Gave dummy block a texture. Fixes #92

Esteemed-Innovation · Nov 2, 2014 · 5ccb9bd · 5ccb9bd
1 parent a464e0b
commit 5ccb9bd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 27 deletions.
diff --git a/src/main/java/flaxbeard/steamcraft/block/BlockDummy.java b/src/main/java/flaxbeard/steamcraft/block/BlockDummy.java
@@ -1,15 +1,12 @@
 package flaxbeard.steamcraft.block;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import flaxbeard.steamcraft.SteamcraftBlocks;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.particle.EffectRenderer;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
@@ -33,6 +30,11 @@ public boolean isOpaqueCube() {
         return false;
     }
 
+    @Override
+    public void registerBlockIcons(IIconRegister iconRegister) {
+        this.blockIcon = iconRegister.registerIcon("steamcraft:blockBrass");
+    }
+
     @Override
     public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) {
         return true;

diff --git a/src/main/java/flaxbeard/steamcraft/block/BlockSmasher.java b/src/main/java/flaxbeard/steamcraft/block/BlockSmasher.java
@@ -1,34 +1,31 @@
 package flaxbeard.steamcraft.block;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import flaxbeard.steamcraft.api.IWrenchable;
 import flaxbeard.steamcraft.api.block.BlockSteamTransporter;
 import flaxbeard.steamcraft.tile.TileEntitySmasher;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 
 public class BlockSmasher extends BlockSteamTransporter implements IWrenchable {
 
-    @SideOnly(Side.CLIENT)
-    public IIcon frontIcon;
-
-
     public BlockSmasher() {
         super(Material.iron);
 
     }
 
+    @Override
+    public int getRenderType() {
+        return -1;
+    }
+
     public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) {
         int l = MathHelper.floor_double((double) (entity.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
 
@@ -51,21 +48,6 @@ public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase e
 
     }
 
-    @Override
-    @SideOnly(Side.CLIENT)
-    public IIcon getIcon(int side, int meta) {
-        if (meta == 0) {
-            meta = 3;
-        }
-        return this.blockIcon;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerBlockIcons(IIconRegister register) {
-        this.blockIcon = register.registerIcon("steamcraft:blankTexture");
-    }
-
     public TileEntity createNewTileEntity(World var1, int var2) {
         return new TileEntitySmasher();