修正

[chemicraft/ChemiCraftNext.git] / common / pcc / chemicraft / block / BlockElectrolysisTable.java

diff --git a/common/pcc/chemicraft/block/BlockElectrolysisTable.java b/common/pcc/chemicraft/block/BlockElectrolysisTable.java
index 24dfc54..ce677ee 100644 (file)
--- a/common/pcc/chemicraft/block/BlockElectrolysisTable.java
+++ b/common/pcc/chemicraft/block/BlockElectrolysisTable.java
@@ -6,25 +6,51 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.debug.DebugTick;
 import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
 
 public class BlockElectrolysisTable extends BlockContainer
 {
 
-       public BlockElectrolysisTable(int par1, int par2, Material par3Material) {
+       public BlockElectrolysisTable(int par1, int par2, Material par3Material)
+       {
                super(par1, par2, par3Material);
-               this.setCreativeTab(ChemiCraft.creativeTab);
+               this.setCreativeTab(ChemiCraft.creativeTabChemiCraft);
        }
 
        @Override
-       public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9){
+       public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9)
+       {
                par5EntityPlayer.openGui(ChemiCraft.instance, ChemiCraft.instance.guiElectrolysisTableID, par1World, par2, par3, par4);
                return true;
        }
 
        @Override
-       public String getTextureFile(){
-               return ChemiCraft.instance.BLOCK_CHEMICALCRAFTING_TABLE_TEXTURE;
+       public String getTextureFile()
+       {
+               return ChemiCraft.instance.BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE;
+       }
+
+       @Override
+       public void breakBlock(World par1World, int par2, int par3, int par4, int par5, int par6)
+       {
+               TileEntity tileentity = par1World.getBlockTileEntity(par2, par3, par4);
+               if (tileentity != null) {
+                       DebugTick.removeDebugData("ElectrolysisTable" + "(x:" + tileentity.xCoord + " y:" + tileentity.yCoord + " z:" + tileentity.zCoord + ")");
+               }
+               super.breakBlock(par1World, par2, par3, par4, par5, par6);
+       }
+
+       @Override
+       public int getBlockTextureFromSide(int par1)
+       {
+               if (par1 == 0) {
+                       return 17;
+               } else if (par1 == 1) {
+                       return this.blockIndexInTexture;
+               } else {
+                       return 16;
+               }
        }
 
        @Override