Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft

[chemicraft/chemicraft.git] / src / chemicraft / gui / GuiDecompositionTable.java

diff --git a/src/chemicraft/gui/GuiDecompositionTable.java b/src/chemicraft/gui/GuiDecompositionTable.java
index 1bef9c4..b22ae2b 100644 (file)
--- a/src/chemicraft/gui/GuiDecompositionTable.java
+++ b/src/chemicraft/gui/GuiDecompositionTable.java
@@ -8,8 +8,17 @@ import chemicraft.tileentity.TileEntityDecompositionTable;
 
 public class GuiDecompositionTable extends GuiContainer{
 
+<<<<<<< HEAD:common/chemicraft/gui/GuiPyrolysisTable.java
+       private TileEntityPyrolysisTable tileentity;
+
+       public GuiPyrolysisTable(EntityPlayer par1EntityPlayer, TileEntityPyrolysisTable par2) {
+               super(new ContainerPyrolysisTable(par1EntityPlayer, par2));
+               this.tileentity = par2;
+               this.ySize = 204;
+=======
        public GuiDecompositionTable(EntityPlayer par1EntityPlayer, TileEntityDecompositionTable par2) {
                super(new ContainerDecompositionTable(par1EntityPlayer, par2));
+>>>>>>> cbf016a981df6758b057ca883a1527676a1a9ec3:src/chemicraft/gui/GuiDecompositionTable.java
        }
 
        @Override
@@ -18,5 +27,9 @@ public class GuiDecompositionTable extends GuiContainer{
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 
+       @Override
+       protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+               this.fontRenderer.drawString(String.valueOf("Temp:" + (int)this.tileentity.getHeat()), 110, 100, 0x000000);
+       }
 
 }