(・∀・)

diff --git a/common/pcc/chemicraft/ChemiCraft.java b/common/pcc/chemicraft/ChemiCraft.java
index 828960a..a979673 100644 (file)
--- a/common/pcc/chemicraft/ChemiCraft.java
+++ b/common/pcc/chemicraft/ChemiCraft.java
@@ -39,7 +39,7 @@ public abstract class ChemiCraft implements Runnable {
        /**
         * this is Textures Path on ChemiCraft.
         */
-       public static final String ITEM_TEXTURE = "ChemiCraft:";
+       public static final String TEXTURE = "ChemiCraft:";
        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";

diff --git a/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java b/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java
index 2b522b5..ada8ec0 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java
+++ b/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java
@@ -81,7 +81,7 @@ public class ItemAtomsGrenade extends Item {
 
        @Override
        public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.ITEM_TEXTURE + "ItemAtomsGrenade");
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ItemAtomsGrenade");
        }
 
 }

diff --git a/common/pcc/chemicraft/base/item/ItemBlackSmoke.java b/common/pcc/chemicraft/base/item/ItemBlackSmoke.java
index a3b9db5..3ac27e0 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemBlackSmoke.java
+++ b/common/pcc/chemicraft/base/item/ItemBlackSmoke.java
@@ -56,7 +56,7 @@ public class ItemBlackSmoke extends Item {
 
        @Override
        public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.ITEM_TEXTURE + "ItemBlackSmoke");
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ItemBlackSmoke");
        }
 
 }

diff --git a/common/pcc/chemicraft/base/item/ItemOreSerarcher.java b/common/pcc/chemicraft/base/item/ItemOreSerarcher.java
index ca38707..aa1992d 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemOreSerarcher.java
+++ b/common/pcc/chemicraft/base/item/ItemOreSerarcher.java
@@ -67,7 +67,7 @@ public class ItemOreSerarcher extends Item {
 
        @Override
        public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.ITEM_TEXTURE + "ItemOreSearcher");
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ItemOreSearcher");
        }
 
 }

diff --git a/common/pcc/chemicraft/base/item/ItemRadiationBallet.java b/common/pcc/chemicraft/base/item/ItemRadiationBallet.java
index 1af99ed..732c514 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemRadiationBallet.java
+++ b/common/pcc/chemicraft/base/item/ItemRadiationBallet.java
@@ -19,6 +19,6 @@ public class ItemRadiationBallet extends Item {
 
        @Override
        public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.ITEM_TEXTURE + "ItemRadiationBullet");
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ItemRadiationBullet");
        }
 }

diff --git a/common/pcc/chemicraft/base/item/ItemRadiationGun.java b/common/pcc/chemicraft/base/item/ItemRadiationGun.java
index ffa02ab..8b7d9d1 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemRadiationGun.java
+++ b/common/pcc/chemicraft/base/item/ItemRadiationGun.java
@@ -2,6 +2,7 @@ package pcc.chemicraft.base.item;
 
 import java.util.ArrayList;
 
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;
@@ -31,8 +32,8 @@ public class ItemRadiationGun extends Item {
        }
 
        @Override
-       public String getTextureFile() {
-               return ChemiCraft.ITEM_TEXTURE;
+       public void updateIcons(IconRegister par1IconRegister){
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ItemRadiationGun");
        }
 
        @Override
@@ -44,8 +45,8 @@ public class ItemRadiationGun extends Item {
                if (this.delay <= 0) {
                        if (!isCreative) {
                                this.field_00001(par1ItemStack, par2World, par3EntityPlayer);
-                               if (par3EntityPlayer.inventory.hasItem(ChemiCraftBase.instance.itemRadiationBallet.shiftedIndex)) {
-                                       par3EntityPlayer.inventory.consumeInventoryItem(ChemiCraftBase.instance.itemRadiationBallet.shiftedIndex);
+                               if (par3EntityPlayer.inventory.hasItem(ChemiCraftBase.instance.itemRadiationBallet.itemID)) {
+                                       par3EntityPlayer.inventory.consumeInventoryItem(ChemiCraftBase.instance.itemRadiationBallet.itemID);
                                        par2World.playSound(par3EntityPlayer.posX,
                                                        par3EntityPlayer.posY,
                                                        par3EntityPlayer.posZ,

diff --git a/common/pcc/chemicraft/base/ore/BlockAtomOres.java b/common/pcc/chemicraft/base/ore/BlockAtomOres.java
index 1a38df1..96bb8bb 100644 (file)
--- a/common/pcc/chemicraft/base/ore/BlockAtomOres.java
+++ b/common/pcc/chemicraft/base/ore/BlockAtomOres.java
@@ -6,6 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.Icon;
 import pcc.chemicraft.base.ChemiCraftBase;
 import pcc.chemicraft.core.ChemiCraftCore;
 import cpw.mods.fml.relauncher.Side;
@@ -22,10 +23,12 @@ public class BlockAtomOres extends Block {
                this.setCreativeTab(ChemiCraftBase.instance.creativeTabAtomsOre);
        }
 
+       /* 一時保留。詳しい事が決まらないと、変更が難しいため。 --WIP--
        @Override
-       public int getBlockTextureFromSideAndMetadata(int par1, int par2) {
+       public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
                return (this.blockID - ChemiCraftBase.instance.atomOresID[0]) * 16 + par2;
        }
+       */
 
        @Override
        public int damageDropped(int par1) {
@@ -48,9 +51,4 @@ public class BlockAtomOres extends Block {
                }
        }
 
-       @Override
-       public String getTextureFile() {
-               return ChemiCraftCore.instance.BLOCK_ATOMS_ORE_TEXTURE;
-       }
-
 }

diff --git a/common/pcc/chemicraft/base/ore/ItemAtomOres.java b/common/pcc/chemicraft/base/ore/ItemAtomOres.java
index 07330d8..c0bc207 100644 (file)
--- a/common/pcc/chemicraft/base/ore/ItemAtomOres.java
+++ b/common/pcc/chemicraft/base/ore/ItemAtomOres.java
@@ -3,6 +3,7 @@ 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;
@@ -19,11 +20,13 @@ public class ItemAtomOres extends ItemBlock {
                this.setHasSubtypes(true);
        }
 
+       /* 一時保留。詳しい仕様が決まらないと変更が難しいため。 --WIP--
        @Override
        @SideOnly(Side.CLIENT)
-       public int getIconFromDamage(int par1) {
+       public Icon getIconFromDamage(int par1) {
                return ChemiCraftBase.instance.blockAtomOres[0].getBlockTextureFromSideAndMetadata(2, BlockAtomOres.getBlockFromDye(par1));
        }
+       */
 
        @Override
        public int getMetadata(int par1) {
@@ -31,7 +34,7 @@ public class ItemAtomOres extends ItemBlock {
        }
 
        @Override
-       public String getItemNameIS(ItemStack par1ItemStack) {
-               return super.getItemName() + "." + ItemDye.dyeColorNames[BlockAtomOres.getBlockFromDye(par1ItemStack.getItemDamage())];
+       public String getUnlocalizedName(ItemStack par1ItemStack) {
+               return super.getUnlocalizedName() + "." + ItemDye.dyeColorNames[BlockAtomOres.getBlockFromDye(par1ItemStack.getItemDamage())];
        }
 }

diff --git a/common/pcc/chemicraft/base/render/RenderAtomsGrenade.java b/common/pcc/chemicraft/base/render/RenderAtomsGrenade.java
index 379c39a..57edbd3 100644 (file)
--- a/common/pcc/chemicraft/base/render/RenderAtomsGrenade.java
+++ b/common/pcc/chemicraft/base/render/RenderAtomsGrenade.java
@@ -32,7 +32,7 @@ public class RenderAtomsGrenade extends Render {
                float var10 = this.field_77002_a;
                GL11.glScalef(var10 / 1.0F, var10 / 1.0F, var10 / 1.0F);
                byte var11 = 1;
-               this.loadTexture(ChemiCraftCore.instance.ITEM_TEXTURE);
+               this.loadTexture(ChemiCraftCore.instance.TEXTURE);
                Tessellator var12 = Tessellator.instance;
                float var13 = (float)(var11 % 16 * 16 + 0) / 256.0F;
                float var14 = (float)(var11 % 16 * 16 + 16) / 256.0F;

diff --git a/common/pcc/chemicraft/core/ChemiCraftCore.java b/common/pcc/chemicraft/core/ChemiCraftCore.java
index 3f9044f..9ade64f 100644 (file)
--- a/common/pcc/chemicraft/core/ChemiCraftCore.java
+++ b/common/pcc/chemicraft/core/ChemiCraftCore.java
@@ -5,17 +5,14 @@ import java.util.Iterator;
 import java.util.List;
 
 import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.EntityDamageSource;
-import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.common.Configuration;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.Property;
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.ChemiCraftConfiguration;
@@ -307,8 +304,12 @@ public class ChemiCraftCore extends ChemiCraft{
        public static EntityDamageSource getRadiationDamageSource(Entity par1Entity){
                return new EntityDamageSource("radiation", par1Entity){
                        @Override
-                       public String getDeathMessage(EntityPlayer par1EntityPlayer) {
-                               return par1EntityPlayer.username + " is dead by radiation.";
+                       public String getDeathMessage(EntityLiving par1EntityLiving) {
+                               if (par1EntityLiving instanceof EntityPlayer) {
+                                       return ((EntityPlayer) (par1EntityLiving)).username + " is dead by radiation.";
+                               } else {
+                                       return par1EntityLiving.getEntityName() + " is dead by radiation.";
+                               }
                        }
                };
        }

diff --git a/common/pcc/chemicraft/core/ChemiCraftRegisterBlock.java b/common/pcc/chemicraft/core/ChemiCraftRegisterBlock.java
index 4b62438..51068a0 100644 (file)
--- a/common/pcc/chemicraft/core/ChemiCraftRegisterBlock.java
+++ b/common/pcc/chemicraft/core/ChemiCraftRegisterBlock.java
@@ -26,29 +26,29 @@ public class ChemiCraftRegisterBlock extends ChemiCraftCoreRegister {
                                setHardness(2.0F).
                                setResistance(0.0F).
                                setStepSound(Block.soundStoneFootstep).
-                               setBlockName("PyrolysisTable");
+                               setUnlocalizedName("PyrolysisTable");
                this.mod.blockElectrolysisTable = new BlockElectrolysisTable(this.mod.electrolysisTableID, 1, Material.ground).
                                setHardness(2.0F).
                                setResistance(0.0F).
                                setStepSound(Block.soundStoneFootstep).
-                               setBlockName("ElectrolysisTable");
+                               setUnlocalizedName("ElectrolysisTable");
                this.mod.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.mod.chemicalConbinationTableID, 2, Material.ground).
                                setHardness(2.0F).
                                setResistance(0.0F).
                                setStepSound(Block.soundStoneFootstep).
-                               setBlockName("ChemicalCombinationTable");
+                               setUnlocalizedName("ChemicalCombinationTable");
                /*
                this.mod.blockToolAndWeaponCraftingTable = new BlockToolAndWeaponCraftingTable(this.mod.toolAndWeaponCraftingTableID, 3, Material.ground).
                                setHardness(2.0F).
                                setResistance(0.0F).
                                setStepSound(Block.soundStoneFootstep).
-                               setBlockName("ToolAndWeaponCraftingTable");
+                               setUnlocalizedName("ToolAndWeaponCraftingTable");
                */
                this.mod.blockChemicalCraftingTable = new BlockChemicalCraftingTable(this.mod.chemicalCraftingTableID, 4, Material.ground).
                                setHardness(2.0F).
                                setResistance(0.0F).
                                setStepSound(Block.soundStoneFootstep).
-                               setBlockName("ChemicalCraftingTable");
+                               setUnlocalizedName("ChemicalCraftingTable");
 
                //Minecraftに登録
                GameRegistry.registerBlock(this.mod.blockPyrolysisTable, "BlockPyrolysisTable");

diff --git a/common/pcc/chemicraft/core/ChemiCraftRegisterItem.java b/common/pcc/chemicraft/core/ChemiCraftRegisterItem.java
index 1106be2..4106ec7 100644 (file)
--- a/common/pcc/chemicraft/core/ChemiCraftRegisterItem.java
+++ b/common/pcc/chemicraft/core/ChemiCraftRegisterItem.java
@@ -21,15 +21,15 @@ public class ChemiCraftRegisterItem extends ChemiCraftCoreRegister {
        @Override
        public void start() {
                //Itemを変数に代入
-               this.mod.itemAtoms = new ItemAtoms(this.mod.atomsID).setItemName("atoms");
-               this.mod.itemCompounds = new ItemCompounds(this.mod.compoundsID).setItemName("compounds");
-               this.mod.itemGasCollectingBottle = new ItemGasCollectingBottle(this.mod.gasCollectingBottleID).setItemName("gasCollectingBottle").setIconIndex(0);
-               this.mod.itemChemicalCells = new ItemChemiCell(this.mod.chemicalCellsID).setItemName("chemiCell").setIconIndex(3);
+               this.mod.itemAtoms = new ItemAtoms(this.mod.atomsID).setUnlocalizedName("atoms");
+               this.mod.itemCompounds = new ItemCompounds(this.mod.compoundsID).setUnlocalizedName("compounds");
+               this.mod.itemGasCollectingBottle = new ItemGasCollectingBottle(this.mod.gasCollectingBottleID).setUnlocalizedName("gasCollectingBottle");
+               this.mod.itemChemicalCells = new ItemChemiCell(this.mod.chemicalCellsID).setUnlocalizedName("chemiCell");
                this.mod.itemPear = new OldItemFood(this.mod.pearID, 4, 0.4F, false){
                        public int getColorFromItemStack(ItemStack par1ItemStack,int par2){
                                return 0x66FF66;
                                }
-                       }.setIconIndex(11).setCreativeTab(CreativeTabs.tabFood).setItemName("Pear");
+                       }.setCreativeTab(CreativeTabs.tabFood).setUnlocalizedName("Pear");
 
                        //名前登録&Minecraftに登録
                this.mod.nameAuxiliary.addName(this.mod.itemAtoms, ChemiCraftCore.ATOMSNAME);

diff --git a/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java b/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java
index 1d19a10..8e1b0e2 100644 (file)
--- a/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java
+++ b/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java
@@ -2,17 +2,22 @@ package pcc.chemicraft.core.block;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
 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;
 
 public class BlockChemicalCombinationTable extends BlockContainer {
 
-       public BlockChemicalCombinationTable(int par1, int par2, Material par3Material) {
-               super(par1, par2, par3Material);
+       public Icon topIcon;
+       public Icon bottomIcon;
+       public Icon globalIcon;
+
+       public BlockChemicalCombinationTable(int par1, Material par2Material) {
+               super(par1, par2Material);
                this.setCreativeTab(ChemiCraftCore.creativeTabChemiCraft);
        }
 
@@ -25,8 +30,7 @@ public class BlockChemicalCombinationTable extends BlockContainer {
 
 
        @Override
-       public String getTextureFile() {
-               return ChemiCraft.BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE;
+       public void registerIcons(IconRegister par1IconRegister) {
        }
 
 
@@ -49,13 +53,13 @@ public class BlockChemicalCombinationTable extends BlockContainer {
 
 
        @Override
-       public int getBlockTextureFromSide(int par1) {
+       public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
                if(par1 == 0){
-                       return 17;
+                       return this.topIcon;
                }else if(par1 == 1){
-                       return this.blockIndexInTexture;
+                       return this.bottomIcon;
                }else{
-                       return 16;
+                       return this.globalIcon;
                }
        }
 

diff --git a/common/pcc/chemicraft/core/client/ClientProxy.java b/common/pcc/chemicraft/core/client/ClientProxy.java
index a296207..a46334e 100644 (file)
--- a/common/pcc/chemicraft/core/client/ClientProxy.java
+++ b/common/pcc/chemicraft/core/client/ClientProxy.java
@@ -30,7 +30,7 @@ public class ClientProxy extends CommonProxy {
                MinecraftForgeClient.preloadTexture(ChemiCraft.BLOCK_ATOMS_ORE_TEXTURE);
                MinecraftForgeClient.preloadTexture(ChemiCraft.ITEM_ATOMS_TEXTURE);
                MinecraftForgeClient.preloadTexture(ChemiCraft.ITEM_COMPOUNDS_TEXTURE);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.ITEM_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.TEXTURE);
                MinecraftForgeClient.preloadTexture(ChemiCraft.GUI_PYROLYSIS_TEXTURE);
                MinecraftForgeClient.preloadTexture(ChemiCraft.GUI_ELECTROLYSIS_TEXTURE);
                MinecraftForgeClient.preloadTexture(ChemiCraft.GUI_CHEMICALCOMBINATION_TEXTURE);

diff --git a/common/pcc/chemicraft/core/item/ItemChemiCell.java b/common/pcc/chemicraft/core/item/ItemChemiCell.java
index 7e93c5c..25982b8 100644 (file)
--- a/common/pcc/chemicraft/core/item/ItemChemiCell.java
+++ b/common/pcc/chemicraft/core/item/ItemChemiCell.java
@@ -24,7 +24,7 @@ public class ItemChemiCell extends Item
 
        @Override
        public String getTextureFile(){
-               return ChemiCraft.ITEM_TEXTURE;
+               return ChemiCraft.TEXTURE;
        }
 
 }

diff --git a/common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java b/common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java
index 4c7dd3a..1417bac 100644 (file)
--- a/common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java
+++ b/common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java
@@ -94,7 +94,7 @@ public class ItemGasCollectingBottle extends ItemAtomInfoContainer
        @Override
        public String getTextureFile()
        {
-               return ChemiCraft.ITEM_TEXTURE;
+               return ChemiCraft.TEXTURE;
        }
 
 }

diff --git a/仕様書/1.5からのTextureの仕様変更について.odt b/仕様書/1.5からのTextureの仕様変更について.odt
index 2c1e3f7..e7c6fca 100644 (file)
Binary files a/仕様書/1.5からのTextureの仕様変更について.odt and b/仕様書/1.5からのTextureの仕様変更について.odt differ