diff --git a/src/main/java/dev/zenfyr/andromeda/modules/blocks/guarded_loot/GuardedLoot.java b/src/main/java/dev/zenfyr/andromeda/modules/blocks/guarded_loot/GuardedLoot.java index 3764ffaf..519c751e 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/blocks/guarded_loot/GuardedLoot.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/blocks/guarded_loot/GuardedLoot.java @@ -25,7 +25,6 @@ public final class GuardedLoot extends Module implements PostBootstrapEvent { public static class Config extends GameConfig { public double range = 4; - public boolean allowLockPicking = true; public BreakingHandler breakingHandler = BreakingHandler.UNBREAKABLE; public boolean checkReach = false; } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/items/lockpick/Lockpick.java b/src/main/java/dev/zenfyr/andromeda/modules/items/lockpick/Lockpick.java index cb2fe120..12909a3e 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/items/lockpick/Lockpick.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/items/lockpick/Lockpick.java @@ -28,7 +28,10 @@ public final class Lockpick extends Module implements PostBootstrapEvent { } public static class MainConfig extends BaseConfig { + public boolean villagerInventory = true; + + public boolean guardedLoot = true; } public static class Config extends GameConfig { diff --git a/src/main/java/dev/zenfyr/andromeda/modules/items/lockpick/LockpickItem.java b/src/main/java/dev/zenfyr/andromeda/modules/items/lockpick/LockpickItem.java index 66ae0ae8..c4782139 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/items/lockpick/LockpickItem.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/items/lockpick/LockpickItem.java @@ -97,7 +97,7 @@ public class LockpickItem extends Item { ModuleManager.get().get(GuardedLoot.class).ifPresent(gl -> { GuardedLootMain.UNLOCKERS.add((blockEntity, player) -> { - if (player.level().am$get(GuardedLoot.CONFIG).allowLockPicking) { + if (config.guardedLoot) { if (player.getMainHandItem().is(LockpickItem.INSTANCE.orThrow())) { return LockpickItem.INSTANCE .orThrow() diff --git a/src/main/resources/assets/andromeda/lang/en_us.json b/src/main/resources/assets/andromeda/lang/en_us.json index 0330213a..c1962c5b 100644 --- a/src/main/resources/assets/andromeda/lang/en_us.json +++ b/src/main/resources/assets/andromeda/lang/en_us.json @@ -281,6 +281,8 @@ "config.andromeda.items.lockpick.option.breakAfterUse.@Tooltip": "Break the lockpick after use.", "config.andromeda.items.lockpick.option.villagerInventory": "Villager Inventories", "config.andromeda.items.lockpick.option.villagerInventory.@Tooltip": "Open villager inventories.", + "config.andromeda.items.lockpick.option.guardedLoot": "Bypass Guarded Loot", + "config.andromeda.items.lockpick.option.guardedLoot.@Tooltip": "Requires the Guarded Loot module!", "item.andromeda.lockpick": "Lockpick", "gui.andromeda.merchant": "Merchant Inventory",