From f0191022d7a2b3e6b25f171a6e07a3ffd68d675f Mon Sep 17 00:00:00 2001 From: Calclavia Date: Wed, 12 Mar 2014 17:52:08 +0800 Subject: [PATCH] Fixed #428 - TileGenerator not calling super.invalidate() --- .../archaic/fluid/tank}/ItemBlockFluidContainer.java | 3 +-- .../java/resonantinduction/archaic/fluid/tank/TileTank.java | 1 - .../resonantinduction/electrical/generator/TileGenerator.java | 2 ++ .../resonantinduction/electrical/multimeter/GuiMultimeter.java | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) rename {mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe => archaic/src/main/java/resonantinduction/archaic/fluid/tank}/ItemBlockFluidContainer.java (97%) diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/ItemBlockFluidContainer.java b/archaic/src/main/java/resonantinduction/archaic/fluid/tank/ItemBlockFluidContainer.java similarity index 97% rename from mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/ItemBlockFluidContainer.java rename to archaic/src/main/java/resonantinduction/archaic/fluid/tank/ItemBlockFluidContainer.java index c2caab2b..f8749b2b 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/ItemBlockFluidContainer.java +++ b/archaic/src/main/java/resonantinduction/archaic/fluid/tank/ItemBlockFluidContainer.java @@ -1,4 +1,4 @@ -package resonantinduction.mechanical.fluid.pipe; +package resonantinduction.archaic.fluid.tank; import java.util.List; @@ -15,7 +15,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import resonantinduction.archaic.Archaic; -import resonantinduction.archaic.fluid.tank.TileTank; import resonantinduction.core.fluid.TileFluidDistribution; import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; diff --git a/archaic/src/main/java/resonantinduction/archaic/fluid/tank/TileTank.java b/archaic/src/main/java/resonantinduction/archaic/fluid/tank/TileTank.java index 56eee16d..31614452 100644 --- a/archaic/src/main/java/resonantinduction/archaic/fluid/tank/TileTank.java +++ b/archaic/src/main/java/resonantinduction/archaic/fluid/tank/TileTank.java @@ -9,7 +9,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import resonantinduction.core.fluid.FluidDistributionetwork; import resonantinduction.core.fluid.IFluidDistribution; import resonantinduction.core.fluid.TileFluidDistribution; -import resonantinduction.mechanical.fluid.pipe.ItemBlockFluidContainer; import universalelectricity.api.UniversalElectricity; import universalelectricity.api.vector.Vector3; import calclavia.lib.content.module.TileBlock.IComparatorInputOverride; diff --git a/electrical/src/main/java/resonantinduction/electrical/generator/TileGenerator.java b/electrical/src/main/java/resonantinduction/electrical/generator/TileGenerator.java index 70dec3b3..aad0d21f 100644 --- a/electrical/src/main/java/resonantinduction/electrical/generator/TileGenerator.java +++ b/electrical/src/main/java/resonantinduction/electrical/generator/TileGenerator.java @@ -45,6 +45,7 @@ public class TileGenerator extends TileElectrical implements IRotatable, INodePr @Override public void initiate() { + super.initiate(); node.reconstruct(); } @@ -52,6 +53,7 @@ public class TileGenerator extends TileElectrical implements IRotatable, INodePr public void invalidate() { node.deconstruct(); + super.invalidate(); } @Override diff --git a/electrical/src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java b/electrical/src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java index 398a0f37..eb06ff95 100644 --- a/electrical/src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java +++ b/electrical/src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java @@ -86,13 +86,14 @@ public class GuiMultimeter extends GuiContainerBase @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { + String graphName = multimeter.getNetwork().getLocalized(multimeter.getNetwork().graphs.get(multimeter.graphType)); super.drawGuiContainerForegroundLayer(mouseX, mouseY); String s = LanguageUtility.getLocal("item.resonantinduction:multimeter.name"); this.fontRenderer.drawString(s, this.xSize / 2 - this.fontRenderer.getStringWidth(s) / 2, 6, 4210752); this.fontRenderer.drawString(EnumColor.INDIGO + "Detection Type", 9, 20, 4210752); this.fontRenderer.drawString(multimeter.getNetwork().getDisplay(multimeter.detectType), 9, 60, 4210752); this.fontRenderer.drawString("Logic: " + EnumColor.RED + LanguageUtility.getLocal("gui.resonantinduction.multimeter." + this.multimeter.getMode().display), 9, 75, 4210752); - this.fontRenderer.drawString(multimeter.getNetwork().getLocalized(multimeter.getNetwork().graphs.get(multimeter.graphType)), 95, 115, 4210752); + this.fontRenderer.drawString(graphName, 95, 115, 4210752); this.textFieldLimit.drawTextBox(); }