From 6e98af1ae31d30bb26a03e80038fbe416e596b11 Mon Sep 17 00:00:00 2001 From: Brianna Date: Tue, 9 Jun 2020 09:19:56 -0500 Subject: [PATCH 1/2] Added ability to disable block breaking of containers. --- .../hopper/levels/modules/ModuleBlockBreak.java | 7 +++++-- .../java/com/songoda/epichoppers/settings/Settings.java | 8 +++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java b/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java index 335aa9b..96caabe 100644 --- a/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java +++ b/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java @@ -73,8 +73,11 @@ public class ModuleBlockBreak extends Module { if (Settings.BLOCKBREAK_BLACKLIST.getStringList().contains(above.getType().name()) || above.getType() == Material.WATER || above.getType() == Material.LAVA - || above.getType() == Material.AIR - || above.getState() instanceof InventoryHolder) + || above.getType() == Material.AIR) + return; + + if (Settings.ALLOW_BLOCKBREAK_CONTAINERS.getBoolean() + && above.getState() instanceof InventoryHolder) return; // Let's break the block! diff --git a/src/main/java/com/songoda/epichoppers/settings/Settings.java b/src/main/java/com/songoda/epichoppers/settings/Settings.java index 6e9c117..f324159 100644 --- a/src/main/java/com/songoda/epichoppers/settings/Settings.java +++ b/src/main/java/com/songoda/epichoppers/settings/Settings.java @@ -51,11 +51,6 @@ public class Settings { "The amount of time in ticks a player has between hitting the hopper", "Link button and performing the link. When the time is up the link event is canceled."); - public static final ConfigSetting SYNC_TOUCH_BLACKLIST = new ConfigSetting(config, "Main.Sync Touch Blacklist", - Arrays.asList("CHEST", "FURNACE", "HOPPER"), - "Items that shouldn't work with Sync touch. You should put items in here", - "that other plugins use to store data with."); - public static final ConfigSetting MAX_CHUNK = new ConfigSetting(config, "Main.Max Hoppers Per Chunk", -1, "The maximum amount of hoppers per chunk."); @@ -66,6 +61,9 @@ public class Settings { Arrays.asList("BEDROCK", "END_PORTAL", "ENDER_PORTAL", "END_PORTAL_FRAME", "ENDER_PORTAL_FRAME", "PISTON_HEAD", "PISTON_EXTENSION", "RAIL", "RAILS", "ACTIVATOR_RAIL", "DETECTOR_RAIL", "POWERED_RAIL"), "Anything listed here will not be broken by the block break module."); + public static final ConfigSetting ALLOW_BLOCKBREAK_CONTAINERS = new ConfigSetting(config, "Main.Allow BlockBreak Containers", false, + "Allow BlockBreak to break containers."); + public static final ConfigSetting AUTOCRAFT_JAM_EJECT = new ConfigSetting(config, "Main.AutoCraft Jam Eject", false, "AutoCraft module needs a free slot to craft items with.", "Normally, crafting hoppers won't grab items that would fill that slot.", From 21ab081415f0ffc15661b4cd56ed9991b20cf718 Mon Sep 17 00:00:00 2001 From: Brianna Date: Tue, 9 Jun 2020 09:55:30 -0500 Subject: [PATCH 2/2] version 4.6.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6df3946..db88c02 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ com.songoda EpicHoppers 4.0.0 - 4.6.8 + 4.6.9 clean install EpicHoppers-${project.version}