From 3eba40c8700a5165f3ce52088643f141c8d0ab57 Mon Sep 17 00:00:00 2001 From: marcin212 Date: Thu, 30 Mar 2017 15:43:36 +0200 Subject: [PATCH] Better OpenComputers compat. --- .../common/tile/TileEntityGasTank.java | 26 ++++++++++++++++++- .../TileEntityReactorLogicAdapter.java | 6 ++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 12c17f4d3..fdc8335c1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -24,6 +24,7 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITierUpgradeable; import mekanism.common.capabilities.Capabilities; +import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentConfig; @@ -41,7 +42,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; -public class TileEntityGasTank extends TileEntityContainerBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISideConfiguration, ISecurityTile, ITierUpgradeable +public class TileEntityGasTank extends TileEntityContainerBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISideConfiguration, ISecurityTile, ITierUpgradeable, IComputerIntegration { public enum GasMode { @@ -67,6 +68,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; public TileComponentSecurity securityComponent; + private static final String[] methods = new String[] {"getMaxGas", "getStoredGas", "getGas"}; public TileEntityGasTank() { @@ -421,4 +423,26 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH { return securityComponent; } + + @Override + public String[] getMethods() + { + return methods; + } + + @Override + public Object[] invoke(int method, Object[] arguments) throws Exception + { + switch(method) + { + case 0: + return new Object[] {gasTank.getMaxGas()}; + case 1: + return new Object[] {gasTank.getStored()}; + case 2: + return new Object[] {gasTank.getGas()}; + default: + throw new NoSuchMethodException(); + } + } } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java index 677f5be99..8d92c5d64 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java @@ -140,7 +140,7 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem } private static final String[] methods = new String[] {"isIgnited", "canIgnite", "getPlasmaHeat", "getMaxPlasmaHeat", "getCaseHeat", "getMaxCaseHeat", "getInjectionRate", "setInjectionRate", "hasFuel", "getProducing", "getIgnitionTemp", - "getEnergy", "getMaxEnergy", "getWater", "getSteam", "getFuel"}; + "getEnergy", "getMaxEnergy", "getWater", "getSteam", "getFuel", "getDeuterium", "getTritium"}; @Override public String[] getMethods() @@ -198,6 +198,10 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem return new Object[] {getReactor().getSteamTank().getFluidAmount()}; case 15: return new Object[] {getReactor().getFuelTank().getStored()}; + case 16: + return new Object[] {getReactor().getDeuteriumTank().getStored()}; + case 17: + return new Object[] {getReactor().getTritiumTank().getStored()}; default: return new Object[] {"Unknown command."}; }