Migrate to mantle fluid transfer util

SlimeKnights · Jun 6, 2022 · 2407467 · 2407467
1 parent 0a3f650
commit 2407467
Show file tree

Hide file tree

Showing 33 changed files with 78 additions and 705 deletions.
diff --git a/...g/fluid_transfer/beetroot_soup_empty.json → ...e/fluid_transfer/beetroot_soup_empty.json b/...g/fluid_transfer/beetroot_soup_empty.json → ...e/fluid_transfer/beetroot_soup_empty.json
@@ -1,5 +1,5 @@
 {
-  "type": "tconstruct:empty_item",
+  "type": "mantle:empty_item",
   "input": {
     "item": "minecraft:beetroot_soup"
   },

diff --git a/...ng/fluid_transfer/beetroot_soup_fill.json → ...le/fluid_transfer/beetroot_soup_fill.json b/...ng/fluid_transfer/beetroot_soup_fill.json → ...le/fluid_transfer/beetroot_soup_fill.json
@@ -1,5 +1,5 @@
 {
-  "type": "tconstruct:fill_item",
+  "type": "mantle:fill_item",
   "input": {
     "item": "minecraft:bowl"
   },

diff --git a/...ng/fluid_transfer/honey_bottle_empty.json → ...le/fluid_transfer/honey_bottle_empty.json b/...ng/fluid_transfer/honey_bottle_empty.json → ...le/fluid_transfer/honey_bottle_empty.json
@@ -1,5 +1,5 @@
 {
-  "type": "tconstruct:empty_item",
+  "type": "mantle:empty_item",
   "input": {
     "item": "minecraft:honey_bottle"
   },

diff --git a/...ing/fluid_transfer/honey_bottle_fill.json → ...tle/fluid_transfer/honey_bottle_fill.json b/...ing/fluid_transfer/honey_bottle_fill.json → ...tle/fluid_transfer/honey_bottle_fill.json
@@ -1,5 +1,5 @@
 {
-  "type": "tconstruct:fill_item",
+  "type": "mantle:fill_item",
   "input": {
     "item": "minecraft:glass_bottle"
   },

diff --git a/...g/fluid_transfer/mushroom_stew_empty.json → ...e/fluid_transfer/mushroom_stew_empty.json b/...g/fluid_transfer/mushroom_stew_empty.json → ...e/fluid_transfer/mushroom_stew_empty.json
@@ -1,5 +1,5 @@
 {
-  "type": "tconstruct:empty_item",
+  "type": "mantle:empty_item",
   "input": {
     "item": "minecraft:mushroom_stew"
   },

diff --git a/...ng/fluid_transfer/mushroom_stew_fill.json → ...le/fluid_transfer/mushroom_stew_fill.json b/...ng/fluid_transfer/mushroom_stew_fill.json → ...le/fluid_transfer/mushroom_stew_fill.json
@@ -1,5 +1,5 @@
 {
-  "type": "tconstruct:fill_item",
+  "type": "mantle:fill_item",
   "input": {
     "item": "minecraft:bowl"
   },

diff --git a/...inkering/fluid_transfer/potion_empty.json → ...t/mantle/fluid_transfer/potion_empty.json b/...inkering/fluid_transfer/potion_empty.json → ...t/mantle/fluid_transfer/potion_empty.json
diff --git a/...tinkering/fluid_transfer/potion_fill.json → ...ct/mantle/fluid_transfer/potion_fill.json b/...tinkering/fluid_transfer/potion_fill.json → ...ct/mantle/fluid_transfer/potion_fill.json
@@ -1,5 +1,5 @@
 {
-  "type": "tconstruct:fill_nbt",
+  "type": "mantle:fill_nbt",
   "input": {
     "item": "minecraft:glass_bottle"
   },

diff --git a/...luid_transfer/potion_lingering_empty.json → ...luid_transfer/potion_lingering_empty.json b/...luid_transfer/potion_lingering_empty.json → ...luid_transfer/potion_lingering_empty.json
diff --git a/...fluid_transfer/potion_lingering_fill.json → ...fluid_transfer/potion_lingering_fill.json b/...fluid_transfer/potion_lingering_fill.json → ...fluid_transfer/potion_lingering_fill.json
@@ -1,5 +1,5 @@
 {
-  "type": "tconstruct:fill_nbt",
+  "type": "mantle:fill_nbt",
   "input": {
     "tag": "forge:bottles/lingering"
   },

diff --git a/...luid_transfer/potion_lingering_water.json → ...luid_transfer/potion_lingering_water.json b/...luid_transfer/potion_lingering_water.json → ...luid_transfer/potion_lingering_water.json
@@ -1,5 +1,5 @@
 {
-  "type": "tconstruct:fill_item",
+  "type": "mantle:fill_item",
   "input": {
     "tag": "forge:bottles/lingering"
   },

diff --git a/...g/fluid_transfer/potion_splash_empty.json → ...e/fluid_transfer/potion_splash_empty.json b/...g/fluid_transfer/potion_splash_empty.json → ...e/fluid_transfer/potion_splash_empty.json
diff --git a/...ng/fluid_transfer/potion_splash_fill.json → ...le/fluid_transfer/potion_splash_fill.json b/...ng/fluid_transfer/potion_splash_fill.json → ...le/fluid_transfer/potion_splash_fill.json
@@ -1,5 +1,5 @@
 {
-  "type": "tconstruct:fill_nbt",
+  "type": "mantle:fill_nbt",
   "input": {
     "tag": "forge:bottles/splash"
   },

diff --git a/...g/fluid_transfer/potion_splash_water.json → ...e/fluid_transfer/potion_splash_water.json b/...g/fluid_transfer/potion_splash_water.json → ...e/fluid_transfer/potion_splash_water.json
@@ -1,5 +1,5 @@
 {
-  "type": "tconstruct:fill_item",
+  "type": "mantle:fill_item",
   "input": {
     "tag": "forge:bottles/splash"
   },

diff --git a/...inkering/fluid_transfer/potion_water.json → ...t/mantle/fluid_transfer/potion_water.json b/...inkering/fluid_transfer/potion_water.json → ...t/mantle/fluid_transfer/potion_water.json
@@ -1,5 +1,5 @@
 {
-  "type": "tconstruct:fill_item",
+  "type": "mantle:fill_item",
   "input": {
     "item": "minecraft:glass_bottle"
   },

diff --git a/...ing/fluid_transfer/rabbit_stew_empty.json → ...tle/fluid_transfer/rabbit_stew_empty.json b/...ing/fluid_transfer/rabbit_stew_empty.json → ...tle/fluid_transfer/rabbit_stew_empty.json
@@ -1,5 +1,5 @@
 {
-  "type": "tconstruct:empty_item",
+  "type": "mantle:empty_item",
   "input": {
     "item": "minecraft:rabbit_stew"
   },

diff --git a/...ring/fluid_transfer/rabbit_stew_fill.json → ...ntle/fluid_transfer/rabbit_stew_fill.json b/...ring/fluid_transfer/rabbit_stew_fill.json → ...ntle/fluid_transfer/rabbit_stew_fill.json
@@ -1,5 +1,5 @@
 {
-  "type": "tconstruct:fill_item",
+  "type": "mantle:fill_item",
   "input": {
     "item": "minecraft:bowl"
   },

diff --git a/src/main/java/slimeknights/tconstruct/common/network/TinkerNetwork.java b/src/main/java/slimeknights/tconstruct/common/network/TinkerNetwork.java
@@ -11,7 +11,6 @@
 import net.minecraftforge.network.PacketDistributor;
 import slimeknights.mantle.network.NetworkWrapper;
 import slimeknights.tconstruct.TConstruct;
-import slimeknights.tconstruct.library.fluid.transfer.FluidContainerTransferPacket;
 import slimeknights.tconstruct.library.materials.definition.UpdateMaterialsPacket;
 import slimeknights.tconstruct.library.materials.stats.UpdateMaterialStatsPacket;
 import slimeknights.tconstruct.library.materials.traits.UpdateMaterialTraitsPacket;
@@ -102,7 +101,6 @@ public static void setup() {
     instance.registerPacket(StructureUpdatePacket.class, StructureUpdatePacket::new, NetworkDirection.PLAY_TO_CLIENT);
     instance.registerPacket(SmelteryFluidClickedPacket.class, SmelteryFluidClickedPacket::new, NetworkDirection.PLAY_TO_SERVER);
     instance.registerPacket(StructureErrorPositionPacket.class, StructureErrorPositionPacket::new, NetworkDirection.PLAY_TO_CLIENT);
-    instance.registerPacket(FluidContainerTransferPacket.class, FluidContainerTransferPacket::new, NetworkDirection.PLAY_TO_CLIENT);
   }
 
   /**

diff --git a/src/main/java/slimeknights/tconstruct/fluids/item/EmptyPotionTransfer.java b/src/main/java/slimeknights/tconstruct/fluids/item/EmptyPotionTransfer.java
@@ -10,13 +10,13 @@
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraftforge.fluids.FluidStack;
+import slimeknights.mantle.fluid.transfer.EmptyFluidWithNBTTransfer;
 import slimeknights.mantle.recipe.helper.ItemOutput;
 import slimeknights.tconstruct.TConstruct;
-import slimeknights.tconstruct.library.fluid.transfer.EmptyFluidContainerTransfer;
-import slimeknights.tconstruct.library.fluid.transfer.EmptyFluidWithNBTTransfer;
+import slimeknights.tconstruct.library.fluid.transfer.IFluidContainerTransfer;
 
 /** Fluid transfer info that empties a fluid from an item, copying the fluid's NBT to the stack */
-public class EmptyPotionTransfer extends EmptyFluidWithNBTTransfer {
+public class EmptyPotionTransfer extends EmptyFluidWithNBTTransfer implements IFluidContainerTransfer {
   public static final ResourceLocation ID = TConstruct.getResource("empty_potion");
   public EmptyPotionTransfer(Ingredient input, ItemOutput filled, FluidStack fluid) {
     super(input, filled, fluid);
@@ -38,5 +38,5 @@ public JsonObject serialize(JsonSerializationContext context) {
   }
 
   /** Unique loader instance */
-  public static final JsonDeserializer<EmptyFluidContainerTransfer> DESERIALIZER = new Deserializer<>(EmptyPotionTransfer::new);
+  public static final JsonDeserializer<EmptyPotionTransfer> DESERIALIZER = new Deserializer<>(EmptyPotionTransfer::new);
 }
diff --git a/...limeknights/tconstruct/library/data/tinkering/AbstractFluidContainerTransferProvider.java b/...limeknights/tconstruct/library/data/tinkering/AbstractFluidContainerTransferProvider.java
@@ -1,69 +1,11 @@
 package slimeknights.tconstruct.library.data.tinkering;
 
 import net.minecraft.data.DataGenerator;
-import net.minecraft.data.HashCache;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.PackType;
-import net.minecraft.tags.TagKey;
-import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraft.world.level.ItemLike;
-import net.minecraft.world.level.material.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import slimeknights.mantle.data.GenericDataProvider;
-import slimeknights.mantle.recipe.helper.ItemOutput;
-import slimeknights.mantle.recipe.ingredient.FluidIngredient;
-import slimeknights.tconstruct.library.fluid.transfer.EmptyFluidContainerTransfer;
-import slimeknights.tconstruct.library.fluid.transfer.EmptyFluidWithNBTTransfer;
-import slimeknights.tconstruct.library.fluid.transfer.FillFluidContainerTransfer;
-import slimeknights.tconstruct.library.fluid.transfer.FillFluidWithNBTTransfer;
-import slimeknights.tconstruct.library.fluid.transfer.FluidContainerTransferManager;
-import slimeknights.tconstruct.library.fluid.transfer.IFluidContainerTransfer;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/** Datagen for fluid transfer logic */
-public abstract class AbstractFluidContainerTransferProvider extends GenericDataProvider {
-  private final Map<ResourceLocation,IFluidContainerTransfer> allTransfers = new HashMap<>();
-  private final String modId;
 
+/** @deprecated use {@link slimeknights.mantle.fluid.transfer.AbstractFluidContainerTransferProvider} */
+@Deprecated
+public abstract class AbstractFluidContainerTransferProvider extends slimeknights.mantle.fluid.transfer.AbstractFluidContainerTransferProvider {
   public AbstractFluidContainerTransferProvider(DataGenerator generator, String modId) {
-    super(generator, PackType.SERVER_DATA, FluidContainerTransferManager.FOLDER, FluidContainerTransferManager.GSON);
-    this.modId = modId;
-  }
-
-  /** Function to add all relevant transfers */
-  protected abstract void addTransfers();
-
-  /** Adds a transfer to be saved */
-  protected void addTransfer(ResourceLocation id, IFluidContainerTransfer transfer) {
-    IFluidContainerTransfer previous = allTransfers.putIfAbsent(id, transfer);
-    if (previous != null) {
-      throw new IllegalArgumentException("Duplicate fluid container transfer " + id);
-    }
-  }
-
-  /** Adds a transfer to be saved */
-  protected void addTransfer(String name, IFluidContainerTransfer transfer) {
-    addTransfer(new ResourceLocation(modId, name), transfer);
-  }
-
-  /** Adds generic fill and empty for a container */
-  protected void addFillEmpty(String prefix, ItemLike item, ItemLike container, Fluid fluid, TagKey<Fluid> tag, int amount) {
-    addTransfer(prefix + "empty",  new EmptyFluidContainerTransfer(Ingredient.of(item), ItemOutput.fromItem(container), new FluidStack(fluid, amount)));
-    addTransfer(prefix + "fill", new FillFluidContainerTransfer(Ingredient.of(container), ItemOutput.fromItem(item), FluidIngredient.of(tag, amount)));
-  }
-
-  /** Adds generic fill and empty for a container */
-  protected void addFillEmptyNBT(String prefix, ItemLike item, ItemLike container, Fluid fluid, TagKey<Fluid> tag, int amount) {
-    addTransfer(prefix + "empty",  new EmptyFluidWithNBTTransfer(Ingredient.of(item), ItemOutput.fromItem(container), new FluidStack(fluid, amount)));
-    addTransfer(prefix + "fill", new FillFluidWithNBTTransfer(Ingredient.of(container), ItemOutput.fromItem(item), FluidIngredient.of(tag, amount)));
-  }
-
-  @Override
-  public void run(HashCache cache) throws IOException {
-    addTransfers();
-    allTransfers.forEach((id, data) -> saveThing(cache, id, data));
+    super(generator, modId);
   }
 }