修正・変更

[chemicraft/ChemiCraftNext.git] / common / pcc / chemicraft / base / ChemiCraftRegisterChemicalRecipe.java

diff --git a/common/pcc/chemicraft/base/ChemiCraftRegisterChemicalRecipe.java b/common/pcc/chemicraft/base/ChemiCraftRegisterChemicalRecipe.java
index fb1dbb6..db3f12f 100644 (file)
--- a/common/pcc/chemicraft/base/ChemiCraftRegisterChemicalRecipe.java
+++ b/common/pcc/chemicraft/base/ChemiCraftRegisterChemicalRecipe.java
@@ -20,15 +20,25 @@ public class ChemiCraftRegisterChemicalRecipe extends ChemiCraftBaseRegister {
                // 鉱石を追加
                for (int i = 0; i < this.mod.chemicalData.ATOMSLIST.length; i++) {
                        if (AtomInfo.isSolid(i + 1) && !AtomInfo.isLanthanoid(i + 1)
-                                       && !AtomInfo.isActinoid(i + 1)) {
+                                       && !AtomInfo.isActinoid(i + 1) && !AtomInfo.isOreOfVanilla(i + 1)) {
                                //鉱石をAPIに追加
                                this.mod.apiBase.addAtomOres(
                                                ChemiCraftCore.ATOMSNAME[i],
                                                new Formula(this.mod.chemicalData.ATOMSLIST[i]),
                                                this.mod.atomOresID[this.mod.apiBase.getAtomOresLastIndex()],
-                                               EnumOreSpawnFrequency.NORMAL);
+                                               EnumOreSpawnFrequency.NORMAL
+                                               );
                                //日本語名で追加
-                               this.mod.apiBase.addAtomOresLanguage(ChemiCraftCore.ATOMSNAMEJP[i] + "鉱石", "ja_JP");
+                               this.mod.apiBase.addAtomOresLanguage(
+                                               ChemiCraftCore.ATOMSNAME[i],
+                                               ChemiCraftCore.ATOMSNAMEJP[i] + "鉱石",
+                                               "ja_JP"
+                                               );
+                               this.mod.apiBase.addAtomIngotsLanguage(
+                                               ChemiCraftCore.ATOMSNAME[i],
+                                               ChemiCraftCore.ATOMSNAMEJP[i] + "インゴット",
+                                               "ja_JP"
+                                               );
                        }
                }
 
@@ -37,9 +47,19 @@ public class ChemiCraftRegisterChemicalRecipe extends ChemiCraftBaseRegister {
                                "Lanthanoid",
                                new Formula("LaCePrNdPmSmEuGdTbDyHoErTmYbLu"),
                                this.mod.atomOresID[this.mod.apiBase.getAtomOresLastIndex()],
-                               EnumOreSpawnFrequency.RARE);
+                               EnumOreSpawnFrequency.RARE
+                               );
                // LaCePrNdPmSmEuGdTbDyHoErTmYbLu
-               this.mod.apiBase.addAtomOresLanguage("ランタノイド鉱石", "ja_JP");
+               this.mod.apiBase.addAtomOresLanguage(
+                               "Lanthanoid",
+                               "ランタノイド鉱石",
+                               "ja_JP"
+                               );
+               this.mod.apiBase.addAtomIngotsLanguage(
+                               "Lanthanoid",
+                               "ランタノイドインゴット",
+                               "ja_JP"
+                               );
 
                // アクチノイド鉱石
                this.mod.apiBase.addAtomOres(
@@ -48,7 +68,16 @@ public class ChemiCraftRegisterChemicalRecipe extends ChemiCraftBaseRegister {
                                this.mod.atomOresID[this.mod.apiBase.getAtomOresLastIndex()],
                                EnumOreSpawnFrequency.RARE);
                // AcThPaUNpPuAmCmBkCfEsFmMdNoLr
-               this.mod.apiBase.addAtomOresLanguage("アクチノイド鉱石", "ja_JP");
+               this.mod.apiBase.addAtomOresLanguage(
+                               "Actinoid",
+                               "アクチノイド鉱石",
+                               "ja_JP"
+                               );
+               this.mod.apiBase.addAtomIngotsLanguage(
+                               "Actinoid",
+                               "アクチノイドインゴット",
+                               "ja_JP"
+                               );
 
        }