From: mozipi <mozipi_2@yahoo.co.jp>
Date: Sat, 6 Apr 2013 06:18:13 +0000 (+0900)
Subject: 作物のテクスチャごねごねの仕様書ついか
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=96715da9345814c21a7f13a550ae48a537abd784;hp=6dc422cdc0eb8bad56fca8238017daa516954c65;p=chemicraft%2FChemiCraftNext.git

作物のテクスチャごねごねの仕様書ついか
---

diff --git a/common/pcc/chemicraft/base/ChemiCraftBase.java b/common/pcc/chemicraft/base/ChemiCraftBase.java
index 29788e0..693e33c 100644
--- a/common/pcc/chemicraft/base/ChemiCraftBase.java
+++ b/common/pcc/chemicraft/base/ChemiCraftBase.java
@@ -134,7 +134,6 @@ public class ChemiCraftBase extends ChemiCraft {
 		while (true) {
 			if (proxy != null && instance != null) {
 				this.settingProcessing((FMLPostInitializationEvent) event);
-				this.apiProcessing((FMLPostInitializationEvent) event);
 				break;
 			}
 		}
@@ -209,7 +208,7 @@ public class ChemiCraftBase extends ChemiCraft {
 						EnumLoggingType.INFO);
 
 				LanguageRegistry.instance().addNameForObject(
-						new ItemStack(this.blockAtomOres[i / 16], 1, i - i / 16 * 16),
+						new ItemStack(this.atomOresID[i / 16], 1, i % 16),
 						lang,
 						names.get(i));
 			}
diff --git a/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java b/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
index 42fbf02..05eaaf5 100644
--- a/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
+++ b/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
@@ -70,13 +70,11 @@ public class ChemiCraftBaseAPI {
 						par5Frequency,
 						par6PosY));
 
-		atomOresFormulasHash.put(par1Name, par2Formula);
-
 		String var7 = par1Name;
 		if (!var7.contains(" Ore")) {
 			var7 = var7.concat(" Ore");
 		}
-
+		atomOresFormulasHash.put(var7, par2Formula);
 		this.atomOresEnglishList.add(var7);
 		addAtomOresLanguage(var7, "en_US");
 	}
diff --git a/common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java b/common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java
index c420904..985f18e 100644
--- a/common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java
+++ b/common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java
@@ -105,10 +105,10 @@ public class ChemiCraftRegisterBaseRecipe extends ChemiCraftBaseRegister {
 				new Formula("H2O"));
 
 		//鉱石分解の追加
-		for (int i = 0; i < this.mod.apiBase.getAtomOresName().sizeKeysList(); i++) {
+		for (int i = 0; i < this.mod.apiBase.getAtomOresName().sizeElementsList("en_US"); i++) {
 			this.mod.api.addPyrolysisDecompositionRecipe(
 					new ItemStack(this.mod.blockAtomOres[i / 16], 1, i - i / 16 * 16),
-					this.mod.apiBase.getAtomOresFormulas().get(this.mod.apiBase.getAtomOresName().getKeyList(i)));
+					this.mod.apiBase.getAtomOresFormulas().get(this.mod.apiBase.getAtomOresName().get("en_US", (i % 16) + ((i / 16) * 16))));
 		}
 	}
 
diff --git a/common/pcc/chemicraft/base/ore/BlockAtomOres.java b/common/pcc/chemicraft/base/ore/BlockAtomOres.java
index dce3bab..8f918bd 100644
--- a/common/pcc/chemicraft/base/ore/BlockAtomOres.java
+++ b/common/pcc/chemicraft/base/ore/BlockAtomOres.java
@@ -6,8 +6,10 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
+import net.minecraft.world.World;
 import pcc.chemicraft.base.ChemiCraftBase;
 import pcc.chemicraft.core.ChemiCraftCore;
 import cpw.mods.fml.relauncher.Side;
diff --git a/仕様書/ChemicalCropsTexturesList.ods b/仕様書/ChemicalCropsTexturesList.ods
new file mode 100644
index 0000000..2257080
Binary files /dev/null and b/仕様書/ChemicalCropsTexturesList.ods differ