From cf8ef8ad5f8b18fca3035b3d2f9cef13f56defd7 Mon Sep 17 00:00:00 2001 From: pupnewfster Date: Sat, 30 Mar 2019 18:44:50 -0400 Subject: [PATCH] Move configuration capability checking from CapabilityUtils to TileEntityComponentConfig --- .../tile/TileEntityChemicalCrystallizer.java | 3 +- .../common/tile/TileEntityFactory.java | 6 ++-- .../TileEntityFormulaicAssemblicator.java | 3 +- .../common/tile/TileEntityGasTank.java | 2 +- .../tile/TileEntityMetallurgicInfuser.java | 2 +- .../tile/TileEntityQuantumEntangloporter.java | 2 +- .../tile/component/TileComponentConfig.java | 25 ++++++++++++++++- .../tile/prefab/TileEntityBasicMachine.java | 2 +- .../mekanism/common/util/CapabilityUtils.java | 28 ------------------- 9 files changed, 33 insertions(+), 40 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 047818463..1901bd962 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -26,7 +26,6 @@ import mekanism.common.recipe.machines.CrystallizerRecipe; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.tile.prefab.TileEntityOperationalMachine; -import mekanism.common.util.CapabilityUtils; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.ItemDataUtils; @@ -237,7 +236,7 @@ public class TileEntityChemicalCrystallizer extends TileEntityOperationalMachine @Override public boolean isCapabilityDisabled(@Nonnull Capability capability, EnumFacing side) { - return CapabilityUtils.isCapabilityDisabled(capability, side, this) || super + return configComponent.isCapabilityDisabled(capability, side, facing) || super .isCapabilityDisabled(capability, side); } diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 4af83fd50..87a1a984a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -49,7 +49,6 @@ import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; import mekanism.common.tile.prefab.TileEntityMachine; -import mekanism.common.util.CapabilityUtils; import mekanism.common.util.ChargeUtils; import mekanism.common.util.GasUtils; import mekanism.common.util.InventoryUtils; @@ -406,7 +405,8 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt continue; } - Pair evened = StackUtils.even(inventory.get(invID1.ID), inventory.get(invID2.ID)); + Pair evened = StackUtils + .even(inventory.get(invID1.ID), inventory.get(invID2.ID)); inventory.set(invID1.ID, evened.getLeft()); inventory.set(invID2.ID, evened.getRight()); @@ -927,7 +927,7 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt @Override public boolean isCapabilityDisabled(@Nonnull Capability capability, EnumFacing side) { - return CapabilityUtils.isCapabilityDisabled(capability, side, this) || super + return configComponent.isCapabilityDisabled(capability, side, facing) || super .isCapabilityDisabled(capability, side); } diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index c28ffa868..406dd92d5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -24,7 +24,6 @@ import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.tile.prefab.TileEntityElectricBlock; -import mekanism.common.util.CapabilityUtils; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; @@ -705,7 +704,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im @Override public boolean isCapabilityDisabled(@Nonnull Capability capability, EnumFacing side) { - return CapabilityUtils.isCapabilityDisabled(capability, side, this) || super + return configComponent.isCapabilityDisabled(capability, side, facing) || super .isCapabilityDisabled(capability, side); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index a0b6870d8..2073d1242 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -266,7 +266,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH @Override public boolean isCapabilityDisabled(@Nonnull Capability capability, EnumFacing side) { - return CapabilityUtils.isCapabilityDisabled(capability, side, this) || super + return configComponent.isCapabilityDisabled(capability, side, facing) || super .isCapabilityDisabled(capability, side); } diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 1af64a4d2..20b7464c7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -378,7 +378,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityOperationalMachine i @Override public boolean isCapabilityDisabled(@Nonnull Capability capability, EnumFacing side) { - return CapabilityUtils.isCapabilityDisabled(capability, side, this) || super + return configComponent.isCapabilityDisabled(capability, side, facing) || super .isCapabilityDisabled(capability, side); } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 467232f08..e5e789e86 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -648,7 +648,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public boolean isCapabilityDisabled(@Nonnull Capability capability, EnumFacing side) { - return CapabilityUtils.isCapabilityDisabled(capability, side, this) || super + return configComponent.isCapabilityDisabled(capability, side, facing) || super .isCapabilityDisabled(capability, side); } diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index b78023ac4..f7e3f501d 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -6,17 +6,22 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; import mekanism.api.EnumColor; +import mekanism.api.TileNetworkList; import mekanism.api.transmitters.TransmissionType; import mekanism.common.SideData; import mekanism.common.SideData.IOState; import mekanism.common.base.ITileComponent; -import mekanism.api.TileNetworkList; +import mekanism.common.capabilities.Capabilities; import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.items.CapabilityItemHandler; public class TileComponentConfig implements ITileComponent { @@ -78,6 +83,24 @@ public class TileComponentConfig implements ITileComponent { return getConfig(type).get(translatedFacings[sideToTest.ordinal()]) == dataIndex; } + public boolean isCapabilityDisabled(@Nonnull Capability capability, EnumFacing side, EnumFacing tileDirection) { + TransmissionType type = null; + if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { + type = TransmissionType.ITEM; + } else if (capability == Capabilities.GAS_HANDLER_CAPABILITY) { + type = TransmissionType.GAS; + } else if (capability == Capabilities.HEAT_TRANSFER_CAPABILITY) { + type = TransmissionType.HEAT; + } else if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { + type = TransmissionType.FLUID; + } + //Energy is handled by the TileEntityElectricBlock anyways in the super clauses so no need to bother with it + if (type != null) { + return supports(type) && hasSideForData(type, tileDirection, 0, side); + } + return false; + } + public void setCanEject(TransmissionType type, boolean eject) { canEject.put(type, eject); } diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java index 2f33c63f7..08816be26 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java @@ -92,7 +92,7 @@ public abstract class TileEntityBasicMachine, @Override public boolean isCapabilityDisabled(@Nonnull Capability capability, EnumFacing side) { - return CapabilityUtils.isCapabilityDisabled(capability, side, this) || super + return configComponent.isCapabilityDisabled(capability, side, facing) || super .isCapabilityDisabled(capability, side); } } diff --git a/src/main/java/mekanism/common/util/CapabilityUtils.java b/src/main/java/mekanism/common/util/CapabilityUtils.java index 08baa6fe3..bb913f538 100644 --- a/src/main/java/mekanism/common/util/CapabilityUtils.java +++ b/src/main/java/mekanism/common/util/CapabilityUtils.java @@ -1,16 +1,8 @@ package mekanism.common.util; -import javax.annotation.Nonnull; -import mekanism.api.transmitters.TransmissionType; -import mekanism.common.base.ISideConfiguration; -import mekanism.common.capabilities.Capabilities; -import mekanism.common.tile.component.TileComponentConfig; -import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.items.CapabilityItemHandler; public final class CapabilityUtils { @@ -29,24 +21,4 @@ public final class CapabilityUtils { return provider.getCapability(cap, side); } - - public static boolean isCapabilityDisabled( - @Nonnull Capability capability, EnumFacing side, T tile) { - TransmissionType type = null; - if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { - type = TransmissionType.ITEM; - } else if (capability == Capabilities.GAS_HANDLER_CAPABILITY) { - type = TransmissionType.GAS; - } else if (capability == Capabilities.HEAT_TRANSFER_CAPABILITY) { - type = TransmissionType.HEAT; - } else if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { - type = TransmissionType.FLUID; - } - //Energy is handled by the TileEntityElectricBlock anyways in the super clauses so no need to bother with it - if (type != null) { - TileComponentConfig config = tile.getConfig(); - return config != null && config.supports(type) && config.hasSideForData(type, tile.facing, 0, side); - } - return false; - } }