鉱石追加用クラス・API等を追加or更新

[chemicraft/chemicraft.git] / common / pcc / chemicraft / ChemiCraftAPI.java

diff --git a/common/pcc/chemicraft/ChemiCraftAPI.java b/common/pcc/chemicraft/ChemiCraftAPI.java
index 39e38cf..ca4ed8b 100644 (file)
--- a/common/pcc/chemicraft/ChemiCraftAPI.java
+++ b/common/pcc/chemicraft/ChemiCraftAPI.java
@@ -4,10 +4,12 @@ import java.util.ArrayList;
 import java.util.HashMap;
 
 import net.minecraft.item.ItemStack;
+import pcc.chemicraft.gen.WorldGenAtomsOre;
 import pcc.chemicraft.system.ChemiCraftCraftingManager;
 import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
 import pcc.chemicraft.util.ChemicalNBTRecipe;
 import pcc.chemicraft.util.ICompoundHandler;
+import pcc.chemicraft.util.ListHash;
 import pcc.chemicraft.util.MaterialRecipe;
 
 
@@ -92,19 +94,28 @@ public class ChemiCraftAPI {
 
 
 
-       private ArrayList<Integer> atomsOreIDList = new ArrayList<Integer>();
-
-
-       private ArrayList<Integer> atomsOreMetaList = new ArrayList<Integer>();
+       /**
+        * 鉱石名リスト
+        */
+       private ListHash<String, String> atomsOreNameListHash = new ListHash<String, String>();
 
 
-       private ArrayList<Integer> atomsOreSizeList = new ArrayList<Integer>();
+       /**
+        * 鉱石IDリスト
+        */
+       private ArrayList<Integer> atomsOreIDList = new ArrayList<Integer>();
 
 
-       private ArrayList<Integer> atomsOreFrequencyList = new ArrayList<Integer>();
+       /**
+        * 鉱石の言語リスト
+        */
+       private ListHash<String, String> atomsOreLangListHash = new ListHash<String, String>();
 
 
-       private ArrayList<Integer> atomsOrePosYList = new ArrayList<Integer>();
+       /**
+        * 鉱石リスト
+        */
+       private ArrayList<WorldGenAtomsOre> atomsOres = new ArrayList<WorldGenAtomsOre>();
 
 
 
@@ -263,18 +274,40 @@ public class ChemiCraftAPI {
 
 
 
-       public void addAtomsOre(int id, int size, int frequency, int posY){
-               addAtomsOre(id, 0, size, frequency, posY);
+       /**
+        * 鉱石を追加します
+        * @param name 鉱石名
+        * @param id 鉱石ID
+        * @param meta 鉱石メタデータ
+        * @param size 一度に生成される量
+        * @param frequency 生成頻度
+        * @param posY Y座標
+        */
+       public void addAtomsOre(String par1Name, int par2Id, int par3Size, int par4Frequency, int par5PosY){
+               addAtomsOre(par1Name, par2Id, 0, par3Size, par4Frequency, par5PosY);
+       }
+
+
+       public void addAtomsOre(String par1Name, int par2Id, int par3Meta, int par4Size, int par5Frequency, int par6PosY){
+               atomsOreNameListHash.add(par1Name, par1Name);
+               atomsOreIDList.add(par2Id);
+               atomsOreLangListHash.add(par1Name, "en_US");
+               atomsOres.add(new WorldGenAtomsOre(par2Id, par3Meta, par4Size, par5Frequency, par6PosY));
        }
 
 
-       public void addAtomsOre(int id, int meta, int size, int frequency, int posY){
-               atomsOreIDList.add(id);
-               atomsOreMetaList.add(meta);
-               atomsOreSizeList.add(size);
-               atomsOreFrequencyList.add(frequency);
-               atomsOrePosYList.add(posY);
+       /**
+        * 既に登録した鉱石の新しい名前・言語を追加します
+        * @param par1Name 英語名
+        * @param par2NewName 新しい名前
+        * @param par3Language 言語
+        */
+       public void addAtomsOreLanguage(String par1Name, String par2NewName, String par3Language){
+               atomsOreNameListHash.add(par1Name, par2NewName);
+               atomsOreLangListHash.add(par1Name, par3Language);
        }
+
+       
        //以下システム関連//////////////////////////////////////////////////////
 
        public ArrayList<ICompoundHandler> getCompoundHandler(){
@@ -361,32 +394,26 @@ public class ChemiCraftAPI {
 
 
 
-       public ArrayList<Integer> getAtomsOreIDList(){
-               return atomsOreIDList;
-       }
-
-
-
-       public ArrayList<Integer> getAtomsOreMetaList(){
-               return atomsOreMetaList;
+       public ListHash<String, String> getAtomsOreNameListHash(){
+               return atomsOreNameListHash;
        }
 
 
 
-       public ArrayList<Integer> getAtomsOreSizeList(){
-               return atomsOreSizeList;
+       public ArrayList<Integer> getAtomsOreIDList(){
+               return atomsOreIDList;
        }
 
 
 
-       public ArrayList<Integer> getAtomsOreFrequencyList(){
-               return atomsOreFrequencyList;
+       public ListHash<String, String> getAtomsOreLangListHash(){
+               return atomsOreLangListHash;
        }
 
 
 
-       public ArrayList<Integer> getAtomsOrePosYList(){
-               return atomsOrePosYList;
+       public ArrayList<WorldGenAtomsOre> getAtomsOres(){
+               return atomsOres;
        }