1.5.2対応

[chemicraft/ChemiCraftNext.git] / common / pcc / chemicraft / base / ore / BlockAtomOres.java

diff --git a/common/pcc/chemicraft/base/ore/BlockAtomOres.java b/common/pcc/chemicraft/base/ore/BlockAtomOres.java
index 54b6613..5b6ea99 100644 (file)
--- a/common/pcc/chemicraft/base/ore/BlockAtomOres.java
+++ b/common/pcc/chemicraft/base/ore/BlockAtomOres.java
@@ -1,5 +1,6 @@
 package pcc.chemicraft.base.ore;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.block.Block;
@@ -10,7 +11,6 @@ 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;
 
@@ -21,27 +21,32 @@ import cpw.mods.fml.relauncher.SideOnly;
 public class BlockAtomOres extends Block {
 
        @SideOnly(Side.CLIENT)
-    private Icon[] iconArray;
+    private Icon[] icons;
 
        public BlockAtomOres(int id) {
                super(id, Material.rock);
-               this.setCreativeTab(ChemiCraftBase.instance.creativeTabAtomsOre);
+               this.setCreativeTab(ChemiCraftBase.instance.creativeTabAtomOres);
        }
 
        @Override
        @SideOnly(Side.CLIENT)
        public void registerIcons(IconRegister par1IconRegister) {
-               this.iconArray = new Icon[ChemiCraftCore.ATOMSNAME.length];
+               ArrayList<String> atomNames = ChemiCraftBaseAPI.instance().getAtomOresAtomName();
+               this.icons = new Icon[atomNames.size()];
 
-               for (int i = 0; i < this.iconArray.length; i++){
-                       this.iconArray[i] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + "WIP");
+               for (int i = 0; i < this.icons.length; i++){
+                       this.icons[i] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + atomNames.get(i));
                }
+
+               // WIP
+               this.icons[icons.length - 1] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + "WIP");
+               this.icons[icons.length - 2] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + "WIP");
        }
 
        @Override
-       public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
+       public Icon getIcon(int par1, int par2) {
                int var3 = this.blockID - ChemiCraftBase.instance.atomOresID[0];
-               return this.iconArray[par2 + var3 * 16];
+               return this.icons[par2 + var3 * 16];
        }
 
        @Override