Merge pull request #68 from AnonymousHacker1279/1.18.x-dev

Update master branch with 1.18.x-dev changes
AnonymousHacker1279 · Jun 4, 2022 · 980b768 · 980b768
2 parents fda735c + 059e83d
commit 980b768
Show file tree

Hide file tree

Showing 374 changed files with 15,381 additions and 44,285 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,8 +6,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		// FG set to 5.1.34 for now, as it fixes the "Invalid Value: -1" with IDEA 2022.1
-		classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.34', changing: true
+		classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
 		classpath 'org.parchmentmc:librarian:1.+'
 	}
 }
@@ -58,7 +57,7 @@ minecraft {
 			property 'mixin.env.remapRefMap', 'true'
 			property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
 
-			jvmArgs '-Xmx4G'
+			jvmArgs '-Xmx4G', '-XX:+UseShenandoahGC'
 
 			mods {
 				immersiveweapons {
@@ -78,7 +77,7 @@ minecraft {
 			property 'mixin.env.remapRefMap', 'true'
 			property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
 
-			jvmArgs '-Xmx4G'
+			jvmArgs '-Xmx4G', '-XX:+UseShenandoahGC'
 
 			mods {
 				immersiveweapons {
@@ -100,7 +99,7 @@ minecraft {
 
 			args '--mod', 'immersiveweapons', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
 
-			jvmArgs '-Xmx4G'
+			jvmArgs '-Xmx4G', '-XX:+UseShenandoahGC'
 
 			mods {
 				immersiveweapons {
@@ -122,9 +121,10 @@ dependencies {
 	// Include JEI
 	implementation fg.deobf("mezz.jei:jei-${jei_version}")
 
-	// Include WTHIT
-	compileOnly fg.deobf("mcp.mobius.waila:wthit-api:${wthit_version}")
-	runtimeOnly fg.deobf("mcp.mobius.waila:wthit:${wthit_version}")
+	// Include WTHIT and badpackets
+	compileOnly fg.deobf("mcp.mobius.waila:wthit-api:forge-${wthit_version}")
+	runtimeOnly fg.deobf("mcp.mobius.waila:wthit:forge-${wthit_version}")
+	implementation fg.deobf("lol.bai:badpackets:forge-${badpackets_version}")
 
 	// Include Patchouli
 	compileOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}:api")

diff --git a/gradle.properties b/gradle.properties
@@ -1,12 +1,13 @@
 org.gradle.jvmargs=-Xmx6G
 org.gradle.daemon=true
 org.gradle.caching=true
-version=1.18.2-1.15.0
+version=1.18.2-1.16.0
 group=com.anonymoushacker1279.immersiveweapons
 mappings_channel=parchment
-mappings_version=2022.03.13-1.18.2
-forge_version=1.18.2-40.1.0
+mappings_version=2022.05.22-1.18.2
+forge_version=1.18.2-40.1.31
 jei_version=1.18.2:9.5.5.174
-wthit_version=forge-4.8.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
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
diff --git a/src/generated/resources/assets/immersiveweapons/blockstates/small_parts_table.json b/src/generated/resources/assets/immersiveweapons/blockstates/small_parts_table.json
@@ -1,7 +1,19 @@
 {
   "variants": {
-    "": {
+    "facing=east": {
+      "model": "immersiveweapons:block/small_parts_table",
+      "y": 90
+    },
+    "facing=north": {
       "model": "immersiveweapons:block/small_parts_table"
+    },
+    "facing=south": {
+      "model": "immersiveweapons:block/small_parts_table",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "immersiveweapons:block/small_parts_table",
+      "y": 270
     }
   }
 }
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/extended_iron_barrel.json b/src/generated/resources/assets/immersiveweapons/models/item/extended_iron_barrel.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "immersiveweapons:item/extended_iron_barrel"
+  }
+}
diff --git a/...apons/models/item/cobalt_musket_ball.json → ...apons/models/item/flintlock_assembly.json b/...apons/models/item/cobalt_musket_ball.json → ...apons/models/item/flintlock_assembly.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "immersiveweapons:item/cobalt_musket_ball"
+    "layer0": "immersiveweapons:item/flintlock_assembly"
   }
 }
diff --git a/...nerated/resources/assets/immersiveweapons/models/item/gauntlet_scaffolding_blueprint.json b/...nerated/resources/assets/immersiveweapons/models/item/gauntlet_scaffolding_blueprint.json
diff --git a/...iveweapons/models/item/wood_tool_rod.json → ...siveweapons/models/item/golden_arrow.json b/...iveweapons/models/item/wood_tool_rod.json → ...siveweapons/models/item/golden_arrow.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "immersiveweapons:item/wood_tool_rod"
+    "layer0": "immersiveweapons:item/golden_arrow"
   }
 }
diff --git a/...weapons/models/item/gold_musket_ball.json → ...weapons/models/item/golden_pike_head.json b/...weapons/models/item/gold_musket_ball.json → ...weapons/models/item/golden_pike_head.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "immersiveweapons:item/gold_musket_ball"
+    "layer0": "immersiveweapons:item/golden_pike_head"
   }
 }
diff --git a/...veweapons/models/item/gold_pike_head.json → ...weapons/models/item/grenade_assembly.json b/...veweapons/models/item/gold_pike_head.json → ...weapons/models/item/grenade_assembly.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "immersiveweapons:item/gold_pike_head"
+    "layer0": "immersiveweapons:item/grenade_assembly"
   }
 }
diff --git a/...apons/models/item/copper_musket_ball.json → ...apons/models/item/heavy_wooden_stock.json b/...apons/models/item/copper_musket_ball.json → ...apons/models/item/heavy_wooden_stock.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "immersiveweapons:item/copper_musket_ball"
+    "layer0": "immersiveweapons:item/heavy_wooden_stock"
   }
 }
diff --git a/...ersiveweapons/models/item/gold_arrow.json → ...rsiveweapons/models/item/iron_barrel.json b/...ersiveweapons/models/item/gold_arrow.json → ...rsiveweapons/models/item/iron_barrel.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "immersiveweapons:item/gold_arrow"
+    "layer0": "immersiveweapons:item/iron_barrel"
   }
 }
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/iron_musket_ball.json b/src/generated/resources/assets/immersiveweapons/models/item/iron_musket_ball.json
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/netherite_musket_ball.json b/src/generated/resources/assets/immersiveweapons/models/item/netherite_musket_ball.json
diff --git a/...ersiveweapons/models/item/wood_shard.json → ...s/immersiveweapons/models/item/scope.json b/...ersiveweapons/models/item/wood_shard.json → ...s/immersiveweapons/models/item/scope.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "immersiveweapons:item/wood_shard"
+    "layer0": "immersiveweapons:item/scope"
   }
 }
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/scope_mount.json b/src/generated/resources/assets/immersiveweapons/models/item/scope_mount.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "immersiveweapons:item/scope_mount"
+  }
+}
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/short_iron_barrel.json b/src/generated/resources/assets/immersiveweapons/models/item/short_iron_barrel.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "immersiveweapons:item/short_iron_barrel"
+  }
+}
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/small_parts_blueprint.json b/src/generated/resources/assets/immersiveweapons/models/item/small_parts_blueprint.json
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/small_parts_iron.json b/src/generated/resources/assets/immersiveweapons/models/item/small_parts_iron.json
diff --git a/...rated/resources/assets/immersiveweapons/models/item/small_parts_metal_throwable_bomb.json b/...rated/resources/assets/immersiveweapons/models/item/small_parts_metal_throwable_bomb.json
diff --git a/...urces/assets/immersiveweapons/models/item/small_parts_metal_throwable_bomb_blueprint.json b/...urces/assets/immersiveweapons/models/item/small_parts_metal_throwable_bomb_blueprint.json
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/small_parts_metal_tool.json b/src/generated/resources/assets/immersiveweapons/models/item/small_parts_metal_tool.json
diff --git a/...rated/resources/assets/immersiveweapons/models/item/small_parts_metal_tool_blueprint.json b/...rated/resources/assets/immersiveweapons/models/item/small_parts_metal_tool_blueprint.json
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow.json
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_blue.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_blue.json
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_green.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_green.json
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_purple.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_purple.json
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_red.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_red.json
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_yellow.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_bomb_arrow_yellow.json
diff --git a/...pons/models/item/diamond_musket_ball.json → ...pons/models/item/smoke_grenade_arrow.json b/...pons/models/item/diamond_musket_ball.json → ...pons/models/item/smoke_grenade_arrow.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "immersiveweapons:item/diamond_musket_ball"
+    "layer0": "immersiveweapons:item/smoke_grenade_arrow"
   }
 }
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_blue.json b/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"
+  }
+}
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_green.json b/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"
+  }
+}
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_purple.json b/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"
+  }
+}
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_red.json b/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_red.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "immersiveweapons:item/smoke_grenade_arrow_red"
+  }
+}
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/smoke_grenade_arrow_yellow.json b/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"
+  }
+}
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/stone_musket_ball.json b/src/generated/resources/assets/immersiveweapons/models/item/stone_musket_ball.json
diff --git a/...ersiveweapons/models/item/wood_arrow.json → ...ersiveweapons/models/item/tool_joint.json b/...ersiveweapons/models/item/wood_arrow.json → ...ersiveweapons/models/item/tool_joint.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "immersiveweapons:item/wood_arrow"
+    "layer0": "immersiveweapons:item/tool_joint"
   }
 }
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/trigger_assembly.json b/src/generated/resources/assets/immersiveweapons/models/item/trigger_assembly.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "immersiveweapons:item/trigger_assembly"
+  }
+}
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/wide_golden_barrel.json b/src/generated/resources/assets/immersiveweapons/models/item/wide_golden_barrel.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "immersiveweapons:item/wide_golden_barrel"
+  }
+}
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/wood_musket_ball.json b/src/generated/resources/assets/immersiveweapons/models/item/wood_musket_ball.json
diff --git a/src/generated/resources/assets/immersiveweapons/models/item/wood_pike_head.json b/src/generated/resources/assets/immersiveweapons/models/item/wood_pike_head.json