X-Git-Url: http://git.sourceforge.jp/view?p=chemicraft%2Fchemicraft.git;a=blobdiff_plain;f=common%2Fpcc%2Fchemicraft%2Fbase%2Fore%2FBlockAtomOres.java;h=02cd35c5214904fe833978a7a384a5d723b28828;hp=96bb8bb278553beff214530f43606a28f36ce2a4;hb=91359869cc19297302b40ad13be82adab863ef8d;hpb=c3664633cb11674281eeeb38aee4f9bbd4ee0ff7

diff --git a/common/pcc/chemicraft/base/ore/BlockAtomOres.java b/common/pcc/chemicraft/base/ore/BlockAtomOres.java
index 96bb8bb..02cd35c 100644
--- a/common/pcc/chemicraft/base/ore/BlockAtomOres.java
+++ b/common/pcc/chemicraft/base/ore/BlockAtomOres.java
@@ -4,10 +4,14 @@ import java.util.List;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
 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;
@@ -18,17 +22,29 @@ import cpw.mods.fml.relauncher.SideOnly;
  */
 public class BlockAtomOres extends Block {
 
+	@SideOnly(Side.CLIENT)
+    private Icon[] iconArray;
+
 	public BlockAtomOres(int id) {
 		super(id, Material.rock);
 		this.setCreativeTab(ChemiCraftBase.instance.creativeTabAtomsOre);
 	}
 
-	/* 一時保留。詳しい事が決まらないと、変更が難しいため。 --WIP--
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerIcons(IconRegister par1IconRegister) {
+		this.iconArray = new Icon[ChemiCraftCore.ATOMSNAME.length];
+
+		for (int i = 0; i < this.iconArray.length; i++){
+			this.iconArray[i] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + "WIP");
+		}
+	}
+
 	@Override
 	public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
-		return (this.blockID - ChemiCraftBase.instance.atomOresID[0]) * 16 + par2;
+		int var3 = this.blockID - ChemiCraftBase.instance.atomOresID[0];
+		return this.iconArray[par2 + var3 * 16];
 	}
-	*/
 
 	@Override
 	public int damageDropped(int par1) {
@@ -46,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));
 		}
 	}