bump: update mod version to 1.7.0-pre.3

Author: rettichlp

gradle.properties

@@ -13,7 +13,7 @@ loader_version=0.17.0
 loom_version=1.12.3
 
 # Mod Properties
-mod_version=1.7.0-pre.2
+mod_version=1.7.0-pre.3
 maven_group=de.rettichlp
 archives_base_name=pkutils
 

src/main/java/de/rettichlp/pkutils/common/registry/Registry.java

@@ -54,6 +54,8 @@
 
 public class Registry {
 
+    private static final String NAVI_TARGET_REACHED_MESSAGE = "Du hast dein Ziel erreicht!";
+
     private final Set<IPKUtilsListener> listenerInstances = getListenerInstances();
 
     private boolean initialized = false;
@@ -99,7 +101,7 @@ public void registerListeners() {
             String rawMessage = message.getString();
 
             // handle navi spot reached
-            if (rawMessage.equals("Du hast dein Ziel erreicht!")) {
+            if (NAVI_TARGET_REACHED_MESSAGE.equals(rawMessage)) {
                 getListenersImplementing(INaviSpotReachedListener.class).forEach(INaviSpotReachedListener::onNaviSpotReached);
             }
 

src/main/java/de/rettichlp/pkutils/common/services/CommandService.java

@@ -18,6 +18,8 @@
 
 public class CommandService {
 
+    private static final String UUID_RETTICHLP = "25855f4d-3874-4a7f-a6ad-e9e4f3042e19";
+
     public void sendCommand(String command) {
         LOGGER.info("PKUtils executing command: {}", command);
         networkHandler.sendChatCommand(command);
@@ -52,7 +54,7 @@ public void run() {
     }
 
     public boolean isSuperUser() {
-        return nonNull(player) && (player.getUuidAsString().equals("25855f4d-3874-4a7f-a6ad-e9e4f3042e19") || getBoolean("fabric.development"));
+        return nonNull(player) && (UUID_RETTICHLP.equals(player.getUuidAsString()) || getBoolean("fabric.development"));
     }
 
     public void retrieveNumberAndRun(String playerName, Consumer<Integer> runWithNumber) {

src/main/java/de/rettichlp/pkutils/listener/impl/faction/PlantListener.java

@@ -57,6 +57,7 @@
 @PKUtilsListener
 public class PlantListener implements IBlockRightClickListener, IEntityRenderListener, IMessageReceiveListener, IScreenOpenListener {
 
+    private static final String PLANT_TEXT = "Plantage";
     private static final Pattern PLANT_PLANT_PATTERN = compile("^\\[Plantage] (?:\\[PK])?(?<playerName>[a-zA-Z0-9_]+) hat eine (Kräuter|Pulver)-Plantage gesetzt\\. \\[\\d+/10]$");
     private static final Pattern PLANT_WATER_PATTERN = compile("^\\[Plantage] Eine (Kräuter|Pulver)-Plantage wurde von (?:\\[PK])?(?<playerName>[a-zA-Z0-9_]+) gewässert\\.$");
     private static final Pattern PLANT_FERTILIZE_PATTERN = compile("^\\[Plantage] Eine (Kräuter|Pulver)-Plantage wurde von (?:\\[PK])?(?<playerName>[a-zA-Z0-9_]+) gedüngt\\.$");
@@ -183,7 +184,7 @@ public boolean onMessageReceive(Text text, String message) {
     public void onScreenOpen(Screen screen, int scaledWidth, int scaledHeight) {
         ClientPlayerInteractionManager interactionManager = MinecraftClient.getInstance().interactionManager;
 
-        if (nonNull(interactionManager) && screen instanceof GenericContainerScreen genericContainerScreen && genericContainerScreen.getTitle().getString().equals("Plantage")) {
+        if (nonNull(interactionManager) && screen instanceof GenericContainerScreen genericContainerScreen && PLANT_TEXT.equals(genericContainerScreen.getTitle().getString())) {
             ItemStack mainHandStack = player.getInventory().getMainHandStack();
 
             int syncId = genericContainerScreen.getScreenHandler().syncId;

src/main/java/de/rettichlp/pkutils/listener/impl/job/GarbageManListener.java

@@ -33,6 +33,7 @@
 @PKUtilsListener
 public class GarbageManListener implements IMessageReceiveListener, ITickListener {
 
+    private static final String GARBAGE_MAN_TEXT = "müllmann";
     private static final Pattern GARBAGE_MAN_DROP_START = compile("^\\[Müllmann] Du hast genug Mülltonnen entleert\\.$");
     private static final Pattern GARBAGE_MAN_FINISHED = compile("^\\[Müllmann] Du hast den Job beendet\\.$");
 
@@ -119,7 +120,7 @@ private Optional<ScoreboardObjective> getGarbageManScoreboard() {
         assert MinecraftClient.getInstance().world != null; // cannot be null at this point
         Scoreboard scoreboard = MinecraftClient.getInstance().world.getScoreboard();
         ScoreboardObjective scoreboardObjective = scoreboard.getObjectiveForSlot(SIDEBAR);
-        return nonNull(scoreboardObjective) && scoreboardObjective.getName().equals("müllmann") ? Optional.of(scoreboardObjective) : empty();
+        return nonNull(scoreboardObjective) && GARBAGE_MAN_TEXT.equals(scoreboardObjective.getName()) ? Optional.of(scoreboardObjective) : empty();
     }
 
     @Getter

src/main/java/de/rettichlp/pkutils/listener/impl/job/JobListener.java

@@ -31,13 +31,14 @@
 public class JobListener
         implements ICommandSendListener, IMessageReceiveListener, IMoveListener, INaviSpotReachedListener {
 
+    private static final String SAWMILL_TEXT = "sägewerk";
     private static final Pattern TRANSPORT_DELIVER_PATTERN = compile("^\\[Transport] Du hast (eine Holz Lieferung|eine Kiste|eine Waffenkiste|ein Weizen Paket|eine Schwarzpulverkiste) abgeliefert\\.$");
     private static final Pattern DRINK_TRANSPORT_DELIVER_PATTERN = compile("^\\[Bar] Du hast eine Flasche abgegeben!$");
     private static final Pattern PIZZA_JOB_TRANSPORT_GET_PIZZA_PATTERN = compile("^\\[Pizzalieferant] Sobald du 10 Pizzen dabei hast, wird dir deine erste Route angezeigt\\.$");
 
     @Override
     public boolean onCommandSend(@NotNull String command) {
-        if (command.equals("sägewerk")) {
+        if (SAWMILL_TEXT.equals(command)) {
             utilService.delayedAction(() -> commandService.sendCommand("findtree"), 1000);
         }