OSDN Git Service

いろいろコミット
authormozipi <mozipi@users.sourceforge.jp>
Sun, 16 Dec 2012 08:34:16 +0000 (17:34 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Sun, 16 Dec 2012 08:34:16 +0000 (17:34 +0900)
common/chemicraft/ChemiCraft.java
resources/chemicraft/guis/ChemicalCombination.png
resources/chemicraft/guis/Decomposition.png
resources/chemicraft/guis/MaterialCrafting.png
resources/chemicraft/guis/tabs.png [deleted file]
src/chemicraft/client/ClientProxy.java

index da4cd42..372656a 100644 (file)
@@ -108,7 +108,6 @@ public class ChemiCraft {
        public String guiChemicalCombinationTexture = "/chemicraft/guis/ChemicalCombination.png";\r
        public String guiToolAndWeaponCraftingTexture = "/chemicraft/guis/ToolAndWeaponCrafting.png";\r
        public String guiMaterialCraftingTexture = "/chemicraft/guis/MaterialCrafting.png";\r
-       public String guiTabs = "/chemicraft/guis/Tabs.png";\r
 \r
        /**\r
         * このmodに必要な補助クラスのインスタンス\r
@@ -122,10 +121,10 @@ public class ChemiCraft {
                Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());\r
                cfg.load();\r
 \r
-               Property decompositionTableIDProp = cfg.getBlock("DecompositionTable", 200);\r
-               Property chemicalCombinationTableIDProp = cfg.getBlock("ChemicalCombinationID", 201);\r
-               Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 202);\r
-               Property materialCraftingTableIDProp = cfg.getBlock("MaterialCraftingTableID", 203);\r
+               Property decompositionTableIDProp = cfg.getBlock("DecompositionTable", 2400);\r
+               Property chemicalCombinationTableIDProp = cfg.getBlock("ChemicalCombinationID", 2401);\r
+               Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 2402);\r
+               Property materialCraftingTableIDProp = cfg.getBlock("MaterialCraftingTableID", 2403);\r
 \r
                Property atomsIDProp = cfg.getItem("AtomsID", 25000);\r
                Property compoundsIDProp = cfg.getItem("CompoundsID", 25001);\r
index 5f9a66b..72aa44d 100644 (file)
Binary files a/resources/chemicraft/guis/ChemicalCombination.png and b/resources/chemicraft/guis/ChemicalCombination.png differ
index 8a71285..3d80f10 100644 (file)
Binary files a/resources/chemicraft/guis/Decomposition.png and b/resources/chemicraft/guis/Decomposition.png differ
index 93fc0d1..1660d6b 100644 (file)
Binary files a/resources/chemicraft/guis/MaterialCrafting.png and b/resources/chemicraft/guis/MaterialCrafting.png differ
diff --git a/resources/chemicraft/guis/tabs.png b/resources/chemicraft/guis/tabs.png
deleted file mode 100644 (file)
index 1aca844..0000000
Binary files a/resources/chemicraft/guis/tabs.png and /dev/null differ
index f2caf86..151937e 100644 (file)
@@ -27,7 +27,6 @@ public class ClientProxy extends CommonProxy {
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiDecompositionTexture);
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiMaterialCraftingTexture);
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiToolAndWeaponCraftingTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiTabs);
        }