update ae2fc code

magcicada · Mar 3, 2025 · 0f62c54 · 0f62c54
1 parent eef6962
commit 0f62c54
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/co/neeve/nae2/common/containers/ContainerPatternMultiTool.java b/src/main/java/co/neeve/nae2/common/containers/ContainerPatternMultiTool.java
@@ -29,6 +29,7 @@
 import co.neeve.nae2.common.slots.SlotPatternMultiToolUpgrade;
 import com.glodblock.github.common.item.ItemFluidDrop;
 import com.glodblock.github.common.item.ItemFluidEncodedPattern;
+import com.glodblock.github.common.item.fake.FakeItemRegister;
 import com.google.common.collect.Lists;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -40,6 +41,7 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.math.BlockPos;
+import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidUtil;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.relauncher.Side;
@@ -327,10 +329,10 @@ public void onSlotChange(Slot s) {
 								list.set(idx, data);
 							} else continue;
 						} else if (fluidReplacement && stack.getItem() instanceof ItemFluidDrop) {
-							var fluidStack = ItemFluidDrop.getFluidStack(stack);
+							var fluidStack = FakeItemRegister.getStack(stack);
 
 							// This should never be a crafting pattern.
-							if (fluidStackIn.isFluidEqual(fluidStack)) {
+							if (fluidStackIn.isFluidEqual(((FluidStack) fluidStack))) {
 								result = ValidatonResult.OK;
 							}
 						}

diff --git a/src/main/java/co/neeve/nae2/common/net/messages/PatternMultiToolPacket.java b/src/main/java/co/neeve/nae2/common/net/messages/PatternMultiToolPacket.java
@@ -16,13 +16,16 @@
 import co.neeve.nae2.common.net.INAEMessage;
 import com.glodblock.github.common.item.ItemFluidDrop;
 import com.glodblock.github.common.item.ItemFluidEncodedPattern;
+import com.glodblock.github.common.item.fake.FakeFluids;
+import com.glodblock.github.common.item.fake.FakeItemRegister;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
+import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidUtil;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 
@@ -177,9 +180,9 @@ private void searchAndReplace(IContainerPatternMultiTool host, EntityPlayerMP pl
 						list.set(idx, data);
 					} else if (fluidReplacement && stack.getItem() instanceof ItemFluidDrop) {
 						// ¯\_(ツ)_/¯
-						var fluidStack = ItemFluidDrop.getFluidStack(stack);
-						if (fluidStackIn.isFluidEqual(fluidStack)) {
-							var ifd = ItemFluidDrop.newStack(fluidStackOut);
+						var fluidStack = FakeItemRegister.getStack(stack);
+						if (fluidStackIn.isFluidEqual(((FluidStack) fluidStack))) {
+							var ifd = FakeFluids.packFluid2Drops(fluidStackOut);
 							NBTTagCompound ifdCompound;
 							if (ifd == null || (ifdCompound = ifd.getTagCompound()) == null) continue;