Fix Drum Item fluid property handling (#2128)

GregTechCEu · Oct 13, 2024 · 0bbf126 · 0bbf126
1 parent 6b4eb5e
commit 0bbf126
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 8 deletions.
diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/DrumMachineItem.java b/src/main/java/com/gregtechceu/gtceu/common/item/DrumMachineItem.java
@@ -2,12 +2,18 @@
 
 import com.gregtechceu.gtceu.api.block.IMachineBlock;
 import com.gregtechceu.gtceu.api.item.MetaMachineItem;
+import com.gregtechceu.gtceu.api.material.material.Material;
+import com.gregtechceu.gtceu.api.material.material.properties.FluidPipeProperties;
+import com.gregtechceu.gtceu.api.material.material.properties.PropertyKey;
+import com.gregtechceu.gtceu.api.misc.forge.ThermalFluidHandlerItemStack;
 import com.gregtechceu.gtceu.data.machine.GTMachines;
 import com.gregtechceu.gtceu.data.tag.GTDataComponents;
 
+import net.minecraft.world.item.ItemStack;
 import net.neoforged.neoforge.capabilities.Capabilities;
 import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
 import net.neoforged.neoforge.fluids.capability.templates.FluidHandlerItemStack;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author KilaBash
@@ -16,18 +22,85 @@
  */
 public class DrumMachineItem extends MetaMachineItem {
 
-    protected DrumMachineItem(IMachineBlock block, Properties properties) {
+    private Material mat;
+
+    protected DrumMachineItem(IMachineBlock block, Properties properties, Material mat) {
         super(block, properties);
+        this.mat = mat;
     }
 
-    public static DrumMachineItem create(IMachineBlock block, Properties properties) {
-        return new DrumMachineItem(block, properties);
+    public static DrumMachineItem create(IMachineBlock block, Properties properties, Material mat) {
+        return new DrumMachineItem(block, properties, mat);
     }
 
     public void attachCapabilities(RegisterCapabilitiesEvent event) {
-        event.registerItem(Capabilities.FluidHandler.ITEM,
-                (stack, ignored) -> new FluidHandlerItemStack(GTDataComponents.FLUID_CONTENT, stack,
-                        GTMachines.DRUM_CAPACITY.getInt(getDefinition())),
-                this);
+        if(mat.hasProperty(PropertyKey.FLUID_PIPE)) {
+            FluidPipeProperties property = mat.getProperty(PropertyKey.FLUID_PIPE);
+            event.registerItem(Capabilities.FluidHandler.ITEM,
+                    (stack, ignored) -> new ThermalFluidHandlerItemStack(stack, GTMachines.DRUM_CAPACITY.getInt(getDefinition()),
+                            property.getMaxFluidTemperature(), property.isGasProof(), property.isAcidProof(), property.isCryoProof(),
+                            property.isPlasmaProof()), this);
+        } else {
+            event.registerItem(Capabilities.FluidHandler.ITEM,
+                    (stack, ignored) -> new FluidHandlerItemStack(GTDataComponents.FLUID_CONTENT, stack,
+                            GTMachines.DRUM_CAPACITY.getInt(getDefinition())),
+                    this);
+        }
     }
 }
+
+/*
+package com.gregtechceu.gtceu.api.item;
+
+import com.gregtechceu.gtceu.api.block.IMachineBlock;
+import com.gregtechceu.gtceu.api.data.chemical.material.Material;
+import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties;
+import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey;
+import com.gregtechceu.gtceu.api.misc.forge.ThermalFluidHandlerItemStack;
+import com.gregtechceu.gtceu.common.data.GTMachines;
+
+import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
+import net.minecraftforge.common.util.LazyOptional;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author KilaBash
+ * @date 2023/3/28
+ * @implNote DrumMachineItem
+*/
+/*
+public class DrumMachineItem extends MetaMachineItem {
+
+    private Material mat;
+
+    protected DrumMachineItem(IMachineBlock block, Properties properties, Material mat) {
+        super(block, properties);
+        this.mat = mat;
+    }
+
+    public static DrumMachineItem create(IMachineBlock block, Properties properties, Material mat) {
+        return new DrumMachineItem(block, properties, mat);
+    }
+
+    public @NotNull <T> LazyOptional<T> getCapability(ItemStack itemStack, @NotNull Capability<T> cap) {
+        FluidPipeProperties property;
+        if (mat.hasProperty(PropertyKey.FLUID_PIPE))
+            property = mat.getProperty(PropertyKey.FLUID_PIPE);
+        else property = null;
+
+        if (cap == ForgeCapabilities.FLUID_HANDLER_ITEM && property != null) {
+            return ForgeCapabilities.FLUID_HANDLER_ITEM.orEmpty(cap, LazyOptional.of(
+                    () -> new ThermalFluidHandlerItemStack(
+                            itemStack,
+                            Math.toIntExact(GTMachines.DRUM_CAPACITY.get(getDefinition())),
+                            property.getMaxFluidTemperature(), property.isGasProof(), property.isAcidProof(),
+                            property.isCryoProof(), property.isPlasmaProof())));
+        }
+        return LazyOptional.empty();
+    }
+}
+
+*/
diff --git a/src/main/java/com/gregtechceu/gtceu/data/machine/GTMachines.java b/src/main/java/com/gregtechceu/gtceu/data/machine/GTMachines.java
@@ -2681,7 +2681,8 @@ public static MachineDefinition registerDrum(Material material, int capacity, St
         var definition = REGISTRATE
                 .machine(material.getName() + "_drum", MachineDefinition::createDefinition,
                         holder -> new DrumMachine(holder, material, capacity), MetaMachineBlock::new,
-                        DrumMachineItem::create, MetaMachineBlockEntity::createBlockEntity)
+                        (holder, prop) -> DrumMachineItem.create(holder, prop, material),
+                        MetaMachineBlockEntity::createBlockEntity)
                 .langValue(lang)
                 .rotationState(RotationState.NONE)
                 .renderer(