Migrate spilling fluids to a tinkering folder

As part of this change, spilling fluid effects no longer sync to client, just the ingredient
SlimeKnights · May 5, 2022 · 1fcc588 · 1fcc588
1 parent 6a5e356
commit 1fcc588
Show file tree

Hide file tree

Showing 70 changed files with 1,077 additions and 1,079 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -11,14 +11,14 @@ minecraft_version=1.18.2
 minecraft_range=[1.18.2,1.19)
 
 # Forge Version Information
-forge_version=40.1.14
+forge_version=40.1.16
 loader_range=[39.0,)
-forge_range=[40.1.3,)
+forge_range=[40.1.16,)
 parchment_version=2022.03.13
 
 # Build Dependencies
-mantle_version=1.9.17
-mantle_range=1.9.17,)
+mantle_version=1.9.19
+mantle_range=1.9.19,)
 
 # Optional compat
 jei_version=9.5.3.153

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/spilling/potion_fluid.json b/src/generated/resources/data/tconstruct/recipes/tools/spilling/potion_fluid.json
diff --git a/...recipes/tools/spilling/beetroot_soup.json → ...uct/tinkering/spilling/beetroot_soup.json b/...recipes/tools/spilling/beetroot_soup.json → ...uct/tinkering/spilling/beetroot_soup.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "forge:beetroot_soup",
     "amount": 50

diff --git a/...recipes/tools/spilling/blazing_blood.json → ...uct/tinkering/spilling/blazing_blood.json b/...recipes/tools/spilling/blazing_blood.json → ...uct/tinkering/spilling/blazing_blood.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "tconstruct:blazing_blood",
     "amount": 50

diff --git a/...nstruct/recipes/tools/spilling/blood.json → .../tconstruct/tinkering/spilling/blood.json b/...nstruct/recipes/tools/spilling/blood.json → .../tconstruct/tinkering/spilling/blood.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "tconstruct:blood",
     "amount": 50

diff --git a/...onstruct/recipes/tools/spilling/clay.json → ...a/tconstruct/tinkering/spilling/clay.json b/...onstruct/recipes/tools/spilling/clay.json → ...a/tconstruct/tinkering/spilling/clay.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "tconstruct:spilling/clay",
     "amount": 50

diff --git a/.../recipes/tools/spilling/molten_ender.json → .../tconstruct/tinkering/spilling/ender.json b/.../recipes/tools/spilling/molten_ender.json → .../tconstruct/tinkering/spilling/ender.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "forge:ender",
     "amount": 50

diff --git a/...t/recipes/tools/spilling/ender_slime.json → ...truct/tinkering/spilling/ender_slime.json b/...t/recipes/tools/spilling/ender_slime.json → ...truct/tinkering/spilling/ender_slime.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "tconstruct:ender_slime",
     "amount": 50

diff --git a/...nstruct/recipes/tools/spilling/glass.json → .../tconstruct/tinkering/spilling/glass.json b/...nstruct/recipes/tools/spilling/glass.json → .../tconstruct/tinkering/spilling/glass.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "tconstruct:spilling/glass",
     "amount": 100

diff --git a/...nstruct/recipes/tools/spilling/honey.json → .../tconstruct/tinkering/spilling/honey.json b/...nstruct/recipes/tools/spilling/honey.json → .../tconstruct/tinkering/spilling/honey.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "forge:honey",
     "amount": 50

diff --git a/...onstruct/recipes/tools/spilling/lava.json → ...a/tconstruct/tinkering/spilling/lava.json b/...onstruct/recipes/tools/spilling/lava.json → ...a/tconstruct/tinkering/spilling/lava.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "name": "minecraft:lava",
     "amount": 50

diff --git a/...t/recipes/tools/spilling/liquid_soul.json → ...truct/tinkering/spilling/liquid_soul.json b/...t/recipes/tools/spilling/liquid_soul.json → ...truct/tinkering/spilling/liquid_soul.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "tconstruct:liquid_soul",
     "amount": 50

diff --git a/...nstruct/recipes/tools/spilling/magma.json → .../tconstruct/tinkering/spilling/magma.json b/...nstruct/recipes/tools/spilling/magma.json → .../tconstruct/tinkering/spilling/magma.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "forge:magma",
     "amount": 50

diff --git a/...recipes/tools/spilling/metal_average.json → ...uct/tinkering/spilling/metal_average.json b/...recipes/tools/spilling/metal_average.json → ...uct/tinkering/spilling/metal_average.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "tconstruct:spilling/metal/average",
     "amount": 10

diff --git a/...t/recipes/tools/spilling/metal_cheap.json → ...truct/tinkering/spilling/metal_cheap.json b/...t/recipes/tools/spilling/metal_cheap.json → ...truct/tinkering/spilling/metal_cheap.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "tconstruct:spilling/metal/cheap",
     "amount": 10

diff --git a/...cipes/tools/spilling/metal_expensive.json → ...t/tinkering/spilling/metal_expensive.json b/...cipes/tools/spilling/metal_expensive.json → ...t/tinkering/spilling/metal_expensive.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "tconstruct:spilling/metal/expensive",
     "amount": 10

diff --git a/...onstruct/recipes/tools/spilling/milk.json → ...a/tconstruct/tinkering/spilling/milk.json b/...onstruct/recipes/tools/spilling/milk.json → ...a/tconstruct/tinkering/spilling/milk.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "forge:milk",
     "amount": 100
@@ -9,8 +8,6 @@
       "type": "tconstruct:cure_effects",
       "item": "minecraft:milk_bucket"
     },
-    {
-      "type": "tconstruct:calcified"
-    }
+    null
   ]
 }
diff --git a/...t/recipes/tools/spilling/molten_gold.json → ...truct/tinkering/spilling/molten_gold.json b/...t/recipes/tools/spilling/molten_gold.json → ...truct/tinkering/spilling/molten_gold.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "forge:molten_gold",
     "amount": 10

diff --git a/...cipes/tools/spilling/molten_pig_iron.json → ...t/tinkering/spilling/molten_pig_iron.json b/...cipes/tools/spilling/molten_pig_iron.json → ...t/tinkering/spilling/molten_pig_iron.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "tconstruct:molten_pig_iron",
     "amount": 10

diff --git a/...ecipes/tools/spilling/molten_uranium.json → ...ct/tinkering/spilling/molten_uranium.json b/...ecipes/tools/spilling/molten_uranium.json → ...ct/tinkering/spilling/molten_uranium.json
@@ -1,7 +1,6 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
-    "tag": "tconstruct:molten_uranium",
+    "tag": "forge:molten_uranium",
     "amount": 10
   },
   "effects": [
@@ -17,15 +16,15 @@
         "damage_amount": 1.5
       }
     },
+    {
+      "type": "tconstruct:set_fire",
+      "time": 3
+    },
     {
       "type": "tconstruct:effect",
       "name": "minecraft:poison",
       "time": 10,
       "level": 1
-    },
-    {
-      "type": "tconstruct:set_fire",
-      "time": 3
     }
   ]
 }
diff --git a/...recipes/tools/spilling/mushroom_stew.json → ...uct/tinkering/spilling/mushroom_stew.json b/...recipes/tools/spilling/mushroom_stew.json → ...uct/tinkering/spilling/mushroom_stew.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "forge:mushroom_stew",
     "amount": 50

diff --git a/...s/tools/spilling/create_potion_fluid.json → ...uct/tinkering/spilling/potion_create.json b/...s/tools/spilling/create_potion_fluid.json → ...uct/tinkering/spilling/potion_create.json
@@ -1,11 +1,8 @@
 {
-  "type": "tconstruct:spilling",
-  "conditions": [
-    {
-      "modid": "create",
-      "type": "forge:mod_loaded"
-    }
-  ],
+  "condition": {
+    "modid": "create",
+    "type": "forge:mod_loaded"
+  },
   "fluid": {
     "name": "create:potion",
     "amount": 125

diff --git a/src/generated/resources/data/tconstruct/tinkering/spilling/potion_fluid.json b/src/generated/resources/data/tconstruct/tinkering/spilling/potion_fluid.json
@@ -0,0 +1,20 @@
+{
+  "condition": {
+    "value": {
+      "registry": "minecraft:fluid",
+      "tag": "forge:potion",
+      "type": "mantle:tag_empty"
+    },
+    "type": "forge:not"
+  },
+  "fluid": {
+    "tag": "forge:potion",
+    "amount": 125
+  },
+  "effects": [
+    {
+      "type": "tconstruct:potion_fluid",
+      "scale": 0.5
+    }
+  ]
+}
diff --git a/...t/recipes/tools/spilling/rabbit_stew.json → ...truct/tinkering/spilling/rabbit_stew.json b/...t/recipes/tools/spilling/rabbit_stew.json → ...truct/tinkering/spilling/rabbit_stew.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "forge:rabbit_stew",
     "amount": 50

diff --git a/...uct/recipes/tools/spilling/sky_slime.json → ...nstruct/tinkering/spilling/sky_slime.json b/...uct/recipes/tools/spilling/sky_slime.json → ...nstruct/tinkering/spilling/sky_slime.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "tconstruct:sky_slime",
     "amount": 50

diff --git a/...t/recipes/tools/spilling/earth_slime.json → .../tconstruct/tinkering/spilling/slime.json b/...t/recipes/tools/spilling/earth_slime.json → .../tconstruct/tinkering/spilling/slime.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "forge:slime",
     "amount": 50

diff --git a/...nstruct/recipes/tools/spilling/venom.json → .../tconstruct/tinkering/spilling/venom.json b/...nstruct/recipes/tools/spilling/venom.json → .../tconstruct/tinkering/spilling/venom.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "tag": "tconstruct:venom",
     "amount": 50

diff --git a/...nstruct/recipes/tools/spilling/water.json → .../tconstruct/tinkering/spilling/water.json b/...nstruct/recipes/tools/spilling/water.json → .../tconstruct/tinkering/spilling/water.json
@@ -1,5 +1,4 @@
 {
-  "type": "tconstruct:spilling",
   "fluid": {
     "name": "minecraft:water",
     "amount": 50

diff --git a/src/main/java/slimeknights/tconstruct/common/network/TinkerNetwork.java b/src/main/java/slimeknights/tconstruct/common/network/TinkerNetwork.java
@@ -16,6 +16,7 @@
 import slimeknights.tconstruct.library.materials.stats.UpdateMaterialStatsPacket;
 import slimeknights.tconstruct.library.materials.traits.UpdateMaterialTraitsPacket;
 import slimeknights.tconstruct.library.modifiers.UpdateModifiersPacket;
+import slimeknights.tconstruct.library.modifiers.spilling.UpdateSpillingFluidsPacket;
 import slimeknights.tconstruct.library.tools.definition.UpdateToolDefinitionDataPacket;
 import slimeknights.tconstruct.library.tools.layout.UpdateTinkerSlotLayoutsPacket;
 import slimeknights.tconstruct.shared.network.GeneratePartTexturesPacket;
@@ -91,6 +92,7 @@ public static void setup() {
     instance.registerPacket(TinkerControlPacket.class, TinkerControlPacket::read, NetworkDirection.PLAY_TO_SERVER);
     instance.registerPacket(OnChestplateUsePacket.class, OnChestplateUsePacket::read, NetworkDirection.PLAY_TO_SERVER);
     instance.registerPacket(UpdateModifiersPacket.class, UpdateModifiersPacket::new, NetworkDirection.PLAY_TO_CLIENT);
+    instance.registerPacket(UpdateSpillingFluidsPacket.class, UpdateSpillingFluidsPacket::new, NetworkDirection.PLAY_TO_CLIENT);
 
     // smeltery
     instance.registerPacket(FluidUpdatePacket.class, FluidUpdatePacket::new, NetworkDirection.PLAY_TO_CLIENT);