OSDN Git Service

Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
authorponkotate <ponkotate@users.sourceforge.jp>
Sun, 17 Feb 2013 15:51:04 +0000 (00:51 +0900)
committerponkotate <ponkotate@users.sourceforge.jp>
Sun, 17 Feb 2013 15:51:04 +0000 (00:51 +0900)
Conflicts:
common/pcc/chemicraft/ChemiCraft.java

1  2 
common/pcc/chemicraft/ChemiCraft.java

@@@ -107,7 -105,7 +108,8 @@@ public class ChemiCraft 
        public int toolAndWeaponCraftingTableID;
        public int chemicalCraftingTableID;
  
 -      public int[] atomsOreID = new int[1];
++
 +      public int[] atomsOreID = new int[16];
  
        /**
         * GUIID.
                });
  
                //鉱石を追加します
 -              this.api.addAtomsOre("Petalite", this.atomsOreID[0], 0, 5, 5, 20); //ペタル石を追加
 -              this.api.addAtomsOreLanguage("Petalite", "ペタル石", "ja_JP");
  
 -              //化合物を追加します
 -              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", "水");
 +              // リチウム
 +              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.addAtomsOre("Beryl", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // Be3Al2Si6O18
 +              api.addAtomsOreLanguage("Beryl", "緑柱石", "ja_JP");
 +              api.addAtomsOre("Chrysoberyl", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // BeAl2O4
 +              api.addAtomsOreLanguage("Chrysoberyl", "金緑石", "ja_JP");
 +
 +              // ホウ素
 +              api.addAtomsOre("Ulexite", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50);   // NaCaB5O6(OH)6・5H2O
 +              api.addAtomsOreLanguage("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.addAtomsOre("RockSalt", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // NaCl
 +              api.addAtomsOreLanguage("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.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.addAtomsOre("Quartz", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // SiO2
 +              api.addAtomsOreLanguage("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.addCompound("ja_JP", "ChlorousAcid", "亜塩素酸");
-               api.addCompound("ja_JP", "SodiumChloride", "塩化ナトリウム");
-               api.addCompound("ja_JP", "SodiumBicarbonate", "重曹");
-               api.addCompound("ja_JP", "CarbonMonoxide", "一酸化炭素");
-               api.addCompound("ja_JP", "CarbonDioxide", "二酸化炭素");
-               api.addCompound("ja_JP", "Water", "水");
 +              //化合物を追加します
++              this.api.addCompound("ja_JP", "ChlorousAcid", "亜塩素酸");
++              this.api.addCompound("ja_JP", "CarbonMonoxide", "一酸化炭素");
++              this.api.addCompound("ja_JP", "CarbonDioxide", "二酸化炭素");
++              this.api.addCompound("ja_JP", "Water", "水");
++              this.api.addCompound("ja_JP", "SodiumChloride", "塩化ナトリウム");
++              this.api.addCompound("ja_JP", "SodiumBicarbonate", "重曹");
++              this.api.addCompound("ja_JP", "CarbonMonoxide", "一酸化炭素");
++              this.api.addCompound("ja_JP", "CarbonDioxide", "二酸化炭素");
++              this.api.addCompound("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,