Fixed energy conduits being able to be filled with normal fluids.

Fixed Crystal Cutters fluid slot capacity. Fixed Infuser not accepting fluids. Fixed crash with the power suit when pressing rshift.
MartinSVK12 · Mar 15, 2024 · 48ba82f · 48ba82f
1 parent 85e0e49
commit 48ba82f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/src/main/java/sunsetsatellite/signalindustries/inventories/TileEntityConduit.java b/src/main/java/sunsetsatellite/signalindustries/inventories/TileEntityConduit.java
@@ -3,15 +3,19 @@
 
 import net.minecraft.core.block.BlockFluid;
 import sunsetsatellite.catalyst.fluids.impl.tiles.TileEntityFluidPipe;
+import sunsetsatellite.catalyst.fluids.util.FluidStack;
 import sunsetsatellite.signalindustries.SignalIndustries;
 import sunsetsatellite.signalindustries.blocks.base.BlockContainerTiered;
 
+import java.util.ArrayList;
+
 public class TileEntityConduit extends TileEntityFluidPipe {
     public String getInvName() {
         return "Signalum Conduit";
     }
 
     public TileEntityConduit(){
+        acceptedFluids.get(0).clear();
         acceptedFluids.get(0).add((BlockFluid) SignalIndustries.energyFlowing);
     }
 

diff --git a/...n/java/sunsetsatellite/signalindustries/inventories/machines/TileEntityCrystalCutter.java b/...n/java/sunsetsatellite/signalindustries/inventories/machines/TileEntityCrystalCutter.java
@@ -55,6 +55,7 @@ public void writeToNBT(CompoundTag nBTTagCompound1) {
     @Override
     public void tick() {
         recipeId = recipeSelector;
+        fluidCapacity[1] = 1000 * (2 * tier.ordinal());
         super.tick();
     }
 

diff --git a/src/main/java/sunsetsatellite/signalindustries/inventories/machines/TileEntityInfuser.java b/src/main/java/sunsetsatellite/signalindustries/inventories/machines/TileEntityInfuser.java
@@ -4,6 +4,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.block.BlockFluid;
 import net.minecraft.core.item.ItemStack;
+import sunsetsatellite.catalyst.CatalystFluids;
 import sunsetsatellite.catalyst.fluids.util.FluidStack;
 import sunsetsatellite.signalindustries.SignalIndustries;
 import sunsetsatellite.signalindustries.blocks.BlockGlowingObsidian;
@@ -28,6 +29,8 @@ public TileEntityInfuser(){
             acceptedFluids.add(new ArrayList<>());
         }
         acceptedFluids.get(0).add((BlockFluid) SignalIndustries.energyFlowing);
+        acceptedFluids.get(1).addAll(CatalystFluids.FLUIDS.getAllFluids());
+        acceptedFluids.get(1).remove((BlockFluid) SignalIndustries.energyFlowing);
         itemContents = new ItemStack[3];
         energySlot = 0;
         recipeGroup = SIRecipes.INFUSER;

diff --git a/...ain/java/sunsetsatellite/signalindustries/inventories/machines/TileEntityPlateFormer.java b/...ain/java/sunsetsatellite/signalindustries/inventories/machines/TileEntityPlateFormer.java
@@ -18,6 +18,13 @@ public TileEntityPlateFormer(){
         itemInputs = new int[]{0};
         itemOutputs = new int[]{1};
     }
+
+    @Override
+    public void tick() {
+        super.tick();
+        fluidCapacity[0] = 2000 * (2 * tier.ordinal());
+    }
+
     @Override
     public String getInvName() {
         return "Plate Former";

diff --git a/src/main/java/sunsetsatellite/signalindustries/powersuit/SignalumPowerSuit.java b/src/main/java/sunsetsatellite/signalindustries/powersuit/SignalumPowerSuit.java
@@ -306,7 +306,7 @@ public void tick(){
     }
 
     public void activateApplication(){
-        if(module.contents[selectedApplicationSlot] != null) {
+        if(module != null && module.contents[selectedApplicationSlot] != null) {
             IApplicationItem<?> app = (IApplicationItem<?>) module.contents[selectedApplicationSlot].getItem();
             if(app.getType() == ApplicationType.ABILITY){
                 SuitBaseAbility selectedAbility = ((ItemWithAbility) module.contents[selectedApplicationSlot].getItem()).getApplication();
@@ -338,7 +338,7 @@ public void activateApplication(){
     }
 
     public void activateApplication(Entity entity){
-        if(module.contents[selectedApplicationSlot] != null) {
+        if(module != null && module.contents[selectedApplicationSlot] != null) {
             IApplicationItem<?> app = (IApplicationItem<?>) module.contents[selectedApplicationSlot].getItem();
             if(app.getType() == ApplicationType.ABILITY){
                 SuitBaseAbility selectedAbility = ((ItemWithAbility) module.contents[selectedApplicationSlot].getItem()).getApplication();
@@ -369,7 +369,7 @@ public void activateApplication(Entity entity){
     }
 
     public void activateApplication(int x, int y, int z){
-        if(module.contents[selectedApplicationSlot] != null) {
+        if(module != null && module.contents[selectedApplicationSlot] != null) {
             IApplicationItem<?> app = (IApplicationItem<?>) module.contents[selectedApplicationSlot].getItem();
             if(app.getType() == ApplicationType.ABILITY){
                 SuitBaseAbility selectedAbility = ((ItemWithAbility) module.contents[selectedApplicationSlot].getItem()).getApplication();