diff --git a/src/main/java/com/hbm/blocks/machine/RailGeneric.java b/src/main/java/com/hbm/blocks/machine/RailGeneric.java index decb33ec8..c636b47f4 100644 --- a/src/main/java/com/hbm/blocks/machine/RailGeneric.java +++ b/src/main/java/com/hbm/blocks/machine/RailGeneric.java @@ -17,10 +17,10 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; public class RailGeneric extends BlockRailBase implements ITooltipProvider { - + @SideOnly(Side.CLIENT) protected IIcon turnedIcon; - + protected static final float baseSpeed = 0.4F; protected float maxSpeed = 0.4F; protected boolean slopable = true; @@ -28,8 +28,9 @@ public class RailGeneric extends BlockRailBase implements ITooltipProvider { public RailGeneric() { super(false); + setHarvestLevel("pickaxe", 0); } - + @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { @@ -40,16 +41,16 @@ public class RailGeneric extends BlockRailBase implements ITooltipProvider { @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister reg) { super.registerBlockIcons(reg); - + if(flexible) this.turnedIcon = reg.registerIcon(this.getTextureName() + "_turned"); } - + @Override public float getRailMaxSpeed(World world, EntityMinecart cart, int y, int x, int z) { return maxSpeed; } - + public RailGeneric setMaxSpeed(float speed) { this.maxSpeed = speed; return this; @@ -59,7 +60,7 @@ public class RailGeneric extends BlockRailBase implements ITooltipProvider { public boolean isFlexibleRail(IBlockAccess world, int y, int x, int z) { return !isPowered(); } - + public RailGeneric setFlexible(boolean flexible) { this.flexible = flexible; return this; @@ -69,7 +70,7 @@ public class RailGeneric extends BlockRailBase implements ITooltipProvider { public boolean canMakeSlopes(IBlockAccess world, int x, int y, int z) { return true; } - + public RailGeneric setSlopable(boolean slopable) { this.slopable = slopable; return this; @@ -78,15 +79,15 @@ public class RailGeneric extends BlockRailBase implements ITooltipProvider { @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { float speed = this.maxSpeed / this.baseSpeed; - + if(speed != 1F) { list.add((speed > 1 ? EnumChatFormatting.BLUE : EnumChatFormatting.RED) + "Speed: " + ((int) (speed * 100)) + "%"); } - + if(!flexible) { list.add(EnumChatFormatting.RED + "Cannot be used for turns!"); } - + if(!slopable) { list.add(EnumChatFormatting.RED + "Cannot be used for slopes!"); } diff --git a/src/main/java/com/hbm/blocks/machine/RailHighspeed.java b/src/main/java/com/hbm/blocks/machine/RailHighspeed.java index 5a99f46b2..d7d03b163 100644 --- a/src/main/java/com/hbm/blocks/machine/RailHighspeed.java +++ b/src/main/java/com/hbm/blocks/machine/RailHighspeed.java @@ -11,13 +11,14 @@ public class RailHighspeed extends BlockRailBase { public RailHighspeed() { super(true); + setHarvestLevel("pickaxe", 0); } - + /*@Override @SideOnly(Side.CLIENT) public IIcon getIcon(int p_149691_1_, int p_149691_2_) { return p_149691_2_ >= 6 ? this.icon : this.blockIcon; } - + @Override @SideOnly(Side.CLIENT)