とりあえずコミット

diff --git a/common/chemicraft/ChemiCraft.java b/common/chemicraft/ChemiCraft.java
index 471e34d..06bbe9a 100644 (file)
--- a/common/chemicraft/ChemiCraft.java
+++ b/common/chemicraft/ChemiCraft.java
@@ -1,5 +1,7 @@
 package chemicraft;\r
 \r
+import ic2.api.energy.event.EnergyTileEvent;\r
+import ic2.api.energy.event.EnergyTileLoadEvent;\r
 import net.minecraft.block.Block;\r
 import net.minecraft.block.material.Material;\r
 import net.minecraft.creativetab.CreativeTabs;\r
@@ -9,7 +11,7 @@ import net.minecraftforge.common.Configuration;
 import net.minecraftforge.common.Property;\r
 import chemicraft.block.BlockChemicalCombinationTable;\r
 import chemicraft.block.BlockChemicalCraftingTable;\r
-import chemicraft.block.BlockDecompositionTable;\r
+import chemicraft.block.BlockPyrolysisTable;\r
 import chemicraft.block.BlockToolAndWeaponCraftingTable;\r
 import chemicraft.compounds.CompoundWater;\r
 import chemicraft.debug.CommandDeleteItem;\r
@@ -23,7 +25,7 @@ import chemicraft.system.CommonProxy;
 import chemicraft.system.PacketHandler;\r
 import chemicraft.tileentity.TileEntityChemicalCombinationTable;\r
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;\r
-import chemicraft.tileentity.TileEntityDecompositionTable;\r
+import chemicraft.tileentity.TileEntityPyrolysisTable;\r
 import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;\r
 import chemicraft.util.Auxiliary;\r
 import chemicraft.util.Auxiliary.ArrayAuxiliary;\r
@@ -45,9 +47,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
  *\r
  */\r
 @Mod(modid = "chemiCraft", name = "ChemiCraft", version = "beta")\r
-// ID,名前,バージョン\r
-@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.3.2", channels = "chemicraft", packetHandler = PacketHandler.class)\r
-// クライアント、サーバー共に必要 1.3.2用\r
+@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.6", channels = "chemicraft", packetHandler = PacketHandler.class)\r
 public class ChemiCraft {\r
 \r
        public static final String[] ATOMSNAME = {\r
@@ -96,7 +96,7 @@ public class ChemiCraft {
        /**\r
         * BlockID.\r
         */\r
-       public int decompositionTableID;\r
+       public int pyrolysisTableID;\r
        public int chemicalConbinationTableID;\r
        public int toolAndWeaponCraftingTableID;\r
        public int chemicalCraftingTableID;\r
@@ -104,7 +104,7 @@ public class ChemiCraft {
        /**\r
         * GUIID.\r
         */\r
-       public int guiDecompositionTableID;\r
+       public int guiPyrolysisTableID;\r
        public int guiChemicalCombinationTableID;\r
        public int guiToolAndWeaponCraftingTableID;\r
        public int guiChemicalCraftingTableID;\r
@@ -112,7 +112,7 @@ public class ChemiCraft {
        /**\r
         * Block型変数.\r
         */\r
-       public Block blockDecompositionTable;\r
+       public Block blockPyrolysisTable;\r
        public Block blockChemicalCombinationTable;\r
        public Block blockToolAndWeaponCraftingTable;\r
        public Block blockChemicalCraftingTable;\r
@@ -131,8 +131,8 @@ public class ChemiCraft {
        public String itemAtomsTexture = "/chemicraft/items/Atoms.png";\r
        public String itemCompoundsTexture = "/chemicraft/items/Compounds.png";\r
        public String itemTexture = "/chemicraft/items/items.png";\r
-       public String blockChemicalCraftingTableTexture = "/chemicraft/blocks/CCTable.png";\r
-       public String guiDecompositionTexture = "/chemicraft/guis/Decomposition.png";\r
+       public String blockChemicalCraftingTableTexture = "/chemicraft/blocks/cctable.png";\r
+       public String guiPyrolysisTexture = "/chemicraft/guis/Pyrolysis.png";\r
        public String guiChemicalCombinationTexture = "/chemicraft/guis/ChemicalCombination.png";\r
        public String guiToolAndWeaponCraftingTexture = "/chemicraft/guis/ToolAndWeaponCrafting.png";\r
        public String guiChemicalCraftingTexture = "/chemicraft/guis/MaterialCrafting.png";\r
@@ -152,7 +152,7 @@ public class ChemiCraft {
                Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());\r
                cfg.load();\r
 \r
-               Property decompositionTableIDProp = cfg.getBlock("DecompositionTable", 2400);\r
+               Property pyrolysisTableIDProp = cfg.getBlock("PyrolysisTable", 2400);\r
                Property chemicalCombinationTableIDProp = cfg.getBlock("ChemicalCombinationID", 2401);\r
                Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 2402);\r
                Property chemicalCraftingTableIDProp = cfg.getBlock("ChemicalCraftingTableID", 2403);\r
@@ -162,13 +162,13 @@ public class ChemiCraft {
                Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25002);\r
                Property atomGrenadeIDProp = cfg.getItem("AtomGrenadeID", 25003);\r
 \r
-               Property guiDecompositionTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1000);\r
+               Property guiPyrolysisTableIDProp = cfg.get("GUI", "GUIPyrolysisID", 1000);\r
                Property guiChemicalCombinationTableIDProp = cfg.get("GUI", "GUIChemicalCombinationTableID", 1001);\r
                Property guiToolAndWeaponCraftingTableIDProp = cfg.get("GUI", "GUIToolAndWeaponCraftingTableID", 1002);\r
                Property guiChemicalCraftingTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1003);\r
 \r
 \r
-               this.decompositionTableID = decompositionTableIDProp.getInt();\r
+               this.pyrolysisTableID = pyrolysisTableIDProp.getInt();\r
                this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt();\r
                this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt();\r
                this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt();\r
@@ -176,7 +176,7 @@ public class ChemiCraft {
                this.compoundsID = compoundsIDProp.getInt();\r
                this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt();\r
                this.atomGrenadeID = atomGrenadeIDProp.getInt();\r
-               this.guiDecompositionTableID = guiDecompositionTableIDProp.getInt();\r
+               this.guiPyrolysisTableID = guiPyrolysisTableIDProp.getInt();\r
                this.guiChemicalCombinationTableID = guiChemicalCombinationTableIDProp.getInt();\r
                this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt();\r
                this.guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt();\r
@@ -201,11 +201,11 @@ public class ChemiCraft {
        private void settingProcessing(final FMLPostInitializationEvent event) {\r
 \r
                // Blockを追加します\r
-               this.blockDecompositionTable = new BlockDecompositionTable(this.decompositionTableID, 0, Material.ground).\r
+               this.blockPyrolysisTable = new BlockPyrolysisTable(this.pyrolysisTableID, 0, Material.ground).\r
                                setHardness(2.0F).\r
                                setResistance(0.0F).\r
                                setStepSound(Block.soundStoneFootstep).\r
-                               setBlockName("DecompositionTable");\r
+                               setBlockName("PyrolysisTable");\r
                this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground).\r
                                setHardness(2.0F).\r
                                setResistance(0.0F).\r
@@ -229,14 +229,14 @@ public class ChemiCraft {
                this.itemAtomGrenade = new ItemAtomsGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1);\r
 \r
                // BlockをMinecraftに登録します\r
-               GameRegistry.registerBlock(this.blockDecompositionTable, "BlockDecompositionTable");\r
+               GameRegistry.registerBlock(this.blockPyrolysisTable, "BlockPyrolysisTable");\r
                GameRegistry.registerBlock(this.blockChemicalCombinationTable, "BlockChemicalCombinationTable");\r
                GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable, "BlockToolAndWeaponCraftingTable");\r
                GameRegistry.registerBlock(this.blockChemicalCraftingTable, "BlockMaterialCraftingTable");\r
 \r
                // Blockの名前を設定します\r
-               this.nameAuxiliary.addName(this.blockDecompositionTable, "DecompositionTable");\r
-               this.nameAuxiliary.addName(this.blockDecompositionTable, "ja_JP", "分解台");\r
+               this.nameAuxiliary.addName(this.blockPyrolysisTable, "PyrolysisTable");\r
+               this.nameAuxiliary.addName(this.blockPyrolysisTable, "ja_JP", "熱分解台");\r
                this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ChemicalCombinationTable");\r
                this.nameAuxiliary.addName(this.blockChemicalCombinationTable, "ja_JP", "化合台");\r
                this.nameAuxiliary.addName(blockToolAndWeaponCraftingTable, "ToolAndWeaponCraftingTable");\r
@@ -253,7 +253,7 @@ public class ChemiCraft {
                this.nameAuxiliary.addName(this.itemAtomGrenade, "元素手榴弾");\r
 \r
                // TileEntityを追加します\r
-               GameRegistry.registerTileEntity(TileEntityDecompositionTable.class, "DecompositionTable");\r
+               GameRegistry.registerTileEntity(TileEntityPyrolysisTable.class, "TileEntityPyrolysisTable");\r
                GameRegistry.registerTileEntity(TileEntityChemicalCombinationTable.class, "TileEntityChemicalCombinationTable");\r
                GameRegistry.registerTileEntity(TileEntityToolAndWeaponCraftingTable.class, "TileEntityToolAndWeaponCraftingTable");\r
                GameRegistry.registerTileEntity(TileEntityChemicalCraftingTable.class, "TileEntityChemicalCraftingTable");\r
@@ -265,13 +265,13 @@ public class ChemiCraft {
                proxy.registerRenderInformation();\r
 \r
                //化学作業台類のレシピを追加します\r
-               GameRegistry.addRecipe(new ItemStack(this.blockDecompositionTable),\r
+               GameRegistry.addRecipe(new ItemStack(this.blockPyrolysisTable),\r
                                new Object[]{\r
                        "XYX", "ZAZ", "ZZZ",\r
                        Character.valueOf('X'), new ItemStack(Item.ingotIron),\r
                        Character.valueOf('Y'), new ItemStack(Block.workbench),\r
                        Character.valueOf('Z'), new ItemStack(Block.stone),\r
-                       Character.valueOf('A'), new ItemStack(Block.tnt),\r
+                       Character.valueOf('A'), new ItemStack(Item.bucketLava),\r
                });\r
                GameRegistry.addRecipe(new ItemStack(this.blockChemicalCombinationTable),\r
                                new Object[]{\r
@@ -340,4 +340,4 @@ public class ChemiCraft {
        private void debug(final FMLPostInitializationEvent event) {\r
        }\r
 \r
-}
\ No newline at end of file
+}\r

diff --git a/common/chemicraft/block/BlockDecompositionTable.java b/common/chemicraft/block/BlockPyrolysisTable.java
similarity index 76%
rename from common/chemicraft/block/BlockDecompositionTable.java
rename to common/chemicraft/block/BlockPyrolysisTable.java
index d04afa8..686d29f 100644 (file)
--- a/common/chemicraft/block/BlockDecompositionTable.java
+++ b/common/chemicraft/block/BlockPyrolysisTable.java
@@ -6,18 +6,18 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import chemicraft.ChemiCraft;
-import chemicraft.tileentity.TileEntityDecompositionTable;
+import chemicraft.tileentity.TileEntityPyrolysisTable;
 
-public class BlockDecompositionTable extends BlockContainer {
+public class BlockPyrolysisTable extends BlockContainer {
 
-       public BlockDecompositionTable(int par1, int par2, Material par3Material) {
+       public BlockPyrolysisTable(int par1, int par2, Material par3Material) {
                super(par1, par2, par3Material);
                this.setCreativeTab(ChemiCraft.creativeTab);
        }
 
        @Override
        public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9){
-               par5EntityPlayer.openGui(ChemiCraft.instance, ChemiCraft.instance.guiDecompositionTableID, par1World, par2, par3, par4);
+               par5EntityPlayer.openGui(ChemiCraft.instance, ChemiCraft.instance.guiPyrolysisTableID, par1World, par2, par3, par4);
                return true;
        }
 
@@ -44,7 +44,7 @@ public class BlockDecompositionTable extends BlockContainer {
 
        @Override
        public TileEntity createNewTileEntity(World var1) {
-               return new TileEntityDecompositionTable();
+               return new TileEntityPyrolysisTable();
        }
 
 }

diff --git a/common/chemicraft/container/ContainerDecompositionTable.java b/common/chemicraft/container/ContainerPyrolysisTable.java
similarity index 57%
rename from common/chemicraft/container/ContainerDecompositionTable.java
rename to common/chemicraft/container/ContainerPyrolysisTable.java
index b46340d..15b55d2 100644 (file)
--- a/common/chemicraft/container/ContainerDecompositionTable.java
+++ b/common/chemicraft/container/ContainerPyrolysisTable.java
@@ -4,9 +4,9 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.world.World;
 import chemicraft.ChemiCraft;
-import chemicraft.tileentity.TileEntityDecompositionTable;
+import chemicraft.tileentity.TileEntityPyrolysisTable;
 
-public class ContainerDecompositionTable extends Container {
+public class ContainerPyrolysisTable extends Container {
 
        private World worldObj;
 
@@ -14,7 +14,7 @@ public class ContainerDecompositionTable extends Container {
        private int posY;
        private int posZ;
 
-       public ContainerDecompositionTable(EntityPlayer par1EntityPlayer, TileEntityDecompositionTable par2){
+       public ContainerPyrolysisTable(EntityPlayer par1EntityPlayer, TileEntityPyrolysisTable par2){
                super();
                this.worldObj = par2.worldObj;
                this.posX = par2.xCoord;
@@ -24,7 +24,7 @@ public class ContainerDecompositionTable extends Container {
 
        @Override
        public boolean canInteractWith(EntityPlayer par1EntityPlayer) {
-               return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.decompositionTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D;
+               return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.pyrolysisTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D;
        }
 
 }

diff --git a/common/chemicraft/gui/GuiDecompositionTable.java b/common/chemicraft/gui/GuiPyrolysisTable.java
similarity index 51%
rename from common/chemicraft/gui/GuiDecompositionTable.java
rename to common/chemicraft/gui/GuiPyrolysisTable.java
index 1bef9c4..f4037fe 100644 (file)
--- a/common/chemicraft/gui/GuiDecompositionTable.java
+++ b/common/chemicraft/gui/GuiPyrolysisTable.java
@@ -3,18 +3,18 @@ package chemicraft.gui;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.EntityPlayer;
 import chemicraft.ChemiCraft;
-import chemicraft.container.ContainerDecompositionTable;
-import chemicraft.tileentity.TileEntityDecompositionTable;
+import chemicraft.container.ContainerPyrolysisTable;
+import chemicraft.tileentity.TileEntityPyrolysisTable;
 
-public class GuiDecompositionTable extends GuiContainer{
+public class GuiPyrolysisTable extends GuiContainer{
 
-       public GuiDecompositionTable(EntityPlayer par1EntityPlayer, TileEntityDecompositionTable par2) {
-               super(new ContainerDecompositionTable(par1EntityPlayer, par2));
+       public GuiPyrolysisTable(EntityPlayer par1EntityPlayer, TileEntityPyrolysisTable par2) {
+               super(new ContainerPyrolysisTable(par1EntityPlayer, par2));
        }
 
        @Override
        protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiDecompositionTexture));
+               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiPyrolysisTexture));
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 

diff --git a/common/chemicraft/inventory/InventoryPyrolysisTableFuel.java b/common/chemicraft/inventory/InventoryPyrolysisTableFuel.java
new file mode 100644 (file)
index 0000000..1f4c5be
--- /dev/null
+++ b/common/chemicraft/inventory/InventoryPyrolysisTableFuel.java
@@ -0,0 +1,112 @@
+package chemicraft.inventory;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+
+public class InventoryPyrolysisTableFuel implements IInventory {
+
+       private ItemStack[] inventory = new ItemStack[1];
+       private Container eventHandler;
+
+       public void setEventHandler(Container par1){
+               this.eventHandler = par1;
+       }
+
+       @Override
+       public int getSizeInventory() {
+               return this.inventory.length;
+       }
+
+       @Override
+       public ItemStack getStackInSlot(int var1) {
+               return this.inventory[var1];
+       }
+
+       @Override
+       public ItemStack decrStackSize(int var1, int var2) {
+               if (this.inventory[var1] != null)
+               {
+                       ItemStack var3;
+
+                       if (this.inventory[var1].stackSize <= var2)
+                       {
+                               var3 = this.inventory[var1];
+                               this.inventory[var1] = null;
+                               this.onInventoryChanged();
+                               return var3;
+                       }
+                       else
+                       {
+                               var3 = this.inventory[var1].splitStack(var2);
+
+                               if (this.inventory[var1].stackSize == 0)
+                               {
+                                       this.inventory[var1] = null;
+                               }
+
+                               this.onInventoryChanged();
+                               return var3;
+                       }
+               }
+               else
+               {
+                       return null;
+               }
+       }
+
+       @Override
+       public ItemStack getStackInSlotOnClosing(int var1) {
+               if (this.inventory[var1] != null)
+               {
+                       ItemStack var2 = this.inventory[var1];
+                       this.inventory[var1] = null;
+                       return var2;
+               }
+               else
+               {
+                       return null;
+               }
+       }
+
+       @Override
+       public void setInventorySlotContents(int var1, ItemStack var2) {
+               this.inventory[var1] = var2;
+
+               if (var2 != null && var2.stackSize > this.getInventoryStackLimit())
+               {
+                       var2.stackSize = this.getInventoryStackLimit();
+               }
+
+               this.onInventoryChanged();
+       }
+
+       @Override
+       public String getInvName() {
+               return "PyrolysisTableFuel";
+       }
+
+       @Override
+       public int getInventoryStackLimit() {
+               return 64;
+       }
+
+       @Override
+       public void onInventoryChanged() {
+               if(this.eventHandler != null) this.eventHandler.onCraftMatrixChanged(this);
+       }
+
+       @Override
+       public boolean isUseableByPlayer(EntityPlayer var1) {
+               return true;
+       }
+
+       @Override
+       public void openChest() {
+       }
+
+       @Override
+       public void closeChest() {
+       }
+}

diff --git a/common/chemicraft/inventory/InventoryDecompositionTableMaterial.java b/common/chemicraft/inventory/InventoryPyrolysisTableMaterial.java
similarity index 94%
rename from common/chemicraft/inventory/InventoryDecompositionTableMaterial.java
rename to common/chemicraft/inventory/InventoryPyrolysisTableMaterial.java
index 9326cb6..7e7b232 100644 (file)
--- a/common/chemicraft/inventory/InventoryDecompositionTableMaterial.java
+++ b/common/chemicraft/inventory/InventoryPyrolysisTableMaterial.java
@@ -5,7 +5,7 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 
-public class InventoryDecompositionTableMaterial implements IInventory {
+public class InventoryPyrolysisTableMaterial implements IInventory {
 
        private ItemStack[] inventory = new ItemStack[16];
        private Container eventHandler;
@@ -84,7 +84,7 @@ public class InventoryDecompositionTableMaterial implements IInventory {
 
        @Override
        public String getInvName() {
-               return "DecompositionTableMaterial";
+               return "PyrolysisTableMaterial";
        }
 
        @Override

diff --git a/common/chemicraft/inventory/InventoryDecompositionTableResult.java b/common/chemicraft/inventory/InventoryPyrolysisTableResult.java
similarity index 94%
rename from common/chemicraft/inventory/InventoryDecompositionTableResult.java
rename to common/chemicraft/inventory/InventoryPyrolysisTableResult.java
index 05bd099..f8ca9fd 100644 (file)
--- a/common/chemicraft/inventory/InventoryDecompositionTableResult.java
+++ b/common/chemicraft/inventory/InventoryPyrolysisTableResult.java
@@ -5,7 +5,7 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 
-public class InventoryDecompositionTableResult implements IInventory {
+public class InventoryPyrolysisTableResult implements IInventory {
 
        private ItemStack[] inventory = new ItemStack[16];
        private Container eventHandler;
@@ -84,7 +84,7 @@ public class InventoryDecompositionTableResult implements IInventory {
 
        @Override
        public String getInvName() {
-               return "DecompositionTableResult";
+               return "PyrolysisTableResult";
        }
 
        @Override

diff --git a/common/chemicraft/slot/SlotPyrolysisTableFuel.java b/common/chemicraft/slot/SlotPyrolysisTableFuel.java
new file mode 100644 (file)
index 0000000..a2ab846
--- /dev/null
+++ b/common/chemicraft/slot/SlotPyrolysisTableFuel.java
@@ -0,0 +1,12 @@
+package chemicraft.slot;
+
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+
+public class SlotPyrolysisTableFuel extends Slot {
+
+       public SlotPyrolysisTableFuel(IInventory par1IInventory, int par2, int par3, int par4) {
+               super(par1IInventory, par2, par3, par4);
+       }
+
+}

diff --git a/common/chemicraft/slot/SlotDecompositionTableMaterial.java b/common/chemicraft/slot/SlotPyrolysisTableMaterial.java
similarity index 50%
rename from common/chemicraft/slot/SlotDecompositionTableMaterial.java
rename to common/chemicraft/slot/SlotPyrolysisTableMaterial.java
index 4925d0d..0d9ae9a 100644 (file)
--- a/common/chemicraft/slot/SlotDecompositionTableMaterial.java
+++ b/common/chemicraft/slot/SlotPyrolysisTableMaterial.java
@@ -3,9 +3,9 @@ package chemicraft.slot;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 
-public class SlotDecompositionTableMaterial extends Slot {
+public class SlotPyrolysisTableMaterial extends Slot {
 
-       public SlotDecompositionTableMaterial(IInventory par1iInventory, int par2, int par3, int par4) {
+       public SlotPyrolysisTableMaterial(IInventory par1iInventory, int par2, int par3, int par4) {
                super(par1iInventory, par2, par3, par4);
        }
 

diff --git a/common/chemicraft/slot/SlotDecompositionTableResult.java b/common/chemicraft/slot/SlotPyrolysisTableResult.java
similarity index 64%
rename from common/chemicraft/slot/SlotDecompositionTableResult.java
rename to common/chemicraft/slot/SlotPyrolysisTableResult.java
index 1200f4b..29412ea 100644 (file)
--- a/common/chemicraft/slot/SlotDecompositionTableResult.java
+++ b/common/chemicraft/slot/SlotPyrolysisTableResult.java
@@ -4,9 +4,9 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-public class SlotDecompositionTableResult extends Slot {
+public class SlotPyrolysisTableResult extends Slot {
 
-       public SlotDecompositionTableResult(IInventory par1iInventory, int par2,        int par3, int par4) {
+       public SlotPyrolysisTableResult(IInventory par1iInventory, int par2,    int par3, int par4) {
                super(par1iInventory, par2, par3, par4);
        }
 

diff --git a/common/chemicraft/system/CommonProxy.java b/common/chemicraft/system/CommonProxy.java
index a2b686b..98753f2 100644 (file)
--- a/common/chemicraft/system/CommonProxy.java
+++ b/common/chemicraft/system/CommonProxy.java
@@ -5,11 +5,11 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import chemicraft.container.ContainerChemicalCombinationTable;
 import chemicraft.container.ContainerChemicalCraftingTable;
-import chemicraft.container.ContainerDecompositionTable;
+import chemicraft.container.ContainerPyrolysisTable;
 import chemicraft.container.ContainerToolAndWeaponCraftingTable;
 import chemicraft.tileentity.TileEntityChemicalCombinationTable;
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import chemicraft.tileentity.TileEntityDecompositionTable;
+import chemicraft.tileentity.TileEntityPyrolysisTable;
 import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import cpw.mods.fml.common.network.IGuiHandler;
 
@@ -29,8 +29,8 @@ public class CommonProxy implements IGuiHandler {
                        return null;
 
                TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-               if (tileEntity instanceof TileEntityDecompositionTable) {
-                       return new ContainerDecompositionTable(player, (TileEntityDecompositionTable) tileEntity);
+               if (tileEntity instanceof TileEntityPyrolysisTable) {
+                       return new ContainerPyrolysisTable(player, (TileEntityPyrolysisTable) tileEntity);
                }else if(tileEntity instanceof TileEntityChemicalCombinationTable){
                        return new ContainerChemicalCombinationTable(player, (TileEntityChemicalCombinationTable) tileEntity);
                }else if(tileEntity instanceof TileEntityToolAndWeaponCraftingTable){

diff --git a/common/chemicraft/system/PacketHandler.java b/common/chemicraft/system/PacketHandler.java
index 6bb2dcb..fa6d9ae 100644 (file)
--- a/common/chemicraft/system/PacketHandler.java
+++ b/common/chemicraft/system/PacketHandler.java
@@ -13,7 +13,7 @@ import net.minecraft.world.World;
 import chemicraft.ChemiCraft;\r
 import chemicraft.tileentity.TileEntityChemicalCombinationTable;\r
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;\r
-import chemicraft.tileentity.TileEntityDecompositionTable;\r
+import chemicraft.tileentity.TileEntityPyrolysisTable;\r
 import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;\r
 \r
 import com.google.common.io.ByteArrayDataInput;\r
@@ -53,7 +53,7 @@ public class PacketHandler implements IPacketHandler {
                                var1 = worldClient.getBlockTileEntity(x, y, z);\r
                                if(var1 instanceof TileEntityChemicalCombinationTable) ((TileEntityChemicalCombinationTable)var1).readPacket(badi);\r
                                if(var1 instanceof TileEntityChemicalCraftingTable) ((TileEntityChemicalCraftingTable)var1).readPacket(badi);\r
-                               if(var1 instanceof TileEntityDecompositionTable) ((TileEntityDecompositionTable)var1).readPacket(badi);\r
+                               if(var1 instanceof TileEntityPyrolysisTable) ((TileEntityPyrolysisTable)var1).readPacket(badi);\r
                                if(var1 instanceof TileEntityToolAndWeaponCraftingTable) ((TileEntityToolAndWeaponCraftingTable)var1).readPacket(badi);\r
                                return;\r
                        }\r
@@ -61,7 +61,7 @@ public class PacketHandler implements IPacketHandler {
                                var1 = worldServer.getBlockTileEntity(x, y, z);\r
                                if(var1 instanceof TileEntityChemicalCombinationTable) ((TileEntityChemicalCombinationTable)var1).readPacket(badi);\r
                                if(var1 instanceof TileEntityChemicalCraftingTable) ((TileEntityChemicalCraftingTable)var1).readPacket(badi);\r
-                               if(var1 instanceof TileEntityDecompositionTable) ((TileEntityDecompositionTable)var1).readPacket(badi);\r
+                               if(var1 instanceof TileEntityPyrolysisTable) ((TileEntityPyrolysisTable)var1).readPacket(badi);\r
                                if(var1 instanceof TileEntityToolAndWeaponCraftingTable) ((TileEntityToolAndWeaponCraftingTable)var1).readPacket(badi);\r
                        }\r
                        return;\r
@@ -69,7 +69,7 @@ public class PacketHandler implements IPacketHandler {
        }\r
 \r
 \r
-       public static Packet getPacket(TileEntityDecompositionTable tileEntity) {\r
+       public static Packet getPacket(TileEntityPyrolysisTable tileEntity) {\r
                ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);\r
                DataOutputStream var2 = new DataOutputStream(var1);\r
 \r

diff --git a/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java b/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
index 35b2dcb..dc90bb7 100644 (file)
--- a/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
+++ b/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
@@ -368,3 +368,4 @@ public class TileEntityChemicalCombinationTable extends TileEntity {
        }
 
 }
+

diff --git a/common/chemicraft/tileentity/TileEntityDecompositionTable.java b/common/chemicraft/tileentity/TileEntityPyrolysisTable.java
similarity index 55%
rename from common/chemicraft/tileentity/TileEntityDecompositionTable.java
rename to common/chemicraft/tileentity/TileEntityPyrolysisTable.java
index fcb4ee5..696990e 100644 (file)
--- a/common/chemicraft/tileentity/TileEntityDecompositionTable.java
+++ b/common/chemicraft/tileentity/TileEntityPyrolysisTable.java
@@ -1,18 +1,21 @@
 package chemicraft.tileentity;
 
+import ic2.api.Direction;
+import ic2.api.energy.tile.IEnergySink;
+
 import java.io.DataOutputStream;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import chemicraft.inventory.InventoryDecompositionTableMaterial;
-import chemicraft.inventory.InventoryDecompositionTableResult;
+import chemicraft.inventory.InventoryPyrolysisTableMaterial;
+import chemicraft.inventory.InventoryPyrolysisTableResult;
 
 import com.google.common.io.ByteArrayDataInput;
 
-public class TileEntityDecompositionTable extends TileEntity {
+public class TileEntityPyrolysisTable extends TileEntity {
 
-       private InventoryDecompositionTableMaterial invm = new InventoryDecompositionTableMaterial();
-       private InventoryDecompositionTableResult invr = new InventoryDecompositionTableResult();
+       private InventoryPyrolysisTableMaterial invm = new InventoryPyrolysisTableMaterial();
+       private InventoryPyrolysisTableResult invr = new InventoryPyrolysisTableResult();
 
        @Override
        public void readFromNBT(NBTTagCompound par1) {
@@ -39,11 +42,11 @@ public class TileEntityDecompositionTable extends TileEntity {
                }
        }
 
-       public InventoryDecompositionTableMaterial getInvMaterial() {
+       public InventoryPyrolysisTableMaterial getInvMaterial() {
                return this.invm;
        }
 
-       public InventoryDecompositionTableResult getInvResult() {
+       public InventoryPyrolysisTableResult getInvResult() {
                return this.invr;
        }
 

diff --git a/resources/chemicraft/guis/ChemicalCombination.png b/resources/chemicraft/guis/ChemicalCombination.png
index 4c235bc..bfcb411 100644 (file)
Binary files a/resources/chemicraft/guis/ChemicalCombination.png and b/resources/chemicraft/guis/ChemicalCombination.png differ

diff --git a/resources/chemicraft/guis/Decomposition.png b/resources/chemicraft/guis/Decomposition.png
deleted file mode 100644 (file)
index 3d80f10..0000000
Binary files a/resources/chemicraft/guis/Decomposition.png and /dev/null differ

diff --git a/resources/chemicraft/guis/Pyrolysis.png b/resources/chemicraft/guis/Pyrolysis.png
new file mode 100644 (file)
index 0000000..bfcb411
Binary files /dev/null and b/resources/chemicraft/guis/Pyrolysis.png differ

diff --git a/src/chemicraft/client/ClientProxy.java b/src/chemicraft/client/ClientProxy.java
index 994d915..89c93ea 100644 (file)
--- a/src/chemicraft/client/ClientProxy.java
+++ b/src/chemicraft/client/ClientProxy.java
@@ -8,13 +8,13 @@ import chemicraft.ChemiCraft;
 import chemicraft.entity.EntityAtomsGrenade;
 import chemicraft.gui.GuiChemicalCombinationTable;
 import chemicraft.gui.GuiChemicalCraftingTable;
-import chemicraft.gui.GuiDecompositionTable;
+import chemicraft.gui.GuiPyrolysisTable;
 import chemicraft.gui.GuiToolAndWeaponCraftingTable;
 import chemicraft.render.RenderAtomsGrenade;
 import chemicraft.system.CommonProxy;
 import chemicraft.tileentity.TileEntityChemicalCombinationTable;
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import chemicraft.tileentity.TileEntityDecompositionTable;
+import chemicraft.tileentity.TileEntityPyrolysisTable;
 import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
@@ -28,7 +28,7 @@ public class ClientProxy extends CommonProxy {
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemCompoundsTexture);
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemTexture);
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiChemicalCombinationTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiDecompositionTexture);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiPyrolysisTexture);
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiChemicalCraftingTexture);
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiToolAndWeaponCraftingTexture);
                RenderingRegistry.registerEntityRenderingHandler(EntityAtomsGrenade.class, new RenderAtomsGrenade(0.5F));
@@ -41,8 +41,8 @@ public class ClientProxy extends CommonProxy {
                        return null;
 
                TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-               if (tileEntity instanceof TileEntityDecompositionTable) {
-                       return new GuiDecompositionTable(player, (TileEntityDecompositionTable) tileEntity);
+               if (tileEntity instanceof TileEntityPyrolysisTable) {
+                       return new GuiPyrolysisTable(player, (TileEntityPyrolysisTable) tileEntity);
                }else if(tileEntity instanceof TileEntityChemicalCombinationTable){
                        return new GuiChemicalCombinationTable(player, (TileEntityChemicalCombinationTable) tileEntity);
                }else if(tileEntity instanceof TileEntityToolAndWeaponCraftingTable){