修正・変更

[chemicraft/chemicraft.git] / common / pcc / chemicraft / base / ChemiCraftBaseAPI.java

diff --git a/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java b/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
index bf8412e..42fbf02 100644 (file)
--- 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>();
@@ -54,6 +47,10 @@ public class ChemiCraftBaseAPI {
        private ListHash<String, String> atomOresNameListHash = new ListHash<String, String>();
 
 
+       /**
+        * 鉱石の英語名リスト
+        */
+       private ArrayList<String> atomOresEnglishList = new ArrayList<String>();
 
        /**
         * 鉱石を追加します。
@@ -80,7 +77,8 @@ public class ChemiCraftBaseAPI {
                        var7 = var7.concat(" Ore");
                }
 
-               addAtomOresLanguage(par1Name, var7, "en_US");
+               this.atomOresEnglishList.add(var7);
+               addAtomOresLanguage(var7, "en_US");
        }
 
 
@@ -111,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
+                               );
        }
 
 
@@ -132,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;
        }
 
 
@@ -154,4 +146,10 @@ public class ChemiCraftBaseAPI {
                return atomOresNameListHash;
        }
 
+
+
+       public String getAtomOreEnglishName(int index) {
+               return this.atomOresEnglishList.get(index);
+       }
+
 }