・mcmod.info修正

[chemicraft/chemicraft.git] / common / pcc / chemicraft / core / block / BlockChemicalCombinationTable.java

diff --git a/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java b/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java
index 1d19a10..e5898a2 100644 (file)
--- a/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java
+++ b/common/pcc/chemicraft/core/block/BlockChemicalCombinationTable.java
@@ -1,21 +1,32 @@
 package pcc.chemicraft.core.block;
 
+import java.util.Random;
+
 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;
+
+       private final Random random = new Random();
+
+       public BlockChemicalCombinationTable(int par1, Material par2Material) {
+               super(par1, par2Material);
                this.setCreativeTab(ChemiCraftCore.creativeTabChemiCraft);
        }
 
+
+
        @Override
        public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) {
                par5EntityPlayer.openGui(ChemiCraftCore.instance, ChemiCraftCore.instance.guiChemicalCombinationTableID, par1World, par2, par3, par4);
@@ -25,8 +36,10 @@ public class BlockChemicalCombinationTable extends BlockContainer {
 
 
        @Override
-       public String getTextureFile() {
-               return ChemiCraft.BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE;
+       public void registerIcons(IconRegister par1IconRegister) {
+               this.topIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "ChemicalCombinationTable");
+               this.bottomIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Bottom");
+               this.globalIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Side");
        }
 
 
@@ -49,13 +62,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.bottomIcon;
                }else if(par1 == 1){
-                       return this.blockIndexInTexture;
+                       return this.topIcon;
                }else{
-                       return 16;
+                       return this.globalIcon;
                }
        }