mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Update to 1.11.2. Untested, still using outdated MCMP
This commit is contained in:
1 parent
2b02042f4c
commit
6a42eb64e3
666 files changed
+11360
-3713
No files matched your search
@@ -59,7 +59,7 @@ public abstract class TileEntityMultiblock<T extends SynchronizedData<T>> extend
|
||||
@Override
|
||||
public void onUpdate()
|
||||
{
|
||||
if(worldObj.isRemote)
|
||||
if(world.isRemote)
|
||||
{
|
||||
if(structure == null)
|
||||
{
|
||||
@@ -77,16 +77,16 @@ public abstract class TileEntityMultiblock<T extends SynchronizedData<T>> extend
|
||||
prevStructure = clientHasStructure;
|
||||
}
|
||||
|
||||
if(playersUsing.size() > 0 && ((worldObj.isRemote && !clientHasStructure) || (!worldObj.isRemote && structure == null)))
|
||||
if(playersUsing.size() > 0 && ((world.isRemote && !clientHasStructure) || (!world.isRemote && structure == null)))
|
||||
{
|
||||
for(EntityPlayer player : playersUsing)
|
||||
{
|
||||
System.out.println(worldObj.isRemote + " " + clientHasStructure + " " + structure);
|
||||
System.out.println(world.isRemote + " " + clientHasStructure + " " + structure);
|
||||
//player.closeScreen();
|
||||
}
|
||||
}
|
||||
|
||||
if(!worldObj.isRemote)
|
||||
if(!world.isRemote)
|
||||
{
|
||||
//System.out.println(pos + " " + structure);
|
||||
if(structure == null)
|
||||
@@ -116,11 +116,11 @@ public abstract class TileEntityMultiblock<T extends SynchronizedData<T>> extend
|
||||
for(EnumFacing side : EnumFacing.VALUES)
|
||||
{
|
||||
Coord4D obj = Coord4D.get(this).offset(side);
|
||||
TileEntity tile = obj.getTileEntity(worldObj);
|
||||
TileEntity tile = obj.getTileEntity(world);
|
||||
|
||||
if(!obj.isAirBlock(worldObj) && (tile == null || tile.getClass() != getClass()))
|
||||
if(!obj.isAirBlock(world) && (tile == null || tile.getClass() != getClass()))
|
||||
{
|
||||
obj.getBlock(worldObj).onNeighborChange(worldObj, obj.getPos(), getPos());
|
||||
obj.getBlock(world).onNeighborChange(world, obj.getPos(), getPos());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -147,7 +147,7 @@ public abstract class TileEntityMultiblock<T extends SynchronizedData<T>> extend
|
||||
@Override
|
||||
public void doUpdate()
|
||||
{
|
||||
if(!worldObj.isRemote && (structure == null || !getSynchronizedData().didTick))
|
||||
if(!world.isRemote && (structure == null || !getSynchronizedData().didTick))
|
||||
{
|
||||
getProtocol().doUpdate();
|
||||
|
||||
@@ -164,7 +164,7 @@ public abstract class TileEntityMultiblock<T extends SynchronizedData<T>> extend
|
||||
{
|
||||
for(Coord4D obj : getSynchronizedData().locations)
|
||||
{
|
||||
TileEntityMultiblock<T> tileEntity = (TileEntityMultiblock<T>)obj.getTileEntity(worldObj);
|
||||
TileEntityMultiblock<T> tileEntity = (TileEntityMultiblock<T>)obj.getTileEntity(world);
|
||||
|
||||
if(tileEntity != null && tileEntity.isRendering)
|
||||
{
|
||||
@@ -285,9 +285,9 @@ public abstract class TileEntityMultiblock<T extends SynchronizedData<T>> extend
|
||||
{
|
||||
getSynchronizedData().getInventory()[slotID] = itemstack;
|
||||
|
||||
if(itemstack != null && itemstack.stackSize > getInventoryStackLimit())
|
||||
if(itemstack != null && itemstack.getCount() > getInventoryStackLimit())
|
||||
{
|
||||
itemstack.stackSize = getInventoryStackLimit();
|
||||
itemstack.setCount(getInventoryStackLimit());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user