OSDN Git Service

Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
authorponkotate <ponkotate@users.sourceforge.jp>
Sat, 23 Feb 2013 09:03:21 +0000 (18:03 +0900)
committerponkotate <ponkotate@users.sourceforge.jp>
Sat, 23 Feb 2013 09:03:21 +0000 (18:03 +0900)
Conflicts:
common/pcc/chemicraft/ChemiCraft.java

1  2 
common/pcc/chemicraft/ChemiCraft.java

@@@ -360,67 -348,56 +360,71 @@@ public class ChemiCraft 
                //鉱石を追加します
  
                // リチウム
 -              api.addAtomsOre("Petalite", this.atomsOreID[api.getAtomsOreIndex()], 5, 10, 50); // LiAlSi4O10
 -              api.addAtomsOreLanguage("Petalite", "ペタル石", "ja_JP");
 -              api.addAtomsOre("Spodumene", this.atomsOreID[api.getAtomsOreIndex()], 5, 15, 50); // LiAlSi2O6
 -              api.addAtomsOreLanguage("Spodumene", "リチア輝石", "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.addAtomsOre("Beryl", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // Be3Al2Si6O18
+               api.addAtomsOreLanguage("Beryl", "緑柱石", "ja_JP");
+               api.addAtomsOre("Chrysoberyl", this.atomsOreID[api.getAtomsOreIndex()], 5, 200, 50); // BeAl2O4
+               api.addAtomsOreLanguage("Chrysoberyl", "金緑石", "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.addAtomsOre("Ulexite", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50);   // NaCaB5O6(OH)6・5H2O
 -              api.addAtomsOreLanguage("Ulexite", "ウレキサイト", "ja_JP"); // ホウ酸塩鉱石
 +              api.addAtomOres("Ulexite", new String[]{"Na", "Ca", "B", "O"}, new Integer[]{1, 1, 5, 6}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50);   // NaCaB5O6(OH)6・5H2O
 +              api.addAtomOresLanguage("Ulexite", "ウレキサイト", "ja_JP");
  
                // フッ素
 -              api.addAtomsOre("Fluorite", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // CaF2
 -              api.addAtomsOreLanguage("Fluorite", "蛍石", "ja_JP");
 -              api.addAtomsOre("Cryolite", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // Na3AlF6
 -              api.addAtomsOreLanguage("Cryolite", "氷晶石", "ja_JP");
 +              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.addAtomsOre("RockSalt", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // NaCl
 -              api.addAtomsOreLanguage("RockSalt", "岩塩", "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.addAtomsOre("Dolomite", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // CaMg(CO3)2
 -              api.addAtomsOreLanguage("Dolomite", "苦灰石", "ja_JP");
 -              api.addAtomsOre("Magnesite", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // MgCO3
 -              api.addAtomsOreLanguage("Magnesite", "菱苦土石", "ja_JP");
 +              api.addAtomOres("Dolomite", new String[]{"Ca", "Mg"}, new Integer[]{1, 1}, 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.addAtomsOre("Gibbsite", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // Al(OH)3
 -              api.addAtomsOreLanguage("Gibbsite", "ギブス石", "ja_JP");
 -              api.addAtomsOre("Ruby", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // Al2O3
 -              api.addAtomsOreLanguage("Ruby", "ルビー", "ja_JP");
 -              api.addAtomsOre("Sapphire", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // Al2O3
 -              api.addAtomsOreLanguage("Sapphire", "サファイア", "ja_JP");
 +              api.addAtomOres("Gibbsite", new String[]{"Al"}, new Integer[]{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.addAtomsOre("Quartz", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // SiO2
 -              api.addAtomsOreLanguage("Quartz", "石英", "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");
  
                // リン
 -              api.addAtomsOre("Fluorapatite", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // Ca5(PO4)3F
 -              api.addAtomsOreLanguage("Fluorapatite", "フッ素リン灰石", "ja_JP");
 -              api.addAtomsOre("Chlorapatite", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // Ca5(PO4)3Cl
 -              api.addAtomsOreLanguage("Chlorapatite", "塩素燐灰石", "ja_JP");
 -              api.addAtomsOre("Hydroxylapatite", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // Ca5(PO4)3(OH)
 -              api.addAtomsOreLanguage("Hydroxylapatite", "水酸燐灰石", "ja_JP");
 +              api.addAtomOres("Fluorapatite", new String[]{"Ca"}, new Integer[]{5}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Ca5(PO4)3F
 +              api.addAtomOresLanguage("Fluorapatite", "フッ素リン灰石", "ja_JP");
 +              api.addAtomOres("Chlorapatite", new String[]{"Ca"}, new Integer[]{5}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Ca5(PO4)3Cl
 +              api.addAtomOresLanguage("Chlorapatite", "塩素燐灰石", "ja_JP");
 +              api.addAtomOres("Hydroxylapatite", new String[]{"Ca"}, new Integer[]{5}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Ca5(PO4)3(OH)
 +              api.addAtomOresLanguage("Hydroxylapatite", "水酸燐灰石", "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("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("元素名(英)", new String[]{"元素"}, new Integer[]{<数>}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // 化学式
 +              // api.addAtomOresLanguage("元素名(英)", "元素名(他国語)", "言語");
  
                //化合物を追加します
                this.api.addCompound("ja_JP", "ChlorousAcid", "亜塩素酸");