Major object renaming and refactoring, new small parts

Rename a ton of various items.

Gold objects are now gold(en).
Wood objects are now wood(en).
Smoke bombs and the related are now smoke grenades.

Internally, musket ball entities are no longer referred to as "bullets", and are now "musket balls".

Old entries will automatically be upgraded when opening an old world, so items will be preserved.

New small parts; replacing the generic bomb parts and tool parts are the Grenade Assembly and Tool Joint.

Fix broken entry in the battlefield camp structure.

gradle.properties

@@ -5,9 +5,9 @@ version=1.18.2-1.16.0
 group=com.anonymoushacker1279.immersiveweapons
 mappings_channel=parchment
 mappings_version=2022.05.22-1.18.2
-forge_version=1.18.2-40.1.21
+forge_version=1.18.2-40.1.31
 jei_version=1.18.2:9.5.5.174
-wthit_version=4.10.1
+wthit_version=4.10.3
 badpackets_version=0.1.2
 patchouli_version=1.18.2-67
-terrablender_version=1.18.2-1.1.0.99
+terrablender_version=1.18.2-1.1.0.101

src/generated/resources/assets/immersiveweapons/models/item/wood_shard.json → src/generated/resources/assets/immersiveweapons/models/item/golden_arrow.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "immersiveweapons:item/wood_shard"
+    "layer0": "immersiveweapons:item/golden_arrow"
   }
 }

src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow.json → src/generated/resources/assets/immersiveweapons/models/item/golden_pike_head.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "immersiveweapons:item/smoke_bomb_arrow"
+    "layer0": "immersiveweapons:item/golden_pike_head"
   }
 }

src/generated/resources/assets/immersiveweapons/models/item/grenade_assembly.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "immersiveweapons:item/grenade_assembly"
+  }
+}

src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "immersiveweapons:item/smoke_grenade_arrow"
+  }
+}

src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_blue.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "immersiveweapons:item/smoke_grenade_arrow_blue"
+  }
+}

src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_green.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "immersiveweapons:item/smoke_grenade_arrow_green"
+  }
+}

src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_purple.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "immersiveweapons:item/smoke_grenade_arrow_purple"
+  }
+}

src/generated/resources/assets/immersiveweapons/models/item/small_parts_metal_tool.json → src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_red.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "immersiveweapons:item/small_parts_metal_tool"
+    "layer0": "immersiveweapons:item/smoke_grenade_arrow_red"
   }
 }

src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_yellow.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "immersiveweapons:item/smoke_grenade_arrow_yellow"
+  }
+}

src/generated/resources/assets/immersiveweapons/models/item/gold_arrow.json → src/generated/resources/assets/immersiveweapons/models/item/tool_joint.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "immersiveweapons:item/gold_arrow"
+    "layer0": "immersiveweapons:item/tool_joint"
   }
 }

src/generated/resources/assets/immersiveweapons/models/item/wood_arrow.json → src/generated/resources/assets/immersiveweapons/models/item/wooden_arrow.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "immersiveweapons:item/wood_arrow"
+    "layer0": "immersiveweapons:item/wooden_arrow"
   }
 }

src/generated/resources/assets/immersiveweapons/models/item/wooden_pike_head.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "immersiveweapons:item/wooden_pike_head"
+  }
+}

src/generated/resources/assets/immersiveweapons/models/item/wood_tool_rod.json → src/generated/resources/assets/immersiveweapons/models/item/wooden_shard.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "immersiveweapons:item/wood_tool_rod"
+    "layer0": "immersiveweapons:item/wooden_shard"
   }
 }

src/generated/resources/assets/immersiveweapons/models/item/gold_pike_head.json → src/generated/resources/assets/immersiveweapons/models/item/wooden_tool_rod.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "immersiveweapons:item/gold_pike_head"
+    "layer0": "immersiveweapons:item/wooden_tool_rod"
   }
 }

src/generated/resources/data/immersiveweapons/advancements/blunderbuss.json

@@ -1,5 +1,5 @@
 {
-  "parent": "immersiveweapons:small_partss_table",
+  "parent": "immersiveweapons:small_parts_table",
   "display": {
     "icon": {
       "item": "immersiveweapons:blunderbuss",

src/generated/resources/data/immersiveweapons/advancements/flare_gun.json

@@ -1,5 +1,5 @@
 {
-  "parent": "immersiveweapons:small_partss_table",
+  "parent": "immersiveweapons:small_parts_table",
   "display": {
     "icon": {
       "item": "immersiveweapons:flare_gun",

src/generated/resources/data/immersiveweapons/advancements/flintlock_pistol.json

@@ -1,5 +1,5 @@
 {
-  "parent": "immersiveweapons:small_partss_table",
+  "parent": "immersiveweapons:small_parts_table",
   "display": {
     "icon": {
       "item": "immersiveweapons:flintlock_pistol",

src/generated/resources/data/immersiveweapons/advancements/gauntlet.json

@@ -23,7 +23,7 @@
         "items": [
           {
             "items": [
-              "immersiveweapons:wood_gauntlet"
+              "immersiveweapons:wooden_gauntlet"
             ]
           }
         ]
@@ -47,7 +47,7 @@
         "items": [
           {
             "items": [
-              "immersiveweapons:gold_gauntlet"
+              "immersiveweapons:golden_gauntlet"
             ]
           }
         ]

src/generated/resources/data/immersiveweapons/advancements/musket.json

@@ -1,5 +1,5 @@
 {
-  "parent": "immersiveweapons:small_partss_table",
+  "parent": "immersiveweapons:small_parts_table",
   "display": {
     "icon": {
       "item": "immersiveweapons:musket",

src/generated/resources/data/immersiveweapons/advancements/musket_ball.json

@@ -2,7 +2,7 @@
   "parent": "immersiveweapons:root",
   "display": {
     "icon": {
-      "item": "immersiveweapons:gold_musket_ball"
+      "item": "immersiveweapons:golden_musket_ball"
     },
     "title": {
       "translate": "advancements.immersiveweapons.musket_ball.title"

src/generated/resources/data/immersiveweapons/advancements/pike.json

@@ -23,7 +23,7 @@
         "items": [
           {
             "items": [
-              "immersiveweapons:wood_pike"
+              "immersiveweapons:wooden_pike"
             ]
           }
         ]
@@ -71,7 +71,7 @@
         "items": [
           {
             "items": [
-              "immersiveweapons:gold_pike"
+              "immersiveweapons:golden_pike"
             ]
           }
         ]

src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_arrow.json → src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_arrow.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "immersiveweapons:gold_arrow"
+      "immersiveweapons:golden_arrow"
     ]
   },
   "criteria": {
@@ -19,7 +19,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "immersiveweapons:gold_arrow"
+        "recipe": "immersiveweapons:golden_arrow"
       }
     }
   },

src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_gauntlet.json → src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_gauntlet.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "immersiveweapons:gold_gauntlet"
+      "immersiveweapons:golden_gauntlet"
     ]
   },
   "criteria": {
@@ -19,7 +19,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "immersiveweapons:gold_gauntlet"
+        "recipe": "immersiveweapons:golden_gauntlet"
       }
     }
   },

src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_musket_ball.json → src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_musket_ball.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "immersiveweapons:gold_musket_ball"
+      "immersiveweapons:golden_musket_ball"
     ]
   },
   "criteria": {
@@ -19,7 +19,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "immersiveweapons:gold_musket_ball"
+        "recipe": "immersiveweapons:golden_musket_ball"
       }
     }
   },

src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_pike.json → src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_pike.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "immersiveweapons:gold_pike"
+      "immersiveweapons:golden_pike"
     ]
   },
   "criteria": {
@@ -19,7 +19,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "immersiveweapons:gold_pike"
+        "recipe": "immersiveweapons:golden_pike"
       }
     }
   },

src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/gold_pike_head.json → src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/golden_pike_head.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "immersiveweapons:gold_pike_head"
+      "immersiveweapons:golden_pike_head"
     ]
   },
   "criteria": {
@@ -19,7 +19,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "immersiveweapons:gold_pike_head"
+        "recipe": "immersiveweapons:golden_pike_head"
       }
     }
   },

src/generated/resources/data/immersiveweapons/advancements/recipes/immersiveweapons/pliers.json

@@ -12,7 +12,7 @@
         "items": [
           {
             "items": [
-              "immersiveweapons:small_parts_metal_tool"
+              "immersiveweapons:tool_joint"
             ]
           }
         ]