From 4b46c0a661c04b2fba0c8aa8b2a52b5e98a834e5 Mon Sep 17 00:00:00 2001 From: ponkotate Date: Thu, 18 Apr 2013 00:57:06 +0900 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=AD=A3=E3=83=BB=E5=A4=89=E6=9B=B4=20?= =?utf8?q?=E3=83=BB=E5=90=8D=E5=89=8D=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=80=82?= =?utf8?q?=20=E3=83=BB=E3=82=A4=E3=83=B3=E3=82=B4=E3=83=83=E3=83=88?= =?utf8?q?=E6=9C=AA=E5=AE=8C=E3=80=82=20=E3=83=BBFormula=E6=95=B4=E5=BD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- common/pcc/chemicraft/base/ChemiCraftBase.java | 28 ++++-- common/pcc/chemicraft/base/ChemiCraftBaseAPI.java | 47 ++++++++-- .../base/ChemiCraftRegisterBaseRecipe.java | 39 +++++++-- .../chemicraft/base/ChemiCraftRegisterBlock.java | 4 +- .../base/ChemiCraftRegisterChemicalRecipe.java | 15 ++++ .../chemicraft/base/ChemiCraftRegisterItem.java | 14 +-- .../base/creativetab/CreativeTabAtomOres.java | 2 +- ...WorldGenAtomsOre.java => WorldGenAtomOres.java} | 6 +- common/pcc/chemicraft/base/ore/BlockAtomOres.java | 16 ++-- common/pcc/chemicraft/base/ore/ItemAtomIngots.java | 69 +++++++++++++++ .../core/ChemiCraftRegisterCoreRecipe.java | 10 ++- .../core/item/ItemGasCollectingBottle.java | 2 +- common/pcc/chemicraft/util/AtomInfo.java | 18 +--- common/pcc/chemicraft/util/Formula.java | 97 ++++++++++----------- ...s_ore_Aluminium.png => atom_ores_Aluminium.png} | Bin ...oms_ore_Antimony.png => atom_ores_Antimony.png} | Bin ...atoms_ore_Arsenic.png => atom_ores_Arsenic.png} | Bin ...oms_ore_Astatine.png => atom_ores_Astatine.png} | Bin .../{atoms_ore_Barium.png => atom_ores_Barium.png} | Bin ...s_ore_Beryllium.png => atom_ores_Beryllium.png} | Bin ...atoms_ore_Bismuth.png => atom_ores_Bismuth.png} | Bin .../{atoms_ore_Boron.png => atom_ores_Boron.png} | Bin ...atoms_ore_Cadmium.png => atom_ores_Cadmium.png} | Bin ...atoms_ore_Caesium.png => atom_ores_Caesium.png} | Bin ...atoms_ore_Calcium.png => atom_ores_Calcium.png} | Bin .../{atoms_ore_Carbon.png => atom_ores_Carbon.png} | Bin ...oms_ore_Chromium.png => atom_ores_Chromium.png} | Bin .../{atoms_ore_Cobalt.png => atom_ores_Cobalt.png} | Bin .../{atoms_ore_Copper.png => atom_ores_Copper.png} | Bin ...oms_ore_Francium.png => atom_ores_Francium.png} | Bin ...atoms_ore_Gallium.png => atom_ores_Gallium.png} | Bin ...s_ore_Germanium.png => atom_ores_Germanium.png} | Bin .../{atoms_ore_Gold.png => atom_ores_Gold.png} | Bin ...atoms_ore_Hafnium.png => atom_ores_Hafnium.png} | Bin .../{atoms_ore_Indium.png => atom_ores_Indium.png} | Bin .../{atoms_ore_Iodine.png => atom_ores_Iodine.png} | Bin ...atoms_ore_Iridium.png => atom_ores_Iridium.png} | Bin .../{atoms_ore_Iron.png => atom_ores_Iron.png} | Bin .../{atoms_ore_Lead.png => atom_ores_Lead.png} | Bin ...atoms_ore_Lithium.png => atom_ores_Lithium.png} | Bin ...s_ore_Magnesium.png => atom_ores_Magnesium.png} | Bin ...s_ore_Manganese.png => atom_ores_Manganese.png} | Bin ...ore_Molybdenum.png => atom_ores_Molybdenum.png} | Bin .../{atoms_ore_Nickel.png => atom_ores_Nickel.png} | Bin ...atoms_ore_Niobium.png => atom_ores_Niobium.png} | Bin .../{atoms_ore_Osmium.png => atom_ores_Osmium.png} | Bin ...s_ore_Palladium.png => atom_ores_Palladium.png} | Bin ...ore_Phosphorus.png => atom_ores_Phosphorus.png} | Bin ...oms_ore_Platinum.png => atom_ores_Platinum.png} | Bin ...oms_ore_Polonium.png => atom_ores_Polonium.png} | Bin ...s_ore_Potassium.png => atom_ores_Potassium.png} | Bin .../{atoms_ore_Radium.png => atom_ores_Radium.png} | Bin ...atoms_ore_Rhenium.png => atom_ores_Rhenium.png} | Bin ...atoms_ore_Rhodium.png => atom_ores_Rhodium.png} | Bin ...oms_ore_Rubidium.png => atom_ores_Rubidium.png} | Bin ...s_ore_Ruthenium.png => atom_ores_Ruthenium.png} | Bin ...oms_ore_Scandium.png => atom_ores_Scandium.png} | Bin ...oms_ore_Selenium.png => atom_ores_Selenium.png} | Bin ...atoms_ore_Silicon.png => atom_ores_Silicon.png} | Bin .../{atoms_ore_Silver.png => atom_ores_Silver.png} | Bin .../{atoms_ore_Sodium.png => atom_ores_Sodium.png} | Bin ...s_ore_Strontium.png => atom_ores_Strontium.png} | Bin .../{atoms_ore_Sulfur.png => atom_ores_Sulfur.png} | Bin ...oms_ore_Tantalum.png => atom_ores_Tantalum.png} | Bin ...ore_Technetium.png => atom_ores_Technetium.png} | Bin ...s_ore_Tellurium.png => atom_ores_Tellurium.png} | Bin ...oms_ore_Thallium.png => atom_ores_Thallium.png} | Bin .../{atoms_ore_Tin.png => atom_ores_Tin.png} | Bin ...oms_ore_Titanium.png => atom_ores_Titanium.png} | Bin ...oms_ore_Tungsten.png => atom_ores_Tungsten.png} | Bin ...oms_ore_Vanadium.png => atom_ores_Vanadium.png} | Bin .../{atoms_ore_WIP.png => atom_ores_WIP.png} | Bin ...oms_ore_Yttorium.png => atom_ores_Yttorium.png} | Bin .../{atoms_ore_Zinc.png => atom_ores_Zinc.png} | Bin ...s_ore_Zirconium.png => atom_ores_Zirconium.png} | Bin 75 files changed, 259 insertions(+), 108 deletions(-) rename common/pcc/chemicraft/base/gen/{WorldGenAtomsOre.java => WorldGenAtomOres.java} (85%) create mode 100644 common/pcc/chemicraft/base/ore/ItemAtomIngots.java rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Aluminium.png => atom_ores_Aluminium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Antimony.png => atom_ores_Antimony.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Arsenic.png => atom_ores_Arsenic.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Astatine.png => atom_ores_Astatine.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Barium.png => atom_ores_Barium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Beryllium.png => atom_ores_Beryllium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Bismuth.png => atom_ores_Bismuth.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Boron.png => atom_ores_Boron.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Cadmium.png => atom_ores_Cadmium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Caesium.png => atom_ores_Caesium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Calcium.png => atom_ores_Calcium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Carbon.png => atom_ores_Carbon.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Chromium.png => atom_ores_Chromium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Cobalt.png => atom_ores_Cobalt.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Copper.png => atom_ores_Copper.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Francium.png => atom_ores_Francium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Gallium.png => atom_ores_Gallium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Germanium.png => atom_ores_Germanium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Gold.png => atom_ores_Gold.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Hafnium.png => atom_ores_Hafnium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Indium.png => atom_ores_Indium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Iodine.png => atom_ores_Iodine.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Iridium.png => atom_ores_Iridium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Iron.png => atom_ores_Iron.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Lead.png => atom_ores_Lead.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Lithium.png => atom_ores_Lithium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Magnesium.png => atom_ores_Magnesium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Manganese.png => atom_ores_Manganese.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Molybdenum.png => atom_ores_Molybdenum.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Nickel.png => atom_ores_Nickel.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Niobium.png => atom_ores_Niobium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Osmium.png => atom_ores_Osmium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Palladium.png => atom_ores_Palladium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Phosphorus.png => atom_ores_Phosphorus.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Platinum.png => atom_ores_Platinum.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Polonium.png => atom_ores_Polonium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Potassium.png => atom_ores_Potassium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Radium.png => atom_ores_Radium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Rhenium.png => atom_ores_Rhenium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Rhodium.png => atom_ores_Rhodium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Rubidium.png => atom_ores_Rubidium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Ruthenium.png => atom_ores_Ruthenium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Scandium.png => atom_ores_Scandium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Selenium.png => atom_ores_Selenium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Silicon.png => atom_ores_Silicon.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Silver.png => atom_ores_Silver.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Sodium.png => atom_ores_Sodium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Strontium.png => atom_ores_Strontium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Sulfur.png => atom_ores_Sulfur.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Tantalum.png => atom_ores_Tantalum.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Technetium.png => atom_ores_Technetium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Tellurium.png => atom_ores_Tellurium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Thallium.png => atom_ores_Thallium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Tin.png => atom_ores_Tin.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Titanium.png => atom_ores_Titanium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Tungsten.png => atom_ores_Tungsten.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Vanadium.png => atom_ores_Vanadium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_WIP.png => atom_ores_WIP.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Yttorium.png => atom_ores_Yttorium.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Zinc.png => atom_ores_Zinc.png} (100%) rename resources/mods/ChemiCraft/textures/blocks/{atoms_ore_Zirconium.png => atom_ores_Zirconium.png} (100%) diff --git a/common/pcc/chemicraft/base/ChemiCraftBase.java b/common/pcc/chemicraft/base/ChemiCraftBase.java index 6c71f9c..ee4b742 100644 --- a/common/pcc/chemicraft/base/ChemiCraftBase.java +++ b/common/pcc/chemicraft/base/ChemiCraftBase.java @@ -57,17 +57,18 @@ public class ChemiCraftBase extends ChemiCraft { /** * CreativeTab of ChemiCraft. */ - public static final CreativeTabs creativeTabAtomsOre = new CreativeTabAtomOres("AtomsOre"); + public static final CreativeTabs creativeTabAtomOres = new CreativeTabAtomOres("AtomOres"); /** * the ItemID. */ + public int atomIngotsID; public int atomGrenadeID; public int blackSmokeID; + public int oreSerarcherID; public int dustID; public int radiationGunID; public int radiationBalletID; - public int oreSerarcherID; /** * the BlockID. @@ -82,6 +83,7 @@ public class ChemiCraftBase extends ChemiCraft { /** * Variables of Item type. */ + public Item itemAtomIngots; public Item itemAtomGrenade; public Item itemBlackSmoke; public Item itemDust; @@ -103,7 +105,8 @@ public class ChemiCraftBase extends ChemiCraft { /** * the Textures */ - public static final String ORE = ChemiCraft.TEXTURE + "atoms_ore_"; + public static final String INGOT = ChemiCraft.TEXTURE + "atom_ingots_"; + public static final String ORE = ChemiCraft.TEXTURE + "atom_ores_"; public ChemiCraftBase() { this.registerCompounds = new ChemiCraftRegisterCompounds(this); @@ -179,6 +182,7 @@ public class ChemiCraftBase extends ChemiCraft { this.atomOresID[i] = ccfgBlock.additionID(); } + this.atomIngotsID = ccfgItem.additionID(); this.atomGrenadeID = ccfgItem.additionID(); this.dustID = ccfgItem.additionID(); this.radiationGunID = ccfgItem.additionID(); @@ -203,22 +207,32 @@ public class ChemiCraftBase extends ChemiCraft { // API用の処理 for (int i = 0; i < this.apiBase.getAtomOres().size(); i++) { OreDictionary.registerOre("ore" + this.apiBase.getAtomOresAtomName().get(i), new ItemStack(this.blockAtomOres[i / 16], 1, i % 16)); + OreDictionary.registerOre("ingot" + this.apiBase.getAtomOresAtomName().get(i), new ItemStack(this.itemAtomIngots, 1, i )); GameRegistry.registerWorldGenerator(this.apiBase.getAtomOres().get(i)); } Iterator langoresItr = this.apiBase.getAtomOresName().iterator(); while (langoresItr.hasNext()){ String lang = langoresItr.next(); - ArrayList names = this.apiBase.getAtomOresName().get(lang); - for (int i = 0; i < names.size(); i++) { - ChemiCraftCore.logger.write("AtomOresAddName:" + "Name-" + names.get(i) + "ID-" + (i / 16)+ "/Damage-" + (i - i / 16 * 16) + "/Lang-" + lang, + ArrayList oresName = this.apiBase.getAtomOresName().get(lang); + ArrayList ingotsName = this.apiBase.getAtomIngotsName().get(lang); + for (int i = 0; i < oresName.size(); i++) { + ChemiCraftCore.logger.write("AtomOresAddName:" + "IngotName-" + ingotsName.get(i) + "OreName-" + oresName.get(i) + "ID-" + (i / 16)+ "/Damage-" + (i - i / 16 * 16) + "/Lang-" + lang, EnumLoggingType.INFO); LanguageRegistry.instance().addNameForObject( new ItemStack(this.atomOresID[i / 16], 1, i % 16), lang, - names.get(i) + oresName.get(i) + ); + + /* + LanguageRegistry.instance().addNameForObject( + new ItemStack(this.atomIngotsID, 1, i), + lang, + ingotsName.get(i) ); + */ } } diff --git a/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java b/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java index 993a84d..d22ea49 100644 --- a/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java +++ b/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.HashMap; import pcc.chemicraft.base.gen.EnumOreSpawnFrequency; -import pcc.chemicraft.base.gen.WorldGenAtomsOre; +import pcc.chemicraft.base.gen.WorldGenAtomOres; import pcc.chemicraft.util.AtomInfo; import pcc.chemicraft.util.Formula; import pcc.chemicraft.util.ListHash; @@ -39,7 +39,7 @@ public class ChemiCraftBaseAPI { /** * 鉱石リスト */ - private ArrayList atomOresList = new ArrayList(); + private ArrayList atomOresList = new ArrayList(); /** @@ -49,6 +49,12 @@ public class ChemiCraftBaseAPI { /** + * インゴット名リスト + */ + private ListHash atomIngotsNameListHash = new ListHash(); + + + /** * 鉱石の英語名リスト */ private ArrayList atomOresAtomList = new ArrayList(); @@ -67,7 +73,7 @@ public class ChemiCraftBaseAPI { if (!AtomInfo.isExisting(par1Name)) { atomOresList.add( - new WorldGenAtomsOre( + new WorldGenAtomOres( par3Id, getAtomOresMetaOfLastIndex(), par4Size, @@ -77,11 +83,17 @@ public class ChemiCraftBaseAPI { atomOresAtomList.add(par1Name); String var7 = par1Name; - if (!var7.contains(" Ore")) { - var7 = var7.concat(" Ore"); + if (!par1Name.contains(" Ore")) { + var7 = par1Name + " Ore"; } addAtomOresLanguage(par1Name, var7, "en_US"); + + if (!par1Name.contains(" Ingot")) { + var7 = par1Name + " Ingot"; + } + + addAtomIngotsLanguage(par1Name, var7, "en_US"); } } @@ -124,9 +136,26 @@ public class ChemiCraftBaseAPI { + /** + * 既に登録したインゴットの新しい名前・言語を追加します + * @param par1KeyName 鉱石追加の際に用いたpar1Nameに当たる文字列 + * @param par2NewName 新しい名前 + * @param par3NewLanguage 新しい言語 + */ + public void addAtomIngotsLanguage(String par1KeyName, String par2NewName, String par3NewLanguage){ + if (this.atomOresAtomList.contains(par1KeyName)){ + atomIngotsNameListHash.add( + par3NewLanguage, + par2NewName + ); + } + } + + + //以下システム関連////////////////////////////////////////////////////// - public ArrayList getAtomOres(){ + public ArrayList getAtomOres(){ return atomOresList; } @@ -154,6 +183,12 @@ public class ChemiCraftBaseAPI { + public ListHash getAtomIngotsName(){ + return atomIngotsNameListHash; + } + + + public ArrayList getAtomOresAtomName() { return this.atomOresAtomList; } diff --git a/common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java b/common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java index a59a51d..88ed7f1 100644 --- a/common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java +++ b/common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java @@ -22,6 +22,7 @@ public class ChemiCraftRegisterBaseRecipe extends ChemiCraftBaseRegister { @Override public void start() { + //化合物のレシピ this.mod.api.addChemicalCombinationRecipe( new ItemStack(ChemiCraftCore.instance.itemCompounds, 1, this.mod.api.getCompound("SodiumChloride")), @@ -38,10 +39,10 @@ public class ChemiCraftRegisterBaseRecipe extends ChemiCraftBaseRegister { this.mod.api.addChemicalCombinationRecipe(new ItemStack(Item.sugar), new Formula("C12H22O11")); - this.mod.api.addElectrolysisDecompositionRecipe(new ItemStack(Item.bucketWater), + this.mod.api.addReversibleOfElectrolysis(new ItemStack(Item.bucketWater), new Formula("H2O")); - this.mod.api.addElectrolysisDecompositionRecipe(new ItemStack(Item.potion, 1, 0), + this.mod.api.addReversibleOfElectrolysis(new ItemStack(Item.potion, 1, 0), new Formula("H2O")); this.mod.api.addPyrolysisDecompositionRecipe(new ItemStack(Block.oreCoal), @@ -50,6 +51,24 @@ public class ChemiCraftRegisterBaseRecipe extends ChemiCraftBaseRegister { this.mod.api.addPyrolysisDecompositionRecipe(new ItemStack(Item.coal), new Formula("C")); + this.mod.api.addPyrolysisDecompositionRecipe(new ItemStack(Block.oreIron), + new Formula("Fe")); + + this.mod.api.addPyrolysisDecompositionRecipe(new ItemStack(Item.ingotIron), + new Formula("Fe")); + + this.mod.api.addPyrolysisDecompositionRecipe(new ItemStack(Block.blockSteel), + new Formula("9Fe")); + + this.mod.api.addPyrolysisDecompositionRecipe(new ItemStack(Block.oreGold), + new Formula("Au")); + + this.mod.api.addPyrolysisDecompositionRecipe(new ItemStack(Item.ingotGold), + new Formula("Au")); + + this.mod.api.addReversibleOfPyrolysis(new ItemStack(Block.blockGold), + new Formula("9Au")); + this.mod.api.addReversibleOfElectrolysis(new ItemStack(Block.wood), new Formula("C6H10O5")); @@ -106,17 +125,23 @@ public class ChemiCraftRegisterBaseRecipe extends ChemiCraftBaseRegister { //鉱石分解の追加 Iterator arrayOreNames = this.mod.apiBase.getAtomOresFormulas().keySet().iterator(); - while (arrayOreNames.hasNext()) { + for (int i = 0; arrayOreNames.hasNext(); i++) { String name = arrayOreNames.next(); - ItemStack itemstack; + ItemStack ingot; + ItemStack ore; try { - itemstack = OreDictionary.getOres(name).get(0); + ingot = OreDictionary.getOres("ingot" + name).get(0); + ore = OreDictionary.getOres("ore" + name).get(0); } catch (IndexOutOfBoundsException e) { int var1 = this.mod.apiBase.getAtomOresAtomName().indexOf(name); - itemstack = new ItemStack(this.mod.blockAtomOres[var1 / 16], 1, var1 % 16); + ingot = new ItemStack(this.mod.itemAtomIngots, 1, i); + ore = new ItemStack(this.mod.blockAtomOres[var1 / 16], 1, var1 % 16); } this.mod.api.addPyrolysisDecompositionRecipe( - itemstack, + ingot, + this.mod.apiBase.getAtomOresFormulas().get(name)); + this.mod.api.addPyrolysisDecompositionRecipe( + ore, this.mod.apiBase.getAtomOresFormulas().get(name)); } } diff --git a/common/pcc/chemicraft/base/ChemiCraftRegisterBlock.java b/common/pcc/chemicraft/base/ChemiCraftRegisterBlock.java index 9893078..6d90a51 100644 --- a/common/pcc/chemicraft/base/ChemiCraftRegisterBlock.java +++ b/common/pcc/chemicraft/base/ChemiCraftRegisterBlock.java @@ -22,9 +22,9 @@ public class ChemiCraftRegisterBlock extends ChemiCraftBaseRegister { for (int i = 0; i < this.mod.blockAtomOres.length; i++) { this.mod.blockAtomOres[i] = new BlockAtomOres(this.mod.atomOresID[i]). setHardness(3.0F).setResistance(0.0F). - setStepSound(Block.soundStoneFootstep).setUnlocalizedName("BlockAtomsOre"); + setStepSound(Block.soundStoneFootstep).setUnlocalizedName("atomOres"); //鉱石をMinecraftに登録 - GameRegistry.registerBlock(this.mod.blockAtomOres[i], ItemAtomOres.class, "AtomsOre" + i); + GameRegistry.registerBlock(this.mod.blockAtomOres[i], ItemAtomOres.class, "atomOres" + i); //回収&最適に破壊できるピッケルのレベルを設定 MinecraftForge.setBlockHarvestLevel(this.mod.blockAtomOres[i], "pickaxe", 2); } diff --git a/common/pcc/chemicraft/base/ChemiCraftRegisterChemicalRecipe.java b/common/pcc/chemicraft/base/ChemiCraftRegisterChemicalRecipe.java index e750dc0..db3f12f 100644 --- a/common/pcc/chemicraft/base/ChemiCraftRegisterChemicalRecipe.java +++ b/common/pcc/chemicraft/base/ChemiCraftRegisterChemicalRecipe.java @@ -34,6 +34,11 @@ public class ChemiCraftRegisterChemicalRecipe extends ChemiCraftBaseRegister { ChemiCraftCore.ATOMSNAMEJP[i] + "鉱石", "ja_JP" ); + this.mod.apiBase.addAtomIngotsLanguage( + ChemiCraftCore.ATOMSNAME[i], + ChemiCraftCore.ATOMSNAMEJP[i] + "インゴット", + "ja_JP" + ); } } @@ -50,6 +55,11 @@ public class ChemiCraftRegisterChemicalRecipe extends ChemiCraftBaseRegister { "ランタノイド鉱石", "ja_JP" ); + this.mod.apiBase.addAtomIngotsLanguage( + "Lanthanoid", + "ランタノイドインゴット", + "ja_JP" + ); // アクチノイド鉱石 this.mod.apiBase.addAtomOres( @@ -63,6 +73,11 @@ public class ChemiCraftRegisterChemicalRecipe extends ChemiCraftBaseRegister { "アクチノイド鉱石", "ja_JP" ); + this.mod.apiBase.addAtomIngotsLanguage( + "Actinoid", + "アクチノイドインゴット", + "ja_JP" + ); } diff --git a/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java b/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java index 98b51e3..b057e5b 100644 --- a/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java +++ b/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java @@ -6,6 +6,7 @@ import pcc.chemicraft.base.item.ItemDust; import pcc.chemicraft.base.item.ItemOreSerarcher; import pcc.chemicraft.base.item.ItemRadiationBullet; import pcc.chemicraft.base.item.ItemRadiationGun; +import pcc.chemicraft.base.ore.ItemAtomIngots; /** * アイテムを追加します @@ -20,26 +21,27 @@ public class ChemiCraftRegisterItem extends ChemiCraftBaseRegister { @Override public void start() { //アイテムを変数に代入 + this.mod.itemAtomIngots = new ItemAtomIngots(this.mod.atomIngotsID).setUnlocalizedName("atomIngots"); this.mod.itemAtomGrenade = new ItemAtomsGrenade(this.mod.atomGrenadeID).setUnlocalizedName("AtomsGrenade"); + this.mod.itemBlackSmoke = new ItemBlackSmoke(this.mod.blackSmokeID).setUnlocalizedName("BlackSmoke"); this.mod.itemDust = new ItemDust(this.mod.dustID).setUnlocalizedName("dust"); + this.mod.itemOreSearcher = new ItemOreSerarcher(this.mod.oreSerarcherID).setUnlocalizedName("oreSearcher"); this.mod.itemRadiationGun = new ItemRadiationGun(this.mod.radiationGunID).setUnlocalizedName("RadiationGun"); this.mod.itemRadiationBallet = new ItemRadiationBullet(this.mod.radiationBalletID).setUnlocalizedName("RadiationBullet"); - this.mod.itemBlackSmoke = new ItemBlackSmoke(this.mod.blackSmokeID).setUnlocalizedName("BlackSmoke"); - this.mod.itemOreSearcher = new ItemOreSerarcher(this.mod.oreSerarcherID).setUnlocalizedName("oreSearcher"); //名前を登録&Minecraftに登録 this.mod.nameAuxiliary.addName(this.mod.itemAtomGrenade, "AtomGrenade"); this.mod.nameAuxiliary.addName(this.mod.itemAtomGrenade, "ja_JP", "元素手榴弾"); + this.mod.nameAuxiliary.addName(this.mod.itemBlackSmoke, "BlackSmoke"); + this.mod.nameAuxiliary.addName(this.mod.itemBlackSmoke, "ja_JP", "黒煙"); this.mod.nameAuxiliary.addName(this.mod.itemDust, "dust"); this.mod.nameAuxiliary.addName(this.mod.itemDust, "ja_JP", "粉塵"); + this.mod.nameAuxiliary.addName(this.mod.itemOreSearcher, "OreSearcher"); + this.mod.nameAuxiliary.addName(this.mod.itemOreSearcher, "ja_JP", "鉱石情報探知機"); this.mod.nameAuxiliary.addName(this.mod.itemRadiationGun, "RadiationGun"); this.mod.nameAuxiliary.addName(this.mod.itemRadiationGun, "ja_JP", "放射線銃"); this.mod.nameAuxiliary.addName(this.mod.itemRadiationBallet, "RadiationBullet"); this.mod.nameAuxiliary.addName(this.mod.itemRadiationGun, "ja_JP", "放射線弾"); - this.mod.nameAuxiliary.addName(this.mod.itemBlackSmoke, "BlackSmoke"); - this.mod.nameAuxiliary.addName(this.mod.itemBlackSmoke, "ja_JP", "黒煙"); - this.mod.nameAuxiliary.addName(this.mod.itemOreSearcher, "OreSearcher"); - this.mod.nameAuxiliary.addName(this.mod.itemOreSearcher, "ja_JP", "鉱石情報探知機"); } } diff --git a/common/pcc/chemicraft/base/creativetab/CreativeTabAtomOres.java b/common/pcc/chemicraft/base/creativetab/CreativeTabAtomOres.java index e37e31c..8f5587b 100644 --- a/common/pcc/chemicraft/base/creativetab/CreativeTabAtomOres.java +++ b/common/pcc/chemicraft/base/creativetab/CreativeTabAtomOres.java @@ -28,7 +28,7 @@ public class CreativeTabAtomOres extends CreativeTabs { @Override @SideOnly(Side.CLIENT) public String getTranslatedTabLabel() { - return "AtomsOre"; + return "AtomOres"; } } diff --git a/common/pcc/chemicraft/base/gen/WorldGenAtomsOre.java b/common/pcc/chemicraft/base/gen/WorldGenAtomOres.java similarity index 85% rename from common/pcc/chemicraft/base/gen/WorldGenAtomsOre.java rename to common/pcc/chemicraft/base/gen/WorldGenAtomOres.java index bbb13e7..d5df72c 100644 --- a/common/pcc/chemicraft/base/gen/WorldGenAtomsOre.java +++ b/common/pcc/chemicraft/base/gen/WorldGenAtomOres.java @@ -12,7 +12,7 @@ import cpw.mods.fml.common.IWorldGenerator; * 鉱石生成のインスタンスです * @author mozipi,ponkotate,つやぴん */ -public class WorldGenAtomsOre extends WorldGenMinable implements IWorldGenerator { +public class WorldGenAtomOres extends WorldGenMinable implements IWorldGenerator { /** * 生成率 @@ -24,13 +24,13 @@ public class WorldGenAtomsOre extends WorldGenMinable implements IWorldGenerator */ private int posY; - public WorldGenAtomsOre(int id, int meta, int size, int frequency, int posY) { + public WorldGenAtomOres(int id, int meta, int size, int frequency, int posY) { super(id, meta, size, Block.stone.blockID); this.frequency = frequency; this.posY = posY; } - public WorldGenAtomsOre(int id, int meta, EnumOreSpawnFrequency frequency) { + public WorldGenAtomOres(int id, int meta, EnumOreSpawnFrequency frequency) { this(id, meta, frequency.getSize(), frequency.getFrequency(), frequency.getPosY()); } diff --git a/common/pcc/chemicraft/base/ore/BlockAtomOres.java b/common/pcc/chemicraft/base/ore/BlockAtomOres.java index db8b59e..3431ab2 100644 --- a/common/pcc/chemicraft/base/ore/BlockAtomOres.java +++ b/common/pcc/chemicraft/base/ore/BlockAtomOres.java @@ -21,32 +21,32 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockAtomOres extends Block { @SideOnly(Side.CLIENT) - private Icon[] iconArray; + private Icon[] icons; public BlockAtomOres(int id) { super(id, Material.rock); - this.setCreativeTab(ChemiCraftBase.instance.creativeTabAtomsOre); + this.setCreativeTab(ChemiCraftBase.instance.creativeTabAtomOres); } @Override @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { ArrayList atomNames = ChemiCraftBaseAPI.instance().getAtomOresAtomName(); - this.iconArray = new Icon[atomNames.size()]; + this.icons = new Icon[atomNames.size()]; - for (int i = 0; i < this.iconArray.length; i++){ - this.iconArray[i] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + atomNames.get(i)); + for (int i = 0; i < this.icons.length; i++){ + this.icons[i] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + atomNames.get(i)); } // WIP - this.iconArray[iconArray.length - 1] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + "WIP"); - this.iconArray[iconArray.length - 2] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + "WIP"); + this.icons[icons.length - 1] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + "WIP"); + this.icons[icons.length - 2] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + "WIP"); } @Override public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { int var3 = this.blockID - ChemiCraftBase.instance.atomOresID[0]; - return this.iconArray[par2 + var3 * 16]; + return this.icons[par2 + var3 * 16]; } @Override diff --git a/common/pcc/chemicraft/base/ore/ItemAtomIngots.java b/common/pcc/chemicraft/base/ore/ItemAtomIngots.java new file mode 100644 index 0000000..8394ab2 --- /dev/null +++ b/common/pcc/chemicraft/base/ore/ItemAtomIngots.java @@ -0,0 +1,69 @@ +package pcc.chemicraft.base.ore; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import pcc.chemicraft.base.ChemiCraftBase; +import pcc.chemicraft.base.ChemiCraftBaseAPI; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ItemAtomIngots extends Item { + + @SideOnly(Side.CLIENT) + private Icon[] icons; + + public ItemAtomIngots(int par1) { + super(par1); + this.maxStackSize = 64; + this.setHasSubtypes(true); + this.setMaxDamage(0); + this.setCreativeTab(ChemiCraftBase.instance.creativeTabAtomOres); + } + + + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @SideOnly(Side.CLIENT) + @Override + public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List){ + for(int type = 0; type < ChemiCraftBaseAPI.instance().getAtomOresAtomName().size(); type++) + { + par3List.add(new ItemStack(par1, 1, type)); + } + } + + + + @Override + @SideOnly(Side.CLIENT) + public Icon getIconFromDamage(int par1) { + return this.icons[par1]; + } + + + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack){ + return super.getUnlocalizedName() + "." + ChemiCraftBaseAPI.instance().getAtomOresAtomName().get(par1ItemStack.getItemDamage()); + } + + + + @Override + @SideOnly(Side.CLIENT) + public void updateIcons(IconRegister par1IconRegister) { + ArrayList atomNames = ChemiCraftBaseAPI.instance().getAtomOresAtomName(); + this.icons = new Icon[atomNames.size()]; + + for (int i = 0; i < this.icons.length; i++){ + this.icons[i] = par1IconRegister.registerIcon(ChemiCraftBase.INGOT + atomNames.get(i)); + } + } + +} diff --git a/common/pcc/chemicraft/core/ChemiCraftRegisterCoreRecipe.java b/common/pcc/chemicraft/core/ChemiCraftRegisterCoreRecipe.java index 14ac23c..c373378 100644 --- a/common/pcc/chemicraft/core/ChemiCraftRegisterCoreRecipe.java +++ b/common/pcc/chemicraft/core/ChemiCraftRegisterCoreRecipe.java @@ -18,6 +18,12 @@ public class ChemiCraftRegisterCoreRecipe extends ChemiCraftCoreRegister { @Override public void start() { + GameRegistry.addRecipe(new ItemStack(this.mod.itemGasCollectingBottle), + new Object[]{ + " X ", "X X", "XXX", + Character.valueOf('X'), new ItemStack(Item.ingotIron), + }); + //科学作業台のレシピ GameRegistry.addRecipe(new ItemStack(this.mod.blockPyrolysisTable), new Object[]{ @@ -66,7 +72,7 @@ public class ChemiCraftRegisterCoreRecipe extends ChemiCraftCoreRegister { Character.valueOf('A'), new ItemStack(this.mod.itemAtoms, 1, 0), }); - GameRegistry.addRecipe(new ItemStack(this.mod.itemChemicalCells, 1, 0), + GameRegistry.addRecipe(new ItemStack(this.mod.itemChemicalCells), new Object[]{ " X ", "ZYZ", "ZYZ", Character.valueOf('X'), new ItemStack(Item.redstone), @@ -87,7 +93,7 @@ public class ChemiCraftRegisterCoreRecipe extends ChemiCraftCoreRegister { new ItemStack(Item.bucketWater), new ItemStack(Item.bucketWater), }, - new ItemStack(this.mod.itemChemicalCells, 1, 0), + new ItemStack(this.mod.itemChemicalCells), null); this.mod.api.addMaterialRecipe( diff --git a/common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java b/common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java index eb0095e..b1b10cf 100644 --- a/common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java +++ b/common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java @@ -21,7 +21,7 @@ public class ItemGasCollectingBottle extends ItemAtomInfoContainer { super(id); this.setMaxStackSize(1); - this.setMaxDamage(2); + this.setMaxDamage(4); this.setCreativeTab(ChemiCraftCore.instance.creativeTabChemiCraft); } diff --git a/common/pcc/chemicraft/util/AtomInfo.java b/common/pcc/chemicraft/util/AtomInfo.java index f4198d2..661f6c2 100644 --- a/common/pcc/chemicraft/util/AtomInfo.java +++ b/common/pcc/chemicraft/util/AtomInfo.java @@ -345,11 +345,7 @@ public final class AtomInfo { */ @SideOnly(Side.CLIENT) public boolean isOverY(int par1) { - if (this.posY >= par1) { - return true; - }else{ - return false; - } + return this.posY >= par1; } @@ -361,11 +357,7 @@ public final class AtomInfo { */ @SideOnly(Side.CLIENT) public boolean isEquivalentY(int par1) { - if (this.posY == par1) { - return true; - }else{ - return false; - } + return this.posY == par1; } @@ -377,11 +369,7 @@ public final class AtomInfo { */ @SideOnly(Side.CLIENT) public boolean isBelowY(int par1) { - if (this.posY <= par1) { - return true; - }else{ - return false; - } + return this.posY <= par1; } } diff --git a/common/pcc/chemicraft/util/Formula.java b/common/pcc/chemicraft/util/Formula.java index ed00aee..0250b77 100644 --- a/common/pcc/chemicraft/util/Formula.java +++ b/common/pcc/chemicraft/util/Formula.java @@ -13,7 +13,13 @@ public class Formula { private ArrayList atoms = new ArrayList(); private ArrayList amonts = new ArrayList(); + private int magnification; + + private String lastSpell; + private int lastIndex; + public Formula(String par1) { + this.magnification = 1; this.run(par1); } @@ -26,67 +32,50 @@ public class Formula { this.amonts = par2; } - // 今後ソースの整頓をする予定 -WIP- + // 括弧対応はまだ未完成です。 --WIP-- public void run(String par1) { - char[] var2 = par1.toCharArray(); // par1のchar配列 - String var3 = null; // setAtomの第一引数に送る - int var4 = 0; // setAtomの第二引数に送る - int var5 = 1; // 倍率 - Formula var6 = null; // Formula格納用 + char[] var2 = par1.toCharArray(); for (int i = 0; i < var2.length; i++) { - if (Character.isLetter(var2[i])) { - if (Character.isUpperCase(var2[i])) { - if (var4 <= 0) { - var4 = 1; - } - if (var3 != null) { - this.setAtom(var3, var4 * var5); - } else if (var6 != null) { - this.setAtoms(var6.getAtoms(), var6.getAmonts(), var4 * var5); - var6 = null; - } - var3 = Character.toString(var2[i]); - } else { - var3 = var3.concat(Character.toString(var2[i])); + if (var2[i] == '・') { + if (this.lastSpell != null) { + setAtom(this.lastSpell, this.magnification); } - var4 = 0; + setAtoms(new Formula(new String(var2, ++i, var2.length - i))); + return; + } else if (var2[i] == '(') { + // 括弧対応はまだ未完成です。 --WIP-- } else if (Character.isDigit(var2[i])) { - if (var3 != null || var6 != null) { - var4 = var4 * 10 + Integer.valueOf(Character.toString(var2[i])); + if (this.lastIndex > 0) { + this.amonts.set(this.amonts.size() - 1, this.magnification + * (this.lastIndex = this.lastIndex * 10 + Integer.valueOf(Character.toString(var2[i])))); + } else if (this.lastSpell != null) { + setAtom(this.lastSpell, this.lastIndex = Integer.valueOf(Character.toString(var2[i]))); } else { - var5 = Integer.valueOf(Character.toString(var2[i])); - } - } else if (var2[i] == '・') { - if (var3 != null) { - this.setAtom(var3, var4 * var5); - } else if (var6 != null) { - this.setAtoms(var6.getAtoms(), var6.getAmonts(), var4 * var5); + this.magnification = Integer.valueOf(Character.toString(var2[i])); } - var3 = null; - var4 = 0; - var5 = 1; - var6 = null; - } else if (var2[i] == '(') { - if (var3 != null) { - this.setAtom(var3, var4 * var5); - var3 = null; - var4 = 1; + this.lastSpell = null; + } else if (Character.isLetter(var2[i])) { + if (Character.isUpperCase(var2[i])) { + if (this.lastSpell != null) { + setAtom(this.lastSpell, this.magnification); + } + this.lastSpell = Character.toString(var2[i]); + } else if (Character.isLowerCase(var2[i])) { + if (this.lastSpell == null) { + throw new IllegalArgumentException(); + } + this.lastSpell = this.lastSpell.concat(Character.toString(var2[i])); + + if (var2.length <= i + 1) { + setAtom(this.lastSpell, this.magnification); + } } - int var7 = par1.indexOf(')'); - String var8 = par1.substring(i + 1, var7); - var6 = new Formula(var8); - i = var7; + this.lastIndex = 0; } else { throw new IllegalArgumentException(); } } - if (var3 != null) { - if (var4 <= 0) { - var4 = 1; - } - this.setAtom(var3, var4 * var5); - } } public boolean isAtom(String par1) { @@ -124,10 +113,18 @@ public class Formula { throw new IndexOutOfBoundsException(); } for (int i = 0; i < par1.length; i++) { - this.setAtom(par1[i], par2[i] * par3); + setAtom(par1[i], par2[i] * par3); } } + public void setAtoms(Formula par1) { + setAtoms(par1, 1); + } + + public void setAtoms(Formula par1, int par2) { + setAtoms(par1.getAtoms(), par1.getAmonts(), par2); + } + public String[] getAtoms() { return atoms.toArray(new String[atoms.size()]); } diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Aluminium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Aluminium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Aluminium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Aluminium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Antimony.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Antimony.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Antimony.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Antimony.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Arsenic.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Arsenic.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Arsenic.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Arsenic.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Astatine.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Astatine.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Astatine.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Astatine.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Barium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Barium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Barium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Barium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Beryllium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Beryllium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Beryllium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Beryllium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Bismuth.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Bismuth.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Bismuth.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Bismuth.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Boron.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Boron.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Boron.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Boron.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Cadmium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Cadmium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Cadmium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Cadmium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Caesium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Caesium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Caesium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Caesium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Calcium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Calcium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Calcium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Calcium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Carbon.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Carbon.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Carbon.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Carbon.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Chromium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Chromium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Chromium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Chromium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Cobalt.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Cobalt.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Cobalt.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Cobalt.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Copper.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Copper.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Copper.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Copper.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Francium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Francium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Francium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Francium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Gallium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Gallium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Gallium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Gallium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Germanium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Germanium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Germanium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Germanium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Gold.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Gold.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Gold.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Gold.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Hafnium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Hafnium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Hafnium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Hafnium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Indium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Indium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Indium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Indium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Iodine.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Iodine.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Iodine.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Iodine.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Iridium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Iridium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Iridium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Iridium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Iron.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Iron.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Iron.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Iron.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Lead.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Lead.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Lead.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Lead.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Lithium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Lithium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Lithium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Lithium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Magnesium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Magnesium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Magnesium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Magnesium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Manganese.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Manganese.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Manganese.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Manganese.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Molybdenum.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Molybdenum.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Molybdenum.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Molybdenum.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Nickel.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Nickel.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Nickel.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Nickel.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Niobium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Niobium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Niobium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Niobium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Osmium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Osmium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Osmium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Osmium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Palladium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Palladium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Palladium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Palladium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Phosphorus.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Phosphorus.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Phosphorus.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Phosphorus.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Platinum.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Platinum.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Platinum.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Platinum.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Polonium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Polonium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Polonium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Polonium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Potassium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Potassium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Potassium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Potassium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Radium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Radium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Radium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Radium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Rhenium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Rhenium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Rhenium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Rhenium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Rhodium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Rhodium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Rhodium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Rhodium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Rubidium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Rubidium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Rubidium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Rubidium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Ruthenium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Ruthenium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Ruthenium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Ruthenium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Scandium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Scandium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Scandium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Scandium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Selenium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Selenium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Selenium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Selenium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Silicon.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Silicon.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Silicon.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Silicon.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Silver.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Silver.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Silver.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Silver.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Sodium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Sodium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Sodium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Sodium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Strontium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Strontium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Strontium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Strontium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Sulfur.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Sulfur.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Sulfur.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Sulfur.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Tantalum.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Tantalum.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Tantalum.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Tantalum.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Technetium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Technetium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Technetium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Technetium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Tellurium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Tellurium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Tellurium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Tellurium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Thallium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Thallium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Thallium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Thallium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Tin.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Tin.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Tin.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Tin.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Titanium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Titanium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Titanium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Titanium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Tungsten.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Tungsten.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Tungsten.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Tungsten.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Vanadium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Vanadium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Vanadium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Vanadium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_WIP.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_WIP.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_WIP.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_WIP.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Yttorium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Yttorium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Yttorium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Yttorium.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Zinc.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Zinc.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Zinc.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Zinc.png diff --git a/resources/mods/ChemiCraft/textures/blocks/atoms_ore_Zirconium.png b/resources/mods/ChemiCraft/textures/blocks/atom_ores_Zirconium.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/atoms_ore_Zirconium.png rename to resources/mods/ChemiCraft/textures/blocks/atom_ores_Zirconium.png -- 2.11.0