From 68e7042bd8b4cf1d0d2bc1e122e0b5b124d12749 Mon Sep 17 00:00:00 2001 From: Cricket Date: Tue, 23 Jun 2015 14:42:37 -0400 Subject: [PATCH] Done with #339 --- src/main/java/com/cricketcraft/chisel/Features.java | 6 +++--- .../java/com/cricketcraft/chisel/config/Configurations.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 03f57ceb..a54c8dd8 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -115,7 +115,7 @@ public enum Features { @Override void addBlocks() { BlockCarvable andesite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); - andesite.carverHelper.addVariation("tile.andesite.0.desc", 0, "andesite/andesite"); + andesite.carverHelper.addVariation(Configurations.imTooGoodForDescriptions ? "" : "tile.andesite.0.desc", 0, "andesite/andesite"); andesite.carverHelper.addVariation("tile.andesite.1.desc", 1, "andesite/andesitePolished"); andesite.carverHelper.addVariation("tile.andesite.2.desc", 2, "andesite/andesitePillar"); andesite.carverHelper.addVariation("tile.andesite.3.desc", 3, "andesite/andesiteLBrick"); @@ -617,7 +617,7 @@ public enum Features { void addBlocks() { BlockCarvable diorite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); - diorite.carverHelper.addVariation("tile.diorite.0.desc", 0, "diorite/diorite"); + diorite.carverHelper.addVariation(Configurations.imTooGoodForDescriptions ? "" : "tile.diorite.0.desc", 0, "diorite/diorite"); diorite.carverHelper.addVariation("tile.diorite.1.desc", 1, "diorite/dioritePolished"); diorite.carverHelper.addVariation("tile.diorite.2.desc", 2, "diorite/dioritePillar"); diorite.carverHelper.addVariation("tile.diorite.3.desc", 3, "diorite/dioriteLBrick"); @@ -1010,7 +1010,7 @@ public enum Features { void addBlocks() { BlockCarvable granite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); - granite.carverHelper.addVariation("tile.granite.0.desc", 0, "granite/granite"); + granite.carverHelper.addVariation(Configurations.imTooGoodForDescriptions ? "" : "tile.granite.0.desc", 0, "granite/granite"); granite.carverHelper.addVariation("tile.granite.1.desc", 1, "granite/granitePolished"); granite.carverHelper.addVariation("tile.granite.2.desc", 2, "granite/granitePillar"); granite.carverHelper.addVariation("tile.granite.3.desc", 3, "granite/graniteLBrick"); diff --git a/src/main/java/com/cricketcraft/chisel/config/Configurations.java b/src/main/java/com/cricketcraft/chisel/config/Configurations.java index 2dc105d3..94e3b7e5 100644 --- a/src/main/java/com/cricketcraft/chisel/config/Configurations.java +++ b/src/main/java/com/cricketcraft/chisel/config/Configurations.java @@ -38,6 +38,7 @@ public class Configurations { public static boolean disableCTM; public static boolean connectInsideCTM; public static boolean blockDescriptions; + public static boolean imTooGoodForDescriptions; public static boolean allowChiselDamage; public static int ironChiselMaxDamage; @@ -94,6 +95,7 @@ public class Configurations { "Choose whether the inside corner is disconnected on a CTM block - http://imgur.com/eUywLZ4").getBoolean(false); blockDescriptions = config.get(category, "tooltipsUseBlockDescriptions", true, "Make variations of blocks have the same name, and use the description in tooltip to distinguish them.") .getBoolean(true); + imTooGoodForDescriptions = config.get(category, "imTooGooForBlockDescriptions", false, "For those people who just hate block descriptions on the world gen!").getBoolean(); /* chisel */ category = "chisel";