OSDN Git Service

ponkotateさんのミスがエラー出すのでとりあえず
[chemicraft/chemicraft.git] / common / chemicraft / ChemiCraft.java
index a55a8de..087a68f 100644 (file)
@@ -1,8 +1,9 @@
-package chemicraft;\r
+package chemicraft;\r
 \r
 import net.minecraft.src.Block;\r
 import net.minecraft.src.CreativeTabs;\r
 import net.minecraft.src.Item;\r
+import net.minecraft.src.ItemStack;\r
 import net.minecraft.src.Material;\r
 import net.minecraftforge.common.Configuration;\r
 import net.minecraftforge.common.Property;\r
@@ -15,37 +16,33 @@ import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.network.NetworkRegistry;\r
 import cpw.mods.fml.common.registry.GameRegistry;\r
 \r
+/**\r
+ * ChemiCraft本体\r
+ *\r
+ * @author P.C.C.\r
+ *\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
+@NetworkMod(clientSideRequired = true, serverSideRequired = false, versionBounds = "1.3.2", channels = "chemicraft", packetHandler = PacketHandler.class)\r
 // クライアント、サーバー共に必要 1.3.2用\r
 public class ChemiCraft {\r
 \r
-       public static final String[] atomsName = {\r
-               "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon",\r
-               "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium",\r
-               "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine",\r
-               "Krypton", "Rubidium", "Strontium", "Yttorium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver",\r
-               "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium",\r
-               "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium",\r
-               "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine",\r
-               "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium",\r
-               "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium",\r
-               "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Ununtrium", "Ununquadium", "Ununpentium", "Ununhexium", "Ununseptium", "Ununoctium"\r
-       };\r
-\r
-\r
-       public static final String[] atomsNameJP = {\r
-               "水素", "ヘリウム", "リチウム", "ベリウム", "ホウ素", "炭素", "窒素", "酸素", "フッ素", "ネオン", "ナトリウム", "マグネシウム", "アルミニウム", "ケイ素", "リン",\r
-               "硫黄", "塩素", "アルゴン", "カリウム", "カルシウム", "スカンジウム", "チタン", "バナジウム", "クロム", "マンガン", "鉄", "コバルト", "ニッケル", "銅", "亜鉛", "ガリウム", "ゲルマニウム", "ヒ素", "セレン", "臭素",\r
-               "クリプトン", "ルビジウム", "ストロンチウム", "イットリウム", "ジルコニウム", "ニオブ", "モリブデン", "テクネチウム", "ルテニウム", "ロジウム", "パラジウム", "銀", "カドミウム", "インジウム", "スズ", "アンチモン", "テルル",\r
-               "ヨウ素", "キセノン", "セシウム", "バリウム", "ランタン", "セリウム", "プラセオジム", "ネオジム", "プロメチウム", "サマリウム", "ユウロビウム", "ガドリニウム", "テルビウム", "ジスプロニウム", "ホルミウム", "エルビウム",\r
-               "ツリウム", "イッテルビウム", "ルテチウム", "ハフニウム", "タンタル", "タングステン", "レニウム", "オスミウム", "イリジウム", "白金", "金", "水銀", "タリウム", "鉛", "ビスマス", "ポロニウム", "アスタチン", "ラドン",\r
-               "フランシウム", "ラジウム", "アクチニウム", "トリウム", "プロトアクチウム", "ウラン", "ネプツニウム", "プルトニウム", "アメリシウム", "キュリウム", "バークリウム", "カルホルニウム", "アインスタイニウム", "フェルミウム",\r
-               "メンデレビウム", "ノーベリウム", "ローレンシウム", "ラサホージウム", "ドブニウム", "シーボーギウム", "ボーリウム", "ハッシウム", "マイトネリウム", "ダームスタチウム", "レントゲニウム", "コペルニシウム", "ウンウントリウム",\r
-               "ウンウンクアジウム", "ウンウンペンチウム", "ウンウンヘキシウム", "ウンウンセプチウム", "ウンウンオクチウム"\r
-       };\r
-\r
+       public final String[] atomsName = { "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon",\r
+                       "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium",\r
+                       "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttorium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium",\r
+                       "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium",\r
+                       "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum",\r
+                       "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium",\r
+                       "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium",\r
+                       "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Ununtrium", "Ununquadium", "Ununpentium", "Ununhexium", "Ununseptium", "Ununoctium" };\r
+\r
+       public final String[] atomsNameJP = { "水素", "ヘリウム", "リチウム", "ベリウム", "ホウ素", "炭素", "窒素", "酸素", "フッ素", "ネオン", "ナトリウム", "マグネシウム", "アルミニウム", "ケイ素", "リン", "硫黄", "塩素", "アルゴン", "カリウム", "カルシウム", "スカンジウム",\r
+                       "チタン", "バナジウム", "クロム", "マンガン", "鉄", "コバルト", "ニッケル", "銅", "亜鉛", "ガリウム", "ゲルマニウム", "ヒ素", "セレン", "臭素", "クリプトン", "ルビジウム", "ストロンチウム", "イットリウム", "ジルコニウム", "ニオブ", "モリブデン", "テクネチウム", "ルテニウム",\r
+                       "ロジウム", "パラジウム", "銀", "カドミウム", "インジウム", "スズ", "アンチモン", "テルル", "ヨウ素", "キセノン", "セシウム", "バリウム", "ランタン", "セリウム", "プラセオジム", "ネオジム", "プロメチウム", "サマリウム", "ユウロビウム", "ガドリニウム", "テルビウム", "ジスプロニウム",\r
+                       "ホルミウム", "エルビウム", "ツリウム", "イッテルビウム", "ルテチウム", "ハフニウム", "タンタル", "タングステン", "レニウム", "オスミウム", "イリジウム", "白金", "金", "水銀", "タリウム", "鉛", "ビスマス", "ポロニウム", "アスタチン", "ラドン", "フランシウム", "ラジウム",\r
+                       "アクチニウム", "トリウム", "プロトアクチウム", "ウラン", "ネプツニウム", "プルトニウム", "アメリシウム", "キュリウム", "バークリウム", "カルホルニウム", "アインスタイニウム", "フェルミウム", "メンデレビウム", "ノーベリウム", "ローレンシウム", "ラサホージウム", "ドブニウム", "シーボーギウム",\r
+                       "ボーリウム", "ハッシウム", "マイトネリウム", "ダームスタチウム", "レントゲニウム", "コペルニシウム", "ウンウントリウム", "ウンウンクアジウム", "ウンウンペンチウム", "ウンウンヘキシウム", "ウンウンセプチウム", "ウンウンオクチウム" };\r
 \r
        /**\r
         * このmodのインスタンス\r
@@ -53,45 +50,47 @@ public class ChemiCraft {
        @Mod.Instance("chemiCraft")\r
        public static ChemiCraft instance;\r
 \r
-\r
        /**\r
         * ChemiCraftのProxy\r
         */\r
        @SidedProxy(clientSide = "chemicraft.client.ClientProxy", serverSide = "chemicraft.CommonProxy")\r
        public static CommonProxy proxy;\r
 \r
-\r
        /**\r
         * ChemiCraftのCreativeTab\r
         */\r
-       public static CreativeTabs creativeTab = new CreativeTabAtoms("ChemiCraft");\r
-\r
+       public CreativeTabs creativeTab = new CreativeTabAtoms("ChemiCraft");\r
 \r
        /**\r
         * ItemID\r
         */\r
-       public static int atomsID;\r
-       public static int compoundsID;\r
-       public static int gasCollectingBottleID;\r
-\r
+       public int atomsID;\r
+       public int compoundsID;\r
+       public int gasCollectingBottleID;\r
 \r
        /**\r
         * BlockID\r
         */\r
-       public static int scienceCraftingTableID;\r
-\r
+       public int decompositionTableID;\r
+       public int chemicalConbinationTableID;\r
+       public int toolAndWeaponCraftingTableID;\r
+       public int materialCraftingTableID;\r
 \r
        /**\r
         * GUIID\r
         */\r
-       public static int guiScienceCraftingTableID;\r
-\r
+       public int guiDecompositionTableID;\r
+       public int guiChemicalCombinationTableID;\r
+       public int guiToolAndWeaponCraftingTableID;\r
+       public int guiMaterialCraftingTableID;\r
 \r
        /**\r
         * Block型変数\r
         */\r
-       public static Block blockScienceCraftingTable;\r
-\r
+       public static Block blockDecompositionTable;\r
+       public static Block blockChemicalCombinationTable;\r
+       public static Block blockToolAndWeaponCraftingTable;\r
+       public static Block blockMaterialCraftingTable;\r
 \r
        /**\r
         * Item型変数\r
@@ -100,74 +99,115 @@ public class ChemiCraft {
        public static Item itemCompounds;\r
        public static Item itemGasCollectingBottle;\r
 \r
+       /**\r
+        * このmodで使用するTextureのパス\r
+        */\r
+       public String itemAtomsTexture = "/chemicraft/items/Atoms.png";\r
+       public String itemCompoundsTexture = "/chemicraft/items/Compounds.png";\r
+       public String blockChemicalCraftingTableTexture = "/chemicraft/blocks/CCTable.png";\r
+       public String guiDecompositionTexture = "/chemicraft/guis/Decomposition.png";\r
+       public String guiChemicalCombinationTexture = "/chemicraft/guis/ChemicalCombination.png";\r
+       public String guiToolAndWeaponCraftingTexture = "/chemicraft/guis/ToolAndWeaponCrafting.png";\r
+       public String guiMaterialCraftingTexture = "/chemicraft/guis/MaterialCrafting.png";\r
 \r
        /**\r
         * このmodに必要な補助クラスのインスタンス\r
         */\r
-       private static Auxiliary Auxiliary = new Auxiliary();\r
-       private static NameAuxiliary NameAuxiliary = Auxiliary.new NameAuxiliary();\r
-\r
-\r
+       private Auxiliary Auxiliary = new Auxiliary();\r
+       private NameAuxiliary NameAuxiliary = Auxiliary.new NameAuxiliary();\r
 \r
        @Mod.PreInit\r
-       public void chemiPreLoadMethod(FMLPreInitializationEvent event){\r
+       public void chemiPreLoadMethod(FMLPreInitializationEvent event) {\r
                Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());\r
                cfg.load();\r
 \r
-               Property scienceCraftingTableIDProp = cfg.getBlock("scienceCraftingTable", 200);\r
-               Property atomsIDProp = cfg.getItem("atomsID", 25000);\r
-               Property compoundsIDProp = cfg.getItem("compoundsID", 25001);\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
                Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25002);\r
-               Property guiScienceCraftingTableIDProp = cfg.get("GUI", "GUIScienceCraftingTableID", 1000);\r
 \r
-               scienceCraftingTableID = scienceCraftingTableIDProp.getInt();\r
-               atomsID = atomsIDProp.getInt();\r
-               compoundsID = compoundsIDProp.getInt();\r
-               gasCollectingBottleID = gasCollectingBottleIDProp.getInt();\r
-               guiScienceCraftingTableID = guiScienceCraftingTableIDProp.getInt();\r
+               Property guiDecompositionTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1000);\r
+               Property guiChemicalCombinationTableIDProp = cfg.get("GUI", "GUIChemicalCombinationTableID", 1001);\r
+               Property guiToolAndWeaponCraftingTableIDProp = cfg.get("GUI", "GUIToolAndWeaponCraftingTableID", 1002);\r
+               Property guiMaterialCraftingTableIDProp = cfg.get("GUI", "GUIMaterialCraftingTableID", 1003);\r
+\r
+\r
+               this.decompositionTableID = decompositionTableIDProp.getInt();\r
+               this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt();\r
+               this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt();\r
+               this.materialCraftingTableID = materialCraftingTableIDProp.getInt();\r
+               this.atomsID = atomsIDProp.getInt();\r
+               this.compoundsID = compoundsIDProp.getInt();\r
+               this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt();\r
+               this.guiDecompositionTableID = guiDecompositionTableIDProp.getInt();\r
+               this.guiChemicalCombinationTableID = guiChemicalCombinationTableIDProp.getInt();\r
+               this.guiToolAndWeaponCraftingTableID = guiToolAndWeaponCraftingTableIDProp.getInt();\r
+               this.guiMaterialCraftingTableID = guiMaterialCraftingTableIDProp.getInt();\r
 \r
                cfg.save();\r
-       }\r
 \r
+               // 描画関係の読み込み\r
+               proxy.registerRenderInformation();\r
+       }\r
 \r
 \r
        @Mod.PostInit\r
-       public void chemiPostLoadMethod(FMLPostInitializationEvent event){\r
+       public void chemiPostLoadMethod(FMLPostInitializationEvent event) {\r
                // API用の処理\r
-               NameAuxiliary.addName(itemCompounds, ChemiCraftAPI.getCompoundsName().toArray());\r
-               NameAuxiliary.addName(itemCompounds, "ja_JP", ChemiCraftAPI.getCompoundsLangName().toArray());\r
+               this.NameAuxiliary.addName(itemCompounds, ChemiCraftAPI.instance.getCompoundsName().toArray());\r
+               this.NameAuxiliary.addName(itemCompounds, "ja_JP", ChemiCraftAPI.instance.getCompoundsLangName().toArray());\r
 \r
                // Blockを追加します\r
-               blockScienceCraftingTable = new BlockScienceCraftingTable(scienceCraftingTableID, Block.workbench.blockIndexInTexture, Material.ground)\r
-               .setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ScienceCraftingTable");\r
+               this.blockDecompositionTable = new BlockDecompositionTable(this.decompositionTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("DecompositionTable");\r
+               this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ChemicalCombinationTable");\r
+               this.blockToolAndWeaponCraftingTable = new BlockToolAndMaterialCraftingTable(this.toolAndWeaponCraftingTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ToolAndWeaponCraftingTable");\r
+               this.blockMaterialCraftingTable = new BlockMaterialCraftingTable(materialCraftingTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("MaterialCraftingTable");\r
+\r
 \r
                // Itemを追加します\r
-               itemAtoms = new ItemAtoms(atomsID).setItemName("atoms");\r
-               itemCompounds = new ItemCompounds(compoundsID).setItemName("compounds");\r
-               itemGasCollectingBottle = new ItemGasCollectingBottle(gasCollectingBottleID).setItemName("gasCollectingBottle");\r
+               this.itemAtoms = new ItemAtoms(this.atomsID).setItemName("atoms");\r
+               this.itemCompounds = new ItemCompounds(this.compoundsID).setItemName("compounds");\r
+               this.itemGasCollectingBottle = new ItemGasCollectingBottle(this.gasCollectingBottleID).setItemName("gasCollectingBottle");\r
 \r
                // BlockをMinecraftに登録します\r
-               GameRegistry.registerBlock(blockScienceCraftingTable);\r
+               GameRegistry.registerBlock(this.blockDecompositionTable);\r
+               GameRegistry.registerBlock(this.blockChemicalCombinationTable);\r
+               GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable);\r
+               GameRegistry.registerBlock(this.blockMaterialCraftingTable);\r
 \r
                // Blockの名前を設定します\r
-               NameAuxiliary.addName(blockScienceCraftingTable, "ScienceCraftingTable");\r
-               NameAuxiliary.addName(blockScienceCraftingTable, "ja_JP", "科学作業台");\r
+               this.NameAuxiliary.addName(this.blockDecompositionTable, "DecompositionTable");\r
+               this.NameAuxiliary.addName(this.blockDecompositionTable, "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(blockMaterialCraftingTable, "MaterialCraftingTable");\r
+               this.NameAuxiliary.addName(blockMaterialCraftingTable, "ja_JP", "素材製作台");\r
 \r
-               // Itemの名前を設定します\r
-               NameAuxiliary.addName(itemAtoms, atomsName);\r
-               NameAuxiliary.addName(itemAtoms, "ja_JP", atomsNameJP);\r
-               NameAuxiliary.addName(itemGasCollectingBottle, "GasCollectingBottle");\r
-               NameAuxiliary.addName(itemGasCollectingBottle, "ja_JP", "集気瓶");\r
 \r
-               // 化合物の名前を設定し追加します\r
-               ChemiCraftAPI.addLangCompound("ja_JP", "Salt", "塩");\r
+               // Itemの名前を設定します\r
+               this.NameAuxiliary.addName(this.itemAtoms, atomsName);\r
+               this.NameAuxiliary.addName(this.itemAtoms, "ja_JP", atomsNameJP);\r
+               this.NameAuxiliary.addName(this.itemGasCollectingBottle, "GasCollectingBottle");\r
+               this.NameAuxiliary.addName(this.itemGasCollectingBottle, "ja_JP", "集気瓶");\r
 \r
                // TileEntityを追加します\r
-               GameRegistry.registerTileEntity(TileEntityScienceCraftingTable.class, "TileEntityScienceCraftingTable");\r
+               GameRegistry.registerTileEntity(TileEntityDecompositionTable.class, "DecompositionTable");\r
+               GameRegistry.registerTileEntity(TileEntityChemicalCombinationTable.class, "TileEntityChemicalCombinationTable");\r
+               GameRegistry.registerTileEntity(TileEntityToolAndWeaponCraftingTable.class, "TileEntityToolAndWeaponCraftingTable");\r
+               GameRegistry.registerTileEntity(TileEntityMaterialCraftingTable.class, "TileEntityMaterialCraftingTable");\r
 \r
                // GUIを追加します\r
                NetworkRegistry.instance().registerGuiHandler(instance, proxy);\r
 \r
+               //Textureをpreloadします\r
+               proxy.registerTextures();\r
+\r
        }\r
 \r
 }
\ No newline at end of file