競合修正

diff --git a/common/chemicraft/ChemiCraft.java b/common/chemicraft/ChemiCraft.java
index 704344b..c2b7b7f 100644 (file)
--- a/common/chemicraft/ChemiCraft.java
+++ b/common/chemicraft/ChemiCraft.java
@@ -10,6 +10,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.BlockElectrolysisTable;\r
 import chemicraft.block.BlockPyrolysisTable;\r
 import chemicraft.block.BlockToolAndWeaponCraftingTable;\r
 import chemicraft.compounds.CompoundDebug;\r
@@ -25,6 +26,7 @@ import chemicraft.system.CommonProxy;
 import chemicraft.system.PacketHandler;\r
 import chemicraft.tileentity.TileEntityChemicalCombinationTable;\r
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;\r
+import chemicraft.tileentity.TileEntityElectrolysisTable;\r
 import chemicraft.tileentity.TileEntityPyrolysisTable;\r
 import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;\r
 import chemicraft.util.Auxiliary;\r
@@ -100,6 +102,7 @@ public class ChemiCraft {
        public int chemicalConbinationTableID;\r
        public int toolAndWeaponCraftingTableID;\r
        public int chemicalCraftingTableID;\r
+       public int electrolysisTableID;\r
 \r
        /**\r
         * GUIID.\r
@@ -108,6 +111,7 @@ public class ChemiCraft {
        public int guiChemicalCombinationTableID;\r
        public int guiToolAndWeaponCraftingTableID;\r
        public int guiChemicalCraftingTableID;\r
+       public int guiElectrolysisTableID;\r
 \r
        /**\r
         * Block型変数.\r
@@ -116,6 +120,7 @@ public class ChemiCraft {
        public Block blockChemicalCombinationTable;\r
        public Block blockToolAndWeaponCraftingTable;\r
        public Block blockChemicalCraftingTable;\r
+       public Block blockElectrolysisTable;\r
 \r
        /**\r
         * Item型変数.\r
@@ -128,14 +133,15 @@ public class ChemiCraft {
        /**\r
         * このmodで使用するTextureのパス.\r
         */\r
-       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 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
+       public final String ITEM_ATOMS_TEXTURE = "/chemicraft/items/Atoms.png";\r
+       public final String ITEM_COMPOUNDS_TEXTURE = "/chemicraft/items/Compounds.png";\r
+       public final String ITEM_TEXTURE = "/chemicraft/items/items.png";\r
+       public final String BLOCK_CHEMICALCRAFTING_TABLE_TEXTURE = "/chemicraft/blocks/cctable.png";\r
+       public final String GUI_PYROLYSIS_TEXTURE = "/chemicraft/guis/Pyrolysis.png";\r
+       public final String GUI_ELECTROLYSIS_TEXTURE = "/chemicraft/guis/Electrolysis.png";\r
+       public final String GUI_CHEMICALCOMBINATION_TEXTURE = "/chemicraft/guis/ChemicalCombination.png";\r
+       public final String GUI_TOOLANDWEAPONCRAFTING_TEXTURE = "/chemicraft/guis/ToolAndWeaponCrafting.png";\r
+       public final String GUI_CHEMICALCRAFTING_TEXTURE = "/chemicraft/guis/MaterialCrafting.png";\r
 \r
        /**\r
         * このmodに必要な補助クラスのインスタンス.\r
@@ -156,6 +162,7 @@ public class ChemiCraft {
                Property chemicalCombinationTableIDProp = cfg.getBlock("ChemicalCombinationID", 2401);\r
                Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 2402);\r
                Property chemicalCraftingTableIDProp = cfg.getBlock("ChemicalCraftingTableID", 2403);\r
+               Property electrolysisTableIDProp = cfg.getBlock("ElectrolysisTableID", 2404);\r
 \r
                Property atomsIDProp = cfg.getItem("AtomsID", 25000);\r
                Property compoundsIDProp = cfg.getItem("CompoundsID", 25001);\r
@@ -166,6 +173,7 @@ public class ChemiCraft {
                Property guiChemicalCombinationTableIDProp = cfg.get("GUI", "GUIChemicalCombinationTableID", 1001);\r
                Property guiToolAndWeaponCraftingTableIDProp = cfg.get("GUI", "GUIToolAndWeaponCraftingTableID", 1002);\r
                Property guiChemicalCraftingTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1003);\r
+               Property guiElectrolysisTableIDProp = cfg.get("GUI", "GUIElectrolysisTableID", 1004);\r
 \r
 \r
                this.pyrolysisTableID = pyrolysisTableIDProp.getInt();\r
@@ -180,6 +188,7 @@ public class ChemiCraft {
                this.guiChemicalCombinationTableID = guiChemicalCombinationTableIDProp.getInt();\r
                this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt();\r
                this.guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt();\r
+               this.guiElectrolysisTableID = guiElectrolysisTableIDProp.getInt();\r
 \r
                cfg.save();\r
        }\r
@@ -221,6 +230,11 @@ public class ChemiCraft {
                                setResistance(0.0F).\r
                                setStepSound(Block.soundStoneFootstep).\r
                                setBlockName("ChemicalCraftingTable");\r
+               this.blockElectrolysisTable = new BlockElectrolysisTable(electrolysisTableID, 0, Material.ground).\r
+                               setHardness(2.0F).\r
+                               setResistance(0.0F).\r
+                               setStepSound(Block.soundStoneFootstep).\r
+                               setBlockName("ElectrolysisTable");\r
 \r
                // Itemを追加します\r
                this.itemAtoms = new ItemAtoms(this.atomsID).setItemName("atoms");\r
@@ -239,10 +253,12 @@ public class ChemiCraft {
                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
-               this.nameAuxiliary.addName(blockToolAndWeaponCraftingTable, "ja_JP", "ツール&武器製作台");\r
-               this.nameAuxiliary.addName(blockChemicalCraftingTable, "ChemicalCraftingTable");\r
-               this.nameAuxiliary.addName(blockChemicalCraftingTable, "ja_JP", "素材製作台");\r
+               this.nameAuxiliary.addName(this.blockToolAndWeaponCraftingTable, "ToolAndWeaponCraftingTable");\r
+               this.nameAuxiliary.addName(this.blockToolAndWeaponCraftingTable, "ja_JP", "ツール&武器製作台");\r
+               this.nameAuxiliary.addName(this.blockChemicalCraftingTable, "ChemicalCraftingTable");\r
+               this.nameAuxiliary.addName(this.blockChemicalCraftingTable, "ja_JP", "素材製作台");\r
+               this.nameAuxiliary.addName(this.blockElectrolysisTable, "ElectrolysisTable");\r
+               this.nameAuxiliary.addName(this.blockElectrolysisTable, "ja_JP", "電気分解台");\r
 \r
                // Itemの名前を設定します\r
                this.nameAuxiliary.addName(this.itemAtoms, ATOMSNAME);\r
@@ -257,6 +273,7 @@ public class ChemiCraft {
                GameRegistry.registerTileEntity(TileEntityChemicalCombinationTable.class, "TileEntityChemicalCombinationTable");\r
                GameRegistry.registerTileEntity(TileEntityToolAndWeaponCraftingTable.class, "TileEntityToolAndWeaponCraftingTable");\r
                GameRegistry.registerTileEntity(TileEntityChemicalCraftingTable.class, "TileEntityChemicalCraftingTable");\r
+               GameRegistry.registerTileEntity(TileEntityElectrolysisTable.class, "TileEntityElectrolysisTable");\r
 \r
                // GUIを追加します\r
                NetworkRegistry.instance().registerGuiHandler(instance, proxy);\r

diff --git a/common/chemicraft/block/BlockChemicalCombinationTable.java b/common/chemicraft/block/BlockChemicalCombinationTable.java
index 4562eda..3f8340a 100644 (file)
--- a/common/chemicraft/block/BlockChemicalCombinationTable.java
+++ b/common/chemicraft/block/BlockChemicalCombinationTable.java
@@ -25,7 +25,7 @@ public class BlockChemicalCombinationTable extends BlockContainer {
 
        @Override
        public String getTextureFile() {
-               return ChemiCraft.instance.blockChemicalCraftingTableTexture;
+               return ChemiCraft.instance.BLOCK_CHEMICALCRAFTING_TABLE_TEXTURE;
        }
 
 

diff --git a/common/chemicraft/block/BlockChemicalCraftingTable.java b/common/chemicraft/block/BlockChemicalCraftingTable.java
index 7bf1578..0ba75da 100644 (file)
--- a/common/chemicraft/block/BlockChemicalCraftingTable.java
+++ b/common/chemicraft/block/BlockChemicalCraftingTable.java
@@ -26,7 +26,7 @@ public class BlockChemicalCraftingTable extends BlockContainer {
 
        @Override
        public String getTextureFile(){
-               return ChemiCraft.instance.blockChemicalCraftingTableTexture;
+               return ChemiCraft.instance.BLOCK_CHEMICALCRAFTING_TABLE_TEXTURE;
        }
 
 

diff --git a/common/chemicraft/block/BlockElectrolysisTable.java b/common/chemicraft/block/BlockElectrolysisTable.java
index e4ef985..11e8e65 100644 (file)
--- a/common/chemicraft/block/BlockElectrolysisTable.java
+++ b/common/chemicraft/block/BlockElectrolysisTable.java
@@ -24,7 +24,7 @@ public class BlockElectrolysisTable extends BlockContainer
 
        @Override
        public String getTextureFile(){
-               return ChemiCraft.instance.BLOCKCHEMICALCRAFTINGTABLETEXTURE;
+               return ChemiCraft.instance.BLOCK_CHEMICALCRAFTING_TABLE_TEXTURE;
        }
 
        @Override

diff --git a/common/chemicraft/block/BlockPyrolysisTable.java b/common/chemicraft/block/BlockPyrolysisTable.java
index 728545f..d24cc1a 100644 (file)
--- a/common/chemicraft/block/BlockPyrolysisTable.java
+++ b/common/chemicraft/block/BlockPyrolysisTable.java
@@ -26,7 +26,7 @@ public class BlockPyrolysisTable extends BlockContainer {
 
        @Override
        public String getTextureFile(){
-               return ChemiCraft.instance.blockChemicalCraftingTableTexture;
+               return ChemiCraft.instance.BLOCK_CHEMICALCRAFTING_TABLE_TEXTURE;
        }
 
 

diff --git a/common/chemicraft/block/BlockToolAndWeaponCraftingTable.java b/common/chemicraft/block/BlockToolAndWeaponCraftingTable.java
index 463d2da..668dfd0 100644 (file)
--- a/common/chemicraft/block/BlockToolAndWeaponCraftingTable.java
+++ b/common/chemicraft/block/BlockToolAndWeaponCraftingTable.java
@@ -25,7 +25,7 @@ public class BlockToolAndWeaponCraftingTable extends BlockContainer {
 
        @Override
        public String getTextureFile(){
-               return ChemiCraft.instance.blockChemicalCraftingTableTexture;
+               return ChemiCraft.instance.BLOCK_CHEMICALCRAFTING_TABLE_TEXTURE;
        }
 
 

diff --git a/common/chemicraft/gui/GuiChemicalCombinationTable.java b/common/chemicraft/gui/GuiChemicalCombinationTable.java
index 7daf181..3e14652 100644 (file)
--- a/common/chemicraft/gui/GuiChemicalCombinationTable.java
+++ b/common/chemicraft/gui/GuiChemicalCombinationTable.java
@@ -33,7 +33,7 @@ public class GuiChemicalCombinationTable extends GuiContainer {
 
        @Override
        protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiChemicalCombinationTexture));
+               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.GUI_CHEMICALCOMBINATION_TEXTURE));
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 

diff --git a/common/chemicraft/gui/GuiChemicalCraftingTable.java b/common/chemicraft/gui/GuiChemicalCraftingTable.java
index a25ad96..ea115d2 100644 (file)
--- a/common/chemicraft/gui/GuiChemicalCraftingTable.java
+++ b/common/chemicraft/gui/GuiChemicalCraftingTable.java
@@ -19,7 +19,7 @@ public class GuiChemicalCraftingTable extends GuiContainer {
 
        @Override
        protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3){
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiChemicalCraftingTexture));
+               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.GUI_CHEMICALCRAFTING_TEXTURE));
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 

diff --git a/common/chemicraft/gui/GuiPyrolysisTable.java b/common/chemicraft/gui/GuiPyrolysisTable.java
index 903740c..59b7008 100644 (file)
--- a/common/chemicraft/gui/GuiPyrolysisTable.java
+++ b/common/chemicraft/gui/GuiPyrolysisTable.java
@@ -18,7 +18,7 @@ public class GuiPyrolysisTable extends GuiContainer{
 
        @Override
        protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiPyrolysisTexture));
+               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.GUI_PYROLYSIS_TEXTURE));
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 

diff --git a/common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java b/common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
index d3e9288..d26ce31 100644 (file)
--- a/common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
+++ b/common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
@@ -14,7 +14,7 @@ public class GuiToolAndWeaponCraftingTable extends GuiContainer {
 
        @Override
        protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiToolAndWeaponCraftingTexture));
+               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.GUI_TOOLANDWEAPONCRAFTING_TEXTURE));
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 

diff --git a/common/chemicraft/item/ItemAtoms.java b/common/chemicraft/item/ItemAtoms.java
index b766426..ad1b147 100644 (file)
--- a/common/chemicraft/item/ItemAtoms.java
+++ b/common/chemicraft/item/ItemAtoms.java
@@ -43,7 +43,7 @@ public class ItemAtoms extends Item {
 
        @Override
        public String getTextureFile(){
-               return ChemiCraft.instance.itemAtomsTexture;
+               return ChemiCraft.instance.ITEM_ATOMS_TEXTURE;
        }
 
 

diff --git a/common/chemicraft/item/ItemCompounds.java b/common/chemicraft/item/ItemCompounds.java
index 18df605..17d6514 100644 (file)
--- a/common/chemicraft/item/ItemCompounds.java
+++ b/common/chemicraft/item/ItemCompounds.java
@@ -79,7 +79,7 @@ public class ItemCompounds extends Item {
 
        @Override
        public String getTextureFile(){
-               return ChemiCraft.instance.itemCompoundsTexture;
+               return ChemiCraft.instance.ITEM_COMPOUNDS_TEXTURE;
        }
 
 

diff --git a/common/chemicraft/render/RenderAtomsGrenade.java b/common/chemicraft/render/RenderAtomsGrenade.java
index 916a86f..dd402de 100644 (file)
--- a/common/chemicraft/render/RenderAtomsGrenade.java
+++ b/common/chemicraft/render/RenderAtomsGrenade.java
@@ -30,7 +30,7 @@ public class RenderAtomsGrenade extends Render {
                float var10 = this.field_77002_a;
                GL11.glScalef(var10 / 1.0F, var10 / 1.0F, var10 / 1.0F);
                byte var11 = 1;
-               this.loadTexture(ChemiCraft.instance.itemTexture);
+               this.loadTexture(ChemiCraft.instance.ITEM_TEXTURE);
                Tessellator var12 = Tessellator.instance;
                float var13 = (float)(var11 % 16 * 16 + 0) / 256.0F;
                float var14 = (float)(var11 % 16 * 16 + 16) / 256.0F;