diff --git a/src/main/java/mekanism/common/SideData.java b/src/main/java/mekanism/common/SideData.java index 082b9d93f..e144229be 100644 --- a/src/main/java/mekanism/common/SideData.java +++ b/src/main/java/mekanism/common/SideData.java @@ -1,30 +1,54 @@ package mekanism.common; import mekanism.api.EnumColor; +import mekanism.common.util.MekanismUtils; public class SideData { /** The color of this SideData */ public EnumColor color; + + /** The name of this SideData */ + public String name; - /** Int[] of available side slots */ + /** Int[] of available side slots, can be used for items, gases, or items */ public int[] availableSlots; /** EnergyState representing this SideData */ public EnergyState energyState; - public SideData(EnumColor colour, int[] slots) + public SideData(String n, EnumColor colour, int[] slots) { + name = n; color = colour; availableSlots = slots; } - public SideData(EnumColor colour, EnergyState state) + public SideData(String n, EnumColor colour, EnergyState state) { + name = n; color = colour; energyState = state; } + public String localize() + { + return MekanismUtils.localize("sideData." + name); + } + + public boolean hasSlot(int slot) + { + for(int i : availableSlots) + { + if(i == slot) + { + return true; + } + } + + return false; + } + public static enum EnergyState { INPUT, diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index 0d9ddd35f..85bacb2f7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -70,14 +70,13 @@ public abstract class TileEntityAdvancedElectricMachine()); - ejecting.put(transmission.ordinal(), false); - canEject.put(transmission.ordinal(), true); + addSupported(type); } tile.components.add(this); } + public void addSupported(TransmissionType type) + { + transmissions.add(type); + + sideOutputs.put(type.ordinal(), new ArrayList()); + ejecting.put(type.ordinal(), false); + canEject.put(type.ordinal(), true); + } + public EnumSet getSidesForData(TransmissionType type, int facing, int dataIndex) { EnumSet ret = EnumSet.noneOf(ForgeDirection.class); @@ -71,19 +75,26 @@ public class TileComponentConfig implements ITileComponent return canEject.get(type.ordinal()); } + public void fillConfig(TransmissionType type, int data) + { + byte sideData = (byte)data; + + setConfig(type, new byte[] {sideData, sideData, sideData, sideData, sideData, sideData}); + } + public void setIOEnergyConfig() { - addOutput(TransmissionType.ENERGY, new SideData(EnumColor.GREY, EnergyState.OFF)); - addOutput(TransmissionType.ENERGY, new SideData(EnumColor.DARK_GREEN, EnergyState.INPUT)); - addOutput(TransmissionType.ENERGY, new SideData(EnumColor.DARK_RED, EnergyState.OUTPUT)); + addOutput(TransmissionType.ENERGY, new SideData("None", EnumColor.GREY, EnergyState.OFF)); + addOutput(TransmissionType.ENERGY, new SideData("Input", EnumColor.DARK_GREEN, EnergyState.INPUT)); + addOutput(TransmissionType.ENERGY, new SideData("Output", EnumColor.DARK_RED, EnergyState.OUTPUT)); setConfig(TransmissionType.ENERGY, new byte[] {1, 1, 2, 1, 1, 1}); } public void setInputEnergyConfig() { - addOutput(TransmissionType.ENERGY, new SideData(EnumColor.GREY, EnergyState.OFF)); - addOutput(TransmissionType.ENERGY, new SideData(EnumColor.DARK_GREEN, EnergyState.INPUT)); + addOutput(TransmissionType.ENERGY, new SideData("None", EnumColor.GREY, EnergyState.OFF)); + addOutput(TransmissionType.ENERGY, new SideData("Input", EnumColor.DARK_GREEN, EnergyState.INPUT)); setConfig(TransmissionType.ENERGY, new byte[] {1, 1, 1, 1, 1, 1}); setCanEject(TransmissionType.ENERGY, false); diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index c658ba429..d753d4992 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -601,7 +601,7 @@ public final class MekanismUtils TileEntity tile = (TileEntity)config; Coord4D coord = Coord4D.get(tile).getFromSide(ForgeDirection.getOrientation(MekanismUtils.getBaseOrientation(side, config.getOrientation()))); - tile.getWorldObj().notifyBlockOfNeighborChange(coord.xCoord, coord.yCoord, coord.zCoord, tile.getBlockType()); + tile.markDirty(); } /** @@ -627,7 +627,7 @@ public final class MekanismUtils TileEntity tile = (TileEntity)config; Coord4D coord = Coord4D.get(tile).getFromSide(ForgeDirection.getOrientation(MekanismUtils.getBaseOrientation(side, config.getOrientation()))); - tile.getWorldObj().notifyBlockOfNeighborChange(coord.xCoord, coord.yCoord, coord.zCoord, tile.getBlockType()); + tile.markDirty(); } /** diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 8d119f10b..56f9df0eb 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -680,6 +680,15 @@ tooltip.OsmiumOre=A strong mineral that can be found !nat nearly any height in t tooltip.CopperOre=A common, conductive material that !ncan be used in the production of !nwires. Its ability to withstand !nhigh heats also makes it essential !nto advanced machinery. tooltip.TinOre=A lightweight, yet sturdy, conductive !nmaterial that is found slightly less !ncommonly than Copper. +//Side data +sideData.None=None +sideData.Input=Input +sideData.Output=Output +sideData.Energy=Energy +sideData.Gas=Gas +sideData.Extra=Extra +sideData.Infuse=Infuse + //Redstone control control.disabled=Disabled control.high=High