From 96715da9345814c21a7f13a550ae48a537abd784 Mon Sep 17 00:00:00 2001 From: mozipi Date: Sat, 6 Apr 2013 15:18:13 +0900 Subject: [PATCH] =?utf8?q?=E4=BD=9C=E7=89=A9=E3=81=AE=E3=83=86=E3=82=AF?= =?utf8?q?=E3=82=B9=E3=83=81=E3=83=A3=E3=81=94=E3=81=AD=E3=81=94=E3=81=AD?= =?utf8?q?=E3=81=AE=E4=BB=95=E6=A7=98=E6=9B=B8=E3=81=A4=E3=81=84=E3=81=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- common/pcc/chemicraft/base/ChemiCraftBase.java | 3 +-- common/pcc/chemicraft/base/ChemiCraftBaseAPI.java | 4 +--- .../chemicraft/base/ChemiCraftRegisterBaseRecipe.java | 4 ++-- common/pcc/chemicraft/base/ore/BlockAtomOres.java | 2 ++ 仕様書/ChemicalCropsTexturesList.ods | Bin 0 -> 8854 bytes 5 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 仕様書/ChemicalCropsTexturesList.ods 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 0000000000000000000000000000000000000000..22570809d18297306eb0621641dc6bd559b843e4 GIT binary patch literal 8854 zcma)C1z1$g*C$0m8bm@$TG*vKq)R#^C6*X^duPu4&{W05B11#Fh=#__`%oqbB7y**p`o2!s46r^ zJ4Z15o-^3O*%@L7vVhw;L4j^iD}a*)%nk-{at1@KoItLQU?>~_b9Mn+Six+;V7TVL zFi|l72ojbs7vvGC#h6dvW!r&HgSD2-R3-G(%#fule`SOnvs=)dOJqr*B3<0BH zoLqn)R~MHvCp;V>m}r`+IA^}2VVvDi@^^QxqTc@Qjy1%|0uDZR<~%UpfPUQm)Cp%N zXIE!b99(~N;!k=sf3W84;$-6jhW*n0KWYBSBHYOd;%os0L;l0!pZa&^3fEi2N3H

HdU&Lkx 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 GJ^dd~IB^{S literal 0 HcmV?d00001 -- 2.11.0