diff --git a/Modding-Library b/Modding-Library index 7508caa16..990cf57f2 160000 --- a/Modding-Library +++ b/Modding-Library @@ -1 +1 @@ -Subproject commit 7508caa166af6c208bc930b96a46a0dcd5d9215d +Subproject commit 990cf57f2b8e30766bc848e5802b1e80d27ddb77 diff --git a/src/resonantinduction/TileEntityAdvancedFurnace.java b/src/resonantinduction/TileEntityAdvancedFurnace.java index 96ca33b92..51a3109c1 100644 --- a/src/resonantinduction/TileEntityAdvancedFurnace.java +++ b/src/resonantinduction/TileEntityAdvancedFurnace.java @@ -71,13 +71,13 @@ public class TileEntityAdvancedFurnace extends TileEntityFurnace implements IEle { this.produceUE(direction); } - + hasRequest = true; break; } } } - + if (hasRequest) { /** @@ -94,9 +94,8 @@ public class TileEntityAdvancedFurnace extends TileEntityFurnace implements IEle if (doBlockStateUpdate != this.furnaceBurnTime > 0) { - BlockFurnace.updateFurnaceBlockState(this.furnaceBurnTime > 0, this.worldObj, this.xCoord, this.yCoord, this.zCoord); - if (this.isInvalid()) - this.refreshConductors(); + //BlockFurnace.updateFurnaceBlockState(this.furnaceBurnTime > 0, this.worldObj, this.xCoord, this.yCoord, this.zCoord); + this.refreshConductors(); } } } @@ -131,7 +130,7 @@ public class TileEntityAdvancedFurnace extends TileEntityFurnace implements IEle if (tileEntity instanceof IConductor) { - ((IConductor)tileEntity).refresh(); + ((IConductor) tileEntity).refresh(); } } } diff --git a/src/resonantinduction/wire/multipart/PartConductor.java b/src/resonantinduction/wire/multipart/PartConductor.java index e61c52ce7..e47cff9c8 100644 --- a/src/resonantinduction/wire/multipart/PartConductor.java +++ b/src/resonantinduction/wire/multipart/PartConductor.java @@ -167,14 +167,16 @@ public abstract class PartConductor extends PartAdvanced implements IConductor } } - currentWireConnections = possibleWireConnections; + this.currentWireConnections = possibleWireConnections; } - currentAcceptorConnections = possibleAcceptorConnections; + this.currentAcceptorConnections = possibleAcceptorConnections; + this.getNetwork().refresh(); this.sendDescUpdate(); } - tile().markRender(); + + this.tile().markRender(); } /** @@ -222,20 +224,20 @@ public abstract class PartConductor extends PartAdvanced implements IConductor public void onAdded() { super.onAdded(); - refresh(); + this.refresh(); } @Override public void onChunkLoad() { super.onChunkLoad(); - refresh(); + this.refresh(); } @Override public void onNeighborChanged() { super.onNeighborChanged(); - refresh(); + this.refresh(); } } diff --git a/src/resonantinduction/wire/multipart/PartWire.java b/src/resonantinduction/wire/multipart/PartWire.java index e09dd86bb..fdb08b1f6 100644 --- a/src/resonantinduction/wire/multipart/PartWire.java +++ b/src/resonantinduction/wire/multipart/PartWire.java @@ -329,17 +329,20 @@ public class PartWire extends PartUniversalConductor implements TSlottedPart, JN { if (isInsulated() && !world().isRemote) { - tile().dropItems(Collections.singletonList(new ItemStack(Block.cloth, 1, BlockColored.getBlockFromDye(dyeID)))); + this.tile().dropItems(Collections.singletonList(new ItemStack(Block.cloth, 1, BlockColored.getBlockFromDye(dyeID)))); } - setInsulated(BlockColored.getDyeFromBlock(item.getItemDamage())); + this.setInsulated(BlockColored.getDyeFromBlock(item.getItemDamage())); player.inventory.decrStackSize(player.inventory.currentItem, 1); return true; } else if ((item.itemID == Item.shears.itemID || item.getItem() instanceof ItemShears) && this.isInsulated()) { - if (!world().isRemote) - tile().dropItems(Collections.singletonList(new ItemStack(Block.cloth, 1, BlockColored.getBlockFromDye(dyeID)))); - setInsulated(false); + if (!this.world().isRemote) + { + this.tile().dropItems(Collections.singletonList(new ItemStack(Block.cloth, 1, BlockColored.getBlockFromDye(dyeID)))); + } + + this.setInsulated(false); return true; } } @@ -451,7 +454,7 @@ public class PartWire extends PartUniversalConductor implements TSlottedPart, JN @Override public void onPartChanged(TMultiPart part) { - refresh(); + this.refresh(); } }