From cbd98a53213ce0d5bbc8df6920176291a8b6a37e Mon Sep 17 00:00:00 2001 From: warlordjones Date: Mon, 12 Jan 2015 18:36:30 +0000 Subject: [PATCH] Refactor some remaining things that oddly contained "Marble" --- .../block/{BlockMarbleIce.java => BlockCarvableIce.java} | 4 ++-- ...{BlockMarbleIceStairs.java => BlockCarvableIceStairs.java} | 4 ++-- ...{BlockMarblePackedIce.java => BlockCarvablePackedIce.java} | 4 ++-- ...PackedIceStairs.java => BlockCarvablePackedIceStairs.java} | 4 ++-- .../{BlockMarblePillar.java => BlockCarvablePillar.java} | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename src/main/java/com/cricketcraft/chisel/block/{BlockMarbleIce.java => BlockCarvableIce.java} (95%) rename src/main/java/com/cricketcraft/chisel/block/{BlockMarbleIceStairs.java => BlockCarvableIceStairs.java} (87%) rename src/main/java/com/cricketcraft/chisel/block/{BlockMarblePackedIce.java => BlockCarvablePackedIce.java} (94%) rename src/main/java/com/cricketcraft/chisel/block/{BlockMarblePackedIceStairs.java => BlockCarvablePackedIceStairs.java} (86%) rename src/main/java/com/cricketcraft/chisel/block/{BlockMarblePillar.java => BlockCarvablePillar.java} (89%) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIce.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/block/BlockMarbleIce.java rename to src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java index f65cd360..7bcf7e3b 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIce.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java @@ -16,11 +16,11 @@ import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.carving.CarvableVariation; -public class BlockMarbleIce extends BlockIce implements ICarvable { +public class BlockCarvableIce extends BlockIce implements ICarvable { public CarvableHelper carverHelper; - public BlockMarbleIce() { + public BlockCarvableIce() { super(); carverHelper = new CarvableHelper(); } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIceStairs.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIceStairs.java similarity index 87% rename from src/main/java/com/cricketcraft/chisel/block/BlockMarbleIceStairs.java rename to src/main/java/com/cricketcraft/chisel/block/BlockCarvableIceStairs.java index 7480c6dd..4b3ba12e 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIceStairs.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIceStairs.java @@ -9,9 +9,9 @@ import net.minecraft.world.World; import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.init.ChiselBlocks; -public class BlockMarbleIceStairs extends BlockCarvableStairs { +public class BlockCarvableIceStairs extends BlockCarvableStairs { - public BlockMarbleIceStairs(Block block, int meta, CarvableHelper helper) { + public BlockCarvableIceStairs(Block block, int meta, CarvableHelper helper) { super(block, meta, helper); slipperiness = 0.98F; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarblePackedIce.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java similarity index 94% rename from src/main/java/com/cricketcraft/chisel/block/BlockMarblePackedIce.java rename to src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java index 438470a2..c090ec86 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarblePackedIce.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java @@ -16,11 +16,11 @@ import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.carving.CarvableVariation; -public class BlockMarblePackedIce extends Block implements ICarvable { +public class BlockCarvablePackedIce extends Block implements ICarvable { public CarvableHelper carverHelper; - public BlockMarblePackedIce() { + public BlockCarvablePackedIce() { super(Material.ice); carverHelper = new CarvableHelper(); } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarblePackedIceStairs.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIceStairs.java similarity index 86% rename from src/main/java/com/cricketcraft/chisel/block/BlockMarblePackedIceStairs.java rename to src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIceStairs.java index c506ce04..dcca7406 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarblePackedIceStairs.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIceStairs.java @@ -9,9 +9,9 @@ import net.minecraft.world.World; import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.init.ChiselBlocks; -public class BlockMarblePackedIceStairs extends BlockCarvableStairs { +public class BlockCarvablePackedIceStairs extends BlockCarvableStairs { - public BlockMarblePackedIceStairs(Block block, int meta, CarvableHelper helper) { + public BlockCarvablePackedIceStairs(Block block, int meta, CarvableHelper helper) { super(block, meta, helper); slipperiness = 0.98F; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarblePillar.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePillar.java similarity index 89% rename from src/main/java/com/cricketcraft/chisel/block/BlockMarblePillar.java rename to src/main/java/com/cricketcraft/chisel/block/BlockCarvablePillar.java index d39d9f03..f2736c4a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarblePillar.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePillar.java @@ -7,11 +7,11 @@ import net.minecraft.world.IBlockAccess; import com.cricketcraft.chisel.carving.CarvableVariation; import com.cricketcraft.chisel.client.render.BlockMarblePillarRenderer; -public class BlockMarblePillar extends BlockCarvable { +public class BlockCarvablePillar extends BlockCarvable { public IIcon sides[] = new IIcon[6]; - public BlockMarblePillar(Material m) { + public BlockCarvablePillar(Material m) { super(m); }