OSDN Git Service

Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
authormozipi <mozipi@users.sourceforge.jp>
Sun, 17 Feb 2013 09:17:40 +0000 (18:17 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Sun, 17 Feb 2013 09:17:40 +0000 (18:17 +0900)
Conflicts:
common/pcc/chemicraft/ChemiCraft.java

1  2 
common/pcc/chemicraft/ChemiCraft.java

@@@ -17,11 -17,12 +17,13 @@@ import pcc.chemicraft.compounds.Compoun
  import pcc.chemicraft.debug.CommandDeleteItem;
  import pcc.chemicraft.debug.CommandGenDebugRoom;
  import pcc.chemicraft.debug.CommandSetTile;
 +import pcc.chemicraft.gen.WorldGenAtomsOre;
  import pcc.chemicraft.item.ItemAtoms;
  import pcc.chemicraft.item.ItemAtomsGrenade;
  import pcc.chemicraft.item.ItemCompounds;
  import pcc.chemicraft.item.ItemGasCollectingBottle;
+ import pcc.chemicraft.ore.BlockAtomsOre;
+ import pcc.chemicraft.ore.ItemAtomsOre;
  import pcc.chemicraft.system.CommonProxy;
  import pcc.chemicraft.system.PacketHandler;
  import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
@@@ -103,6 -104,8 +105,8 @@@ public class ChemiCraft 
        public int toolAndWeaponCraftingTableID;
        public int chemicalCraftingTableID;
  
+       public int[] atomsOreID = new int[1];
        /**
         * GUIID.
         */
        public Block blockToolAndWeaponCraftingTable;
        public Block blockChemicalCraftingTable;
  
+       public Block[] blockAtomsOre = new Block[atomsOreID.length];
        /**
         * Item型変数.
         */
        /**
         * このmodで使用するTextureのパス.
         */
-       public final String ITEMATOMSTEXTURE = "/pcc/chemicraft/items/Atoms.png";
-       public final String ITEMCOMPOUNDSTEXTURE = "/pcc/chemicraft/items/Compounds.png";
-       public final String ITEMTEXTURE = "/pcc/chemicraft/items/items.png";
-       public final String BLOCKCHEMICALCRAFTINGTABLETEXTURE = "/pcc/chemicraft/blocks/cctable.png";
-       public final String GUIPYROLYSISTEXTURE = "/pcc/chemicraft/guis/Pyrolysis.png";
-       public final String GUIELECTROLYSISTEXTURE = "/pcc/chemicraft/guis/Electrolysis.png";
-       public final String GUICHEMICALCOMBINATIONTEXTURE = "/pcc/chemicraft/guis/ChemicalCombination.png";
-       public final String GUITOOLANDWEAPONCRAFTINGTEXTURE = "/pcc/chemicraft/guis/ToolAndWeaponCrafting.png";
-       public final String GUICHEMICALCRAFTINGTEXTURE = "/pcc/chemicraft/guis/MaterialCrafting.png";
+       public final String ITEM_ATOMS_TEXTURE = "/pcc/chemicraft/items/Atoms.png";
+       public final String ITEM_COMPOUNDS_TEXTURE = "/pcc/chemicraft/items/Compounds.png";
+       public final String ITEM_TEXTURE = "/pcc/chemicraft/items/items.png";
+       public final String BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE = "/pcc/chemicraft/blocks/cctable.png";
+       public final String BLOCK_ATOMS_ORE_TEXTURE = "/pcc/chemicraft/blocks/AtomsOre.png";
+       public final String GUI_PYROLYSIS_TEXTURE = "/pcc/chemicraft/guis/Pyrolysis.png";
+       public final String GUI_ELECTROLYSIS_TEXTURE = "/pcc/chemicraft/guis/Electrolysis.png";
+       public final String GUI_CHEMICALCOMBINATION_TEXTURE = "/pcc/chemicraft/guis/ChemicalCombination.png";
+       public final String GUI_TOOLANDWEAPONCRAFTING_TEXTURE = "/pcc/chemicraft/guis/ToolAndWeaponCrafting.png";
+       public final String GUI_CHEMICALCRAFTING_TEXTURE = "/pcc/chemicraft/guis/MaterialCrafting.png";
  
        /**
         * このmodに必要な補助クラスのインスタンス.
                Property toolAndWeaponCraftingTableIDProp = cfg.getBlock("ToolAndWeaponCraftingTableID", 2403);
                Property chemicalCraftingTableIDProp = cfg.getBlock("ChemicalCraftingTableID", 2404);
  
+               Property[] atomsOreIDProp = new Property[this.atomsOreID.length];
+               for (int i = 0; i < atomsOreIDProp.length; i++) {
+                       atomsOreIDProp[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);
                this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt();
                this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt();
                this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt();
+               for (int i = 0; i < atomsOreID.length; i++) {
+                       this.atomsOreID[i] = atomsOreIDProp[i].getInt();
+               }
                this.atomsID = atomsIDProp.getInt();
                this.compoundsID = compoundsIDProp.getInt();
                this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt();
                                setResistance(0.0F).
                                setStepSound(Block.soundStoneFootstep).
                                setBlockName("PyrolysisTable");
+               this.blockElectrolysisTable = new BlockElectrolysisTable(this.electrolysisTableID, 0, Material.ground).
+                               setHardness(2.0F).
+                               setResistance(0.0F).
+                               setStepSound(Block.soundStoneFootstep).
+                               setBlockName("ElectrolysisTable");
                this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground).
                                setHardness(2.0F).
                                setResistance(0.0F).
                                setResistance(0.0F).
                                setStepSound(Block.soundStoneFootstep).
                                setBlockName("ChemicalCraftingTable");
-               this.blockElectrolysisTable = new BlockElectrolysisTable(this.electrolysisTableID, 0, Material.ground).
-                               setHardness(2.0F).
-                               setResistance(0.0F).
-                               setStepSound(Block.soundStoneFootstep).
-                               setBlockName("ElectrolysisTable");
+               for (int i = 0; i < blockAtomsOre.length; i++)
+               {
+                       this.blockAtomsOre[i] = new BlockAtomsOre(this.atomsOreID[i]).
+                                       setHardness(3.0F).
+                                       setResistance(0.0F).
+                                       setStepSound(Block.soundStoneFootstep).
+                                       setBlockName("AtomsOre" + i);
+                       GameRegistry.registerBlock(blockAtomsOre[i], ItemAtomsOre.class, "AtomsOre" + i);
+               }
  
                // Itemを追加します
                this.itemAtoms = new ItemAtoms(this.atomsID).setItemName("atoms");
                        Character.valueOf('A'), new ItemStack(this.itemAtoms, 1, 0),
                });
  
 -              api.addAtomsOre("Petalite", this.atomsOreID[0], 0, 5, 5, 20); //ペタル石を追加
 -              api.addAtomsOreLanguage("Petalite", "ペタル石", "ja_JP");
+               //鉱石を追加します
++              this.api.addAtomsOre("Petalite", this.atomsOreID[0], 0, 5, 5, 20); //ペタル石を追加
++              this.api.addAtomsOreLanguage("Petalite", "ペタル石", "ja_JP");
                //化合物を追加します
 -              api.addLangCompound("ja_JP", "ChlorousAcid", "亜塩素酸");
 -
 -              api.addLangCompound("ja_JP", "SodiumChloride", "塩化ナトリウム");
 -              api.addLangCompound("ja_JP", "SodiumBicarbonate", "重曹");
 -
 -              api.addLangCompound("ja_JP", "CarbonMonoxide", "一酸化炭素");
 -              api.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");
 -              api.addLangCompound("ja_JP", "Water", "水");
 +              this.api.addLangCompound("ja_JP", "ChlorousAcid", "亜塩素酸");
++              this.api.addLangCompound("ja_JP", "CarbonMonoxide", "一酸化炭素");
++              this.api.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");
++              this.api.addLangCompound("ja_JP", "Water", "水");
++              this.api.addLangCompound("ja_JP", "SodiumChloride", "塩化ナトリウム");
++              this.api.addLangCompound("ja_JP", "SodiumBicarbonate", "重曹");
 +              this.api.addLangCompound("ja_JP", "CarbonMonoxide", "一酸化炭素");
 +              this.api.addLangCompound("ja_JP", "CarbonDioxide", "二酸化炭素");
 +              this.api.addLangCompound("ja_JP", "Water", "水");
  
  
                //化合物のHandlerを設定します
 -              api.settingCompoundHandler("Water", new CompoundWater());
 +              this.api.settingCompoundHandler("Water", new CompoundWater());
  
                //化合物のレシピを追加します
 -              api.addChemicalCombinationRecipe(new String[]{"Na", "O", "H"}, new Integer[]{1, 1, 1}, new ItemStack(this.itemCompounds, 1, api.getCompound("SodiumChloride")));
 -              api.addChemicalCombinationRecipe(new String[]{"H", "O", "Cl"}, new Integer[]{1, 2, 1}, new ItemStack(this.itemCompounds, 1, api.getCompound("ChlorousAcid")));
 -
 -              api.addChemicalCombinationRecipe(new String[]{"H", "O"}, new Integer[]{2, 1}, new ItemStack(this.itemCompounds, 1, api.getCompound("Water")));
 +              this.api.addChemicalCombinationRecipe(new String[]{"H", "O", "Cl"}, new Integer[]{1, 2, 1}, new ItemStack(this.itemCompounds, 1, this.api.getCompound("ChlorousAcid")));
++              this.api.addChemicalCombinationRecipe(new String[]{"Na", "O", "H"}, new Integer[]{1, 1, 1}, new ItemStack(this.itemCompounds, 1, api.getCompound("SodiumChloride")));
++              this.api.addChemicalCombinationRecipe(new String[]{"H", "O", "Cl"}, new Integer[]{1, 2, 1}, new ItemStack(this.itemCompounds, 1, api.getCompound("ChlorousAcid")));
 +              this.api.addChemicalCombinationRecipe(new String[]{"H", "O"}, new Integer[]{2, 1}, new ItemStack(this.itemCompounds, 1, this.api.getCompound("Water")));
  
                //手榴弾の追加
 -              api.addMaterialRecipe(new ItemStack[] {
 +              this.api.addMaterialRecipe(new ItemStack[] {
                                null,
                                new ItemStack(Block.stone),
                                null,
                new NBTRecipeGrenade()
                                );
  
 -              api.addDecompositionRecipe(new ItemStack(Item.potion, 1, 0),
 +              this.api.addDecompositionRecipe(new ItemStack(Item.potion, 1, 0),
                                new int[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN},
                                new int[] {2, 1});
  
 -              api.addDecompositionRecipe(new ItemStack(this.itemCompounds, 1, api.getCompound("Water")),
 +              this.api.addDecompositionRecipe(new ItemStack(this.itemCompounds, 1, this.api.getCompound("Water")),
                                new int[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN},
                                new int[] {2, 1});
  
 -              api.addDecompositionFuel(new ItemStack(Item.coal), 2000*8);
 +              this.api.addDecompositionFuel(new ItemStack(Item.coal), 2000*8);
        }
  
        private void apiProcessing(final FMLPostInitializationEvent event) {
                // API用の処理
 -              this.nameAuxiliary.addName(itemCompounds, api.getCompoundsName().toArray());
 -              for (int i = 0; i < api.getCompoundsLang().size(); i++) {
 -                      this.nameAuxiliary.addName(itemCompounds, api.getCompoundsLang().get(i), api.getCompoundsLangName().toArray());
 +              this.nameAuxiliary.addName(itemCompounds, this.api.getCompoundsName().toArray());
 +              for (int i = 0; i < this.api.getCompoundsLang().size(); i++) {
 +                      this.nameAuxiliary.addName(itemCompounds, this.api.getCompoundsLang().get(i), this.api.getCompoundsLangName().toArray());
                }
  
+               for (int i = 0; i < blockAtomsOre.length; i++)
+               {
+                       for (int j = 0; j < api.getAtomsOreNameListHash().sizeKeysList(); j++)
+                       {
+                               for (int k = 0; k < api.getAtomsOreNameListHash().sizeElementsList(api.getAtomsOreNameListHash().getKeyList(j)); k++)
+                               {
+                                       this.nameAuxiliary.addName(new ItemStack(blockAtomsOre[i], 0, j), api.getAtomsOreLangListHash().get(api.getAtomsOreNameListHash().getKeyList(j), k), api.getAtomsOreNameListHash().get(api.getAtomsOreNameListHash().getKeyList(j), k));
+                               }
+                       }
+               }
++
++              /* 動作がおかしかったため一時的にコメントアウト */
++              /*
                //鉱石の生成
 -              for (int i = 0; i < api.getAtomsOreIDList().size(); i++) {
 +              for (int i = 0; i < this.api.getAtomsOreIDList().size(); i++) {
 +                      GameRegistry.registerWorldGenerator(new WorldGenAtomsOre(this.api.getAtomsOreIDList().get(i), this.api.getAtomsOreMetaList().get(i), this.api.getAtomsOreSizeList().get(i), this.api.getAtomsOreFrequencyList().get(i), this.api.getAtomsOrePosYList().get(i)));
+                       GameRegistry.registerWorldGenerator(api.getAtomsOres().get(i));
                }
++               */
 +
        }
  
        private void debug(final FMLPostInitializationEvent event) {
                /*
                 * TWDebug
                 */
 -              api.addToolAndWeaponRecipe(new ItemStack[] {
 +              this.api.addToolAndWeaponRecipe(new ItemStack[] {
                                new ItemStack(Block.stone, 1, 1)
                },
                new ItemStack(Block.dirt, 1, 0));
-               //鉱石を追加します
-               this.api.addAtomsOre(Block.blockDiamond.blockID, 0, 5, 5, 20);
 +
        }
  
  }