diff --git a/src/main/java/com/cricketcraft/chisel/Crafting.java b/src/main/java/com/cricketcraft/chisel/Crafting.java index 34cda3af..f7b64fe1 100644 --- a/src/main/java/com/cricketcraft/chisel/Crafting.java +++ b/src/main/java/com/cricketcraft/chisel/Crafting.java @@ -126,8 +126,6 @@ public class Crafting { if(Configurations.featureEnabled("hexPlating")) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.hexPlating, 1), new Object[]{"XXX", "XYX", "XXX", 'X', "stone", 'Y', "blockCoal"})); - if(Configurations.featureEnabled("cloudbrick")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.cloudbrick, 4), new Object[]{"XX", "XX", 'X', ModBlocks.cloud}); if(Configurations.featureEnabled("bone")) GameRegistry.addRecipe(new ItemStack(ModBlocks.bone, 4), new Object[]{"XX", "XX", 'X', Items.bone}); } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java b/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java index fb299b1f..232fd2d7 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java @@ -59,11 +59,11 @@ public class BlockCloud extends BlockCarvable { @Override public int quantityDropped(Random rand) { - return 0; + return rand.nextInt(2); } @Override public int damageDropped(int meta) { - return 0; + return meta; } } diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 7b54b0a6..defde1ce 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -82,7 +82,6 @@ public class ModBlocks { public static BlockSnakestoneObsidian obsidianSnakestone; public static BlockCarvable hexPlating; public static BlockCarvable mechanical; - public static BlockCarvable cloudbrick; public static BlockCarvable bone; // 1.7 @@ -1124,7 +1123,11 @@ public class ModBlocks { if(Configurations.featureEnabled("cloud")) { cloud = (BlockCloud) new BlockCloud().setHardness(0.2F).setLightOpacity(3).setStepSound(Block.soundTypeCloth); - cloud.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloud.0.desc"), 0, "cloud"); + cloud.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloud.0.desc"), 0, "cloud/cloud"); + cloud.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloud.1.desc"), 1, "cloud/large"); + cloud.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloud.2.desc"), 2, "cloud/small"); + cloud.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloud.3.desc"), 3, "cloud/vertical"); + cloud.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloud.4.desc"), 4, "cloud/grid"); cloud.carverHelper.register(cloud, "cloud"); OreDictionary.registerOre("cloud", cloud); Carving.chisel.registerOre("cloud", "cloud"); @@ -1450,16 +1453,6 @@ public class ModBlocks { mechanical.carverHelper.register(mechanical, "mechanical"); Carving.chisel.registerOre("mechanical", "mechanical"); } - if(Configurations.featureEnabled("cloudbrick")){ - cloudbrick = (BlockCarvable) new BlockCarvable(Material.leaves).setHardness(0.1F).setResistance(0.5F); - cloudbrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloudbrick.0.desc"), 0, "cloudbrick/large"); - cloudbrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloudbrick.1.desc"), 1, "cloudbrick/small"); - //Broken - //cloudbrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloudbrick.2.desc"), 2, "cloudbrick/vertical"); - cloudbrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloudbrick.3.desc"), 3, "cloudbrick/grid"); - cloudbrick.carverHelper.register(cloudbrick, "cloudbrick"); - Carving.chisel.registerOre("cloudbrick", "cloudbrick"); - } if(Configurations.featureEnabled("bone")) { bone = (BlockCarvable) new BlockCarvable(Material.rock); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 3465a335..63eae9f9 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -45,12 +45,6 @@ tile.bone.2.desc=Pile of Bones tile.bone.3.desc=Beveled Compressed Bone tile.bone.4.desc=Brick Compressed Bone -#Cloudbrick -tile.cloudbrick.name=Cloud Brick -tile.cloudbrick.0.desc=Large Cloud Bricks -tile.cloudbrick.1.desc=Small Cloud Bricks -tile.cloudbrick.3.desc=Gridded Cloud Bricks - #Void Stone Blocks tile.voidstone.name=Voidstone tile.voidstone.0.desc=Raw Voidstone @@ -886,6 +880,10 @@ tile.mossy_templeblock.15.desc=Small Light Mossy Temple Tiles #Cloud tile.cloud.name=Cloud tile.cloud.0.desc=Cloud block +tile.cloud.1.desc=Large Cloud Bricks +tile.cloud.2.desc=Small Cloud Bricks +tile.cloud.3.desc=Small Vertical Cloud Bricks +tile.cloud.4.desc=Gridded Cloud Bricks #Stained glass T.T tile.stained_glass_white.name=Stained Glass diff --git a/src/main/resources/assets/chisel/textures/blocks/cloud.png b/src/main/resources/assets/chisel/textures/blocks/cloud/cloud.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/cloud.png rename to src/main/resources/assets/chisel/textures/blocks/cloud/cloud.png diff --git a/src/main/resources/assets/chisel/textures/blocks/cloudbrick/grid.png b/src/main/resources/assets/chisel/textures/blocks/cloud/grid.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/cloudbrick/grid.png rename to src/main/resources/assets/chisel/textures/blocks/cloud/grid.png diff --git a/src/main/resources/assets/chisel/textures/blocks/cloudbrick/large.png b/src/main/resources/assets/chisel/textures/blocks/cloud/large.png similarity index 93% rename from src/main/resources/assets/chisel/textures/blocks/cloudbrick/large.png rename to src/main/resources/assets/chisel/textures/blocks/cloud/large.png index 9e738030..434179f7 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/cloudbrick/large.png and b/src/main/resources/assets/chisel/textures/blocks/cloud/large.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cloudbrick/small.png b/src/main/resources/assets/chisel/textures/blocks/cloud/small.png similarity index 87% rename from src/main/resources/assets/chisel/textures/blocks/cloudbrick/small.png rename to src/main/resources/assets/chisel/textures/blocks/cloud/small.png index c015236d..1ef4f0f1 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/cloudbrick/small.png and b/src/main/resources/assets/chisel/textures/blocks/cloud/small.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cloudbrick/vertical.png b/src/main/resources/assets/chisel/textures/blocks/cloud/vertical.png similarity index 87% rename from src/main/resources/assets/chisel/textures/blocks/cloudbrick/vertical.png rename to src/main/resources/assets/chisel/textures/blocks/cloud/vertical.png index f3a1d2ca..fb3a00b8 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/cloudbrick/vertical.png and b/src/main/resources/assets/chisel/textures/blocks/cloud/vertical.png differ