From 55cddfabd644e54df21418e63b4be5587f678114 Mon Sep 17 00:00:00 2001 From: Roadhog360 Date: Tue, 26 Sep 2023 01:07:13 -0500 Subject: [PATCH] Add separate config toggle for honey --- src/main/java/ganymedes01/etfuturum/ModBlocks.java | 4 ++-- src/main/java/ganymedes01/etfuturum/ModItems.java | 4 ++-- .../etfuturum/configuration/configs/ConfigBlocksItems.java | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/ganymedes01/etfuturum/ModBlocks.java b/src/main/java/ganymedes01/etfuturum/ModBlocks.java index 1c83f22b8..d29d6ea02 100644 --- a/src/main/java/ganymedes01/etfuturum/ModBlocks.java +++ b/src/main/java/ganymedes01/etfuturum/ModBlocks.java @@ -234,8 +234,8 @@ public enum ModBlocks { DRIPSTONE_BLOCK(EtFuturum.TESTING, new BaseBlock(Material.rock).setNames("dripstone_block") .setBlockSound(ModSounds.soundDripstoneBlock).setHardness(1.5F).setResistance(1F)), POINTED_DRIPSTONE(EtFuturum.TESTING, new BlockPointedDripstone()), - HONEY_BLOCK(ConfigEntities.enableBees, new BlockHoney()), - HONEYCOMB_BLOCK(ConfigEntities.enableBees, new BaseBlock(Material.clay).setNames("honeycomb_block") + HONEY_BLOCK(ConfigBlocksItems.enableHoney, new BlockHoney()), + HONEYCOMB_BLOCK(ConfigBlocksItems.enableHoney, new BaseBlock(Material.clay).setNames("honeycomb_block") .setBlockSound(ModSounds.soundCoralBlock).setHardness(0.6F).setResistance(0.6F)), BEEHIVE(ConfigEntities.enableBees, new BlockBeeHive().setHiveType("beehive", true)), BEE_NEST(ConfigEntities.enableBees, new BlockBeeHive().setHiveType("bee_nest", true)), diff --git a/src/main/java/ganymedes01/etfuturum/ModItems.java b/src/main/java/ganymedes01/etfuturum/ModItems.java index cad6cdced..298f3aa6a 100644 --- a/src/main/java/ganymedes01/etfuturum/ModItems.java +++ b/src/main/java/ganymedes01/etfuturum/ModItems.java @@ -57,8 +57,8 @@ public enum ModItems { OTHERSIDE_RECORD(ConfigBlocksItems.enableOtherside, new ItemEtFuturumRecord("otherside")), AMETHYST_SHARD(ConfigBlocksItems.enableAmethyst, new BaseItem("amethyst_shard")), SHULKER_BOX_UPGRADE(EtFuturum.hasIronChest && ConfigModCompat.shulkerBoxesIronChest, new ItemShulkerBoxUpgrade()), - HONEYCOMB(ConfigEntities.enableBees, new BaseItem("honeycomb")), - HONEY_BOTTLE(ConfigEntities.enableBees, new ItemHoneyBottle()), + HONEYCOMB(ConfigBlocksItems.enableHoney, new BaseItem("honeycomb")), + HONEY_BOTTLE(ConfigBlocksItems.enableHoney, new ItemHoneyBottle()), ITEM_SIGN_SPRUCE(ConfigBlocksItems.enableSigns, new ItemWoodSign(1)), ITEM_SIGN_BIRCH(ConfigBlocksItems.enableSigns, new ItemWoodSign(2)), diff --git a/src/main/java/ganymedes01/etfuturum/configuration/configs/ConfigBlocksItems.java b/src/main/java/ganymedes01/etfuturum/configuration/configs/ConfigBlocksItems.java index 09604b5bb..83ce475a9 100644 --- a/src/main/java/ganymedes01/etfuturum/configuration/configs/ConfigBlocksItems.java +++ b/src/main/java/ganymedes01/etfuturum/configuration/configs/ConfigBlocksItems.java @@ -110,6 +110,7 @@ public class ConfigBlocksItems extends ConfigBase { public static boolean enableTarget; public static boolean enableSculk; public static boolean enableChain; + public static boolean enableHoney; //Nether Update temp disabled public static boolean enableCrimsonBlocks = false; public static boolean enableWarpedBlocks = false; @@ -258,6 +259,7 @@ protected void syncConfigOptions() { enableBarrier = getBoolean("enableBarrier", catBlockMisc, true, "A solid, indestructible and invisible block. Can be seen when holding it in Creative mode."); enableLightBlock = getBoolean("enableLightBlock", catBlockMisc, true, "Invisible light blocks. Only has a selection box when held, right click to change light level. Otherwise functionally identical to air and can be replaced by placing blocks into it. Invisible, but can be seen when holding it in Creative mode."); enableChain = getBoolean("enableChain", catBlockMisc, true, ""); + enableHoney = getBoolean("enableHoney", catBlockMisc, true, "Enables honey blocks, honeycomb blocks, honeycombs, and honey bottles. See entities.cfg for toggling bee nests, beehives, and bees."); //Misc Items enableMutton = getBoolean("enableMutton", catItemMisc, true, "");