Make fluids slots functional

GTNewHorizons · Apr 5, 2024 · c39ebc9 · c39ebc9
1 parent 8202645
commit c39ebc9
Show file tree

Hide file tree

Showing 20 changed files with 1,024 additions and 179 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -40,4 +40,4 @@ dependencies {
     //runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.5.4-GTNH:dev")
     // For Thaumcraft runtime
     //runtimeOnlyNonPublishable("com.github.GTNewHorizons:Baubles:1.0.4:dev")
-}
+}
diff --git a/gradle.properties b/gradle.properties
@@ -108,7 +108,7 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories.
+# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/settings.gradle b/settings.gradle
@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.14'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.21'
 }
 
 
diff --git a/src/main/java/com/cleanroommc/modularui/ModularUI.java b/src/main/java/com/cleanroommc/modularui/ModularUI.java
@@ -60,4 +60,4 @@ public void onLoadComplete(FMLLoadCompleteEvent event) {
     public void onServerLoad(FMLServerStartingEvent event) {
         proxy.onServerLoad(event);
     }
-}
+}
diff --git a/src/main/java/com/cleanroommc/modularui/api/IFluidTankLong.java b/src/main/java/com/cleanroommc/modularui/api/IFluidTankLong.java
@@ -53,6 +53,7 @@ default int getCapacity() {
 
     @Override
     default FluidStack getFluid() {
+        if (getRealFluid() == null) return null;
         final FluidStack fluid = new FluidStack(getRealFluid(), getFluidAmount());
         return fluid;
     }
@@ -68,4 +69,6 @@ default FluidTankInfo getInfo() {
         return info;
     }
 
+    IFluidTankLong copy();
+
 }
diff --git a/src/main/java/com/cleanroommc/modularui/future/SlotItemHandler.java b/src/main/java/com/cleanroommc/modularui/future/SlotItemHandler.java
@@ -67,6 +67,10 @@ public IItemStackLong getStackLong() {
 
     @Override
     public void putStack(ItemStack stack) {
+        if (stack == null) {
+            putStackLong(null);
+            return;
+        }
         putStackLong(new ItemStackLongDelegate(stack));
     }
 

diff --git a/src/main/java/com/cleanroommc/modularui/network/NetworkHandler.java b/src/main/java/com/cleanroommc/modularui/network/NetworkHandler.java
@@ -54,4 +54,4 @@ public static void sendToPlayer(IPacket packet, EntityPlayerMP player) {
         NetHandlerPlayServer handler = ctx.getServerHandler();
         return message.executeServer(handler);
     };
-}
+}
diff --git a/src/main/java/com/cleanroommc/modularui/network/NetworkUtils.java b/src/main/java/com/cleanroommc/modularui/network/NetworkUtils.java
@@ -1,7 +1,10 @@
 package com.cleanroommc.modularui.network;
 
 import com.cleanroommc.modularui.ModularUI;
+import com.cleanroommc.modularui.api.IFluidTankLong;
 import com.cleanroommc.modularui.api.IItemStackLong;
+import com.cleanroommc.modularui.utils.fluid.FluidTankLong;
+import com.cleanroommc.modularui.utils.fluid.FluidTankLongDelegate;
 import com.cleanroommc.modularui.utils.item.ItemStackLong;
 
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -12,9 +15,15 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.PacketBuffer;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTank;
+
 import org.jetbrains.annotations.Nullable;
 
+import static com.google.common.primitives.Ints.saturatedCast;
+
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.function.Consumer;
@@ -75,7 +84,12 @@ public static ItemStack readItemStack(PacketBuffer buffer) {
     public static void writeItemStackLong(PacketBuffer buffer, IItemStackLong itemStack) {
         try {
             NBTTagCompound nbt = new NBTTagCompound();
-            itemStack.writeToNBT(nbt);
+            if (itemStack == null) {
+                nbt.setInteger("check", -1);
+            } else {
+                itemStack.writeToNBT(nbt);
+                nbt.setInteger("check", 1);
+            }
             buffer.writeNBTTagCompoundToBuffer(nbt);
         } catch (IOException e) {
             ModularUI.LOGGER.catching(e);
@@ -85,6 +99,8 @@ public static void writeItemStackLong(PacketBuffer buffer, IItemStackLong itemSt
     public static IItemStackLong readItemStackLong(PacketBuffer buffer) {
         try {
             NBTTagCompound nbt = buffer.readNBTTagCompoundFromBuffer();
+            int check = nbt.getInteger("check");
+            if (check < 0) return null;
             return IItemStackLong.loadItemStackFromNBT(nbt);
         } catch (IOException e) {
             ModularUI.LOGGER.catching(e);
@@ -119,6 +135,54 @@ public static FluidStack readFluidStack(PacketBuffer buffer) {
         }
     }
 
+    public static void writeFluidTank(PacketBuffer buffer, @Nullable IFluidTankLong tank) {
+        if (tank == null) {
+            buffer.writeBoolean(true);
+        } else {
+            buffer.writeBoolean(false);
+            NBTTagCompound fluidStackTag = new NBTTagCompound();
+            fluidStackTag.setLong("cap", tank.getCapacityLong());
+            fluidStackTag.setLong("amt", tank.getFluidAmountLong());
+            if (tank.getRealFluid() != null) {
+                fluidStackTag.setString("flu", tank.getRealFluid().getName());
+            }
+            if (tank instanceof FluidTankLongDelegate) {
+                fluidStackTag.setByte("type", (byte)1);
+            } else {
+                fluidStackTag.setByte("type", (byte)0);
+            }
+            try {
+                buffer.writeNBTTagCompoundToBuffer(fluidStackTag);
+            } catch (IOException e) {
+                ModularUI.LOGGER.catching(e);
+            }
+        }
+    }
+
+    @Nullable
+    public static IFluidTankLong readFluidTank(PacketBuffer buffer) {
+        if (buffer.readBoolean()) {
+            return null;
+        }
+        try {
+            NBTTagCompound nbt = buffer.readNBTTagCompoundFromBuffer();
+            byte type = nbt.getByte("type");
+            Fluid fluid = FluidRegistry.getFluid(nbt.getString("flu"));
+            long cap = nbt.getLong("cap");
+            long amt = nbt.getLong("amt");
+            IFluidTankLong tank;
+            if (type == 1) {
+                tank = new FluidTankLongDelegate(new FluidTank(fluid, saturatedCast(cap), saturatedCast(amt)));
+            } else {
+                tank = new FluidTankLong(fluid, cap, amt);
+            }
+            return tank;
+        } catch (IOException e) {
+            ModularUI.LOGGER.catching(e);
+            return null;
+        }
+    }
+
     public static void writeStringSafe(PacketBuffer buffer, String string) {
         writeStringSafe(buffer, string, Short.MAX_VALUE, false);
     }

diff --git a/src/main/java/com/cleanroommc/modularui/test/TestTile.java b/src/main/java/com/cleanroommc/modularui/test/TestTile.java
@@ -130,7 +130,7 @@ public ModularPanel buildUI(PosGuiData guiData, GuiSyncManager guiSyncManager) {
                                                 .child(new ButtonWidget<>()
                                                         .size(60, 18)
                                                         .overlay(IKey.dynamic(() -> "Button " + this.val)))
-                                                .child(new FluidSlot()
+                                                .child(new FluidSlot<>()
                                                         .margin(2)
                                                         .syncHandler(SyncHandlers.fluidSlot(this.fluidTank)))
                                                 .child(new ButtonWidget<>()
@@ -197,7 +197,7 @@ public ModularPanel buildUI(PosGuiData guiData, GuiSyncManager guiSyncManager) {
                                                         .value(SyncHandlers.intNumber(() -> this.cycleState, val -> this.cycleState = val)))*/
                                                 .child(new ItemSlot()
                                                         .slot(SyncHandlers.phantomItemSlot(this.inventory, 0).ignoreMaxStackSize(true)))
-                                                .child(new FluidSlot()
+                                                .child(new FluidSlot<>()
                                                         .margin(2)
                                                         .width(30)
                                                         .syncHandler(SyncHandlers.fluidSlot(this.fluidTankPhantom).phantom(true)))

diff --git a/src/main/java/com/cleanroommc/modularui/utils/fluid/FluidInteractions.java b/src/main/java/com/cleanroommc/modularui/utils/fluid/FluidInteractions.java
@@ -0,0 +1,102 @@
+package com.cleanroommc.modularui.utils.fluid;
+
+import static com.cleanroommc.modularui.ModularUI.isGT5ULoaded;
+
+import codechicken.nei.recipe.StackInfo;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidContainerItem;
+import net.minecraftforge.fluids.IFluidTank;
+
+public class FluidInteractions {
+        /**
+     * Gets fluid actually stored in item. Used for transferring fluid.
+     */
+    public static FluidStack getFluidForRealItem(ItemStack itemStack) {
+        FluidStack fluidStack = null;
+        if (isGT5ULoaded) {
+            fluidStack = GT_Utility.getFluidForFilledItem(itemStack, true);
+        }
+        if (fluidStack == null && itemStack.getItem() instanceof IFluidContainerItem container) {
+            fluidStack = container.getFluid(itemStack);
+        }
+        if (fluidStack == null) {
+            fluidStack = FluidContainerRegistry.getFluidForFilledItem(itemStack);
+        }
+        if (fluidStack == null) {
+            fluidStack = StackInfo.getFluid(itemStack);
+        }
+        return fluidStack;
+    }
+
+    /**
+     * Gets fluid for use in phantom slot.
+     */
+    public static FluidStack getFluidForPhantomItem(ItemStack itemStack) {
+        if (isGT5ULoaded) {
+            return GT_Utility.getFluidFromContainerOrFluidDisplay(itemStack);
+        } else {
+            return StackInfo.getFluid(itemStack);
+        }
+    }
+
+    public static ItemStack fillFluidContainer(FluidStack fluidStack, ItemStack itemStack) {
+        ItemStack filledContainer = fillFluidContainerWithoutIFluidContainerItem(fluidStack, itemStack);
+        if (filledContainer == null) {
+            filledContainer = fillFluidContainerWithIFluidContainerItem(fluidStack, itemStack);
+        }
+        if (filledContainer == null) {
+            filledContainer = FluidContainerRegistry.fillFluidContainer(fluidStack, itemStack);
+            FluidStack newFluid = getFluidForRealItem(filledContainer);
+            fluidStack.amount -= newFluid.amount;
+        }
+        return filledContainer;
+    }
+
+    public static ItemStack fillFluidContainerWithoutIFluidContainerItem(FluidStack fluidStack, ItemStack itemStack) {
+        if (isGT5ULoaded) {
+            return GT_Utility.fillFluidContainer(fluidStack, itemStack, true, false);
+        }
+        return null;
+    }
+
+    public static ItemStack fillFluidContainerWithIFluidContainerItem(FluidStack fluidStack, ItemStack itemStack) {
+        if (itemStack.getItem() instanceof IFluidContainerItem) {
+            IFluidContainerItem tContainerItem = (IFluidContainerItem) itemStack.getItem();
+            int tFilledAmount = tContainerItem.fill(itemStack, fluidStack, true);
+            if (tFilledAmount > 0) {
+                fluidStack.amount -= tFilledAmount;
+                return itemStack;
+            }
+        }
+        return null;
+    }
+
+    public static ItemStack getContainerForFilledItem(ItemStack itemStack) {
+        ItemStack stack = getContainerForFilledItemWithoutIFluidContainerItem(itemStack);
+        if (stack == null && itemStack.getItem() instanceof IFluidContainerItem container) {
+            stack = itemStack.copy();
+            container.drain(stack, Integer.MAX_VALUE, true);
+        }
+        if (stack == null) {
+            stack = FluidContainerRegistry.drainFluidContainer(itemStack.copy());
+        }
+        return stack;
+    }
+
+    public static ItemStack getContainerForFilledItemWithoutIFluidContainerItem(ItemStack itemStack) {
+        if (isGT5ULoaded) {
+            return GT_Utility.getContainerForFilledItem(itemStack, false);
+        }
+        return null;
+    }
+
+    public static int getRealCapacity(IFluidTank fluidTank) {
+        if (fluidTank instanceof IOverflowableTank) {
+            return ((IOverflowableTank) fluidTank).getRealCapacity();
+        }
+        return fluidTank.getCapacity();
+    }
+}
diff --git a/src/main/java/com/cleanroommc/modularui/utils/fluid/FluidTankLong.java b/src/main/java/com/cleanroommc/modularui/utils/fluid/FluidTankLong.java
@@ -23,11 +23,16 @@ public FluidTankLong(Fluid fluid, long capacity) {
         this(fluid, capacity, 0);
     }
 
+    public FluidTankLong(long capacity) {
+        this(null, capacity, 0);
+    }
+
     public FluidTankLong(Fluid fluid, long capacity, long amount) {
         this.fluid = fluid;
         this.capacity = capacity;
         this.amount = amount;
     }
+
     @Override
     public long drainLong(long maxDrain, boolean doDrain) {
         long toDrain = Math.min(maxDrain, amount);
@@ -83,4 +88,9 @@ public void setFluid(Fluid fluid, long amount) {
         this.fluid = fluid;
         this.amount = amount;
     }
+
+    @Override
+    public IFluidTankLong copy() {
+        return new FluidTankLong(getRealFluid(), getCapacityLong(), getFluidAmountLong());
+    }
 }
diff --git a/src/main/java/com/cleanroommc/modularui/utils/fluid/FluidTankLongDelegate.java b/src/main/java/com/cleanroommc/modularui/utils/fluid/FluidTankLongDelegate.java
@@ -6,6 +6,7 @@
 
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.IFluidTank;
 
 public class FluidTankLongDelegate implements IFluidTankLong {
@@ -50,4 +51,9 @@ public void setFluid(Fluid fluid, long amount) {
         delegate.drain(Integer.MAX_VALUE, true);
         delegate.fill(new FluidStack(fluid, saturatedCast(amount)), true);
     }
+
+    @Override
+    public IFluidTankLong copy() {
+        return new FluidTankLongDelegate(new FluidTank(delegate.getFluid(), delegate.getCapacity()));
+    }
 }
diff --git a/src/main/java/com/cleanroommc/modularui/utils/fluid/FluidTanksHandler.java b/src/main/java/com/cleanroommc/modularui/utils/fluid/FluidTanksHandler.java
@@ -1,5 +1,6 @@
 package com.cleanroommc.modularui.utils.fluid;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -15,6 +16,18 @@ public FluidTanksHandler(IFluidTankLong tank) {
         fluids = Collections.singletonList(tank);
     }
 
+    public FluidTanksHandler(int size) {
+        this(size, 10000);
+    }
+
+    public FluidTanksHandler(int size, long capacity) {
+        FluidTankLong[] fluids = new FluidTankLong[size];
+        for (int i = 0; i < fluids.length; i++) {
+            fluids[i] = new FluidTankLong(capacity);
+        }
+        this.fluids = Arrays.asList(fluids);
+    }
+
     @Override
     public int getTanks() {
         return fluids.size();
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,4 +60,4 @@ public void onLoadComplete(FMLLoadCompleteEvent event) { @@
         public void onServerLoad(FMLServerStartingEvent event) {
             proxy.onServerLoad(event);
         }
-    }
+    }