From 18deec05d3263a1a9441c7a09da4404a6180f2c4 Mon Sep 17 00:00:00 2001 From: ponkotate Date: Sun, 7 Apr 2013 16:17:11 +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=E9=89=B1=E7=9F=B3=E4=BF=AE=E6=AD=A3=20=E3=83=BB?= =?utf8?q?=E3=83=86=E3=82=AF=E3=82=B9=E3=83=81=E3=83=A3=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- common/pcc/chemicraft/ChemiCraft.java | 2 +- common/pcc/chemicraft/base/ChemiCraftBase.java | 5 ++-- common/pcc/chemicraft/base/ChemiCraftBaseAPI.java | 12 +++++----- .../base/ChemiCraftRegisterBaseRecipe.java | 6 ++--- .../chemicraft/base/ChemiCraftRegisterBlock.java | 1 - .../pcc/chemicraft/base/item/ItemOreSerarcher.java | 11 ++++----- common/pcc/chemicraft/base/ore/BlockAtomOres.java | 12 +++++++--- common/pcc/chemicraft/base/ore/ItemAtomOres.java | 9 ++++--- common/pcc/chemicraft/core/ChemiCraftCore.java | 7 +++++- .../core/block/BlockChemicalCombinationTable.java | 11 ++++----- .../core/block/BlockChemicalCraftingTable.java | 11 ++++----- .../core/block/BlockElectrolysisTable.java | 11 ++++----- .../chemicraft/core/block/BlockPyrolysisTable.java | 11 ++++----- .../block/BlockToolAndWeaponCraftingTable.java | 11 ++++----- common/pcc/chemicraft/core/item/ItemAtoms.java | 26 +++++++-------------- common/pcc/chemicraft/util/ListHash.java | 5 ++-- .../{ => AtomsOre_未カット}/AtomsOre.png | Bin .../blocks/{ => AtomsOre_未カット}/colors.txt | 0 .../textures/blocks/ChemiCraftTable_Bottom.png | Bin 0 -> 572 bytes .../ChemiCraftTable_ChemicalCombinationTable.png | Bin 0 -> 816 bytes .../ChemiCraftTable_ChemicalCraftingTable.png | Bin 0 -> 785 bytes .../blocks/ChemiCraftTable_ElectrolysisTable.png | Bin 0 -> 761 bytes .../blocks/ChemiCraftTable_PyrolysisTable.png | Bin 0 -> 891 bytes .../textures/blocks/ChemiCraftTable_Side.png | Bin 0 -> 640 bytes .../ChemiCraftTable_ToolAndWeaponCraftingTable.png | Bin 0 -> 846 bytes .../mods/ChemiCraft/textures/blocks/cctable.png | Bin 4126 -> 0 bytes 26 files changed, 71 insertions(+), 80 deletions(-) rename resources/mods/ChemiCraft/textures/blocks/{ => AtomsOre_未カット}/AtomsOre.png (100%) rename resources/mods/ChemiCraft/textures/blocks/{ => AtomsOre_未カット}/colors.txt (100%) create mode 100644 resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_Bottom.png create mode 100644 resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ChemicalCombinationTable.png create mode 100644 resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ChemicalCraftingTable.png create mode 100644 resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ElectrolysisTable.png create mode 100644 resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_PyrolysisTable.png create mode 100644 resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_Side.png create mode 100644 resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ToolAndWeaponCraftingTable.png delete mode 100644 resources/mods/ChemiCraft/textures/blocks/cctable.png diff --git a/common/pcc/chemicraft/ChemiCraft.java b/common/pcc/chemicraft/ChemiCraft.java index a979673..b705318 100644 --- a/common/pcc/chemicraft/ChemiCraft.java +++ b/common/pcc/chemicraft/ChemiCraft.java @@ -40,7 +40,7 @@ public abstract class ChemiCraft implements Runnable { * this is Textures Path on ChemiCraft. */ public static final String TEXTURE = "ChemiCraft:"; - public static final String BASE_PATH = "mods/ChemiCraft/textures"; + public static final String BASE_PATH = "/mods/ChemiCraft/textures"; public static final String GUI_PYROLYSIS_TEXTURE = BASE_PATH + "/guis/Pyrolysis.png"; public static final String GUI_ELECTROLYSIS_TEXTURE = BASE_PATH + "/guis/Electrolysis.png"; public static final String GUI_CHEMICALCOMBINATION_TEXTURE = BASE_PATH + "/guis/ChemicalCombination.png"; diff --git a/common/pcc/chemicraft/base/ChemiCraftBase.java b/common/pcc/chemicraft/base/ChemiCraftBase.java index 3a1ebc1..d93ddc0 100644 --- a/common/pcc/chemicraft/base/ChemiCraftBase.java +++ b/common/pcc/chemicraft/base/ChemiCraftBase.java @@ -17,7 +17,6 @@ import pcc.chemicraft.EnumLoggingType; import pcc.chemicraft.base.creativetab.CreativeTabAtomOres; import pcc.chemicraft.base.system.CommonProxy; import pcc.chemicraft.base.system.PacketHandler; -import pcc.chemicraft.core.ChemiCraftAPI; import pcc.chemicraft.core.ChemiCraftCore; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.LoaderState.ModState; @@ -33,7 +32,7 @@ import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.registry.LanguageRegistry; @Mod(modid = "ChemiCraftBase", name = "ChemiCraftBase", version = "beta1") -@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.7", channels = "chemicraftbase", packetHandler = PacketHandler.class) +@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.5", channels = "chemicraftbase", packetHandler = PacketHandler.class) public class ChemiCraftBase extends ChemiCraft { /** @@ -206,7 +205,7 @@ public class ChemiCraftBase extends ChemiCraft { 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) + "/Damage-" + (i - i / 16 * 16) + "/Lang-" + lang, + ChemiCraftCore.logger.write("AtomOresAddName:" + "Name-" + names.get(i) + "ID-" + (i / 16)+ "/Damage-" + (i - i / 16 * 16) + "/Lang-" + lang, EnumLoggingType.INFO); LanguageRegistry.instance().addNameForObject( diff --git a/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java b/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java index 42fbf02..ad26de2 100644 --- a/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java +++ b/common/pcc/chemicraft/base/ChemiCraftBaseAPI.java @@ -50,7 +50,7 @@ public class ChemiCraftBaseAPI { /** * 鉱石の英語名リスト */ - private ArrayList atomOresEnglishList = new ArrayList(); + private ArrayList atomOresAtomList = new ArrayList(); /** * 鉱石を追加します。 @@ -70,6 +70,7 @@ public class ChemiCraftBaseAPI { par5Frequency, par6PosY)); + atomOresAtomList.add(par1Name); atomOresFormulasHash.put(par1Name, par2Formula); String var7 = par1Name; @@ -77,7 +78,6 @@ public class ChemiCraftBaseAPI { var7 = var7.concat(" Ore"); } - this.atomOresEnglishList.add(var7); addAtomOresLanguage(var7, "en_US"); } @@ -131,13 +131,13 @@ public class ChemiCraftBaseAPI { public int getAtomOresLastIndex(){ - return atomOresEnglishList.size() / 16; + return atomOresAtomList.size() / 16; } public int getAtomOresMetaOfLastIndex(){ - return atomOresEnglishList.size() - getAtomOresLastIndex() * 16; + return atomOresAtomList.size() - getAtomOresLastIndex() * 16; } @@ -148,8 +148,8 @@ public class ChemiCraftBaseAPI { - public String getAtomOreEnglishName(int index) { - return this.atomOresEnglishList.get(index); + public ArrayList getAtomOresAtomName() { + return this.atomOresAtomList; } } diff --git a/common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java b/common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java index c420904..d060008 100644 --- a/common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java +++ b/common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java @@ -1,10 +1,8 @@ package pcc.chemicraft.base; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EntityDamageSource; import net.minecraftforge.oredict.OreDictionary; import pcc.chemicraft.core.ChemiCraftCore; import pcc.chemicraft.core.nbt.NBTRecipeGrenade; @@ -105,10 +103,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.getAtomOresAtomName().size(); 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.getAtomOresAtomName().get(i))); } } diff --git a/common/pcc/chemicraft/base/ChemiCraftRegisterBlock.java b/common/pcc/chemicraft/base/ChemiCraftRegisterBlock.java index 7a217ea..9893078 100644 --- a/common/pcc/chemicraft/base/ChemiCraftRegisterBlock.java +++ b/common/pcc/chemicraft/base/ChemiCraftRegisterBlock.java @@ -2,7 +2,6 @@ package pcc.chemicraft.base; import net.minecraft.block.Block; import net.minecraftforge.common.MinecraftForge; -import pcc.chemicraft.base.gen.WorldGenAtomsOre; import pcc.chemicraft.base.ore.BlockAtomOres; import pcc.chemicraft.base.ore.ItemAtomOres; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/common/pcc/chemicraft/base/item/ItemOreSerarcher.java b/common/pcc/chemicraft/base/item/ItemOreSerarcher.java index aa1992d..c418de8 100644 --- a/common/pcc/chemicraft/base/item/ItemOreSerarcher.java +++ b/common/pcc/chemicraft/base/item/ItemOreSerarcher.java @@ -1,17 +1,14 @@ package pcc.chemicraft.base.item; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.SideOnly; -import pcc.chemicraft.ChemiCraft; -import pcc.chemicraft.base.ChemiCraftBase; -import pcc.chemicraft.core.ChemiCraftCore; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StringTranslate; import net.minecraft.world.World; +import pcc.chemicraft.ChemiCraft; +import pcc.chemicraft.base.ChemiCraftBase; +import pcc.chemicraft.core.ChemiCraftCore; public class ItemOreSerarcher extends Item { @@ -33,7 +30,7 @@ public class ItemOreSerarcher extends Item { if (par3World.isRemote) { this.changeItem(par2EntityPlayer); } - String blockName = ChemiCraftBase.instance.apiBase.getAtomOreEnglishName( + String blockName = ChemiCraftBase.instance.apiBase.getAtomOresAtomName().get( (Math.abs(ChemiCraftBase.instance.atomOresID[ChemiCraftBase.instance.atomOresID.length-1] - (par3World.getBlockId(par4, par5, par6) + 3))) * 16 + par3World.getBlockMetadata(par4, par5, par6)); diff --git a/common/pcc/chemicraft/base/ore/BlockAtomOres.java b/common/pcc/chemicraft/base/ore/BlockAtomOres.java index dce3bab..54b6613 100644 --- a/common/pcc/chemicraft/base/ore/BlockAtomOres.java +++ b/common/pcc/chemicraft/base/ore/BlockAtomOres.java @@ -9,6 +9,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import pcc.chemicraft.base.ChemiCraftBase; +import pcc.chemicraft.base.ChemiCraftBaseAPI; import pcc.chemicraft.core.ChemiCraftCore; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -40,7 +41,7 @@ public class BlockAtomOres extends Block { @Override public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { int var3 = this.blockID - ChemiCraftBase.instance.atomOresID[0]; - return this.iconArray[var3 - var3 / 16 * 16]; + return this.iconArray[par2 + var3 * 16]; } @Override @@ -59,8 +60,13 @@ public class BlockAtomOres extends Block { @Override @SideOnly(Side.CLIENT) public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int var4 = 0; var4 < 16; ++var4) { - par3List.add(new ItemStack(par1, 1, var4)); + int var4 = this.blockID - ChemiCraftBase.instance.atomOresID[0] + 1; + int var5 = 16; + if (var4 == ChemiCraftBase.instance.atomOresID.length){ + var5 -= var4 * 16 - ChemiCraftBaseAPI.instance().getAtomOresAtomName().size(); + } + for (int i = 0; i < var5; i++) { + par3List.add(new ItemStack(par1, 1, i)); } } diff --git a/common/pcc/chemicraft/base/ore/ItemAtomOres.java b/common/pcc/chemicraft/base/ore/ItemAtomOres.java index c0bc207..2fd602d 100644 --- a/common/pcc/chemicraft/base/ore/ItemAtomOres.java +++ b/common/pcc/chemicraft/base/ore/ItemAtomOres.java @@ -1,12 +1,9 @@ package pcc.chemicraft.base.ore; import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemDye; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; import pcc.chemicraft.base.ChemiCraftBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import pcc.chemicraft.base.ChemiCraftBaseAPI; /** * 鉱石のアイテム版です @@ -35,6 +32,8 @@ public class ItemAtomOres extends ItemBlock { @Override public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName() + "." + ItemDye.dyeColorNames[BlockAtomOres.getBlockFromDye(par1ItemStack.getItemDamage())]; + int var2 = this.itemID - (ChemiCraftBase.instance.atomOresID[0]); + return super.getUnlocalizedName() + "." + ChemiCraftBaseAPI.instance().getAtomOresAtomName().get(par1ItemStack.getItemDamage() + var2 * 16); } + } diff --git a/common/pcc/chemicraft/core/ChemiCraftCore.java b/common/pcc/chemicraft/core/ChemiCraftCore.java index 6f78a71..989e9d7 100644 --- a/common/pcc/chemicraft/core/ChemiCraftCore.java +++ b/common/pcc/chemicraft/core/ChemiCraftCore.java @@ -46,7 +46,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry; * @author P.C.C. */ @Mod(modid = "ChemiCraft", name = "ChemiCraft", version = "Beta1") -@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.7", channels = "chemicraftcore", packetHandler = PacketHandler.class) +@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.5", channels = "chemicraftcore", packetHandler = PacketHandler.class) public class ChemiCraftCore extends ChemiCraft{ /** @@ -148,6 +148,11 @@ public class ChemiCraftCore extends ChemiCraft{ */ public static final ChemiCraftLogging logger = new ChemiCraftLogging(System.getProperty("user.dir")); + /** + * the Textures + */ + public static final String CCTABLE = ChemiCraft.TEXTURE + "ChemiCraftTable_"; + public ChemiCraftCore() { ChemiCraftAPI.getCompoundsName().entrySet(); this.api.getCompoundsName().createHash("en_US"); diff --git a/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java b/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java index 19d0ec9..1c23482 100644 --- a/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java +++ b/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java @@ -7,7 +7,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; -import pcc.chemicraft.ChemiCraft; import pcc.chemicraft.core.ChemiCraftCore; import pcc.chemicraft.core.tileentity.TileEntityChemicalCombinationTable; @@ -32,9 +31,9 @@ public class BlockChemicalCombinationTable extends BlockContainer { @Override public void registerIcons(IconRegister par1IconRegister) { - this.topIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCombinationTableTop"); - this.bottomIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCombinationTableBottom"); - this.globalIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCombinationTable"); + this.topIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "ChemicalCombinationTable"); + this.bottomIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Bottom"); + this.globalIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Side"); } @@ -59,9 +58,9 @@ public class BlockChemicalCombinationTable extends BlockContainer { @Override public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { if(par1 == 0){ - return this.topIcon; - }else if(par1 == 1){ return this.bottomIcon; + }else if(par1 == 1){ + return this.topIcon; }else{ return this.globalIcon; } diff --git a/common/pcc/chemicraft/core/block/BlockChemicalCraftingTable.java b/common/pcc/chemicraft/core/block/BlockChemicalCraftingTable.java index e396f45..bf43af0 100644 --- a/common/pcc/chemicraft/core/block/BlockChemicalCraftingTable.java +++ b/common/pcc/chemicraft/core/block/BlockChemicalCraftingTable.java @@ -7,7 +7,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; -import pcc.chemicraft.ChemiCraft; import pcc.chemicraft.core.ChemiCraftCore; import pcc.chemicraft.core.tileentity.TileEntityChemicalCraftingTable; @@ -33,9 +32,9 @@ public class BlockChemicalCraftingTable extends BlockContainer { @Override public void registerIcons(IconRegister par1IconRegister) { - this.topIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCraftingTableTop"); - this.bottomIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCraftingTableBottom"); - this.globalIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCraftingTable"); + this.topIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "ChemicalCraftingTable"); + this.bottomIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Bottom"); + this.globalIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Side"); } @@ -43,9 +42,9 @@ public class BlockChemicalCraftingTable extends BlockContainer { @Override public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { if(par1 == 0){ - return this.topIcon; - }else if(par1 == 1){ return this.bottomIcon; + }else if(par1 == 1){ + return this.topIcon; }else{ return this.globalIcon; } diff --git a/common/pcc/chemicraft/core/block/BlockElectrolysisTable.java b/common/pcc/chemicraft/core/block/BlockElectrolysisTable.java index 52fc2b7..8125789 100644 --- a/common/pcc/chemicraft/core/block/BlockElectrolysisTable.java +++ b/common/pcc/chemicraft/core/block/BlockElectrolysisTable.java @@ -7,7 +7,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; -import pcc.chemicraft.ChemiCraft; import pcc.chemicraft.core.ChemiCraftCore; import pcc.chemicraft.core.debug.DebugTick; import pcc.chemicraft.core.tileentity.TileEntityElectrolysisTable; @@ -31,9 +30,9 @@ public class BlockElectrolysisTable extends BlockContainer { @Override public void registerIcons(IconRegister par1IconRegister) { - this.topIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockElectrolysisTableTop"); - this.bottomIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockElectrolysisTableBottom"); - this.globalIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockElectrolysisTable"); + this.topIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "ElectrolysisTable"); + this.bottomIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Bottom"); + this.globalIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Side"); } @Override @@ -48,9 +47,9 @@ public class BlockElectrolysisTable extends BlockContainer { @Override public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { if(par1 == 0){ - return this.topIcon; - }else if(par1 == 1){ return this.bottomIcon; + }else if(par1 == 1){ + return this.topIcon; }else{ return this.globalIcon; } diff --git a/common/pcc/chemicraft/core/block/BlockPyrolysisTable.java b/common/pcc/chemicraft/core/block/BlockPyrolysisTable.java index 06944cd..769a113 100644 --- a/common/pcc/chemicraft/core/block/BlockPyrolysisTable.java +++ b/common/pcc/chemicraft/core/block/BlockPyrolysisTable.java @@ -7,7 +7,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; -import pcc.chemicraft.ChemiCraft; import pcc.chemicraft.core.ChemiCraftCore; import pcc.chemicraft.core.debug.DebugTick; import pcc.chemicraft.core.tileentity.TileEntityPyrolysisTable; @@ -33,9 +32,9 @@ public class BlockPyrolysisTable extends BlockContainer { @Override public void registerIcons(IconRegister par1IconRegister) { - this.topIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockPyrolysisTableTop"); - this.bottomIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockPyrolysisTableBottom"); - this.globalIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockPyrolysisTable"); + this.topIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "PyrolysisTable"); + this.bottomIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Bottom"); + this.globalIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Side"); } @@ -57,9 +56,9 @@ public class BlockPyrolysisTable extends BlockContainer { @Override public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { if(par1 == 0){ - return this.topIcon; - }else if(par1 == 1){ return this.bottomIcon; + }else if(par1 == 1){ + return this.topIcon; }else{ return this.globalIcon; } diff --git a/common/pcc/chemicraft/core/block/BlockToolAndWeaponCraftingTable.java b/common/pcc/chemicraft/core/block/BlockToolAndWeaponCraftingTable.java index 3f1ddd0..b4b6416 100644 --- a/common/pcc/chemicraft/core/block/BlockToolAndWeaponCraftingTable.java +++ b/common/pcc/chemicraft/core/block/BlockToolAndWeaponCraftingTable.java @@ -7,7 +7,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; -import pcc.chemicraft.ChemiCraft; import pcc.chemicraft.core.ChemiCraftCore; import pcc.chemicraft.core.tileentity.TileEntityToolAndWeaponCraftingTable; @@ -32,9 +31,9 @@ public class BlockToolAndWeaponCraftingTable extends BlockContainer { @Override public void registerIcons(IconRegister par1IconRegister) { - this.topIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockToolAndWeaponCraftingTableTop"); - this.bottomIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockToolAndWeaponCraftingTableBottom"); - this.globalIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockToolAndWeaponCraftingTable"); + this.topIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "ToolAndWeaponCraftingTable"); + this.bottomIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Bottom"); + this.globalIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Side"); } @@ -42,9 +41,9 @@ public class BlockToolAndWeaponCraftingTable extends BlockContainer { @Override public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { if(par1 == 0){ - return this.topIcon; - }else if(par1 == 1){ return this.bottomIcon; + }else if(par1 == 1){ + return this.topIcon; }else{ return this.globalIcon; } diff --git a/common/pcc/chemicraft/core/item/ItemAtoms.java b/common/pcc/chemicraft/core/item/ItemAtoms.java index 072fd8d..da85e5e 100644 --- a/common/pcc/chemicraft/core/item/ItemAtoms.java +++ b/common/pcc/chemicraft/core/item/ItemAtoms.java @@ -9,13 +9,7 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSource; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; -import pcc.chemicraft.ChemiCraft; import pcc.chemicraft.core.ChemiCraftCore; import pcc.chemicraft.util.AtomInfo; import cpw.mods.fml.relauncher.Side; @@ -59,7 +53,6 @@ public class ItemAtoms extends Item { - /* 一時保留。詳しいことが決まるまで変更が難しいため。 --WIP-- @SuppressWarnings({ "unchecked", "rawtypes" }) @SideOnly(Side.CLIENT) @Override @@ -67,31 +60,30 @@ public class ItemAtoms extends Item { for(int type = 0; type < ChemiCraftCore.instance.ATOMSNAME.length; type++) { par3List.add(new ItemStack(par1, 1, type)); - this.setIconIndex(type); } } - @Override - public String getItemNameIS(ItemStack par1ItemStack){ - return super.getItemName() + "." + ChemiCraftCore.instance.ATOMSNAME[par1ItemStack.getItemDamage()]; + public int getMetadata(int par1) + { + return par1; } @Override - public String getTextureFile(){ - return ChemiCraft.ITEM_ATOMS_TEXTURE; + public String getUnlocalizedName(ItemStack par1ItemStack){ + return super.getUnlocalizedName() + "." + ChemiCraftCore.instance.ATOMSNAME[par1ItemStack.getItemDamage()]; } - @SideOnly(Side.CLIENT) + /* 一時保留。詳しいことが決まるまで変更が難しいため。 --WIP-- @Override - public int getIconFromDamage(int par1){ - return par1; + public String getTextureFile(){ + return ChemiCraft.ITEM_ATOMS_TEXTURE; } - */ + */ } \ No newline at end of file diff --git a/common/pcc/chemicraft/util/ListHash.java b/common/pcc/chemicraft/util/ListHash.java index 1b3e990..317c179 100644 --- a/common/pcc/chemicraft/util/ListHash.java +++ b/common/pcc/chemicraft/util/ListHash.java @@ -7,6 +7,7 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; /** @@ -63,8 +64,8 @@ public class ListHash { return this.elementsHash.get(par1Key).containsAll(par2Collection); } - public Set> entrySet() { - return this.entrySet(); + public Set>> entrySet() { + return this.elementsHash.entrySet(); } public K getKeyList(int par1Index) { diff --git a/resources/mods/ChemiCraft/textures/blocks/AtomsOre.png b/resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/AtomsOre.png similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/AtomsOre.png rename to resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/AtomsOre.png diff --git a/resources/mods/ChemiCraft/textures/blocks/colors.txt b/resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/colors.txt similarity index 100% rename from resources/mods/ChemiCraft/textures/blocks/colors.txt rename to resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/colors.txt diff --git a/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_Bottom.png b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_Bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..0511838bb67a64a804cb619564f648abedfa8058 GIT binary patch literal 572 zcmV-C0>k}@P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m?d01m?e$8V@)00007bV*G`2i*h& z1UnzDCEnKn0013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~0004# zNklftfMJpw`N=EYw<2RcfvL{`C{TZ8u6OLKWy@A$f|6aC)?segFC=9!oY*X#8QN-mX|O*eqYy=blB z?wA?9ci!IKo{&<%nGq43&*upc5vaRUN|~4BxJ0?a>B!OUWbzk*0YiF5EU?c20000< KMNUMnLSTaRa{5OA literal 0 HcmV?d00001 diff --git a/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ChemicalCombinationTable.png b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ChemicalCombinationTable.png new file mode 100644 index 0000000000000000000000000000000000000000..ef000975ec398030ab9b9dd56e6c7a9d94d57c5e GIT binary patch literal 816 zcmV-01JC@4P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m?d01m?e$8V@)00007bV*G`2i*h& z1p*v6YG~j90013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~0007q zNkl>rYuY9x@P~WeT)d}^@{a+P209KO+(wZbX~`Ky++Eix<< z9`NQ1?@<&5x~eKfgrmdTJoxqwS(X7{jKO=K(3Mg+=lJHwFSv2#7=XI2(RE!TA^;p6 zo^bE%lo%t!Fc4z|V6)i(aR1>QUVrXgwr@V4ql=;-#+cCFdFg}1L`2B446QZyAD(ja z>MfK~gb)ZJJZ4Z;6(I!jJZBgNoO9f~dYgM^r>XJtN1t)y$}vhQVvH!I04U26UCzs- zPec+M5tEvY(PUXh2m!4%B7#ziSusOz4bxf^Lckc4G;aR@LI^0O7>3~qlcnw2sgL94$0)5}3o2EfT$n!i&*dEQ!&Q3xE5D|u9NIsmOpQGEhO%um)#5sqx1J+uc zb4hcSJ-*63&l$%Nr4&umAbsDH=Q-Z{#Nw@MCw%$cT|$V67(xiVef@o$a~NaT-QC4n zOV@SCa=An)l>%anVYAur#`CwH*vK{;*4qD9YiQdRxwyFCm6xBPu4}5QVsCGc#bQBO umQ44jm@K33T9(UYig4F;bX~`4wcPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m?d01m?e$8V@)00007bV*G`2i*h& z1p_AMeSi}H0013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~0007L zNklK5dk2^h=}05C#A%l+viAK*Q{169{%wyF(zJmv&DOlsxnOzB7!l7loHlj zRFxlo`-YSfbzLKy%?5y@qa$L3zkeN2RdQBDgb)HLC90|dz!*c$nX0O2+ZJitmXs1# zS68f7zPz+tE&y=O0g!V>L{QaIuh;8qgp?8@Le80-Ga&>HhpE)Y7>qGY(}cCQG-})S z8lkExa?Zq$>iytMcHzkI6an;u~vJmBpfEnkL}6 z;=igg{~oZ`a&d8i^!+u$a_Mo-p{iJGOI$^yV0rIv!gY<+bscUTN2;pg?#u7;^><(0 zjF|zbD$hIzocqsv5#gO%AE2rX!+_gvw}cQd#_-np{Sw)fQc-=eSa3KT5D`*JMcBUY zahI2u+_`;D+qP^r8&<0oXJ=Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m?d01m?e$8V@)00007bV*G`2i*h& z1pzk5{POhx0013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~0006| zNklLECFbIMX{Lw|5Xzjls*a<=e z!Ae661}xNI8L$(<#!3Yd6gjeYyC)Hn%nysrjW{sH3~%21-ZwLH|K8n@rYW6HhjzP7 zQ50lZMo|>BcC^sOFc|b13{TI)EiwTwmxfe->psaQlrNYfOP=Q-Z{7^sv&DTRojwT_3a zwQ=7$ht`^+C{RUF5JHHEE1wr5k+n9GBuT>CuS>DIwU)`rNlcoihzL(#y+TCjObL6A zbRw$OI#yI)6mNbmpcI_%UTp~SJa5pH0>FD8C5~{FQh4v#*s$9I8{#a>P}yXLbB^FW zH>Rf%5sWcWpw>EK8zWrUeVq^j-g_p}2@DVe0M72e%>2RwjQNK?a&qp#OiVax%~W;O z5QGp9Oix{l4uEJMU~_X5r5fSG-$P8l-){o8GjDBevF}(nCL3L^i16cMxt*+`9u9|? zvMifsMR@l5H9HUfVfOeOPnPEiAuxM+F5<3yUWAs%`{uo@t*v3Is$yGh6z81d=FDvX z9xpw_d(W*acSd#MD9aLg@%&L(ez}UZmLy4V&awCCF0|Ho@1sBw;oJLP|Fw1L;z>-e z*NZPLguvL?7~eni;?0B*Fvei5#TbM4K1!{s3bVex&Z!fJD2jqS&lw*dr`zq4Wf|>O r8=WK!>xy2l7r$^_*VJ`Qzu)ICckMXR^sq3Z00000NkvXXu0mjfrQ}8T literal 0 HcmV?d00001 diff --git a/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_PyrolysisTable.png b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_PyrolysisTable.png new file mode 100644 index 0000000000000000000000000000000000000000..40f631074de17af0339ec7733fc0340041adaa9d GIT binary patch literal 891 zcmV->1BCpEP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m?d01m?e$8V@)00007bV*G`2i*h& z1qTkcr0wkh0013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~0008g zNklF{V-JMz3m)ZHfct|tP`FWo2%kzE2mtTAu zvMgg|WrcRTjWLEi&oRcZcx(}+HN)Y6;c!S%6!iOjilU$_ONPTCI?r?d{ObWB1mZZx zIfs-I?>*jo;y9+RYXCwBgb+|lVXfu0S67i)mXRb0Qc7mC8Cq++_uPHB!_zN5LH>No zy+^xPYXMM7p_C$oK$d05PN&0cHbW^z6h+i^-85BIg%AQEM8g1}swx1CF=%59tyYV= zu4%Pe2qCEJ8s{9XRtu#R)9IWfNt!{W6k2PRmzNJESZmQ*GoR0~*7DnfEiRtjWImrW znM}BJZj-(JExh*}mG>TF%%OxMx=E67=l+j;bp8qeT5F_~0DSP?W&Zf@*M^;Qjy%ti z`EpKO*J!P|bN>e}oVnEa@cr!@e7k#tD2njjbN-F@`TgJ9NGVZDv6L+#kC68Ex4CfU zW8ydl;G3;$oL=4F?X`7o?py~TNfIue-DGcn8vy4VVtDXRxcbTGc<-4`r=)4x_@R_) zvJgUOvf;f)2*LHQK0^)$1Dtd0?Qiq!%TKX#d=c})G44IuZG8Co?^|@&mguf6@#M*z zyAO8&7>!2Ae!u@1G0 zuw+>VK$@n^W;3h}q-lx};!yYF1^s>>JsOQrN^$PghkW-7*qFdmONy}HpLL{UUlRcNgdLh$-C?-Iu`N+~9j32B;A z6a{)b9`nje&tZ(A)9J9Vut2xlCC_u(i)~aCF)9msyPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m?d01m?e$8V@)00007bV*G`2i*h& z1pozZH=?2d0013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~0005k zNkl|&1w}v5QV?)u9^wiWO2zN?;!X9f(VM}0|-Iz=>(C0YhC1R?jj3AhA?w~ zySvIo=;mHr4MSC(`Rde};Q6nA_;icA0}x}x%m^Xi?xd6`rJU7LO1L}se|{pH?FLot z1EmzkairGTn`4Xsgb*+@+#L~N*(}IB&xi=BikTrIh)8cvDPd-q8369yN#=PbF3WLm zA}J+Aq(`)2fBX8G_wQbx`OxYqrI&NIo!p(AbI*Q^k?%i#Q)@+4skI^^Jy`8Jay%Y; z!X6$TdUP9Z%f+dXyZ5KGpJlaL5kfd?1gN!kPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m?d01m?e$8V@)00007bV*G`2i*h& z1p^2>tBu?M0013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~0007| zNkl{{EMy`3Dg}L}=TV7$YJ= zN(t{hUDqKZ09b43x{hmCuONAz1Mug6zoVK^1#3YSL=4tiLWo#v@ZJ+bpzD;qcW;vC zIWn8gNGV~A;mZ#Xm`oZB7-Km3eX z&S6ZCQ#XlMk7bl zG+5gU)^!~*MkbR9r>Cb#RaLZYJIHkB`XM5Ms&ezcZ*SuU6S Y4<++v5M~`38~^|S07*qoM6N<$g79v0J^%m! literal 0 HcmV?d00001 diff --git a/resources/mods/ChemiCraft/textures/blocks/cctable.png b/resources/mods/ChemiCraft/textures/blocks/cctable.png deleted file mode 100644 index 1a09c7a508f01f9a2952e06a66f0fb55192eace0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4126 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