From fd6fcf950c6fc1e5ba9c58559a00f675ebed3aa3 Mon Sep 17 00:00:00 2001 From: jzitnik-dev Date: Thu, 13 Mar 2025 10:32:54 +0100 Subject: [PATCH] chore: Minor changes --- src/main/java/cz/jzitnik/game/Game.java | 2 +- .../{ThreadAnnotation.java => ThreadRegistry.java} | 2 +- .../java/cz/jzitnik/game/entities/items/InventoryItem.java | 1 - src/main/java/cz/jzitnik/game/threads/ThreadProvider.java | 4 ++-- .../jzitnik/game/threads/list/HealthRegenerationThread.java | 4 ++-- .../java/cz/jzitnik/game/threads/list/HungerDrainThread.java | 4 ++-- .../java/cz/jzitnik/game/threads/list/InputHandlerThread.java | 4 ++-- .../java/cz/jzitnik/game/threads/list/NoHungerThread.java | 4 ++-- .../java/cz/jzitnik/tui/ScreenMovingCalculationProvider.java | 4 ++++ 9 files changed, 16 insertions(+), 13 deletions(-) rename src/main/java/cz/jzitnik/game/annotations/{ThreadAnnotation.java => ThreadRegistry.java} (87%) diff --git a/src/main/java/cz/jzitnik/game/Game.java b/src/main/java/cz/jzitnik/game/Game.java index 9905519..380f5ce 100644 --- a/src/main/java/cz/jzitnik/game/Game.java +++ b/src/main/java/cz/jzitnik/game/Game.java @@ -253,7 +253,7 @@ public class Game implements Serializable { } } - if (inventory.getItemInHand().isPresent()) { + if (inventory.getItemInHand().isPresent() && inventory.getItemInHand().get().getMaxDurability() != 0) { boolean broken = inventory.getItemInHand().get().use(); if (broken) { inventory.decreaseItemInHand(); diff --git a/src/main/java/cz/jzitnik/game/annotations/ThreadAnnotation.java b/src/main/java/cz/jzitnik/game/annotations/ThreadRegistry.java similarity index 87% rename from src/main/java/cz/jzitnik/game/annotations/ThreadAnnotation.java rename to src/main/java/cz/jzitnik/game/annotations/ThreadRegistry.java index 9a2a6fc..6db9f75 100644 --- a/src/main/java/cz/jzitnik/game/annotations/ThreadAnnotation.java +++ b/src/main/java/cz/jzitnik/game/annotations/ThreadRegistry.java @@ -7,5 +7,5 @@ import java.lang.annotation.ElementType; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) -public @interface ThreadAnnotation { +public @interface ThreadRegistry { } diff --git a/src/main/java/cz/jzitnik/game/entities/items/InventoryItem.java b/src/main/java/cz/jzitnik/game/entities/items/InventoryItem.java index 7198ecc..36664e9 100644 --- a/src/main/java/cz/jzitnik/game/entities/items/InventoryItem.java +++ b/src/main/java/cz/jzitnik/game/entities/items/InventoryItem.java @@ -4,7 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; import java.io.Serializable; -import java.lang.foreign.SegmentAllocator; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/cz/jzitnik/game/threads/ThreadProvider.java b/src/main/java/cz/jzitnik/game/threads/ThreadProvider.java index 08351a8..f618c53 100644 --- a/src/main/java/cz/jzitnik/game/threads/ThreadProvider.java +++ b/src/main/java/cz/jzitnik/game/threads/ThreadProvider.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Set; import cz.jzitnik.game.Game; -import cz.jzitnik.game.annotations.ThreadAnnotation; +import cz.jzitnik.game.annotations.ThreadRegistry; import cz.jzitnik.game.entities.Player; import cz.jzitnik.tui.ScreenRenderer; @@ -35,7 +35,7 @@ public class ThreadProvider { private void registerHandlers() { Reflections reflections = new Reflections("cz.jzitnik.game.threads"); - Set> handlerClasses = reflections.getTypesAnnotatedWith(ThreadAnnotation.class); + Set> handlerClasses = reflections.getTypesAnnotatedWith(ThreadRegistry.class); for (Class clazz : handlerClasses) { if (Thread.class.isAssignableFrom(clazz)) { diff --git a/src/main/java/cz/jzitnik/game/threads/list/HealthRegenerationThread.java b/src/main/java/cz/jzitnik/game/threads/list/HealthRegenerationThread.java index d7f7bc5..9a68cda 100644 --- a/src/main/java/cz/jzitnik/game/threads/list/HealthRegenerationThread.java +++ b/src/main/java/cz/jzitnik/game/threads/list/HealthRegenerationThread.java @@ -1,11 +1,11 @@ package cz.jzitnik.game.threads.list; -import cz.jzitnik.game.annotations.ThreadAnnotation; +import cz.jzitnik.game.annotations.ThreadRegistry; import cz.jzitnik.game.entities.Player; import lombok.AllArgsConstructor; @AllArgsConstructor -@ThreadAnnotation +@ThreadRegistry public class HealthRegenerationThread extends Thread { private final Player player; diff --git a/src/main/java/cz/jzitnik/game/threads/list/HungerDrainThread.java b/src/main/java/cz/jzitnik/game/threads/list/HungerDrainThread.java index 28deca4..f201265 100644 --- a/src/main/java/cz/jzitnik/game/threads/list/HungerDrainThread.java +++ b/src/main/java/cz/jzitnik/game/threads/list/HungerDrainThread.java @@ -1,11 +1,11 @@ package cz.jzitnik.game.threads.list; -import cz.jzitnik.game.annotations.ThreadAnnotation; +import cz.jzitnik.game.annotations.ThreadRegistry; import cz.jzitnik.game.entities.Player; import lombok.AllArgsConstructor; @AllArgsConstructor -@ThreadAnnotation +@ThreadRegistry public class HungerDrainThread extends Thread { private final Player player; diff --git a/src/main/java/cz/jzitnik/game/threads/list/InputHandlerThread.java b/src/main/java/cz/jzitnik/game/threads/list/InputHandlerThread.java index 0e92837..00c96fa 100644 --- a/src/main/java/cz/jzitnik/game/threads/list/InputHandlerThread.java +++ b/src/main/java/cz/jzitnik/game/threads/list/InputHandlerThread.java @@ -11,9 +11,9 @@ import org.jline.terminal.Terminal; import java.io.IOException; import java.nio.BufferUnderflowException; import java.util.Optional; -import cz.jzitnik.game.annotations.ThreadAnnotation; +import cz.jzitnik.game.annotations.ThreadRegistry; -@ThreadAnnotation +@ThreadRegistry public class InputHandlerThread extends Thread { private final Game game; private final Terminal terminal; diff --git a/src/main/java/cz/jzitnik/game/threads/list/NoHungerThread.java b/src/main/java/cz/jzitnik/game/threads/list/NoHungerThread.java index 8081f8f..60ec560 100644 --- a/src/main/java/cz/jzitnik/game/threads/list/NoHungerThread.java +++ b/src/main/java/cz/jzitnik/game/threads/list/NoHungerThread.java @@ -1,11 +1,11 @@ package cz.jzitnik.game.threads.list; -import cz.jzitnik.game.annotations.ThreadAnnotation; +import cz.jzitnik.game.annotations.ThreadRegistry; import cz.jzitnik.game.entities.Player; import lombok.AllArgsConstructor; @AllArgsConstructor -@ThreadAnnotation +@ThreadRegistry public class NoHungerThread extends Thread { private final Player player; diff --git a/src/main/java/cz/jzitnik/tui/ScreenMovingCalculationProvider.java b/src/main/java/cz/jzitnik/tui/ScreenMovingCalculationProvider.java index ff01083..52acf53 100644 --- a/src/main/java/cz/jzitnik/tui/ScreenMovingCalculationProvider.java +++ b/src/main/java/cz/jzitnik/tui/ScreenMovingCalculationProvider.java @@ -22,3 +22,7 @@ public class ScreenMovingCalculationProvider { return new int[] { startX, endX, startY, endY }; } } + +class Something { + +}