Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft

Conflicts:
	common/pcc/chemicraft/ChemiCraftAPI.java

diff --combined common/pcc/chemicraft/ChemiCraft.java
index 2c22393,fb8b3fb..ff38197
--- 1/common/pcc/chemicraft/ChemiCraft.java
--- 2/common/pcc/chemicraft/ChemiCraft.java
+++ b/common/pcc/chemicraft/ChemiCraft.java
@@@ -7,7 -7,6 +7,7 @@@ import net.minecraft.item.Item
  import net.minecraft.item.ItemStack;
  import net.minecraft.src.ModLoader;
  import net.minecraftforge.common.Configuration;
 +import net.minecraftforge.common.MinecraftForge;
  import net.minecraftforge.common.Property;
  import net.minecraftforge.oredict.OreDictionary;
  import pcc.chemicraft.block.BlockChemicalCombinationTable;
@@@ -23,7 -22,6 +23,7 @@@ import pcc.chemicraft.debug.CommandDele
  import pcc.chemicraft.debug.CommandGenDebugRoom;
  import pcc.chemicraft.debug.CommandSetTile;
  import pcc.chemicraft.entity.EntityDust;
 +import pcc.chemicraft.gen.EnumOreSpawnFrequency;
  import pcc.chemicraft.item.ItemAtoms;
  import pcc.chemicraft.item.ItemAtomsGrenade;
  import pcc.chemicraft.item.ItemChemiCell;
@@@ -313,7 -311,6 +313,7 @@@ public class ChemiCraft implements Runn
                                        setStepSound(Block.soundStoneFootstep).
                                        setBlockName("AtomsOre" + i);
                        GameRegistry.registerBlock(blockAtomOres[i], ItemAtomOres.class, "AtomsOre" + i);
 +                      MinecraftForge.setBlockHarvestLevel(this.blockAtomOres[i], "pickaxe", 2);
                }
  
                // Itemを追加します
@@@ -401,69 -398,73 +401,69 @@@
                api.addChemicalCell(itemChemicalCells, "ChemicalCell", 1000);
                api.addChemicalCellLanguage("ChemicalCell", "ja_JP", "化学電池");
  
 -              //鉱石を追加します
 +              //元素入手手段
 +
 +              // 水素
 +              // 水を分解。
 +
 +              // ヘリウム
 +              // 未定。
  
                // リチウム
 -              api.addAtomOres("Petalite", new String[]{"Li", "Al", "Si", "O"}, new Integer[]{1, 1, 4, 10}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // LiAlSi4O10
 -              api.addAtomOresLanguage("Petalite", "ペタル石", "ja_JP");
 -              api.addAtomOres("Spodumene", new String[]{"Li", "Al", "Si", "O"}, new Integer[]{1, 1, 2, 6}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // LiAlSi2O6
 -              api.addAtomOresLanguage("Spodumene", "リチア輝石", "ja_JP");
 +              api.addAtomOres("LithiumOre", new String[]{"Li", "Al", "Si", "O"}, new Integer[]{1, 1, 4, 10}, this.atomOresID[api.getAtomOresLastIndex()], 8, EnumOreSpawnFrequency.NORMAL, 50); // LiAlSi4O10
 +              api.addAtomOresLanguage("LithiumOre", "リチウム鉱石", "ja_JP");
  
                // ベリリウム
 -              api.addAtomOres("Beryl", new String[]{"Be", "Al", "Si", "O"}, new Integer[]{3, 2, 6, 18}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Be3Al2Si6O18
 -              api.addAtomOresLanguage("Beryl", "緑柱石", "ja_JP");
 -              api.addAtomOres("Chrysoberyl", new String[]{"Be", "Al", "O"}, new Integer[]{1, 2, 4}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // BeAl2O4
 -              api.addAtomOresLanguage("Chrysoberyl", "金緑石", "ja_JP");
 +              api.addAtomOres("BerylliumOre", new String[]{"Be", "Al", "Si", "O"}, new Integer[]{3, 2, 6, 18}, this.atomOresID[api.getAtomOresLastIndex()], 8, EnumOreSpawnFrequency.NORMAL, 50); // Be3Al2Si6O18
 +              api.addAtomOresLanguage("BerylliumOre", "ベリリウム鉱石", "ja_JP");
  
                // ホウ素
 -              api.addAtomOres("Ulexite", new String[]{"Na", "Ca", "B", "O", "H"}, new Integer[]{1, 1, 5, 17, 16}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50);   // NaCaB5O6(OH)6・5H2O
 -              api.addAtomOresLanguage("Ulexite", "ウレキサイト", "ja_JP");
 +              api.addAtomOres("BoronOre", new String[]{"Na", "Ca", "B", "O", "H"}, new Integer[]{1, 1, 5, 17, 16}, this.atomOresID[api.getAtomOresLastIndex()], 8, EnumOreSpawnFrequency.NORMAL, 50);   // NaCaB5O6(OH)6・5H2O
 +              api.addAtomOresLanguage("BoronOre", "ホウ素鉱石", "ja_JP");
 +
 +              // 炭素
 +              api.addPyrolysisDecompositionRecipe(new ItemStack(Block.oreCoal), new Integer[]{chemicalData.CARBON}, new Integer[]{1});
  
                // フッ素
 -              api.addAtomOres("Fluorite", new String[]{"Ca", "F"}, new Integer[]{1, 2}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // CaF2
 -              api.addAtomOresLanguage("Fluorite", "蛍石", "ja_JP");
 -              api.addAtomOres("Cryolite", new String[]{"Na", "Al", "F"}, new Integer[]{3, 1, 6}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Na3AlF6
 -              api.addAtomOresLanguage("Cryolite", "氷晶石", "ja_JP");
 +              api.addAtomOres("FluorineOre", new String[]{"Ca", "F"}, new Integer[]{1, 2}, this.atomOresID[api.getAtomOresLastIndex()], 8, EnumOreSpawnFrequency.NORMAL, 50); // CaF2
 +              api.addAtomOresLanguage("FluorineOre", "フッ素鉱石", "ja_JP");
  
                // ナトリウム
 -              api.addAtomOres("RockSalt", new String[]{"Na", "Cl"}, new Integer[]{1, 1}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // NaCl
 -              api.addAtomOresLanguage("RockSalt", "岩塩", "ja_JP");
 +              api.addAtomOres("SodiumOre", new String[]{"Na", "Cl"}, new Integer[]{1, 1}, this.atomOresID[api.getAtomOresLastIndex()], 8, EnumOreSpawnFrequency.NORMAL, 50); // NaCl
 +              api.addAtomOresLanguage("SodiumOre", "ナトリウム鉱石", "ja_JP");
  
                // マグネシウム
 -              api.addAtomOres("Dolomite", new String[]{"Ca", "Mg", "C", "O"}, new Integer[]{1, 1, 2, 6}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // CaMg(CO3)2
 -              api.addAtomOresLanguage("Dolomite", "苦灰石", "ja_JP");
 -              api.addAtomOres("Magnesite", new String[]{"Mg", "C", "O"}, new Integer[]{1, 1, 3}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // MgCO3
 -              api.addAtomOresLanguage("Magnesite", "菱苦土石", "ja_JP");
 +              api.addAtomOres("MagnesiumOre", new String[]{"Ca", "Mg", "C", "O"}, new Integer[]{1, 1, 2, 6}, this.atomOresID[api.getAtomOresLastIndex()], 8, EnumOreSpawnFrequency.NORMAL, 50); // CaMg(CO3)2
 +              api.addAtomOresLanguage("MagnesiumOre", "マグネシウム鉱石", "ja_JP");
  
                // アルミニウム
 -              api.addAtomOres("Gibbsite", new String[]{"Al", "O", "H"}, new Integer[]{3, 3, 3}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Al(OH)3
 -              api.addAtomOresLanguage("Gibbsite", "ギブス石", "ja_JP");
 -              api.addAtomOres("Ruby", new String[]{"Al", "O"}, new Integer[]{2, 3}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Al2O3
 -              api.addAtomOresLanguage("Ruby", "ルビー", "ja_JP");
 -              api.addAtomOres("Sapphire", new String[]{"Al", "O"}, new Integer[]{2, 3}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Al2O3
 -              api.addAtomOresLanguage("Sapphire", "サファイア", "ja_JP");
 +              api.addAtomOres("AluminiumOre", new String[]{"Al", "O", "H"}, new Integer[]{3, 3, 3}, this.atomOresID[api.getAtomOresLastIndex()], 8, EnumOreSpawnFrequency.NORMAL, 50); // Al(OH)3
 +              api.addAtomOresLanguage("AluminiumOre", "アルミニウム鉱石", "ja_JP");
  
                // ケイ素
 -              api.addAtomOres("Quartz", new String[]{"Si", "O"}, new Integer[]{1, 2}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // SiO2
 -              api.addAtomOresLanguage("Quartz", "石英", "ja_JP");
 +              // 1.5まで保留。
  
                // リン
 -              api.addAtomOres("Fluorapatite", new String[]{"Ca", "P", "O", "F"}, new Integer[]{5, 3, 12, 1}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Ca5(PO4)3F
 -              api.addAtomOresLanguage("Fluorapatite", "フッ素リン灰石", "ja_JP");
 -              api.addAtomOres("Chlorapatite", new String[]{"Ca", "P", "O", "Cl"}, new Integer[]{5, 3, 12, 1}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Ca5(PO4)3Cl
 -              api.addAtomOresLanguage("Chlorapatite", "塩素燐灰石", "ja_JP");
 -              api.addAtomOres("Hydroxylapatite", new String[]{"Ca", "P", "O", "H"}, new Integer[]{5, 3, 13, 1}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Ca5(PO4)3(OH)
 -              api.addAtomOresLanguage("Hydroxylapatite", "水酸燐灰石", "ja_JP");
 +              api.addAtomOres("PhosphorusOre", new String[]{"Ca", "P", "O", "F"}, new Integer[]{5, 3, 12, 1}, this.atomOresID[api.getAtomOresLastIndex()], 8, EnumOreSpawnFrequency.NORMAL, 50); // Ca5(PO4)3F
 +              api.addAtomOresLanguage("PhosphorusOre", "リン鉱石", "ja_JP");
 +
 +              // 硫黄
 +              api.addAtomOres("SulfurOre", new String[]{"S"}, new Integer[]{1}, this.atomOresID[api.getAtomOresLastIndex()], 8, EnumOreSpawnFrequency.NORMAL, 50); // S
 +              api.addAtomOresLanguage("SulfurOre", "硫黄鉱石", "ja_JP");
  
                // カリウム
 -              api.addAtomOres("Sylvite", new String[]{"K", "Cl"}, new Integer[]{1, 1}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // KCl
 -              api.addAtomOresLanguage("Sylvite", "カリ岩塩", "ja_JP");
 +              api.addAtomOres("PotassiumOre", new String[]{"K", "Cl"}, new Integer[]{1, 1}, this.atomOresID[api.getAtomOresLastIndex()], 8, EnumOreSpawnFrequency.NORMAL, 50); // KCl
 +              api.addAtomOresLanguage("PotassiumOre", "カリウム鉱石", "ja_JP");
  
                // カルシウム
 -              api.addAtomOres("Calcite", new String[]{"Ca", "C", "O"}, new Integer[]{1, 1, 3}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // CaCO3
 -              api.addAtomOresLanguage("Calcite", "方解石", "ja_JP");
 +              api.addAtomOres("CalciumOre", new String[]{"Ca", "C", "O"}, new Integer[]{1, 1, 3}, this.atomOresID[api.getAtomOresLastIndex()], 8, EnumOreSpawnFrequency.NORMAL, 50); // CaCO3
 +              api.addAtomOresLanguage("CalciumOre", "カルシウム鉱石", "ja_JP");
  
                // スカンジウム
 -              api.addAtomOres("Thortveitite", new String[]{"Sc", "Y", "Si", "O"}, new Integer[]{2, 2, 2, 7}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // (Sc,Y)2Si2O7
 -              api.addAtomOresLanguage("Thortveitite", "トルトベイト石", "ja_JP");
 +              api.addAtomOres("ScandiumOre", new String[]{"Sc", "Y", "Si", "O"}, new Integer[]{2, 2, 2, 7}, this.atomOresID[api.getAtomOresLastIndex()], 8, EnumOreSpawnFrequency.NORMAL, 50); // (Sc,Y)2Si2O7
 +              api.addAtomOresLanguage("ScandiumOre", "スカンジウム鉱石", "ja_JP");
  
 -              // api.addAtomOres("元素名(英)", new String[]{"元素"}, new Integer[]{<数>}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // 化学式
 +              // api.addAtomOres("元素名(英)", new String[]{"元素"}, new Integer[]{<数>}, this.atomOresID[api.getAtomOresLastIndex()], 8, EnumOreSpawnFrequency.NORMAL, 50); // 化学式
                // api.addAtomOresLanguage("元素名(英)", "元素名(他国語)", "言語");
  
                //化合物を追加します
@@@ -487,9 -488,9 +487,9 @@@
                                null,
                                null,
                                null,
 -                              new ItemStack(this.itemAtoms, 1, ChemiCraftData.ZINC),
 +                              new ItemStack(this.itemAtoms, 1, chemicalData.ZINC),
                                null,
 -                              new ItemStack(this.itemAtoms, 1, ChemiCraftData.COPPER),
 +                              new ItemStack(this.itemAtoms, 1, chemicalData.COPPER),
                                new ItemStack(Item.bucketWater),
                                new ItemStack(Item.bucketWater),
                                new ItemStack(Item.bucketWater),
@@@ -514,17 -515,17 +514,17 @@@
                                );
  
                this.api.addPyrolysisDecompositionRecipe(new ItemStack(Item.potion, 1, 0),
 -                              new Integer[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN},
 +                              new Integer[] {ChemiCraftData.HYDROGEN, chemicalData.OXYGEN},
                                new Integer[] {2, 1});
  
                this.api.addPyrolysisDecompositionRecipe(new ItemStack(this.itemCompounds, 1, this.api.getCompound("Water")),
 -                              new Integer[] {ChemiCraftData.HYDROGEN, ChemiCraftData.OXYGEN},
 +                              new Integer[] {ChemiCraftData.HYDROGEN, chemicalData.OXYGEN},
                                new Integer[] {2, 1});
  
                for (int i = 0; i < api.getAtomOresName().sizeKeysList(); i++){
                        this.api.addPyrolysisDecompositionRecipe(new ItemStack(this.blockAtomOres[i / 16], 1, i - i / 16 * 16),
 -                                      api.getAtomOresAtoms().get(api.getAtomOresName().getKeyList(i)),
 -                                      api.getAtomOresAmounts().get(api.getAtomOresName().getKeyList(i)));
 +                                      api.getAtomOresAtoms().get(i),
 +                                      api.getAtomOresAmounts().get(i));
                }
  
                //Entityを追加
@@@ -536,11 -537,6 +536,6 @@@
                                250,
                                5,
                                true);
-               /*
-               EntityRegistry.registerGlobalEntityID(EntityDust.class,
-                               "Dust",
-                               ModLoader.getUniqueEntityId());
-                               */
  
                this.api.addPyrolysisDecompositionFuel(new ItemStack(Item.coal), 2000*8);
        }