1.5.2対応

diff --git a/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java b/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
index f900572..7d010b9 100644 (file)
--- a/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
+++ b/common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
@@ -1,5 +1,7 @@
 package pcc.chemicraft.base;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.item.Item;
 import pcc.chemicraft.ChemiCraft;
@@ -33,8 +35,9 @@ public class ChemiCraftRegisterItem extends ChemiCraftBaseRegister {
                this.mod.itemRadiationBallet = new ItemRadiationBullet(this.mod.radiationBalletID).setUnlocalizedName("RadiationBullet");
                this.mod.itemRaditionGunDataChip = new Item(this.mod.raditionGunDataChipID) {
                        @Override
-                       public void updateIcons(IconRegister par1IconRegister) {
-                               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "RaditionGunDataChip");
+                       @SideOnly(Side.CLIENT)
+                   public void registerIcons(IconRegister par1IconRegister) {
+                               this.itemIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "RaditionGunDataChip");
                        }
                }.setUnlocalizedName("RaditionGunDataChip");
 

diff --git a/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java b/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java
index e6d78db..1b41542 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java
+++ b/common/pcc/chemicraft/base/item/ItemAtomsGrenade.java
@@ -2,6 +2,9 @@ package pcc.chemicraft.base.item;
 
 import java.util.List;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -79,8 +82,9 @@ public class ItemAtomsGrenade extends Item {
        }
 
        @Override
-       public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "atoms_grenade");
+       @SideOnly(Side.CLIENT)
+    public void registerIcons(IconRegister par1IconRegister){
+               this.itemIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "atoms_grenade");
        }
 
 }

diff --git a/common/pcc/chemicraft/base/item/ItemBlackSmoke.java b/common/pcc/chemicraft/base/item/ItemBlackSmoke.java
index 1d58522..b7fe9fe 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemBlackSmoke.java
+++ b/common/pcc/chemicraft/base/item/ItemBlackSmoke.java
@@ -2,6 +2,9 @@ package pcc.chemicraft.base.item;
 
 import java.util.HashMap;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.monster.EntityMob;
 import net.minecraft.entity.player.EntityPlayer;
@@ -55,8 +58,9 @@ public class ItemBlackSmoke extends Item {
        }
 
        @Override
-       public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "black_smoke");
+       @SideOnly(Side.CLIENT)
+    public void registerIcons(IconRegister par1IconRegister){
+               this.itemIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "black_smoke");
        }
 
 }

diff --git a/common/pcc/chemicraft/base/item/ItemDust.java b/common/pcc/chemicraft/base/item/ItemDust.java
index 59a5056..cc7d309 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemDust.java
+++ b/common/pcc/chemicraft/base/item/ItemDust.java
@@ -1,5 +1,7 @@
 package pcc.chemicraft.base.item;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -35,8 +37,9 @@ public class ItemDust extends Item {
        }
 
        @Override
-       public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon("egg");
+       @SideOnly(Side.CLIENT)
+    public void registerIcons(IconRegister par1IconRegister){
+               this.itemIcon = par1IconRegister.registerIcon("egg");
        }
 
 }

diff --git a/common/pcc/chemicraft/base/item/ItemOreSerarcher.java b/common/pcc/chemicraft/base/item/ItemOreSerarcher.java
index f0a928d..5694e9e 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemOreSerarcher.java
+++ b/common/pcc/chemicraft/base/item/ItemOreSerarcher.java
@@ -1,5 +1,7 @@
 package pcc.chemicraft.base.item;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -65,8 +67,9 @@ public class ItemOreSerarcher extends Item {
        }
 
        @Override
-       public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ore_searcher");
+       @SideOnly(Side.CLIENT)
+    public void registerIcons(IconRegister par1IconRegister){
+               this.itemIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "ore_searcher");
        }
 
 }

diff --git a/common/pcc/chemicraft/base/item/ItemRadiationBullet.java b/common/pcc/chemicraft/base/item/ItemRadiationBullet.java
index 5d0dd59..a012b90 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemRadiationBullet.java
+++ b/common/pcc/chemicraft/base/item/ItemRadiationBullet.java
@@ -1,5 +1,7 @@
 package pcc.chemicraft.base.item;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.item.Item;
 import pcc.chemicraft.ChemiCraft;
@@ -18,7 +20,8 @@ public class ItemRadiationBullet extends Item {
        }
 
        @Override
-       public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "radiation_bullet");
+       @SideOnly(Side.CLIENT)
+    public void registerIcons(IconRegister par1IconRegister){
+               this.itemIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "radiation_bullet");
        }
 }

diff --git a/common/pcc/chemicraft/base/item/ItemRadiationGun.java b/common/pcc/chemicraft/base/item/ItemRadiationGun.java
index afa7475..60a9e5f 100644 (file)
--- a/common/pcc/chemicraft/base/item/ItemRadiationGun.java
+++ b/common/pcc/chemicraft/base/item/ItemRadiationGun.java
@@ -2,6 +2,9 @@ package pcc.chemicraft.base.item;
 
 import java.util.ArrayList;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
@@ -32,8 +35,9 @@ public class ItemRadiationGun extends Item {
        }
 
        @Override
-       public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "radiation_gun");
+       @SideOnly(Side.CLIENT)
+    public void registerIcons(IconRegister par1IconRegister){
+               this.itemIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "radiation_gun");
        }
 
        @Override

diff --git a/common/pcc/chemicraft/base/ore/BlockAtomOres.java b/common/pcc/chemicraft/base/ore/BlockAtomOres.java
index 3431ab2..5b6ea99 100644 (file)
--- a/common/pcc/chemicraft/base/ore/BlockAtomOres.java
+++ b/common/pcc/chemicraft/base/ore/BlockAtomOres.java
@@ -44,7 +44,7 @@ public class BlockAtomOres extends Block {
        }
 
        @Override
-       public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
+       public Icon getIcon(int par1, int par2) {
                int var3 = this.blockID - ChemiCraftBase.instance.atomOresID[0];
                return this.icons[par2 + var3 * 16];
        }

diff --git a/common/pcc/chemicraft/base/ore/ItemAtomIngots.java b/common/pcc/chemicraft/base/ore/ItemAtomIngots.java
index 17d6f74..c617d56 100644 (file)
--- a/common/pcc/chemicraft/base/ore/ItemAtomIngots.java
+++ b/common/pcc/chemicraft/base/ore/ItemAtomIngots.java
@@ -57,7 +57,7 @@ public class ItemAtomIngots extends Item {
 
        @Override
        @SideOnly(Side.CLIENT)
-       public void updateIcons(IconRegister par1IconRegister) {
+    public void registerIcons(IconRegister par1IconRegister) {
                ArrayList<String> atomNames = ChemiCraftBaseAPI.instance().getAtomOresAtomName();
                this.icons = new Icon[atomNames.size()];
 

diff --git a/common/pcc/chemicraft/base/ore/ItemAtomOres.java b/common/pcc/chemicraft/base/ore/ItemAtomOres.java
index 5711a85..7bf86f6 100644 (file)
--- a/common/pcc/chemicraft/base/ore/ItemAtomOres.java
+++ b/common/pcc/chemicraft/base/ore/ItemAtomOres.java
@@ -23,7 +23,7 @@ public class ItemAtomOres extends ItemBlock {
        @Override
        @SideOnly(Side.CLIENT)
        public Icon getIconFromDamage(int par1) {
-               return ChemiCraftBase.instance.blockAtomOres[0].getBlockTextureFromSideAndMetadata(2, BlockAtomOres.getBlockFromDye(par1));
+               return ((BlockAtomOres) ChemiCraftBase.instance.blockAtomOres[0]).getIcon(2, BlockAtomOres.getBlockFromDye(par1));
        }
 
        @Override

diff --git a/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java b/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java
index e5898a2..527db25 100644 (file)
--- a/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java
+++ b/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java
@@ -62,7 +62,7 @@ public class BlockChemicalCombinationTable extends BlockContainer {
 
 
        @Override
-       public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
+       public Icon getIcon(int par1, int par2) {
                if(par1 == 0){
                        return this.bottomIcon;
                }else if(par1 == 1){

diff --git a/common/pcc/chemicraft/core/block/BlockChemicalCraftingTable.java b/common/pcc/chemicraft/core/block/BlockChemicalCraftingTable.java
index bf43af0..7dea390 100644 (file)
--- a/common/pcc/chemicraft/core/block/BlockChemicalCraftingTable.java
+++ b/common/pcc/chemicraft/core/block/BlockChemicalCraftingTable.java
@@ -40,7 +40,7 @@ public class BlockChemicalCraftingTable extends BlockContainer {
 
 
        @Override
-       public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
+       public Icon getIcon(int par1, int par2) {
                if(par1 == 0){
                        return this.bottomIcon;
                }else if(par1 == 1){

diff --git a/common/pcc/chemicraft/core/block/BlockElectrolysisTable.java b/common/pcc/chemicraft/core/block/BlockElectrolysisTable.java
index 8125789..2128a48 100644 (file)
--- a/common/pcc/chemicraft/core/block/BlockElectrolysisTable.java
+++ b/common/pcc/chemicraft/core/block/BlockElectrolysisTable.java
@@ -45,7 +45,7 @@ public class BlockElectrolysisTable extends BlockContainer {
        }
 
        @Override
-       public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
+       public Icon getIcon(int par1, int par2) {
                if(par1 == 0){
                        return this.bottomIcon;
                }else if(par1 == 1){

diff --git a/common/pcc/chemicraft/core/block/BlockPyrolysisTable.java b/common/pcc/chemicraft/core/block/BlockPyrolysisTable.java
index 769a113..4bf24df 100644 (file)
--- a/common/pcc/chemicraft/core/block/BlockPyrolysisTable.java
+++ b/common/pcc/chemicraft/core/block/BlockPyrolysisTable.java
@@ -54,7 +54,7 @@ public class BlockPyrolysisTable extends BlockContainer {
 
 
        @Override
-       public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
+       public Icon getIcon(int par1, int par2) {
                if(par1 == 0){
                        return this.bottomIcon;
                }else if(par1 == 1){

diff --git a/common/pcc/chemicraft/core/block/BlockToolAndWeaponCraftingTable.java b/common/pcc/chemicraft/core/block/BlockToolAndWeaponCraftingTable.java
index b4b6416..9b7aa95 100644 (file)
--- a/common/pcc/chemicraft/core/block/BlockToolAndWeaponCraftingTable.java
+++ b/common/pcc/chemicraft/core/block/BlockToolAndWeaponCraftingTable.java
@@ -38,8 +38,8 @@ public class BlockToolAndWeaponCraftingTable extends BlockContainer {
 
 
 
-       @Override
-       public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
+       
+       public Icon getIcon(int par1, int par2) {
                if(par1 == 0){
                        return this.bottomIcon;
                }else if(par1 == 1){

diff --git a/common/pcc/chemicraft/core/item/ItemAtoms.java b/common/pcc/chemicraft/core/item/ItemAtoms.java
index 80eb6e2..a916952 100644 (file)
--- a/common/pcc/chemicraft/core/item/ItemAtoms.java
+++ b/common/pcc/chemicraft/core/item/ItemAtoms.java
@@ -90,7 +90,7 @@ public class ItemAtoms extends Item {
 
        @Override
        @SideOnly(Side.CLIENT)
-       public void updateIcons(IconRegister par1IconRegister) {
+    public void registerIcons(IconRegister par1IconRegister){
                this.icons = new Icon[ChemiCraftCore.instance.ATOMSNAME.length];
 
                for (int i = 0; i < ChemiCraftCore.instance.ATOMSNAME.length; i++) {

diff --git a/common/pcc/chemicraft/core/item/ItemChemicalCell.java b/common/pcc/chemicraft/core/item/ItemChemicalCell.java
index 516a672..1035036 100644 (file)
--- a/common/pcc/chemicraft/core/item/ItemChemicalCell.java
+++ b/common/pcc/chemicraft/core/item/ItemChemicalCell.java
@@ -1,5 +1,7 @@
 package pcc.chemicraft.core.item;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.item.Item;
 import pcc.chemicraft.ChemiCraft;
@@ -19,8 +21,9 @@ public class ItemChemicalCell extends Item
 
 
        @Override
-       public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "chemical_cell");
+       @SideOnly(Side.CLIENT)
+    public void registerIcons(IconRegister par1IconRegister){
+               this.itemIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "chemical_cell");
        }
 
 }

diff --git a/common/pcc/chemicraft/core/item/ItemCompounds.java b/common/pcc/chemicraft/core/item/ItemCompounds.java
index 567bdcb..e7b783d 100644 (file)
--- a/common/pcc/chemicraft/core/item/ItemCompounds.java
+++ b/common/pcc/chemicraft/core/item/ItemCompounds.java
@@ -94,7 +94,7 @@ public class ItemCompounds extends Item {
 
        @Override
        @SideOnly(Side.CLIENT)
-       public void updateIcons(IconRegister par1IconRegister) {
+    public void registerIcons(IconRegister par1IconRegister) {
                ArrayList<String> textures = ChemiCraftAPI.getCompoundsTexture();
                this.icons = new Icon[textures.size()];
                for (int i = 0; i < textures.size(); i++) {

diff --git a/common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java b/common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java
index b1b10cf..b91d1b6 100644 (file)
--- a/common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java
+++ b/common/pcc/chemicraft/core/item/ItemGasCollectingBottle.java
@@ -1,5 +1,7 @@
 package pcc.chemicraft.core.item;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFire;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -93,8 +95,9 @@ public class ItemGasCollectingBottle extends ItemAtomInfoContainer
        }
 
        @Override
-       public void updateIcons(IconRegister par1IconRegister){
-               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "gas_collecting_bottle");
+       @SideOnly(Side.CLIENT)
+    public void registerIcons(IconRegister par1IconRegister){
+               this.itemIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "gas_collecting_bottle");
        }
 
 }

diff --git a/common/pcc/chemicraft/core/other/ChunkProviderChemical.java b/common/pcc/chemicraft/core/other/ChunkProviderChemical.java
index 57c9358..577b39b 100644 (file)
--- a/common/pcc/chemicraft/core/other/ChunkProviderChemical.java
+++ b/common/pcc/chemicraft/core/other/ChunkProviderChemical.java
@@ -681,4 +681,11 @@ public class ChunkProviderChemical implements IChunkProvider
        public boolean unloadQueuedChunks() {
                return false;
        }
+
+       @Override
+       public void func_104112_b() {
+               // TODO Auto-generated method stub
+               
+       }
+
 }