OSDN Git Service

Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
authorponkotate <ponkotate@users.sourceforge.jp>
Sun, 7 Apr 2013 07:21:46 +0000 (16:21 +0900)
committerponkotate <ponkotate@users.sourceforge.jp>
Sun, 7 Apr 2013 07:21:46 +0000 (16:21 +0900)
Conflicts:
common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java

26 files changed:
common/pcc/chemicraft/ChemiCraft.java
common/pcc/chemicraft/base/ChemiCraftBase.java
common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java
common/pcc/chemicraft/base/ChemiCraftRegisterBlock.java
common/pcc/chemicraft/base/item/ItemOreSerarcher.java
common/pcc/chemicraft/base/ore/BlockAtomOres.java
common/pcc/chemicraft/base/ore/ItemAtomOres.java
common/pcc/chemicraft/core/ChemiCraftCore.java
common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java
common/pcc/chemicraft/core/block/BlockChemicalCraftingTable.java
common/pcc/chemicraft/core/block/BlockElectrolysisTable.java
common/pcc/chemicraft/core/block/BlockPyrolysisTable.java
common/pcc/chemicraft/core/block/BlockToolAndWeaponCraftingTable.java
common/pcc/chemicraft/core/item/ItemAtoms.java
common/pcc/chemicraft/util/ListHash.java
resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/AtomsOre.png [moved from resources/mods/ChemiCraft/textures/blocks/AtomsOre.png with 100% similarity]
resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/colors.txt [moved from resources/mods/ChemiCraft/textures/blocks/colors.txt with 100% similarity]
resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_Bottom.png [new file with mode: 0644]
resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ChemicalCombinationTable.png [new file with mode: 0644]
resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ChemicalCraftingTable.png [new file with mode: 0644]
resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ElectrolysisTable.png [new file with mode: 0644]
resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_PyrolysisTable.png [new file with mode: 0644]
resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_Side.png [new file with mode: 0644]
resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ToolAndWeaponCraftingTable.png [new file with mode: 0644]
resources/mods/ChemiCraft/textures/blocks/cctable.png [deleted file]

index a979673..b705318 100644 (file)
@@ -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";
index 693e33c..bce1fc9 100644 (file)
@@ -32,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 {
 
        /**
@@ -204,7 +204,7 @@ public class ChemiCraftBase extends ChemiCraft {
                        String lang = langoresItr.next();
                        ArrayList<String> 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(
index 05eaaf5..ad26de2 100644 (file)
@@ -50,7 +50,7 @@ public class ChemiCraftBaseAPI {
        /**
         * 鉱石の英語名リスト
         */
-       private ArrayList<String> atomOresEnglishList = new ArrayList<String>();
+       private ArrayList<String> atomOresAtomList = new ArrayList<String>();
 
        /**
         * 鉱石を追加します。
@@ -70,12 +70,14 @@ public class ChemiCraftBaseAPI {
                                                par5Frequency,
                                                par6PosY));
 
+               atomOresAtomList.add(par1Name);
+               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");
        }
 
@@ -129,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;
        }
 
 
@@ -146,8 +148,8 @@ public class ChemiCraftBaseAPI {
 
 
 
-       public String getAtomOreEnglishName(int index) {
-               return this.atomOresEnglishList.get(index);
+       public ArrayList<String> getAtomOresAtomName() {
+               return this.atomOresAtomList;
        }
 
 }
index 985f18e..d060008 100644 (file)
@@ -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().sizeElementsList("en_US"); 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().get("en_US", (i % 16) + ((i / 16) * 16))));
+                                       this.mod.apiBase.getAtomOresFormulas().get(this.mod.apiBase.getAtomOresAtomName().get(i)));
                }
        }
 
index 7a217ea..9893078 100644 (file)
@@ -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;
index aa1992d..c418de8 100644 (file)
@@ -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));
index 8f918bd..02cd35c 100644 (file)
@@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 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;
@@ -42,7 +43,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
@@ -61,8 +62,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));
                }
        }
 
index c0bc207..2fd602d 100644 (file)
@@ -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);
        }
+
 }
index 50c49c2..1c27401 100644 (file)
@@ -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() {
                this.api.getCompoundsName().createHash("en_US");
                this.registerItem = new ChemiCraftRegisterItem(this);
index 19d0ec9..1c23482 100644 (file)
@@ -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;
                }
index e396f45..bf43af0 100644 (file)
@@ -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;
                }
index 52fc2b7..8125789 100644 (file)
@@ -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;
                }
index 06944cd..769a113 100644 (file)
@@ -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;
                }
index 3f1ddd0..b4b6416 100644 (file)
@@ -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;
                }
index 072fd8d..da85e5e 100644 (file)
@@ -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
index 1b3e990..317c179 100644 (file)
@@ -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<K, E> {
                return this.elementsHash.get(par1Key).containsAll(par2Collection);
        }
 
-       public Set<java.util.Map.Entry<K, E>> entrySet() {
-               return this.entrySet();
+       public Set<Entry<K, ArrayList<E>>> entrySet() {
+               return this.elementsHash.entrySet();
        }
 
        public K getKeyList(int par1Index) {
diff --git a/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_Bottom.png b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_Bottom.png
new file mode 100644 (file)
index 0000000..0511838
Binary files /dev/null and b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_Bottom.png differ
diff --git a/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ChemicalCombinationTable.png b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ChemicalCombinationTable.png
new file mode 100644 (file)
index 0000000..ef00097
Binary files /dev/null and b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ChemicalCombinationTable.png differ
diff --git a/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ChemicalCraftingTable.png b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ChemicalCraftingTable.png
new file mode 100644 (file)
index 0000000..e771853
Binary files /dev/null and b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ChemicalCraftingTable.png differ
diff --git a/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ElectrolysisTable.png b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ElectrolysisTable.png
new file mode 100644 (file)
index 0000000..3596f9a
Binary files /dev/null and b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ElectrolysisTable.png differ
diff --git a/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_PyrolysisTable.png b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_PyrolysisTable.png
new file mode 100644 (file)
index 0000000..40f6310
Binary files /dev/null and b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_PyrolysisTable.png differ
diff --git a/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_Side.png b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_Side.png
new file mode 100644 (file)
index 0000000..744bf4e
Binary files /dev/null and b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_Side.png differ
diff --git a/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ToolAndWeaponCraftingTable.png b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ToolAndWeaponCraftingTable.png
new file mode 100644 (file)
index 0000000..8336229
Binary files /dev/null and b/resources/mods/ChemiCraft/textures/blocks/ChemiCraftTable_ToolAndWeaponCraftingTable.png differ
diff --git a/resources/mods/ChemiCraft/textures/blocks/cctable.png b/resources/mods/ChemiCraft/textures/blocks/cctable.png
deleted file mode 100644 (file)
index 1a09c7a..0000000
Binary files a/resources/mods/ChemiCraft/textures/blocks/cctable.png and /dev/null differ