OSDN Git Service

tc
authormozipi <mozipi@users.sourceforge.jp>
Wed, 27 Mar 2013 03:53:12 +0000 (12:53 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Wed, 27 Mar 2013 03:53:12 +0000 (12:53 +0900)
common/pcc/chemicraft/ChemiCraft.java
common/pcc/chemicraft/ChemiCraftConfiguration.java

index 520bf80..5de0b5d 100644 (file)
@@ -36,7 +36,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
  * ChemiCraft本体
  * @author P.C.C.
  */
-@Mod(modid = "chemiCraft", name = "ChemiCraft", version = "beta")
+@Mod(modid = "ChemiCraft", name = "ChemiCraft", version = "beta")
 @NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.6", channels = "chemicraft", packetHandler = PacketHandler.class)
 public class ChemiCraft implements Runnable {
 
@@ -67,7 +67,7 @@ public class ChemiCraft implements Runnable {
        /**
         * this is ChemiCraft instance.
         */
-       @Instance("chemiCraft")
+       @Instance("ChemiCraft")
        public static ChemiCraft instance;
 
        /**
@@ -254,59 +254,6 @@ public class ChemiCraft implements Runnable {
                this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt();
                this.guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt();
 
-               /*
-               Property pyrolysisTableIDProp = cfg.getBlock("PyrolysisTable", 2400);
-               Property electrolysisTableIDProp = cfg.getBlock("ElectrolysisTable", 2401);
-               Property chemicalCombinationTableIDProp = cfg.getBlock("ChemicalCombinationID", 2402);
-               Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 2403);
-               Property chemicalCraftingTableIDProp = cfg.getBlock("ChemicalCraftingTableID", 2404);
-
-               Property[] atomOresIDProp = new Property[this.atomOresID.length];
-               for (int i = 0; i < atomOresIDProp.length; i++) {
-                       atomOresIDProp[i] = cfg.getBlock("AtomsOreID:" + i, 2500 + i);
-               }
-
-               Property atomsIDProp = cfg.getItem("AtomsID", 25000);
-               Property compoundsIDProp = cfg.getItem("CompoundsID", 25001);
-               Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25002);
-               Property atomGrenadeIDProp = cfg.getItem("AtomGrenadeID", 25003);
-               Property chemicalCellsIDProp = cfg.getItem("ChemicalCellID", 25004);
-               Property dustIDProp = cfg.getItem("DustID", 25005);
-               Property radiationGunIDProp = cfg.getItem("RadiationGunID", 25006);
-               Property radiationBalletIDProp = cfg.getItem("RadiationBalletID", 25007);
-
-               Property guiPyrolysisTableIDProp = cfg.get("GUI", "GUIPyrolysisID", 1000);
-               Property guiElectrolysisTableIDProp = cfg.get("GUI", "GUIElectrolysisTableIDProp", 1001);
-               Property guiChemicalCombinationTableIDProp = cfg.get("GUI", "GUIChemicalCombinationTableID", 1002);
-               Property guiToolAndWeaponCraftingTableIDProp = cfg.get("GUI", "GUIToolAndWeaponCraftingTableID", 1003);
-               Property guiChemicalCraftingTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1004);
-
-
-               this.pyrolysisTableID = pyrolysisTableIDProp.getInt();
-               this.electrolysisTableID = electrolysisTableIDProp.getInt();
-               this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt();
-               this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt();
-               this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt();
-               for (int i = 0; i < atomOresID.length; i++) {
-                       this.atomOresID[i] = atomOresIDProp[i].getInt();
-               }
-
-               this.atomsID = atomsIDProp.getInt();
-               this.compoundsID = compoundsIDProp.getInt();
-               this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt();
-               this.atomGrenadeID = atomGrenadeIDProp.getInt();
-               this.chemicalCellsID = chemicalCellsIDProp.getInt();
-               this.dustID = dustIDProp.getInt();
-               this.radiationGunID = radiationGunIDProp.getInt();
-               this.radiationBalletID = radiationBalletIDProp.getInt();
-
-               this.guiPyrolysisTableID = guiPyrolysisTableIDProp.getInt();
-               this.guiElectrolysisTableID = guiElectrolysisTableIDProp.getInt();
-               this.guiChemicalCombinationTableID = guiChemicalCombinationTableIDProp.getInt();
-               this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt();
-               this.guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt();
-               */
-
                cfg.save();
        }
 
index c4a08f2..b872271 100644 (file)
@@ -13,7 +13,7 @@ public class ChemiCraftConfiguration {
        }
 
        public int additionID() {
-               return this.nowID++;
+               return ++this.nowID;
        }
 
 }