diff --git a/src/minecraft/mekanism/client/BasicRenderingHandler.java b/src/minecraft/mekanism/client/BasicRenderingHandler.java index e62909aaa..0f56bc028 100644 --- a/src/minecraft/mekanism/client/BasicRenderingHandler.java +++ b/src/minecraft/mekanism/client/BasicRenderingHandler.java @@ -84,27 +84,27 @@ public class BasicRenderingHandler implements ISimpleBlockRenderingHandler Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, metadata)); + renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, metadata)); + renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, metadata)); + renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, metadata)); + renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, metadata)); + renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, metadata)); + renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, metadata)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/minecraft/mekanism/client/BlockRenderingHandler.java b/src/minecraft/mekanism/client/BlockRenderingHandler.java index c3b369c8e..c0800a736 100644 --- a/src/minecraft/mekanism/client/BlockRenderingHandler.java +++ b/src/minecraft/mekanism/client/BlockRenderingHandler.java @@ -127,27 +127,27 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, metadata)); + renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, metadata)); + renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, metadata)); + renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, metadata)); + renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, metadata)); + renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, metadata)); + renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, metadata)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/minecraft/mekanism/client/ItemRenderingHandler.java b/src/minecraft/mekanism/client/ItemRenderingHandler.java index 4b124aa11..21943afbd 100644 --- a/src/minecraft/mekanism/client/ItemRenderingHandler.java +++ b/src/minecraft/mekanism/client/ItemRenderingHandler.java @@ -52,9 +52,6 @@ public class ItemRenderingHandler implements IItemRenderer } else if(item.getItemDamage() == MachineType.ELECTRIC_CHEST.meta) { - int performanceToFps = EntityRenderer.performanceToFps(Minecraft.getMinecraft().gameSettings.limitFramerate); - float partialTick = System.nanoTime() + (long)(1000000000 / performanceToFps); - IElectricChest chest = (IElectricChest)item.getItem(); ModelChest electricChest = new ModelChest(); @@ -102,27 +99,27 @@ public class ItemRenderingHandler implements IItemRenderer Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderBottomFace(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 0, metadata)); + renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderTopFace(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 1, metadata)); + renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderEastFace(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 2, metadata)); + renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderWestFace(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 5, metadata)); + renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderNorthFace(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 4, metadata)); + renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderSouthFace(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 3, metadata)); + renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, metadata)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/minecraft/mekanism/client/ObjectRenderer.java b/src/minecraft/mekanism/client/ObjectRenderer.java index 187089da3..40994cef0 100644 --- a/src/minecraft/mekanism/client/ObjectRenderer.java +++ b/src/minecraft/mekanism/client/ObjectRenderer.java @@ -82,7 +82,7 @@ public class ObjectRenderer tessellator.setColorOpaque_F(f * f5, f * f5, f * f5); } - renderBlocks.renderBottomFace(null, 0, 0, 0, object.getBlockTextureFromSide(0)); + renderBlocks.renderFaceYNeg(null, 0, 0, 0, object.getBlockTextureFromSide(0)); if(doLight) { @@ -96,7 +96,7 @@ public class ObjectRenderer tessellator.setColorOpaque_F(f1 * f5, f1 * f5, f1 * f5); } - renderBlocks.renderTopFace(null, 0, 0, 0, object.getBlockTextureFromSide(1)); + renderBlocks.renderFaceYPos(null, 0, 0, 0, object.getBlockTextureFromSide(1)); if(doLight) { @@ -110,7 +110,7 @@ public class ObjectRenderer tessellator.setColorOpaque_F(f2 * f5, f2 * f5, f2 * f5); } - renderBlocks.renderEastFace(null, 0, 0, 0, object.getBlockTextureFromSide(2)); + renderBlocks.renderFaceZNeg(null, 0, 0, 0, object.getBlockTextureFromSide(2)); if(doLight) { @@ -124,7 +124,7 @@ public class ObjectRenderer tessellator.setColorOpaque_F(f2 * f5, f2 * f5, f2 * f5); } - renderBlocks.renderWestFace(null, 0, 0, 0, object.getBlockTextureFromSide(3)); + renderBlocks.renderFaceZPos(null, 0, 0, 0, object.getBlockTextureFromSide(3)); if(doLight) { @@ -138,7 +138,7 @@ public class ObjectRenderer tessellator.setColorOpaque_F(f3 * f5, f3 * f5, f3 * f5); } - renderBlocks.renderNorthFace(null, 0, 0, 0, object.getBlockTextureFromSide(4)); + renderBlocks.renderFaceXNeg(null, 0, 0, 0, object.getBlockTextureFromSide(4)); if(doLight) { @@ -152,7 +152,7 @@ public class ObjectRenderer tessellator.setColorOpaque_F(f3 * f5, f3 * f5, f3 * f5); } - renderBlocks.renderSouthFace(null, 0, 0, 0, object.getBlockTextureFromSide(5)); + renderBlocks.renderFaceXPos(null, 0, 0, 0, object.getBlockTextureFromSide(5)); if(doTessellating) { diff --git a/src/minecraft/mekanism/client/SoundHandler.java b/src/minecraft/mekanism/client/SoundHandler.java index 54fa0fa1f..86ee29bfb 100644 --- a/src/minecraft/mekanism/client/SoundHandler.java +++ b/src/minecraft/mekanism/client/SoundHandler.java @@ -132,6 +132,11 @@ public class SoundHandler } } + /** + * Gets a sound object from a specific TileEntity, null if there is none. + * @param tileEntity - the holder of the sound + * @return Sound instance + */ public Sound getFrom(TileEntity tileEntity) { synchronized(sounds) diff --git a/src/minecraft/mekanism/common/Mekanism.java b/src/minecraft/mekanism/common/Mekanism.java index 2b5810684..2b7773d7d 100644 --- a/src/minecraft/mekanism/common/Mekanism.java +++ b/src/minecraft/mekanism/common/Mekanism.java @@ -90,7 +90,10 @@ public class Mekanism /** Map of infuse objects */ public static Map infusions = new HashMap(); + /** A map containing references to all dynamic tank inventory caches. */ public static Map dynamicInventories = new HashMap(); + + /** A map containing references to all locations corresponding to a specific inventory ID. */ public static Map> inventoryLocations = new HashMap>(); /** Mekanism creative tab */ diff --git a/src/minecraft/mekanism/common/TileEntityAdvancedElectricMachine.java b/src/minecraft/mekanism/common/TileEntityAdvancedElectricMachine.java index 736ed39c4..f0316f2a5 100644 --- a/src/minecraft/mekanism/common/TileEntityAdvancedElectricMachine.java +++ b/src/minecraft/mekanism/common/TileEntityAdvancedElectricMachine.java @@ -314,7 +314,7 @@ public abstract class TileEntityAdvancedElectricMachine extends TileEntityBasicM } @Override - public boolean func_102008_b(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { if(slotID == 3) { diff --git a/src/minecraft/mekanism/common/TileEntityBasicMachine.java b/src/minecraft/mekanism/common/TileEntityBasicMachine.java index 4fe91e701..a34a808e5 100644 --- a/src/minecraft/mekanism/common/TileEntityBasicMachine.java +++ b/src/minecraft/mekanism/common/TileEntityBasicMachine.java @@ -313,7 +313,7 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp public void detach(IComputerAccess computer) {} @Override - public int[] getSizeInventorySide(int side) + public int[] getAccessibleSlotsFromSide(int side) { return sideOutputs.get(sideConfig[MekanismUtils.getBaseOrientation(side, facing)]).availableSlots; } diff --git a/src/minecraft/mekanism/common/TileEntityContainerBlock.java b/src/minecraft/mekanism/common/TileEntityContainerBlock.java index 7c1620bc7..2a3919a12 100644 --- a/src/minecraft/mekanism/common/TileEntityContainerBlock.java +++ b/src/minecraft/mekanism/common/TileEntityContainerBlock.java @@ -181,19 +181,19 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl } @Override - public boolean func_102007_a(int slotID, ItemStack itemstack, int side) + public boolean canInsertItem(int slotID, ItemStack itemstack, int side) { return isStackValidForSlot(slotID, itemstack); } @Override - public int[] getSizeInventorySide(int side) + public int[] getAccessibleSlotsFromSide(int side) { return new int[0]; } @Override - public boolean func_102008_b(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { return true; } diff --git a/src/minecraft/mekanism/common/TileEntityElectricChest.java b/src/minecraft/mekanism/common/TileEntityElectricChest.java index 938e655cd..8985c24e4 100644 --- a/src/minecraft/mekanism/common/TileEntityElectricChest.java +++ b/src/minecraft/mekanism/common/TileEntityElectricChest.java @@ -141,7 +141,7 @@ public class TileEntityElectricChest extends TileEntityElectricBlock } @Override - public int[] getSizeInventorySide(int side) + public int[] getAccessibleSlotsFromSide(int side) { if(side == 0) { @@ -160,7 +160,7 @@ public class TileEntityElectricChest extends TileEntityElectricBlock } @Override - public boolean func_102008_b(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { if(slotID == 54) { diff --git a/src/minecraft/mekanism/common/TileEntityElectricDisperser.java b/src/minecraft/mekanism/common/TileEntityElectricDisperser.java deleted file mode 100644 index 23dea4c11..000000000 --- a/src/minecraft/mekanism/common/TileEntityElectricDisperser.java +++ /dev/null @@ -1,16 +0,0 @@ -package mekanism.common; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.liquids.LiquidTank; - -public class TileEntityElectricDisperser extends TileEntityElectricBlock -{ - public LiquidTank liquidTank; - - public TileEntityElectricDisperser() - { - super("Electric Disperser", 10000); - liquidTank = new LiquidTank(10000); - inventory = new ItemStack[3]; - } -} diff --git a/src/minecraft/mekanism/common/TileEntityElectricMachine.java b/src/minecraft/mekanism/common/TileEntityElectricMachine.java index 2cd9dd111..23e6e2b2e 100644 --- a/src/minecraft/mekanism/common/TileEntityElectricMachine.java +++ b/src/minecraft/mekanism/common/TileEntityElectricMachine.java @@ -197,7 +197,7 @@ public abstract class TileEntityElectricMachine extends TileEntityBasicMachine } @Override - public boolean func_102008_b(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { if(slotID == 1) { diff --git a/src/minecraft/mekanism/common/TileEntityElectricPump.java b/src/minecraft/mekanism/common/TileEntityElectricPump.java index 86f15ab1e..81c7145e5 100644 --- a/src/minecraft/mekanism/common/TileEntityElectricPump.java +++ b/src/minecraft/mekanism/common/TileEntityElectricPump.java @@ -414,7 +414,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public boolean func_102008_b(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { if(slotID == 2) { @@ -510,7 +510,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public int[] getSizeInventorySide(int side) + public int[] getAccessibleSlotsFromSide(int side) { if(side == 1) { diff --git a/src/minecraft/mekanism/common/TileEntityEnergyCube.java b/src/minecraft/mekanism/common/TileEntityEnergyCube.java index c731f6138..7751bd1a6 100644 --- a/src/minecraft/mekanism/common/TileEntityEnergyCube.java +++ b/src/minecraft/mekanism/common/TileEntityEnergyCube.java @@ -259,13 +259,13 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEn } @Override - public int[] getSizeInventorySide(int side) + public int[] getAccessibleSlotsFromSide(int side) { return side == 1 ? new int[] {0} : new int[] {1}; } @Override - public boolean func_102008_b(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { if(slotID == 1) { diff --git a/src/minecraft/mekanism/common/TileEntityFactory.java b/src/minecraft/mekanism/common/TileEntityFactory.java index 383931de9..01fdecc5c 100644 --- a/src/minecraft/mekanism/common/TileEntityFactory.java +++ b/src/minecraft/mekanism/common/TileEntityFactory.java @@ -280,7 +280,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IEnerg } @Override - public boolean func_102008_b(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { if(slotID == 1) { @@ -719,7 +719,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IEnerg } @Override - public int[] getSizeInventorySide(int side) + public int[] getAccessibleSlotsFromSide(int side) { return sideOutputs.get(sideConfig[MekanismUtils.getBaseOrientation(side, facing)]).availableSlots; } diff --git a/src/minecraft/mekanism/common/TileEntityGasTank.java b/src/minecraft/mekanism/common/TileEntityGasTank.java index 2ed8b3491..a632fd8e7 100644 --- a/src/minecraft/mekanism/common/TileEntityGasTank.java +++ b/src/minecraft/mekanism/common/TileEntityGasTank.java @@ -136,7 +136,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasS } @Override - public boolean func_102008_b(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { if(slotID == 1) { @@ -166,7 +166,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasS } @Override - public int[] getSizeInventorySide(int side) + public int[] getAccessibleSlotsFromSide(int side) { return side == 1 ? new int[] {0} : new int[] {1}; } diff --git a/src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java b/src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java index c7d7bcf84..d5581b6b0 100644 --- a/src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java +++ b/src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java @@ -212,7 +212,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem } @Override - public boolean func_102008_b(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { if(slotID == 4) { @@ -523,7 +523,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem public void detach(IComputerAccess computer) {} @Override - public int[] getSizeInventorySide(int side) + public int[] getAccessibleSlotsFromSide(int side) { return sideOutputs.get(sideConfig[MekanismUtils.getBaseOrientation(side, facing)]).availableSlots; } diff --git a/src/minecraft/mekanism/common/TileEntityTeleporter.java b/src/minecraft/mekanism/common/TileEntityTeleporter.java index cbc5af64a..4caa39cf6 100644 --- a/src/minecraft/mekanism/common/TileEntityTeleporter.java +++ b/src/minecraft/mekanism/common/TileEntityTeleporter.java @@ -93,7 +93,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IEn } @Override - public int[] getSizeInventorySide(int side) + public int[] getAccessibleSlotsFromSide(int side) { return new int[] {0}; } @@ -365,7 +365,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IEn } @Override - public boolean func_102008_b(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { return (itemstack.getItem() instanceof IItemElectric && ((IItemElectric)itemstack.getItem()).getProvideRequest(itemstack).getWatts() == 0) || (itemstack.getItem() instanceof IElectricItem && (!(itemstack.getItem() instanceof IItemElectric) || diff --git a/src/minecraft/mekanism/generators/client/BlockRenderingHandler.java b/src/minecraft/mekanism/generators/client/BlockRenderingHandler.java index 308be6391..761769d46 100644 --- a/src/minecraft/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/minecraft/mekanism/generators/client/BlockRenderingHandler.java @@ -151,27 +151,27 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, metadata)); + renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, metadata)); + renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, metadata)); + renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, metadata)); + renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, metadata)); + renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, metadata)); + renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, metadata)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java b/src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java index d1a71955c..e7b5ef1a5 100644 --- a/src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java +++ b/src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java @@ -232,7 +232,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } @Override - public boolean func_102008_b(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { if(slotID == 3) { @@ -282,7 +282,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } @Override - public int[] getSizeInventorySide(int side) + public int[] getAccessibleSlotsFromSide(int side) { if(ForgeDirection.getOrientation(side) == MekanismUtils.getLeft(facing)) { diff --git a/src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java b/src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java index 495b8f852..a6113a3b2 100644 --- a/src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java +++ b/src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java @@ -149,7 +149,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan } @Override - public boolean func_102008_b(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { if(slotID == 1) { @@ -197,7 +197,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan } @Override - public int[] getSizeInventorySide(int side) + public int[] getAccessibleSlotsFromSide(int side) { return ForgeDirection.getOrientation(side) == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; } diff --git a/src/minecraft/mekanism/generators/common/TileEntityHydrogenGenerator.java b/src/minecraft/mekanism/generators/common/TileEntityHydrogenGenerator.java index 3c99f6e18..0c8a5da46 100644 --- a/src/minecraft/mekanism/generators/common/TileEntityHydrogenGenerator.java +++ b/src/minecraft/mekanism/generators/common/TileEntityHydrogenGenerator.java @@ -81,7 +81,7 @@ public class TileEntityHydrogenGenerator extends TileEntityGenerator implements } @Override - public boolean func_102008_b(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { if(slotID == 1) { @@ -114,7 +114,7 @@ public class TileEntityHydrogenGenerator extends TileEntityGenerator implements } @Override - public int[] getSizeInventorySide(int side) + public int[] getAccessibleSlotsFromSide(int side) { return ForgeDirection.getOrientation(side) == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; } diff --git a/src/minecraft/mekanism/generators/common/TileEntitySolarGenerator.java b/src/minecraft/mekanism/generators/common/TileEntitySolarGenerator.java index afa20a1ef..e2265ff74 100644 --- a/src/minecraft/mekanism/generators/common/TileEntitySolarGenerator.java +++ b/src/minecraft/mekanism/generators/common/TileEntitySolarGenerator.java @@ -40,7 +40,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator } @Override - public int[] getSizeInventorySide(int side) + public int[] getAccessibleSlotsFromSide(int side) { return new int[] {0}; } @@ -107,7 +107,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator } @Override - public boolean func_102008_b(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { if(slotID == 0) {