From 074de3004331996a99e9dd452a8875c67196ee47 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Mon, 15 Dec 2014 13:39:52 +0000 Subject: [PATCH] Turn Cloudbrick into a subtype of Cloud block. Also made cloud drop --- .../com/cricketcraft/chisel/Crafting.java | 2 -- .../cricketcraft/chisel/block/BlockCloud.java | 4 ++-- .../cricketcraft/chisel/init/ModBlocks.java | 17 +++++------------ .../resources/assets/chisel/lang/en_US.lang | 10 ++++------ .../textures/blocks/{ => cloud}/cloud.png | Bin .../blocks/{cloudbrick => cloud}/grid.png | Bin .../blocks/{cloudbrick => cloud}/large.png | Bin 2840 -> 2840 bytes .../blocks/{cloudbrick => cloud}/small.png | Bin 3036 -> 3051 bytes .../blocks/{cloudbrick => cloud}/vertical.png | Bin 3026 -> 3025 bytes 9 files changed, 11 insertions(+), 22 deletions(-) rename src/main/resources/assets/chisel/textures/blocks/{ => cloud}/cloud.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{cloudbrick => cloud}/grid.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{cloudbrick => cloud}/large.png (93%) rename src/main/resources/assets/chisel/textures/blocks/{cloudbrick => cloud}/small.png (87%) rename src/main/resources/assets/chisel/textures/blocks/{cloudbrick => cloud}/vertical.png (87%) 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 9e738030a7afdab782ab7865d22ec330a16088ea..434179f71f796408b2c794e1c53bf2cc388cdb05 100644 GIT binary patch delta 76 zcmbOsHbZPfDi`N}1|VFpclqSWd0dL(yh@r=R;O=gU|`7dba4!^IGz0G-{0Rglb3PX fG1g3e$|WztH(O5a>Gv(dPm^XU>l`wd^`njxgN@xNA_P-iU 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 c015236dac4841ade350e25c3c18bb4be09348ff..1ef4f0f1f991ae5c966791e0d087e00bc4477071 100644 GIT binary patch delta 372 zcmV-)0gL|J7wZ?WWeN%Z0RI60puMM)lWqzje+?og1QdEE0003!NklU^M z^BJqv3PZSDE?6#?of^G9>bgbzmrsMG#LGGV!x#e* ze?gw-AR>%LqxKUsgNTr28Pux>?>L=Kh~s#0qvP?|mGBPleNd8!gbBWR0sv~i->3g< zbzMU#1!hK7RVa!A#uyl5;GDx`GC|WcD9aMwd(7wat_Roa6^q4UaN6N;zwAzSNy^M{&cRySUTU<~{!So*h~W8r_L8c#4(9*>k|e=qvl;Bu zw=>OVvta)#!6)4v4|cmX#^48%c9v3a S2^i)80000h_NOB delta 357 zcmV-r0h<2n7u*-HWeN#405$+NIDY!#lWqzje+U@>>|oLe0003lNklEe!x&{$pv)PQF zf0!9Wg!}yt)wXT;)$w+_;dng$oTx0zxr9%6@1v4LBu=ol697<`%O$+ohGBqG3e1eY z@6j|3j4?3Az&VHAZif&8x~_xw9*4sLnBMeyy+(ad6h+(zA%y6-Ns`2U@XaVwIOmo- z$n!ifGn{j<){Yvjwf`N6AR>6ZUJIvcPp#uV0DwHtk!9J>I<1{)zu!mes|4S4&vtM= zpGOIg#{+4a!g~)90W;(Ie8O6buIomhXssb4Fvj2ySvCD<2=3dT00000NkvXXu0mjf D*&M0P 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 f3a1d2cae246cfd4a1bb85d6f45a79067f954b95..fb3a00b8edf0b50332a974b8842d614963928fe7 100644 GIT binary patch delta 346 zcmV-g0j2)Z7tt56WeN%Z0RI60puMM)lWqzje+?odbbgMh0003aNkl0z z5S(ZXBwE<`M%SruAlUePLP%lpp|2$z{-CGmRiDQu;B7ZyH<_88Fk{SLp6B>4V+_i& zyl~sL$g=FhbzP&XstbFtDvBc9RS*OOI~PpTMDTGObikt{{PlW~11TlCu7eN)j4^E6 ze?|v5hcO09DFi_P9>+0hIM0)4ZkooC_;@_NjP`ve4a>6JdNPh9m1Jv_QWE@rzX=vX zP)WaBpXV7`Ybd3_Id@Fu!!ST=jW7(+_dSv%abA2rpBL6z(+i}OD2jpv=Z>A2G5DGq>7jGd2Px@Mg()yD|n(t=WgwHN`n6R77%#JX|_<5eUuWeg~ zZ?_x6P17)(BBh`q|PjN#~laU2=`d_H_2rc ze<_75%Rr~oi8XldQI_R~yRM5Qp3mnmqjgwhHyz~yrJN+6=$E&R$w tl!LIsphf>e6pVmTQ50L8(=?43{Q>(WqMlMpQ#Jqq002ovPDHLkV1l?qqO|}3