From e62fe8ef3d3b49c4c8698920fe6b8ac7107bf5ad Mon Sep 17 00:00:00 2001 From: Drullkus Date: Fri, 6 Feb 2015 22:25:09 -0800 Subject: [PATCH] Commit working Malfunction fan stuff, and do other stuffs Also patched the build.gradle to play nicely with IntelliJ 14. --- build.gradle | 2 ++ .../java/com/cricketcraft/chisel/Features.java | 10 +++++++++- src/main/resources/assets/chisel/lang/en_US.lang | 12 ++++++------ .../blocks/technical/malfunctionFan-top.png | Bin 0 -> 4382 bytes 4 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/malfunctionFan-top.png diff --git a/build.gradle b/build.gradle index 391da333..9756c92b 100644 --- a/build.gradle +++ b/build.gradle @@ -165,3 +165,5 @@ curse { displayName = "Chisel 2 - ${mod_version}" additionalArtifact deobfJar, sourcesJar, apiJar } + +sourceSets { main { output.resourcesDir = output.classesDir } } diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 351a89f0..5294fdb3 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -2143,7 +2143,15 @@ public enum Features { stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.14.desc", 14, "stonebrick/ornatepanel"); stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.15.desc", 15, "stonebrick/poison"); stonebricksmooth.carverHelper.registerAll(stonebricksmooth, "stonebricksmooth"); - Carving.chisel.registerOre("stonebricksmooth", "stonebricksmooth"); + + BlockCarvable stonebricksmooth2 = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeStone); + stonebricksmooth2.carverHelper.addVariation("tile.stonebricksmooth2.0.desc", 0, "stonebrick2/masonryPlain"); + stonebricksmooth2.carverHelper.addVariation("tile.stonebricksmooth2.1.desc", 1, "stonebrick2/masonryFelsic"); + stonebricksmooth2.carverHelper.addVariation("tile.stonebricksmooth2.2.desc", 2, "stonebrick2/masonryMafic"); + stonebricksmooth2.carverHelper.addVariation("tile.stonebricksmooth2.3.desc", 3, "stonebrick2/masonryMixed"); + stonebricksmooth2.carverHelper.registerAll(stonebricksmooth2, "stonebricksmooth2"); + Carving.chisel.registerOre("stonebricksmooth2", "stonebricksmooth"); } }, diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 6ab01dcc..782950ee 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -238,12 +238,12 @@ tile.technical.15.desc=Rusty Grate tile.chisel.technical2.name=Transparent Technical Block #Metal Blocks -tile.metalOre.0.desc = Caution Stripes -tile.metalOre.1.desc = Shipping Crate -tile.metalOre.2.desc = Thermal -tile.metalOre.3.desc = An Old Relic from the land of Oneteufyv -tile.metalOre.4.desc = Egregiously Bordered Block -tile.metalOre.5.desc = Fancy Bolted Plating +tile.metalOre.0.desc=Caution Stripes +tile.metalOre.1.desc=Shipping Crate +tile.metalOre.2.desc=Thermal +tile.metalOre.3.desc=An Old Relic from the land of Oneteufyv +tile.metalOre.4.desc=Egregiously Bordered Block +tile.metalOre.5.desc=Fancy Bolted Plating #Present Chest tile.chisel.present.name=Present Box diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/malfunctionFan-top.png b/src/main/resources/assets/chisel/textures/blocks/technical/malfunctionFan-top.png new file mode 100644 index 0000000000000000000000000000000000000000..5838a689b4bb76f4723b9d946629cba85f952e40 GIT binary patch literal 4382 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 F{s)hBI9dPz literal 0 HcmV?d00001