diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index 3dcdc84db..9a297169e 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -78,7 +78,7 @@ public class RenderConfigurableMachine extends TileEntitySpecialRenderer bindTexture(MekanismRenderer.getBlocksTexture()); GL11.glTranslatef((float)x, (float)y, (float)z); - int display = getOverlayDisplay(world, ForgeDirection.getOrientation(pos.sideHit), TransmissionType.ITEM).display; + int display = getOverlayDisplay(world, ForgeDirection.getOrientation(pos.sideHit), type).display; GL11.glCallList(display); pop(); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 267a3674f..d33a9f2af 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -33,6 +33,7 @@ import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FactoryTier; import mekanism.common.Tier.InductionCellTier; import mekanism.common.Tier.InductionProviderTier; +import mekanism.common.base.IChunkLoadHandler; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IModule; import mekanism.common.block.BlockMachine.MachineType; @@ -1299,6 +1300,10 @@ public class Mekanism { ((TileEntityElectricBlock)tileEntity).register(); } + else if(tileEntity instanceof IChunkLoadHandler) + { + ((IChunkLoadHandler)tileEntity).onChunkLoad(); + } } } } diff --git a/src/main/java/mekanism/common/base/IChunkLoadHandler.java b/src/main/java/mekanism/common/base/IChunkLoadHandler.java new file mode 100644 index 000000000..9964514b7 --- /dev/null +++ b/src/main/java/mekanism/common/base/IChunkLoadHandler.java @@ -0,0 +1,6 @@ +package mekanism.common.base; + +public interface IChunkLoadHandler +{ + public void onChunkLoad(); +} diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 4e09cb1b2..04c0827d4 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -54,6 +54,7 @@ public class PacketConfigurationUpdate implements IMessageHandler, } } } + + @Override + public EnumSet getConsumingSides() + { + return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); + } @Override public void readFromNBT(NBTTagCompound nbtTags) diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 0d9df680b..bb4aa3125 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -3,6 +3,7 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import java.util.EnumSet; import java.util.List; import mekanism.api.Coord4D; @@ -365,6 +366,12 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I prevEnergy = getEnergy(); } } + + @Override + public EnumSet getConsumingSides() + { + return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); + } public void sortInventory() { diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 96256f271..5c0a5cd97 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -3,6 +3,7 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.EnumColor; @@ -36,6 +37,7 @@ import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; import dan200.computercraft.api.lua.ILuaContext; @@ -199,6 +201,12 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i prevEnergy = getEnergy(); } } + + @Override + public EnumSet getConsumingSides() + { + return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); + } @Override public boolean canExtractItem(int slotID, ItemStack itemstack, int side) diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index c045ef82d..972e6b567 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.Arrays; +import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -16,6 +17,7 @@ import mekanism.common.base.ITileComponent; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; public class TileComponentConfig implements ITileComponent { @@ -44,6 +46,21 @@ public class TileComponentConfig implements ITileComponent tile.components.add(this); } + public EnumSet getSidesForData(TransmissionType type, int facing, int dataIndex) + { + EnumSet ret = EnumSet.noneOf(ForgeDirection.class); + + for(byte b = 0; b < 6; b++) + { + if(getConfig(type)[b] == dataIndex) + { + ret.add(ForgeDirection.getOrientation(MekanismUtils.getBaseOrientation(b, facing))); + } + } + + return ret; + } + public void setCanEject(TransmissionType type, boolean eject) { canEject.put(type.ordinal(), eject);