X-Git-Url: http://git.sourceforge.jp/view?p=chemicraft%2Fchemicraft.git;a=blobdiff_plain;f=common%2Fpcc%2Fchemicraft%2Fbase%2FChemiCraftBaseAPI.java;h=42fbf02168afe2169c1ec8dc92692d8bdc016ed6;hp=a4a2f6cadbffdf1ea38f36a60c992bb7b827079b;hb=a482eb90e1fe6264a75d6af335f492d303d108d1;hpb=d000c5c64bec1993ccd88c3aa0d829c357edcdf3;ds=sidebyside

diff --git a/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java b/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
index a4a2f6c..42fbf02 100644
--- a/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
+++ b/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
@@ -5,7 +5,6 @@ import java.util.HashMap;
 
 import pcc.chemicraft.base.gen.EnumOreSpawnFrequency;
 import pcc.chemicraft.base.gen.WorldGenAtomsOre;
-import pcc.chemicraft.util.AtomInfo;
 import pcc.chemicraft.util.Formula;
 import pcc.chemicraft.util.ListHash;
 
@@ -37,12 +36,6 @@ public class ChemiCraftBaseAPI {
 
 
 	/**
-	 * 鉱石の言語リスト
-	 */
-	private ListHash<String, String> atomOresLangListHash = new ListHash<String, String>();
-
-
-	/**
 	 * 鉱石リスト
 	 */
 	private ArrayList<WorldGenAtomsOre> atomOresList = new ArrayList<WorldGenAtomsOre>();
@@ -84,8 +77,8 @@ public class ChemiCraftBaseAPI {
 			var7 = var7.concat(" Ore");
 		}
 
-		this.atomOresEnglishList.add(par1Name + " Ore");
-		addAtomOresLanguage(par1Name, var7, "en_US");
+		this.atomOresEnglishList.add(var7);
+		addAtomOresLanguage(var7, "en_US");
 	}
 
 
@@ -116,11 +109,11 @@ public class ChemiCraftBaseAPI {
 	 * @param par2NewName 新しい名前
 	 * @param par3Language 言語
 	 */
-	public void addAtomOresLanguage(String par1Name, String par2NewName, String par3Language){
-		atomOresNameListHash.add(par1Name,
-				par2NewName);
-		atomOresLangListHash.add(par1Name,
-				par3Language);
+	public void addAtomOresLanguage(String par1Name, String par2Language){
+		atomOresNameListHash.add(
+				par2Language,
+				par1Name
+				);
 	}
 
 
@@ -137,20 +130,14 @@ public class ChemiCraftBaseAPI {
 
 
 
-	public ListHash<String, String> getAtomOresLanguage(){
-		return atomOresLangListHash;
-	}
-
-
-
 	public int getAtomOresLastIndex(){
-		return atomOresNameListHash.sizeKeysList() / 16;
+		return atomOresEnglishList.size() / 16;
 	}
 
 
 
 	public int getAtomOresMetaOfLastIndex(){
-		return atomOresNameListHash.sizeKeysList() - getAtomOresLastIndex() * 16;
+		return atomOresEnglishList.size() - getAtomOresLastIndex() * 16;
 	}