diff --git a/1.11/To-Dos b/1.11/To-Dos index 6bdd41b3..6ea1a4b2 100644 --- a/1.11/To-Dos +++ b/1.11/To-Dos @@ -8,6 +8,17 @@ To-Dos - [ ] Make Wootz Recipes and Tools - [ ] Add Yew +*** Feature Musket *** +- [ ] Create powder charge item (copper, charcoal, gunpowder) +- [ ] Create musket round item (lead or iron nugget) +- [ ] Create wadding item (paper) +- [ ] Create soaked wick item (cordage, bucket of water, gunpowder) +- [ ] Create dried wick item (soaked wick on drying rack) +- [ ] Create lit wick item (dried wick and firebow/torch/flint&steel) +- [ ] Create barrel item +- [ ] Create stock item +- [ ] Create lock assembly item + *** Backlog *** - [ ] Add Iron Ring Recipe - [ ] Add chainmail recipe 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 d19800a3..3d988fd1 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 @@ -140,7 +140,7 @@ public class ModItems { GameRegistry.register(ironhoe); GameRegistry.register(ironsword); - GameRegistry.register(matchlockmusket); + //GameRegistry.register(matchlockmusket); //GameRegistry.register(forgingmanual); } @@ -165,7 +165,7 @@ public class ModItems { registerRender(ironsword); //registerRender(forgingmanual); - registerRender(matchlockmusket); + //registerRender(matchlockmusket); } @SideOnly(Side.CLIENT) diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironsword2.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironsword2.json index cf03f126..7398cd04 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/ironsword2.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironsword2.json @@ -7,8 +7,8 @@ "elements": [ { "__comment": "Cube23", - "from": [ 7, -7, 7.5 ], - "to": [ 9.5, 0, 8.5 ], + "from": [ 7.25, -5.5, 7.25 ], + "to": [ 9.25, 0, 8.75 ], "faces": { "down": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, "up": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, @@ -20,8 +20,8 @@ }, { "__comment": "Cube24", - "from": [ 6.5, -8, 7 ], - "to": [ 10, -7, 9 ], + "from": [ 7, -8, 7 ], + "to": [ 9.5, -5.5, 9 ], "faces": { "down": { "uv": [ 6.5, 7, 9.5, 9 ], "texture": "#texture" }, "up": { "uv": [ 6.5, 7, 9.5, 9 ], "texture": "#texture" }, @@ -33,8 +33,8 @@ }, { "__comment": "Cube25", - "from": [ 5, 0, 6.5 ], - "to": [ 11.5, 1, 9.5 ], + "from": [ 6.5, 0, 7.25 ], + "to": [ 10, 0.5, 8.75 ], "faces": { "down": { "uv": [ 5.5, 6.5, 10.5, 9.5 ], "texture": "#texture" }, "up": { "uv": [ 5.5, 6.5, 10.5, 9.5 ], "texture": "#texture" }, @@ -47,7 +47,7 @@ { "__comment": "Cube23", "from": [ 6.5, 1, 7.5 ], - "to": [ 10, 22.5, 8.5 ], + "to": [ 10, 6, 8.5 ], "faces": { "down": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, "up": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, @@ -60,7 +60,7 @@ { "__comment": "Cube28", "from": [ 8, 1, 8.5 ], - "to": [ 8.5, 22.5, 8.5011 ], + "to": [ 8.5, 24, 8.501 ], "faces": { "down": { "uv": [ 7.5, 7, 8.5, 7.5 ], "texture": "#texture" }, "up": { "uv": [ 7.5, 8.5, 8.5, 9 ], "texture": "#texture" }, @@ -72,8 +72,8 @@ }, { "__comment": "Cube32", - "from": [ 7, 22.5, 8 ], - "to": [ 9.5, 25, 8.33 ], + "from": [ 6.75, 21.5, 7.5 ], + "to": [ 9.75, 23, 8.5 ], "faces": { "down": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, "up": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, @@ -85,8 +85,8 @@ }, { "__comment": "Cube32", - "from": [ 7.5, 25, 8 ], - "to": [ 9, 26.5, 8.25 ], + "from": [ 7.25, 24.5, 7.5 ], + "to": [ 9.25, 26, 8.5 ], "faces": { "down": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, "up": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, @@ -98,47 +98,8 @@ }, { "__comment": "Cube9", - "from": [ 8, 26.5, 8 ], - "to": [ 8.5, 27.5, 8.165 ], - "faces": { - "down": { "uv": [ 8, 7.5, 8.5, 8 ], "texture": "#texture" }, - "up": { "uv": [ 8, 8, 8.5, 8.5 ], "texture": "#texture" }, - "north": { "uv": [ 7.5, 4.5, 8, 5.5 ], "texture": "#texture" }, - "south": { "uv": [ 8, 4.5, 8.5, 5.5 ], "texture": "#texture" }, - "west": { "uv": [ 8, 4.5, 8.5, 5.5 ], "texture": "#texture" }, - "east": { "uv": [ 7.5, 4.5, 8, 5.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube32", - "from": [ 7, 22.5, 7.67 ], - "to": [ 9.5, 25, 8 ], - "faces": { - "down": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture", "rotation": 180 }, - "up": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture", "rotation": 180 }, - "north": { "uv": [ 7, 7, 9, 9.5 ], "texture": "#texture" }, - "south": { "uv": [ 7, 7, 9, 9.5 ], "texture": "#texture" }, - "west": { "uv": [ 7.5, 7, 8.5, 9.5 ], "texture": "#texture" }, - "east": { "uv": [ 7.5, 7, 8.5, 9.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube32", - "from": [ 7.5, 25, 7.75 ], - "to": [ 9, 26.5, 8 ], - "faces": { - "down": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture", "rotation": 180 }, - "up": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture", "rotation": 180 }, - "north": { "uv": [ 7, 7, 9, 8 ], "texture": "#texture" }, - "south": { "uv": [ 7, 7, 9, 8 ], "texture": "#texture" }, - "west": { "uv": [ 7.5, 7, 8.5, 8 ], "texture": "#texture" }, - "east": { "uv": [ 7.5, 7, 8.5, 8 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube9", - "from": [ 8, 26.5, 7.835 ], - "to": [ 8.5, 27.5, 8 ], + "from": [ 7.75, 27, 7.5 ], + "to": [ 8.75, 28, 8.5 ], "faces": { "down": { "uv": [ 8, 7.5, 8.5, 8 ], "texture": "#texture", "rotation": 180 }, "up": { "uv": [ 8, 8, 8.5, 8.5 ], "texture": "#texture", "rotation": 180 }, @@ -151,7 +112,7 @@ { "__comment": "Cube28", "from": [ 8, 1, 7.499 ], - "to": [ 8.5, 22.5, 7.5 ], + "to": [ 8.5, 24, 7.5 ], "faces": { "down": { "uv": [ 7.5, 7, 8.5, 7.5 ], "texture": "#texture", "rotation": 180 }, "up": { "uv": [ 7.5, 8.5, 8.5, 9 ], "texture": "#texture", "rotation": 180 }, @@ -160,29 +121,171 @@ "west": { "uv": [ 7, 0, 7.5, 15 ], "texture": "#texture" }, "east": { "uv": [ 8.5, 0, 9, 15 ], "texture": "#texture" } } + }, + { + "__comment": "Cube14", + "from": [ 6, 0.5, 7.25 ], + "to": [ 10.5, 2.5, 8.75 ], + "faces": { + "down": { "uv": [ 6, 7.25, 10.5, 8.75 ], "texture": "#texture" }, + "up": { "uv": [ 6, 7.25, 10.5, 8.75 ], "texture": "#texture" }, + "north": { "uv": [ 5.5, 13.5, 10, 15.5 ], "texture": "#texture" }, + "south": { "uv": [ 6, 13.5, 10.5, 15.5 ], "texture": "#texture" }, + "west": { "uv": [ 7.25, 13.5, 8.75, 15.5 ], "texture": "#texture" }, + "east": { "uv": [ 7.25, 13.5, 8.75, 15.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube11", + "from": [ 6.25, 0.5, 6.75 ], + "to": [ 10.25, 2.5, 9.25 ], + "faces": { + "down": { "uv": [ 6.25, 6.75, 10.25, 9.25 ], "texture": "#texture" }, + "up": { "uv": [ 6.25, 6.75, 10.25, 9.25 ], "texture": "#texture" }, + "north": { "uv": [ 5.75, 13.5, 9.75, 15.5 ], "texture": "#texture" }, + "south": { "uv": [ 6.25, 13.5, 10.25, 15.5 ], "texture": "#texture" }, + "west": { "uv": [ 6.75, 13.5, 9.25, 15.5 ], "texture": "#texture" }, + "east": { "uv": [ 6.75, 13.5, 9.25, 15.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube13", + "from": [ 7, 23, 7.5 ], + "to": [ 9.5, 24.5, 8.5 ], + "faces": { + "down": { "uv": [ 7, 7.5, 9.5, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7, 7.5, 9.5, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 6.5, 7.5, 9, 9 ], "texture": "#texture" }, + "south": { "uv": [ 7, 7.5, 9.5, 9 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 7.5, 8.5, 9 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 7.5, 8.5, 9 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube14", + "from": [ 7.5, 26, 7.5 ], + "to": [ 9, 27, 8.5 ], + "faces": { + "down": { "uv": [ 7.5, 7.5, 9, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7.5, 7.5, 9, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7, 5, 8.5, 6 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 5, 9, 6 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube15", + "from": [ 7, -7.5, 6.5 ], + "to": [ 9.5, -6, 9.5 ], + "faces": { + "down": { "uv": [ 7, 6.5, 9.5, 9.5 ], "texture": "#texture" }, + "up": { "uv": [ 7, 6.5, 9.5, 9.5 ], "texture": "#texture" }, + "north": { "uv": [ 6.5, 6, 9, 7.5 ], "texture": "#texture" }, + "south": { "uv": [ 7, 6, 9.5, 7.5 ], "texture": "#texture" }, + "west": { "uv": [ 6.5, 6, 9.5, 7.5 ], "texture": "#texture" }, + "east": { "uv": [ 6.5, 6, 9.5, 7.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube16", + "from": [ 6.5, -7.5, 7 ], + "to": [ 10, -6, 9 ], + "faces": { + "down": { "uv": [ 6.5, 7, 10, 9 ], "texture": "#texture" }, + "up": { "uv": [ 6.5, 7, 10, 9 ], "texture": "#texture" }, + "north": { "uv": [ 6, 6, 9.5, 7.5 ], "texture": "#texture" }, + "south": { "uv": [ 6.5, 6, 10, 7.5 ], "texture": "#texture" }, + "west": { "uv": [ 7, 6, 9, 7.5 ], "texture": "#texture" }, + "east": { "uv": [ 7, 6, 9, 7.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube17", + "from": [ 8, -8.5, 7.75 ], + "to": [ 8.5, -8, 8.25 ], + "faces": { + "down": { "uv": [ 8, 7.75, 8.5, 8.25 ], "texture": "#texture" }, + "up": { "uv": [ 8, 7.75, 8.5, 8.25 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 8, 8, 8.5 ], "texture": "#texture" }, + "south": { "uv": [ 8, 8, 8.5, 8.5 ], "texture": "#texture" }, + "west": { "uv": [ 7.75, 8, 8.25, 8.5 ], "texture": "#texture" }, + "east": { "uv": [ 7.75, 8, 8.25, 8.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube24", + "from": [ 6.75, 6, 7.5 ], + "to": [ 9.75, 15.5, 8.5 ], + "faces": { + "down": { "uv": [ 6.75, 7.5, 9.75, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 6.75, 7.5, 9.75, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 6.25, 0.5, 9.25, 10 ], "texture": "#texture" }, + "south": { "uv": [ 6.75, 0.5, 9.75, 10 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 0.5, 8.5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 0.5, 8.5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube19", + "from": [ 6.5, 15.5, 7.5 ], + "to": [ 10, 21.5, 8.5 ], + "faces": { + "down": { "uv": [ 6.5, 7.5, 10, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 6.5, 7.5, 10, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 6, 0, 9.5, 0.5 ], "texture": "#texture" }, + "south": { "uv": [ 6.5, 0, 10, 0.5 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 0, 8.5, 0.5 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 0, 8.5, 0.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube20", + "from": [ 8, 27.75, 7.5 ], + "to": [ 8.5, 28.75, 8.5 ], + "faces": { + "down": { "uv": [ 8, 7.5, 8.5, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 8, 7.5, 8.5, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 3.25, 8, 4.25 ], "texture": "#texture" }, + "south": { "uv": [ 8, 3.25, 8.5, 4.25 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 3.25, 8.5, 4.25 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 3.25, 8.5, 4.25 ], "texture": "#texture" } + } } ], "display": { "thirdperson_righthand": { "rotation": [ 0, 90, 0 ], - "translation": [ 0, 6.6, 1.33 ], - "scale": [ 0.7, 0.75, 0.75 ] + "translation": [ 0, 5.9, 1.33 ], + "scale": [ 0.75, 0.75, 0.75 ] + }, + "thirdperson_lefthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 5.9, 1.33 ], + "scale": [ 0.75, 0.75, 0.75 ] }, "firstperson_righthand": { "rotation": [ 0, 90, 0 ], "translation": [ 0, 6.6, 1 ], "scale": [ 0.75, 0.75, 0.75 ] }, + "firstperson_lefthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 6.6, 1 ], + "scale": [ 0.75, 0.75, 0.75 ] + }, "gui": { "rotation": [ 0, 0, -45 ], "translation": [ -0.4, -0.4, 0 ], "scale": [ 0.5, 0.5, 0.5 ] }, "ground": { - "rotation": [ 90, 0, 0 ] + "rotation": [ 90, 0, 0 ], + "scale": [ 0.75, 0.75, 0.75 ] }, "fixed": { "rotation": [ 0, 0, 45 ], + "translation": [ 0.7, -0.7, 0 ], "scale": [ 0.66, 0.66, 0.66 ] } } 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 index d2b0c602..e782e9a9 100644 --- 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 @@ -355,7 +355,8 @@ "translation": [ -2.781, 2.0869, 0.0003 ] }, "firstperson_lefthand": { - "translation": [ 0, -1.389, 13.912 ] + "rotation": [ -60, 0, 0 ], + "translation": [ 0, 7.6544, 6.2598 ] }, "gui": { "rotation": [ 90, 135, -90 ], 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 index 86af0721..9483e9bd 100644 --- 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 @@ -355,7 +355,8 @@ "translation": [ -2.781, 2.0869, 0.0003 ] }, "firstperson_lefthand": { - "translation": [ 0, -1.389, 13.912 ] + "rotation": [ -60, 0, 0 ], + "translation": [ 0, 7.6544, 6.2598 ] }, "gui": { "rotation": [ 90, 135, -90 ],