1.8.8 + deleted all integration can be recovered later or something.

This commit is contained in:
AlgorithmX2
2015-12-31 17:19:44 -06:00
parent 2e51ea5f78
commit 71afa9bf53
142 changed files with 386 additions and 7919 deletions
@@ -163,7 +163,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
}
@Override
public ItemStack getStackInSlotOnClosing( final int slot )
public ItemStack removeStackFromSlot( final int slot )
{
return null;
}
@@ -180,7 +180,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
}
@Override
public String getCommandSenderName()
public String getName()
{
return "AEMultiPart";
}
@@ -270,9 +270,9 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
}
@Override
public ItemStack getStackInSlotOnClosing( final int i )
public ItemStack removeStackFromSlot( final int i )
{
return this.duality.getStorage().getStackInSlotOnClosing( i );
return this.duality.getStorage().removeStackFromSlot( i );
}
@Override
@@ -282,9 +282,9 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
}
@Override
public String getCommandSenderName()
public String getName()
{
return this.duality.getStorage().getCommandSenderName();
return this.duality.getStorage().getName();
}
@Override
@@ -295,7 +295,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements /* IPip
}
@Override
public ItemStack getStackInSlotOnClosing( final int i )
public ItemStack removeStackFromSlot( final int i )
{
return null;
}
@@ -307,7 +307,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements /* IPip
}
@Override
public String getCommandSenderName()
public String getName()
{
return null;
}
@@ -152,8 +152,8 @@ public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone>
srcSide = EnumFacing.UP;
}
this.power = b.isProvidingStrongPower( this.getTile().getWorld(), target, state, srcSide );
this.power = Math.max( this.power, b.isProvidingWeakPower( this.getTile().getWorld(), target, state, srcSide ) );
this.power = b.getWeakPower( this.getTile().getWorld(), target, state, srcSide );
this.power = Math.max( this.power, b.getWeakPower( this.getTile().getWorld(), target, state, srcSide ) );
this.sendToOutput( this.power );
}
else
@@ -369,7 +369,6 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
GL11.glDisable( GL11.GL_LIGHTING );
GL11.glDisable( GL12.GL_RESCALE_NORMAL );
// RenderHelper.enableGUIStandardItemLighting();
wr.setColorOpaque_F( 1.0f, 1.0f, 1.0f );
ClientHelper.proxy.doRenderItem( sis, this.getTile().getWorld() );
}