diff --git a/pom.xml b/pom.xml index 523e748..f510052 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.rsscripting RS-Auger - 1.1.0 + 1.1.1 21 diff --git a/src/main/java/com/rsscripting/rsauger/gui/RSFilterMenu.java b/src/main/java/com/rsscripting/rsauger/gui/RSFilterMenu.java index 6fa9bf8..c98b9f4 100644 --- a/src/main/java/com/rsscripting/rsauger/gui/RSFilterMenu.java +++ b/src/main/java/com/rsscripting/rsauger/gui/RSFilterMenu.java @@ -102,7 +102,7 @@ public class RSFilterMenu { Material.WHITE_WOOL; filterName = - "§aWhitelist"; + "§aMove Only:"; } @@ -114,7 +114,7 @@ public class RSFilterMenu { Material.BLACK_WOOL; filterName = - "§cBlacklist"; + "§cMove All Except:"; } @@ -124,7 +124,7 @@ public class RSFilterMenu { Material.LIME_WOOL; filterName = - "§aAllow All"; + "§aMove All"; } diff --git a/src/main/java/com/rsscripting/rsauger/gui/RSMainMenu.java b/src/main/java/com/rsscripting/rsauger/gui/RSMainMenu.java index c90de8c..c81dcac 100644 --- a/src/main/java/com/rsscripting/rsauger/gui/RSMainMenu.java +++ b/src/main/java/com/rsscripting/rsauger/gui/RSMainMenu.java @@ -2,6 +2,7 @@ package com.rsscripting.rsauger.gui; import com.rsscripting.rsauger.machine.MachineError; import com.rsscripting.rsauger.utils.RSConstants; +import com.rsscripting.rsauger.utils.RSKeys; import com.rsscripting.rsauger.utils.RSMenuUtils; import com.rsscripting.rsauger.managers.MachineManager; import net.kyori.adventure.text.Component; @@ -154,6 +155,26 @@ public class RSMainMenu { |-------------------------------------------------------------------------- */ + String filterMode = + MachineManager.getFilterMode(block); + + String filterDisplay = + switch (filterMode) { + + case RSKeys.FILTER_ALLOW_ALL -> + "Move All"; + + case RSKeys.FILTER_WHITELIST -> + "Move Only:"; + + case RSKeys.FILTER_BLACKLIST -> + "Move All Except:"; + + default -> + filterMode; + + }; + menu.setItem( 13, RSMenuUtils.createMenuItem( @@ -164,7 +185,7 @@ public class RSMainMenu { List.of( "§7Mode: §f" - + MachineManager.getFilterMode(block) + + filterDisplay ) )