tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

v5.5.5 Beta #9

Browse source 
*Updated to Forge #688, v1.5.2.
*More javadocs.
This commit is contained in:
Aidan Brady 2013-05-07 15:57:55 -04:00
parent 012223e34c
commit c3d6965cd0
23 changed files with 66 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/minecraft/mekanism/client/BasicRenderingHandler.java
View file

@ -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);
}

12
src/minecraft/mekanism/client/BlockRenderingHandler.java
View file

@ -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);
}

15
src/minecraft/mekanism/client/ItemRenderingHandler.java
View file

@ -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);
}

12
src/minecraft/mekanism/client/ObjectRenderer.java
View file

@ -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)
{

5
src/minecraft/mekanism/client/SoundHandler.java
View file

@ -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)

3
src/minecraft/mekanism/common/Mekanism.java
View file

@ -90,7 +90,10 @@ public class Mekanism
/** Map of infuse objects */
public static Map<ItemStack, InfuseObject> infusions = new HashMap<ItemStack, InfuseObject>();
/** A map containing references to all dynamic tank inventory caches. */
public static Map<Integer, DynamicTankCache> dynamicInventories = new HashMap<Integer, DynamicTankCache>();
/** A map containing references to all locations corresponding to a specific inventory ID. */
public static Map<Integer, HashSet<Object3D>> inventoryLocations = new HashMap<Integer, HashSet<Object3D>>();
/** Mekanism creative tab */

2
src/minecraft/mekanism/common/TileEntityAdvancedElectricMachine.java
View file

@ -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)
{

2
src/minecraft/mekanism/common/TileEntityBasicMachine.java
View file

@ -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;
}

6
src/minecraft/mekanism/common/TileEntityContainerBlock.java
View file

@ -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;
}

4
src/minecraft/mekanism/common/TileEntityElectricChest.java
View file

@ -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)
{

16
src/minecraft/mekanism/common/TileEntityElectricDisperser.java
View file

@ -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];
}
}

2
src/minecraft/mekanism/common/TileEntityElectricMachine.java
View file

@ -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)
{

4
src/minecraft/mekanism/common/TileEntityElectricPump.java
View file

@ -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)
{

4
src/minecraft/mekanism/common/TileEntityEnergyCube.java
View file

@ -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)
{

4
src/minecraft/mekanism/common/TileEntityFactory.java
View file

@ -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;
}

4
src/minecraft/mekanism/common/TileEntityGasTank.java
View file

@ -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};
}

4
src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java
View file

@ -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;
}

4
src/minecraft/mekanism/common/TileEntityTeleporter.java
View file

@ -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) ||

12
src/minecraft/mekanism/generators/client/BlockRenderingHandler.java
View file

@ -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);
}

4
src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java
View file

@ -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))
{

4
src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java
View file

@ -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};
}

4
src/minecraft/mekanism/generators/common/TileEntityHydrogenGenerator.java
View file

@ -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};
}

4
src/minecraft/mekanism/generators/common/TileEntitySolarGenerator.java
View file

@ -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)
{