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

common/pcc/chemicraft/ChemiCraft.java

index e8ee625..edbf7ae 100644 (file)
@@ -20,6 +20,7 @@ import pcc.chemicraft.creativetab.CreativeTabChemiCraft;
 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;
@@ -107,6 +108,7 @@ public class ChemiCraft {
        public int toolAndWeaponCraftingTableID;
        public int chemicalCraftingTableID;
 
+
        public int[] atomsOreID = new int[16];
 
        /**
@@ -398,27 +400,27 @@ public class ChemiCraft {
                api.addAtomsOreLanguage("Hydroxylapatite", "水酸燐灰石", "ja_JP");
 
                //化合物を追加します
-               api.addCompound("ja_JP", "ChlorousAcid", "亜塩素酸");
-
-               api.addCompound("ja_JP", "SodiumChloride", "å¡©å\8c\96ã\83\8aã\83\88ã\83ªã\82¦ã\83 ");
-               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", "äº\8cé\85¸å\8c\96ç\82­ç´ ");
+               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,
@@ -433,15 +435,15 @@ public class ChemiCraft {
                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) {
@@ -479,10 +481,11 @@ public class ChemiCraft {
                /*
                 * TWDebug
                 */
-               api.addToolAndWeaponRecipe(new ItemStack[] {
+               this.api.addToolAndWeaponRecipe(new ItemStack[] {
                                new ItemStack(Block.stone, 1, 1)
                },
                new ItemStack(Block.dirt, 1, 0));
+
        }
 
 }