From 25e683b2e999bb797f2dfeb3205e00b70eefcd12 Mon Sep 17 00:00:00 2001 From: Ourten Date: Sun, 8 Jan 2017 23:49:09 +0100 Subject: [PATCH] Fix some tiles update on clientside --- .../tiles/teir1/TileCompressor.java | 12 ++-- .../tiles/teir1/TileElectricFurnace.java | 67 ++++++++++--------- .../techreborn/tiles/teir1/TileExtractor.java | 10 +-- .../techreborn/tiles/teir1/TileGrinder.java | 12 ++-- 4 files changed, 55 insertions(+), 46 deletions(-) diff --git a/src/main/java/techreborn/tiles/teir1/TileCompressor.java b/src/main/java/techreborn/tiles/teir1/TileCompressor.java index 239c25f61..65ac8f36b 100644 --- a/src/main/java/techreborn/tiles/teir1/TileCompressor.java +++ b/src/main/java/techreborn/tiles/teir1/TileCompressor.java @@ -20,7 +20,7 @@ import techreborn.init.ModBlocks; import techreborn.utils.upgrade.UpgradeHandler; public class TileCompressor extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { +implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { public Inventory inventory = new Inventory(6, "TileCompressor", 64, this); @@ -39,10 +39,12 @@ public class TileCompressor extends TilePowerAcceptor @Override public void update() { - super.update(); - this.crafter.updateEntity(); - this.upgradeHandler.tick(); - this.charge(3); + if (!this.world.isRemote) { + super.update(); + this.crafter.updateEntity(); + this.upgradeHandler.tick(); + this.charge(3); + } } @Override diff --git a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java index 53bb7e844..cef01dbab 100644 --- a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java @@ -17,7 +17,7 @@ import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; public class TileElectricFurnace extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, IContainerProvider { + implements IWrenchable, IInventoryProvider, IContainerProvider { private static final int[] SLOTS_TOP = new int[] { 0 }; private static final int[] SLOTS_BOTTOM = new int[] { 1 }; @@ -40,30 +40,33 @@ public class TileElectricFurnace extends TilePowerAcceptor @Override public void update() { - super.update(); - final boolean burning = this.isBurning(); - boolean updateInventory = false; - if (this.isBurning() && this.canSmelt()) { - this.updateState(); + if (!this.world.isRemote) { + super.update(); - this.progress++; - if (this.progress % 10 == 0) { - this.useEnergy(this.cost); - } - if (this.progress >= this.fuelScale) { + final boolean burning = this.isBurning(); + boolean updateInventory = false; + if (this.isBurning() && this.canSmelt()) { + this.updateState(); + + this.progress++; + if (this.progress % 10 == 0) { + this.useEnergy(this.cost); + } + if (this.progress >= this.fuelScale) { + this.progress = 0; + this.cookItems(); + updateInventory = true; + } + } else { this.progress = 0; - this.cookItems(); + this.updateState(); + } + if (burning != this.isBurning()) { updateInventory = true; } - } else { - this.progress = 0; - this.updateState(); - } - if (burning != this.isBurning()) { - updateInventory = true; - } - if (updateInventory) { - this.markDirty(); + if (updateInventory) { + this.markDirty(); + } } } @@ -87,17 +90,16 @@ public class TileElectricFurnace extends TilePowerAcceptor public boolean canSmelt() { if (this.getStackInSlot(this.input1) == ItemStack.EMPTY) { return false; - } else { - final ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(this.getStackInSlot(this.input1)); - if (itemstack == ItemStack.EMPTY) - return false; - if (this.getStackInSlot(this.output) == ItemStack.EMPTY) - return true; - if (!this.getStackInSlot(this.output).isItemEqual(itemstack)) - return false; - final int result = this.getStackInSlot(this.output).getCount() + itemstack.getCount(); - return result <= this.getInventoryStackLimit() && result <= itemstack.getMaxStackSize(); } + final ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(this.getStackInSlot(this.input1)); + if (itemstack == ItemStack.EMPTY) + return false; + if (this.getStackInSlot(this.output) == ItemStack.EMPTY) + return true; + if (!this.getStackInSlot(this.output).isItemEqual(itemstack)) + return false; + final int result = this.getStackInSlot(this.output).getCount() + itemstack.getCount(); + return result <= this.getInventoryStackLimit() && result <= itemstack.getMaxStackSize(); } public boolean isBurning() { @@ -153,7 +155,8 @@ public class TileElectricFurnace extends TilePowerAcceptor // ISidedInventory @Override public int[] getSlotsForFace(final EnumFacing side) { - return side == EnumFacing.DOWN ? TileElectricFurnace.SLOTS_BOTTOM : side == EnumFacing.UP ? TileElectricFurnace.SLOTS_TOP : TileElectricFurnace.SLOTS_SIDES; + return side == EnumFacing.DOWN ? TileElectricFurnace.SLOTS_BOTTOM + : side == EnumFacing.UP ? TileElectricFurnace.SLOTS_TOP : TileElectricFurnace.SLOTS_SIDES; } @Override diff --git a/src/main/java/techreborn/tiles/teir1/TileExtractor.java b/src/main/java/techreborn/tiles/teir1/TileExtractor.java index a33d7f5fd..9878782f1 100644 --- a/src/main/java/techreborn/tiles/teir1/TileExtractor.java +++ b/src/main/java/techreborn/tiles/teir1/TileExtractor.java @@ -42,10 +42,12 @@ implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerPr @Override public void update() { - super.update(); - this.crafter.updateEntity(); - this.upgradeHandler.tick(); - this.charge(3); + if (!this.world.isRemote) { + super.update(); + this.crafter.updateEntity(); + this.upgradeHandler.tick(); + this.charge(3); + } } @Override diff --git a/src/main/java/techreborn/tiles/teir1/TileGrinder.java b/src/main/java/techreborn/tiles/teir1/TileGrinder.java index 27b58df0a..b71bbdddd 100644 --- a/src/main/java/techreborn/tiles/teir1/TileGrinder.java +++ b/src/main/java/techreborn/tiles/teir1/TileGrinder.java @@ -43,11 +43,13 @@ implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerPr } @Override - public void updateEntity() { - super.updateEntity(); - this.upgradeHandler.tick(); - //charge(3); TODO - this.charge(3); + public void update() { + if (!this.world.isRemote) { + super.update(); + this.upgradeHandler.tick(); + //charge(3); TODO + this.charge(3); + } } @Override