diff --git a/1.11/screenshots/2017-04-02_13.38.45.png b/1.11/screenshots/2017-04-02_13.38.45.png new file mode 100644 index 00000000..89c1b89e Binary files /dev/null and b/1.11/screenshots/2017-04-02_13.38.45.png differ diff --git a/1.11/screenshots/2017-04-02_13.49.03.png b/1.11/screenshots/2017-04-02_13.49.03.png new file mode 100644 index 00000000..3ba4e650 Binary files /dev/null and b/1.11/screenshots/2017-04-02_13.49.03.png differ diff --git a/1.11/screenshots/2017-04-02_13.49.19.png b/1.11/screenshots/2017-04-02_13.49.19.png new file mode 100644 index 00000000..dac013b8 Binary files /dev/null and b/1.11/screenshots/2017-04-02_13.49.19.png differ diff --git a/1.11/screenshots/2017-04-02_13.49.33.png b/1.11/screenshots/2017-04-02_13.49.33.png new file mode 100644 index 00000000..0c0a8d1e Binary files /dev/null and b/1.11/screenshots/2017-04-02_13.49.33.png differ diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 079c385d..d19800a3 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -26,6 +26,7 @@ import nmd.primal.forgecraft.items.*; import nmd.primal.forgecraft.items.parts.ToolPart; import nmd.primal.forgecraft.items.tools.*; import nmd.primal.forgecraft.items.weapons.CustomSword; +import nmd.primal.forgecraft.items.weapons.Musket; import nmd.primal.forgecraft.util.ToolMaterials; import nmd.primal.forgecraft.items.tools.BaseTool.ForgeToolMaterial; @@ -56,6 +57,7 @@ public class ModItems { public static Item ironhoe; public static Item ironsword; + public static Item matchlockmusket; //public static Item forgingmanual; @@ -79,6 +81,7 @@ public class ModItems { ironsword = new CustomSword("ironsword", ModMaterials.TOOL_WROUGHT_IRON); //ironingotballcool = new BaseMultiItem("ironingotcool") {}; //test = new ItemTest("ironsword"); + matchlockmusket = new Musket("matchlock_musket"); ironingotballhot = new BaseMultiItem("ironingothot", ModMaterials.TOOL_WROUGHT_IRON); ironchunkhot = new BaseMultiItem("ironchunkhot", ModMaterials.TOOL_WROUGHT_IRON); @@ -137,6 +140,7 @@ public class ModItems { GameRegistry.register(ironhoe); GameRegistry.register(ironsword); + GameRegistry.register(matchlockmusket); //GameRegistry.register(forgingmanual); } @@ -161,6 +165,7 @@ public class ModItems { registerRender(ironsword); //registerRender(forgingmanual); + registerRender(matchlockmusket); } @SideOnly(Side.CLIENT) diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java new file mode 100644 index 00000000..b09a1fdc --- /dev/null +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java @@ -0,0 +1,19 @@ +package nmd.primal.forgecraft.items.weapons; + +import net.minecraft.item.Item; +import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.items.BaseItem; + +/** + * Created by Lyle on 4/2/2017. + */ +public class Musket extends BaseItem{ + + public Musket(String name) { + this.setUnlocalizedName(name); + this.setRegistryName(name); + this.setCreativeTab(ModInfo.TAB_FORGECRAFT); + this.setMaxStackSize(1); + this.setNoRepair(); + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/Matchlock_Musket.cubik b/1.11/src/main/resources/assets/forgecraft/models/item/Matchlock_Musket.cubik deleted file mode 100644 index fc69a76d..00000000 Binary files a/1.11/src/main/resources/assets/forgecraft/models/item/Matchlock_Musket.cubik and /dev/null differ diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/e_particle.png b/1.11/src/main/resources/assets/forgecraft/models/item/e_particle.png new file mode 100644 index 00000000..e557878f Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/models/item/e_particle.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/e_texture.png b/1.11/src/main/resources/assets/forgecraft/models/item/e_texture.png new file mode 100644 index 00000000..7291f2ea Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/models/item/e_texture.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironsword 2.cubik b/1.11/src/main/resources/assets/forgecraft/models/item/ironsword 2.cubik deleted file mode 100644 index 9e548b8c..00000000 Binary files a/1.11/src/main/resources/assets/forgecraft/models/item/ironsword 2.cubik and /dev/null differ diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/matchlock_musket.json b/1.11/src/main/resources/assets/forgecraft/models/item/matchlock_musket.json new file mode 100644 index 00000000..d2b0c602 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/matchlock_musket.json @@ -0,0 +1,371 @@ +{ + "__comment": "Designed by Captainaviator with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot" + }, + "elements": [ + { + "__comment": "Barrel", + "from": [ 7.25, 10.875, 2.25 ], + "to": [ 8.25, 11.375, 29.75 ], + "faces": { + "down": { "uv": [ 7.25, 0, 8.25, 13.75 ], "texture": "#texture1" }, + "up": { "uv": [ 7.25, 2.25, 8.25, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 7.75, 4.625, 8.75, 5.125 ], "texture": "#texture1" }, + "south": { "uv": [ 7.25, 4.625, 8.25, 5.125 ], "texture": "#texture1" }, + "west": { "uv": [ 2.25, 4.625, 16, 5.125 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 4.625, 13.75, 5.125 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube2", + "from": [ 7, 9.75, -1.5 ], + "to": [ 8.5, 11.25, 24.5 ], + "faces": { + "down": { "uv": [ 7, 0, 8.5, 16 ], "texture": "#texture" }, + "up": { "uv": [ 7, 0, 8.5, 16 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 4.75, 9, 6.25 ], "texture": "#texture" }, + "south": { "uv": [ 7, 4.75, 8.5, 6.25 ], "texture": "#texture" }, + "west": { "uv": [ 0, 4.75, 16, 6.25 ], "texture": "#texture" }, + "east": { "uv": [ 0, 4.75, 16, 6.25 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube3", + "from": [ 7, 10.25, 24.25 ], + "to": [ 8.5, 11.25, 28.25 ], + "faces": { + "down": { "uv": [ 7, 3.75, 8.5, 7.75 ], "texture": "#texture" }, + "up": { "uv": [ 7, 8.25, 8.5, 12.25 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 4.75, 9, 5.75 ], "texture": "#texture" }, + "south": { "uv": [ 7, 4.75, 8.5, 5.75 ], "texture": "#texture" }, + "west": { "uv": [ 8.25, 4.75, 12.25, 5.75 ], "texture": "#texture" }, + "east": { "uv": [ 3.75, 4.75, 7.75, 5.75 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube4", + "from": [ 7.5, 9.875, 24.25 ], + "to": [ 8, 10.375, 28.75 ], + "faces": { + "down": { "uv": [ 7.5, 3.25, 8, 7.75 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 8.25, 8, 12.75 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 5.625, 8.5, 6.125 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 5.625, 8, 6.125 ], "texture": "#texture1" }, + "west": { "uv": [ 8.25, 5.625, 12.75, 6.125 ], "texture": "#texture1" }, + "east": { "uv": [ 3.25, 5.625, 7.75, 6.125 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube5", + "from": [ 7, 7.2071, -6.2929 ], + "to": [ 8.5, 8.7071, -0.2928996 ], + "rotation": { "origin": [ 7, 7.5, -7 ], "axis": "x", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 4, 5.5, 5, 9 ], "texture": "#texture" }, + "up": { "uv": [ 12, 9, 11, 5.5 ], "texture": "#texture" }, + "north": { "uv": [ 5, 6, 4, 4.5 ], "texture": "#texture" }, + "south": { "uv": [ 4, 10, 5, 11.5 ], "texture": "#texture" }, + "west": { "uv": [ 10, 5.5, 11.5, 9 ], "texture": "#texture", "rotation": 90 }, + "east": { "uv": [ 4.5, 5.5, 6, 9 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "Cube6", + "from": [ 7, 8.25, -7.375 ], + "to": [ 8.5, 10.75, -6.375 ], + "rotation": { "origin": [ 7, 8.25, -7.375 ], "axis": "x", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 4, 10, 5, 11.5 ], "texture": "#texture" }, + "up": { "uv": [ 4, 4.5, 5, 6 ], "texture": "#texture" }, + "north": { "uv": [ 11, 6, 12, 11.5 ], "texture": "#texture" }, + "south": { "uv": [ 4, 6, 5, 11.5 ], "texture": "#texture" }, + "west": { "uv": [ 4.5, 6, 6, 11.5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 6, 11.5, 11.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube7", + "from": [ 7, 5.625, -6.9786 ], + "to": [ 8.5, 9.125, -5.4786 ], + "rotation": { "origin": [ 7, 9.375, -5.375 ], "axis": "x", "angle": 22.5 }, + "faces": { + "down": { "uv": [ 4, 8, 5, 9 ], "texture": "#texture" }, + "up": { "uv": [ 4, 7, 5, 8 ], "texture": "#texture" }, + "north": { "uv": [ 5, 5.5, 4, 2 ], "texture": "#texture" }, + "south": { "uv": [ 12, 5.5, 11, 2 ], "texture": "#texture" }, + "west": { "uv": [ 8, 2, 9, 5.5 ], "texture": "#texture", "rotation": 180 }, + "east": { "uv": [ 7, 2, 8, 5.5 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "Cube8", + "from": [ 7, 10, -7.875 ], + "to": [ 8.5, 11, -4.875 ], + "rotation": { "origin": [ 7, 10, -7.875 ], "axis": "x", "angle": 22.5 }, + "faces": { + "down": { "uv": [ 4, 3.5, 5, 10.5 ], "texture": "#texture" }, + "up": { "uv": [ 4, 5.5, 5, 12.5 ], "texture": "#texture" }, + "north": { "uv": [ 11, 5, 12, 6 ], "texture": "#texture" }, + "south": { "uv": [ 4, 5, 5, 6 ], "texture": "#texture" }, + "west": { "uv": [ 5.5, 5, 12.5, 6 ], "texture": "#texture" }, + "east": { "uv": [ 3.5, 5, 10.5, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube9", + "from": [ 7, 9.75, -3 ], + "to": [ 8.5, 10.75, -2 ], + "faces": { + "down": { "uv": [ 7, 2, 8.5, 3 ], "texture": "#texture" }, + "up": { "uv": [ 7, 13, 8.5, 14 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 5.25, 9, 6.25 ], "texture": "#texture" }, + "south": { "uv": [ 7, 5.25, 8.5, 6.25 ], "texture": "#texture" }, + "west": { "uv": [ 13, 5.25, 14, 6.25 ], "texture": "#texture" }, + "east": { "uv": [ 2, 5.25, 3, 6.25 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube10", + "from": [ 7, 7.25, -7.875 ], + "to": [ 8.5, 9.75, -6.875 ], + "faces": { + "down": { "uv": [ 7, 6.875, 8.5, 7.875 ], "texture": "#texture" }, + "up": { "uv": [ 7, 8.125, 8.5, 9.125 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 6.25, 9, 8.75 ], "texture": "#texture" }, + "south": { "uv": [ 7, 6.25, 8.5, 8.75 ], "texture": "#texture" }, + "west": { "uv": [ 8.125, 6.25, 9.125, 8.75 ], "texture": "#texture" }, + "east": { "uv": [ 6.875, 6.25, 7.875, 8.75 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube11", + "from": [ 7, 9, -7 ], + "to": [ 8.5, 10.5, -4 ], + "faces": { + "down": { "uv": [ 7, 4, 8.5, 7 ], "texture": "#texture" }, + "up": { "uv": [ 7, 9, 8.5, 12 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 5.5, 9, 7 ], "texture": "#texture" }, + "south": { "uv": [ 7, 5.5, 8.5, 7 ], "texture": "#texture" }, + "west": { "uv": [ 9, 5.5, 12, 7 ], "texture": "#texture" }, + "east": { "uv": [ 4, 5.5, 7, 7 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube12", + "from": [ 7, 8.5, -6.875 ], + "to": [ 8.5, 9.5, -2.375 ], + "rotation": { "origin": [ 7, 8.5, -6.875 ], "axis": "x", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 4, 1.5, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 4, 11, 5, 14.5 ], "texture": "#texture" }, + "north": { "uv": [ 11, 4, 12, 4.5 ], "texture": "#texture" }, + "south": { "uv": [ 4, 4, 5, 4.5 ], "texture": "#texture" }, + "west": { "uv": [ 11, 4, 14.5, 4.5 ], "texture": "#texture" }, + "east": { "uv": [ 1.5, 4, 5, 4.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube13", + "from": [ 7, 9.25, -2.25 ], + "to": [ 8.5, 10.25, 6.75 ], + "faces": { + "down": { "uv": [ 7, 9.25, 8.5, 16 ], "texture": "#texture" }, + "up": { "uv": [ 7, 0, 8.5, 6.75 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 5.75, 9, 6.75 ], "texture": "#texture" }, + "south": { "uv": [ 7, 5.75, 8.5, 6.75 ], "texture": "#texture" }, + "west": { "uv": [ 0, 5.75, 6.75, 6.75 ], "texture": "#texture" }, + "east": { "uv": [ 9.25, 5.75, 16, 6.75 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube14", + "from": [ 6.875, 9.75, -0.875 ], + "to": [ 7.875, 10.75, 6.125 ], + "faces": { + "down": { "uv": [ 6.875, 9.875, 7.875, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 6.875, 0, 7.875, 6.125 ], "texture": "#texture1" }, + "north": { "uv": [ 8.125, 5.25, 9.125, 6.25 ], "texture": "#texture1" }, + "south": { "uv": [ 6.875, 5.25, 7.875, 6.25 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 5.25, 6.125, 6.25 ], "texture": "#texture1" }, + "east": { "uv": [ 9.875, 5.25, 16, 6.25 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube15", + "from": [ 7.5, 8.625, 0 ], + "to": [ 8, 9.625, 0.5 ], + "faces": { + "down": { "uv": [ 7.5, 15.5, 8, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 0, 8, 0.5 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 6.375, 8.5, 7.375 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 6.375, 8, 7.375 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 6.375, 0.5, 7.375 ], "texture": "#texture1" }, + "east": { "uv": [ 15.5, 6.375, 16, 7.375 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube16", + "from": [ 7.5, 8.125, -0.5 ], + "to": [ 8, 8.625, 0.5 ], + "faces": { + "down": { "uv": [ 7.5, 15.5, 8, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 0, 8, 0.5 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 7.375, 8.5, 7.875 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 7.375, 8, 7.875 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 7.375, 0.5, 7.875 ], "texture": "#texture1" }, + "east": { "uv": [ 15.5, 7.375, 16, 7.875 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube17", + "from": [ 7.5, 7, -3 ], + "to": [ 8, 7.5, 0 ], + "rotation": { "origin": [ 7.5, 7, -3 ], "axis": "x", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 4, 0, 4.5, 2 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 14, 4.5, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 11.5, 8, 12, 8.5 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 8, 4.5, 8.5 ], "texture": "#texture1" }, + "west": { "uv": [ 14, 8, 16, 8.5 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 8, 2, 8.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube18", + "from": [ 7.5, 6.125, -4.5 ], + "to": [ 8, 8.125, -4 ], + "rotation": { "origin": [ 7.5, 6.125, -4.5 ], "axis": "x", "angle": 45 }, + "faces": { + "down": { "uv": [ 4, 1, 4.5, 1.5 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 14.5, 4.5, 15 ], "texture": "#texture1" }, + "north": { "uv": [ 11.5, 7.5, 12, 9.5 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 7.5, 4.5, 9.5 ], "texture": "#texture1" }, + "west": { "uv": [ 14.5, 7.5, 15, 9.5 ], "texture": "#texture1" }, + "east": { "uv": [ 1, 7.5, 1.5, 9.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube19", + "from": [ 6.375, 10, 5.5 ], + "to": [ 6.875, 10.5, 7 ], + "rotation": { "origin": [ 6.375, 10, 5.5 ], "axis": "x", "angle": -45 }, + "faces": { + "down": { "uv": [ 4, 10.5, 5, 12 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 4, 5, 5.5 ], "texture": "#texture1" }, + "north": { "uv": [ 11, 8.5, 12, 9 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 8.5, 5, 9 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 8.5, 5.5, 9 ], "texture": "#texture1" }, + "east": { "uv": [ 10.5, 8.5, 12, 9 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube20", + "from": [ 6.375, 11, 6 ], + "to": [ 6.875, 12, 6.5 ], + "faces": { + "down": { "uv": [ 4, 11.5, 5, 12 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 4, 5, 4.5 ], "texture": "#texture1" }, + "north": { "uv": [ 11, 7.5, 12, 9 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 7.5, 5, 9 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 7.5, 4.5, 9 ], "texture": "#texture1" }, + "east": { "uv": [ 11.5, 7.5, 12, 9 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube21", + "from": [ 6.375, 11.75, 6 ], + "to": [ 6.875, 13.25, 6.5 ], + "rotation": { "origin": [ 6.375, 11.75, 6 ], "axis": "x", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 4, 11.5, 5, 12 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 4, 5, 4.5 ], "texture": "#texture1" }, + "north": { "uv": [ 11, 7.5, 12, 9 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 7.5, 5, 9 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 7.5, 4.5, 9 ], "texture": "#texture1" }, + "east": { "uv": [ 11.5, 7.5, 12, 9 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube22", + "from": [ 6.375, 12.875, 4.375 ], + "to": [ 6.875, 13.375, 5.875 ], + "faces": { + "down": { "uv": [ 4, 11, 4.5, 12.5 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 3.5, 4.5, 5 ], "texture": "#texture1" }, + "north": { "uv": [ 11.5, 2.5, 12, 3 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 2.5, 4.5, 3 ], "texture": "#texture1" }, + "west": { "uv": [ 3.5, 2.5, 5, 3 ], "texture": "#texture1" }, + "east": { "uv": [ 11, 2.5, 12.5, 3 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube23", + "from": [ 7, 11.25, 2.25 ], + "to": [ 7.5, 11.75, 2.75 ], + "faces": { + "down": { "uv": [ 7, 13.25, 7.5, 13.75 ], "texture": "#texture1" }, + "up": { "uv": [ 7, 2.25, 7.5, 2.75 ], "texture": "#texture1" }, + "north": { "uv": [ 8.5, 4.25, 9, 4.75 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 4.25, 7.5, 4.75 ], "texture": "#texture1" }, + "west": { "uv": [ 2.25, 4.25, 2.75, 4.75 ], "texture": "#texture1" }, + "east": { "uv": [ 13.25, 4.25, 13.75, 4.75 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube24", + "from": [ 7.5, 11.5, 28.5 ], + "to": [ 8, 12, 29 ], + "faces": { + "down": { "uv": [ 7.5, 3, 8, 3.5 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 12.5, 8, 13 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 4, 8.5, 4.5 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 4, 8, 4.5 ], "texture": "#texture1" }, + "west": { "uv": [ 12.5, 4, 13, 4.5 ], "texture": "#texture1" }, + "east": { "uv": [ 3, 4, 3.5, 4.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube25", + "from": [ 7.5, 10.625, 2.25 ], + "to": [ 8, 11.625, 29.75 ], + "faces": { + "down": { "uv": [ 7.5, 0, 8, 13.5 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 2.5, 8, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 4.375, 8.5, 5.375 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 4.375, 8, 5.375 ], "texture": "#texture1" }, + "west": { "uv": [ 2.5, 4.375, 16, 5.375 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 4.375, 13.5, 5.375 ], "texture": "#texture1" } + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [ 90, -180, 0 ], + "translation": [ -0.695, 4.1739, -1.391 ] + }, + "thirdperson_lefthand": { + "rotation": [ 6, 0, 0 ], + "translation": [ 0.0002, -1.389, 13.912 ] + }, + "firstperson_righthand": { + "rotation": [ 29, 166, 0 ], + "translation": [ -2.781, 2.0869, 0.0003 ] + }, + "firstperson_lefthand": { + "translation": [ 0, -1.389, 13.912 ] + }, + "gui": { + "rotation": [ 90, 135, -90 ], + "translation": [ 0, -1.4, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "fixed": { + "rotation": [ 90, -135, 90 ], + "translation": [ 0.7, -1.4, 0 ], + "scale": [ 0.6, 0.6, 0.6 ] + } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/matchlock_musket2.json b/1.11/src/main/resources/assets/forgecraft/models/item/matchlock_musket2.json new file mode 100644 index 00000000..86af0721 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/matchlock_musket2.json @@ -0,0 +1,371 @@ +{ + "__comment": "Designed by Captainaviator with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "blocks/e_particle", + "texture": "blocks/e_texture", + "texture1": "blocks/e_texture" + }, + "elements": [ + { + "__comment": "Barrel", + "from": [ 7.25, 10.875, 2.25 ], + "to": [ 8.25, 11.375, 29.75 ], + "faces": { + "down": { "uv": [ 7.25, 0, 8.25, 13.75 ], "texture": "#texture1" }, + "up": { "uv": [ 7.25, 2.25, 8.25, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 7.75, 4.625, 8.75, 5.125 ], "texture": "#texture1" }, + "south": { "uv": [ 7.25, 4.625, 8.25, 5.125 ], "texture": "#texture1" }, + "west": { "uv": [ 2.25, 4.625, 16, 5.125 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 4.625, 13.75, 5.125 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube2", + "from": [ 7, 9.75, -1.5 ], + "to": [ 8.5, 11.25, 24.5 ], + "faces": { + "down": { "uv": [ 7, 0, 8.5, 16 ], "texture": "#texture" }, + "up": { "uv": [ 7, 0, 8.5, 16 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 4.75, 9, 6.25 ], "texture": "#texture" }, + "south": { "uv": [ 7, 4.75, 8.5, 6.25 ], "texture": "#texture" }, + "west": { "uv": [ 0, 4.75, 16, 6.25 ], "texture": "#texture" }, + "east": { "uv": [ 0, 4.75, 16, 6.25 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube3", + "from": [ 7, 10.25, 24.25 ], + "to": [ 8.5, 11.25, 28.25 ], + "faces": { + "down": { "uv": [ 7, 3.75, 8.5, 7.75 ], "texture": "#texture" }, + "up": { "uv": [ 7, 8.25, 8.5, 12.25 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 4.75, 9, 5.75 ], "texture": "#texture" }, + "south": { "uv": [ 7, 4.75, 8.5, 5.75 ], "texture": "#texture" }, + "west": { "uv": [ 8.25, 4.75, 12.25, 5.75 ], "texture": "#texture" }, + "east": { "uv": [ 3.75, 4.75, 7.75, 5.75 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube4", + "from": [ 7.5, 9.875, 24.25 ], + "to": [ 8, 10.375, 28.75 ], + "faces": { + "down": { "uv": [ 7.5, 3.25, 8, 7.75 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 8.25, 8, 12.75 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 5.625, 8.5, 6.125 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 5.625, 8, 6.125 ], "texture": "#texture1" }, + "west": { "uv": [ 8.25, 5.625, 12.75, 6.125 ], "texture": "#texture1" }, + "east": { "uv": [ 3.25, 5.625, 7.75, 6.125 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube5", + "from": [ 7, 7.2071, -6.2929 ], + "to": [ 8.5, 8.7071, -0.2928996 ], + "rotation": { "origin": [ 7, 7.5, -7 ], "axis": "x", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 4, 5.5, 5, 9 ], "texture": "#texture" }, + "up": { "uv": [ 12, 9, 11, 5.5 ], "texture": "#texture" }, + "north": { "uv": [ 5, 6, 4, 4.5 ], "texture": "#texture" }, + "south": { "uv": [ 4, 10, 5, 11.5 ], "texture": "#texture" }, + "west": { "uv": [ 10, 5.5, 11.5, 9 ], "texture": "#texture", "rotation": 90 }, + "east": { "uv": [ 4.5, 5.5, 6, 9 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "Cube6", + "from": [ 7, 8.25, -7.375 ], + "to": [ 8.5, 10.75, -6.375 ], + "rotation": { "origin": [ 7, 8.25, -7.375 ], "axis": "x", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 4, 10, 5, 11.5 ], "texture": "#texture" }, + "up": { "uv": [ 4, 4.5, 5, 6 ], "texture": "#texture" }, + "north": { "uv": [ 11, 6, 12, 11.5 ], "texture": "#texture" }, + "south": { "uv": [ 4, 6, 5, 11.5 ], "texture": "#texture" }, + "west": { "uv": [ 4.5, 6, 6, 11.5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 6, 11.5, 11.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube7", + "from": [ 7, 5.625, -6.9786 ], + "to": [ 8.5, 9.125, -5.4786 ], + "rotation": { "origin": [ 7, 9.375, -5.375 ], "axis": "x", "angle": 22.5 }, + "faces": { + "down": { "uv": [ 4, 8, 5, 9 ], "texture": "#texture" }, + "up": { "uv": [ 4, 7, 5, 8 ], "texture": "#texture" }, + "north": { "uv": [ 5, 5.5, 4, 2 ], "texture": "#texture" }, + "south": { "uv": [ 12, 5.5, 11, 2 ], "texture": "#texture" }, + "west": { "uv": [ 8, 2, 9, 5.5 ], "texture": "#texture", "rotation": 180 }, + "east": { "uv": [ 7, 2, 8, 5.5 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "Cube8", + "from": [ 7, 10, -7.875 ], + "to": [ 8.5, 11, -4.875 ], + "rotation": { "origin": [ 7, 10, -7.875 ], "axis": "x", "angle": 22.5 }, + "faces": { + "down": { "uv": [ 4, 3.5, 5, 10.5 ], "texture": "#texture" }, + "up": { "uv": [ 4, 5.5, 5, 12.5 ], "texture": "#texture" }, + "north": { "uv": [ 11, 5, 12, 6 ], "texture": "#texture" }, + "south": { "uv": [ 4, 5, 5, 6 ], "texture": "#texture" }, + "west": { "uv": [ 5.5, 5, 12.5, 6 ], "texture": "#texture" }, + "east": { "uv": [ 3.5, 5, 10.5, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube9", + "from": [ 7, 9.75, -3 ], + "to": [ 8.5, 10.75, -2 ], + "faces": { + "down": { "uv": [ 7, 2, 8.5, 3 ], "texture": "#texture" }, + "up": { "uv": [ 7, 13, 8.5, 14 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 5.25, 9, 6.25 ], "texture": "#texture" }, + "south": { "uv": [ 7, 5.25, 8.5, 6.25 ], "texture": "#texture" }, + "west": { "uv": [ 13, 5.25, 14, 6.25 ], "texture": "#texture" }, + "east": { "uv": [ 2, 5.25, 3, 6.25 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube10", + "from": [ 7, 7.25, -7.875 ], + "to": [ 8.5, 9.75, -6.875 ], + "faces": { + "down": { "uv": [ 7, 6.875, 8.5, 7.875 ], "texture": "#texture" }, + "up": { "uv": [ 7, 8.125, 8.5, 9.125 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 6.25, 9, 8.75 ], "texture": "#texture" }, + "south": { "uv": [ 7, 6.25, 8.5, 8.75 ], "texture": "#texture" }, + "west": { "uv": [ 8.125, 6.25, 9.125, 8.75 ], "texture": "#texture" }, + "east": { "uv": [ 6.875, 6.25, 7.875, 8.75 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube11", + "from": [ 7, 9, -7 ], + "to": [ 8.5, 10.5, -4 ], + "faces": { + "down": { "uv": [ 7, 4, 8.5, 7 ], "texture": "#texture" }, + "up": { "uv": [ 7, 9, 8.5, 12 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 5.5, 9, 7 ], "texture": "#texture" }, + "south": { "uv": [ 7, 5.5, 8.5, 7 ], "texture": "#texture" }, + "west": { "uv": [ 9, 5.5, 12, 7 ], "texture": "#texture" }, + "east": { "uv": [ 4, 5.5, 7, 7 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube12", + "from": [ 7, 8.5, -6.875 ], + "to": [ 8.5, 9.5, -2.375 ], + "rotation": { "origin": [ 7, 8.5, -6.875 ], "axis": "x", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 4, 1.5, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 4, 11, 5, 14.5 ], "texture": "#texture" }, + "north": { "uv": [ 11, 4, 12, 4.5 ], "texture": "#texture" }, + "south": { "uv": [ 4, 4, 5, 4.5 ], "texture": "#texture" }, + "west": { "uv": [ 11, 4, 14.5, 4.5 ], "texture": "#texture" }, + "east": { "uv": [ 1.5, 4, 5, 4.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube13", + "from": [ 7, 9.25, -2.25 ], + "to": [ 8.5, 10.25, 6.75 ], + "faces": { + "down": { "uv": [ 7, 9.25, 8.5, 16 ], "texture": "#texture" }, + "up": { "uv": [ 7, 0, 8.5, 6.75 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 5.75, 9, 6.75 ], "texture": "#texture" }, + "south": { "uv": [ 7, 5.75, 8.5, 6.75 ], "texture": "#texture" }, + "west": { "uv": [ 0, 5.75, 6.75, 6.75 ], "texture": "#texture" }, + "east": { "uv": [ 9.25, 5.75, 16, 6.75 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube14", + "from": [ 6.875, 9.75, -0.875 ], + "to": [ 7.875, 10.75, 6.125 ], + "faces": { + "down": { "uv": [ 6.875, 9.875, 7.875, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 6.875, 0, 7.875, 6.125 ], "texture": "#texture1" }, + "north": { "uv": [ 8.125, 5.25, 9.125, 6.25 ], "texture": "#texture1" }, + "south": { "uv": [ 6.875, 5.25, 7.875, 6.25 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 5.25, 6.125, 6.25 ], "texture": "#texture1" }, + "east": { "uv": [ 9.875, 5.25, 16, 6.25 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube15", + "from": [ 7.5, 8.625, 0 ], + "to": [ 8, 9.625, 0.5 ], + "faces": { + "down": { "uv": [ 7.5, 15.5, 8, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 0, 8, 0.5 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 6.375, 8.5, 7.375 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 6.375, 8, 7.375 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 6.375, 0.5, 7.375 ], "texture": "#texture1" }, + "east": { "uv": [ 15.5, 6.375, 16, 7.375 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube16", + "from": [ 7.5, 8.125, -0.5 ], + "to": [ 8, 8.625, 0.5 ], + "faces": { + "down": { "uv": [ 7.5, 15.5, 8, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 0, 8, 0.5 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 7.375, 8.5, 7.875 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 7.375, 8, 7.875 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 7.375, 0.5, 7.875 ], "texture": "#texture1" }, + "east": { "uv": [ 15.5, 7.375, 16, 7.875 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube17", + "from": [ 7.5, 7, -3 ], + "to": [ 8, 7.5, 0 ], + "rotation": { "origin": [ 7.5, 7, -3 ], "axis": "x", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 4, 0, 4.5, 2 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 14, 4.5, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 11.5, 8, 12, 8.5 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 8, 4.5, 8.5 ], "texture": "#texture1" }, + "west": { "uv": [ 14, 8, 16, 8.5 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 8, 2, 8.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube18", + "from": [ 7.5, 6.125, -4.5 ], + "to": [ 8, 8.125, -4 ], + "rotation": { "origin": [ 7.5, 6.125, -4.5 ], "axis": "x", "angle": 45 }, + "faces": { + "down": { "uv": [ 4, 1, 4.5, 1.5 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 14.5, 4.5, 15 ], "texture": "#texture1" }, + "north": { "uv": [ 11.5, 7.5, 12, 9.5 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 7.5, 4.5, 9.5 ], "texture": "#texture1" }, + "west": { "uv": [ 14.5, 7.5, 15, 9.5 ], "texture": "#texture1" }, + "east": { "uv": [ 1, 7.5, 1.5, 9.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube19", + "from": [ 6.375, 10, 5.5 ], + "to": [ 6.875, 10.5, 7 ], + "rotation": { "origin": [ 6.375, 10, 5.5 ], "axis": "x", "angle": -45 }, + "faces": { + "down": { "uv": [ 4, 10.5, 5, 12 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 4, 5, 5.5 ], "texture": "#texture1" }, + "north": { "uv": [ 11, 8.5, 12, 9 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 8.5, 5, 9 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 8.5, 5.5, 9 ], "texture": "#texture1" }, + "east": { "uv": [ 10.5, 8.5, 12, 9 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube20", + "from": [ 6.375, 11, 6 ], + "to": [ 6.875, 12, 6.5 ], + "faces": { + "down": { "uv": [ 4, 11.5, 5, 12 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 4, 5, 4.5 ], "texture": "#texture1" }, + "north": { "uv": [ 11, 7.5, 12, 9 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 7.5, 5, 9 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 7.5, 4.5, 9 ], "texture": "#texture1" }, + "east": { "uv": [ 11.5, 7.5, 12, 9 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube21", + "from": [ 6.375, 11.75, 6 ], + "to": [ 6.875, 13.25, 6.5 ], + "rotation": { "origin": [ 6.375, 11.75, 6 ], "axis": "x", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 4, 11.5, 5, 12 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 4, 5, 4.5 ], "texture": "#texture1" }, + "north": { "uv": [ 11, 7.5, 12, 9 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 7.5, 5, 9 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 7.5, 4.5, 9 ], "texture": "#texture1" }, + "east": { "uv": [ 11.5, 7.5, 12, 9 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube22", + "from": [ 6.375, 12.875, 4.375 ], + "to": [ 6.875, 13.375, 5.875 ], + "faces": { + "down": { "uv": [ 4, 11, 4.5, 12.5 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 3.5, 4.5, 5 ], "texture": "#texture1" }, + "north": { "uv": [ 11.5, 2.5, 12, 3 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 2.5, 4.5, 3 ], "texture": "#texture1" }, + "west": { "uv": [ 3.5, 2.5, 5, 3 ], "texture": "#texture1" }, + "east": { "uv": [ 11, 2.5, 12.5, 3 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube23", + "from": [ 7, 11.25, 2.25 ], + "to": [ 7.5, 11.75, 2.75 ], + "faces": { + "down": { "uv": [ 7, 13.25, 7.5, 13.75 ], "texture": "#texture1" }, + "up": { "uv": [ 7, 2.25, 7.5, 2.75 ], "texture": "#texture1" }, + "north": { "uv": [ 8.5, 4.25, 9, 4.75 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 4.25, 7.5, 4.75 ], "texture": "#texture1" }, + "west": { "uv": [ 2.25, 4.25, 2.75, 4.75 ], "texture": "#texture1" }, + "east": { "uv": [ 13.25, 4.25, 13.75, 4.75 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube24", + "from": [ 7.5, 11.5, 28.5 ], + "to": [ 8, 12, 29 ], + "faces": { + "down": { "uv": [ 7.5, 3, 8, 3.5 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 12.5, 8, 13 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 4, 8.5, 4.5 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 4, 8, 4.5 ], "texture": "#texture1" }, + "west": { "uv": [ 12.5, 4, 13, 4.5 ], "texture": "#texture1" }, + "east": { "uv": [ 3, 4, 3.5, 4.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube25", + "from": [ 7.5, 10.625, 2.25 ], + "to": [ 8, 11.625, 29.75 ], + "faces": { + "down": { "uv": [ 7.5, 0, 8, 13.5 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 2.5, 8, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 4.375, 8.5, 5.375 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 4.375, 8, 5.375 ], "texture": "#texture1" }, + "west": { "uv": [ 2.5, 4.375, 16, 5.375 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 4.375, 13.5, 5.375 ], "texture": "#texture1" } + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [ 90, -180, 0 ], + "translation": [ -0.695, 4.1739, -1.391 ] + }, + "thirdperson_lefthand": { + "rotation": [ 6, 0, 0 ], + "translation": [ 0.0002, -1.389, 13.912 ] + }, + "firstperson_righthand": { + "rotation": [ 29, 166, 0 ], + "translation": [ -2.781, 2.0869, 0.0003 ] + }, + "firstperson_lefthand": { + "translation": [ 0, -1.389, 13.912 ] + }, + "gui": { + "rotation": [ 90, 135, -90 ], + "translation": [ 0, -1.4, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "fixed": { + "rotation": [ 90, -135, 90 ], + "translation": [ 0.7, -1.4, 0 ], + "scale": [ 0.6, 0.6, 0.6 ] + } + } +} \ No newline at end of file