From: mozipi <mozipi@users.sourceforge.jp>
Date: Sun, 17 Feb 2013 09:17:40 +0000 (+0900)
Subject: Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
X-Git-Url: http://git.sourceforge.jp/view?p=chemicraft%2Fchemicraft.git;a=commitdiff_plain;h=070d73c20bef18592301a5d40efb60fd029220f6

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

Conflicts:
	common/pcc/chemicraft/ChemiCraft.java
---

070d73c20bef18592301a5d40efb60fd029220f6
diff --cc common/pcc/chemicraft/ChemiCraft.java
index 7614b10,0b99d76..5b8ec99
--- a/common/pcc/chemicraft/ChemiCraft.java
+++ b/common/pcc/chemicraft/ChemiCraft.java
@@@ -316,24 -340,32 +341,33 @@@ public class ChemiCraft 
  			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,
@@@ -361,16 -393,25 +395,31 @@@
  
  	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) {
@@@ -386,9 -427,6 +435,7 @@@
  				new ItemStack(Block.stone, 1, 1)
  		},
  		new ItemStack(Block.dirt, 1, 0));
 +
- 		//鉱石を追加します
- 		this.api.addAtomsOre(Block.blockDiamond.blockID, 0, 5, 5, 20);
  	}
  
  }