From c82dc1f1486ea4b55ee7dd965d08214950a37dfe Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 15 Jul 2015 17:13:23 +0200 Subject: [PATCH] Removed Copy-Pasta Unuseds --- src/main/java/ellpeck/actuallyadditions/PLANNED.txt | 4 ---- .../actuallyadditions/blocks/BlockXPSolidifier.java | 13 ++----------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/PLANNED.txt b/src/main/java/ellpeck/actuallyadditions/PLANNED.txt index 4fecdc3d0..51ac53d5c 100644 --- a/src/main/java/ellpeck/actuallyadditions/PLANNED.txt +++ b/src/main/java/ellpeck/actuallyadditions/PLANNED.txt @@ -91,10 +91,6 @@ -Customizable with Items in Concrete Mixer -(eg. Redstone->Speed Glowstone->Light etc.) --XP Solidifier - -Block that creates Solidified Experience from Player's Levels - -Has a GUI with Buttons - -Alarm -Gets triggered when Mobs are in the Area -Configurable Range diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java index 8235e6c7d..ab8409b32 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java @@ -30,16 +30,14 @@ import java.util.List; public class BlockXPSolidifier extends BlockContainerBase implements INameableItem{ private IIcon topIcon; - private IIcon onIcon; private IIcon frontIcon; public BlockXPSolidifier(){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.5F); + this.setHardness(2.5F); this.setResistance(10.0F); this.setStepSound(soundTypeStone); - this.setTickRandomly(true); } @Override @@ -57,11 +55,6 @@ public class BlockXPSolidifier extends BlockContainerBase implements INameableIt return new TileEntityXPSolidifier(); } - @Override - public int getLightValue(IBlockAccess world, int x, int y, int z){ - return world.getBlockMetadata(x, y, z) > 3 ? 12 : 0; - } - @Override public IIcon getIcon(int side, int meta){ if(side == 1) return this.topIcon; @@ -73,8 +66,7 @@ public class BlockXPSolidifier extends BlockContainerBase implements INameableIt public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ int meta = world.getBlockMetadata(x, y, z); if(side == 1) return this.topIcon; - if(side == meta+2 && meta <= 3) return this.frontIcon; - else if(side == meta-2 && meta > 3) return this.onIcon; + if(side == meta+2) return this.frontIcon; return this.blockIcon; } @@ -83,7 +75,6 @@ public class BlockXPSolidifier extends BlockContainerBase implements INameableIt public void registerBlockIcons(IIconRegister iconReg){ this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName()); this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName() + "Top"); - this.onIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName() + "On"); this.frontIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName() + "Front"); }