From ca44f2742d00ec1cb3971bfcb188fa44e249f542 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Thu, 21 Aug 2014 15:46:26 +0800 Subject: [PATCH] Added config option to disable reinforced obsidian. --- .../crazypants/enderio/block/BlockReinforcedObsidian.java | 5 +++++ src/main/java/crazypants/enderio/config/Config.java | 5 +++++ .../java/crazypants/enderio/material/MaterialRecipes.java | 6 ++++-- src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java | 3 +++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java b/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java index f599f1c0..6d7b927c 100644 --- a/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java +++ b/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java @@ -9,6 +9,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.painter.TileEntityPaintedBlock; import crazypants.enderio.material.BlockFusedQuartz; @@ -26,6 +27,10 @@ public class BlockReinforcedObsidian extends BlockEio implements IResourceToolti setHardness(50.0F); setResistance(2000.0F); setStepSound(soundTypePiston); + + if(!Config.reinforcedObsidianEnabled) { + setCreativeTab(null); + } } public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) { diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 51cc20d8..009a1e91 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -60,6 +60,8 @@ public final class Config { public static final double DEFAULT_CONDUIT_SCALE = 0.5; + public static boolean reinforcedObsidianEnabled = true; + public static boolean useAlternateBinderRecipe; public static boolean useAlternateTesseractModel; @@ -386,6 +388,9 @@ public final class Config { useSneakMouseWheelYetaWrench = true; } + reinforcedObsidianEnabled = config.get(sectionItems.name, "reinforcedObsidianEnabled", reinforcedObsidianEnabled, + "When set to false reinforced obsidian is not craftable.").getBoolean(reinforcedObsidianEnabled); + travelAnchorEnabled = config.get(sectionItems.name, "travelAnchorEnabled", travelAnchorEnabled, "When set to false: the travel anchor will not be craftable.").getBoolean(travelAnchorEnabled); diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 44de6fb0..50692a58 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -148,8 +148,10 @@ public class MaterialRecipes { GameRegistry.addShapedRecipe(enderCapacitor, " e ", "cgc", " e ", 'e', phasedGold, 'c', activatedCapacitor, 'g', Blocks.glowstone); } - ItemStack reinfObs = new ItemStack(EnderIO.blockReinforcedObsidian); - GameRegistry.addShapedRecipe(reinfObs , "dbd", "bob", "dbd", 'd', darkSteel, 'b', EnderIO.blockDarkIronBars, 'o', Blocks.obsidian); + if(Config.reinforcedObsidianEnabled) { + ItemStack reinfObs = new ItemStack(EnderIO.blockReinforcedObsidian); + GameRegistry.addShapedRecipe(reinfObs , "dbd", "bob", "dbd", 'd', darkSteel, 'b', EnderIO.blockDarkIronBars, 'o', Blocks.obsidian); + } } diff --git a/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java b/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java index b37a5a0b..cdb0d0a6 100644 --- a/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java +++ b/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java @@ -30,6 +30,9 @@ public class NEIEnderIOConfig implements IConfigureNEI { if(!Config.travelAnchorEnabled) { API.hideItem(new ItemStack(EnderIO.itemTravelStaff)); } + if(!Config.reinforcedObsidianEnabled) { + API.hideItem(new ItemStack(EnderIO.blockReinforcedObsidian)); + } } @Override