diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index c168b80..e917175 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -2,7 +2,8 @@ \ No newline at end of file diff --git a/app/src/main/java/org/toop/Main.java b/app/src/main/java/org/toop/Main.java index 8456819..029fa28 100644 --- a/app/src/main/java/org/toop/Main.java +++ b/app/src/main/java/org/toop/Main.java @@ -8,7 +8,7 @@ import org.toop.framework.networking.NetworkingClientManager; import org.toop.framework.networking.NetworkingInitializationException; public final class Main { - public static void main(String[] args) { + static void main(String[] args) { initSystems(); App.run(args); } diff --git a/app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java b/app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java index 460b89d..db4c6dc 100644 --- a/app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java +++ b/app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java @@ -1,5 +1,6 @@ package org.toop.app.layer.layers.game; +import java.util.Objects; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicBoolean; @@ -153,6 +154,7 @@ public final class TicTacToeLayer extends Layer { if (legalMove.position() == wants.position() && legalMove.value() == wants.value()) { move = wants; + // TODO: maybe add break? } } } catch (InterruptedException _) { @@ -315,7 +317,7 @@ public final class TicTacToeLayer extends Layer { ticTacToe.get(), compurterDifficultyToDepth(10, information.computerDifficulty()[0])); - position = move.position(); + position = Objects.requireNonNull(move).position(); } new EventFlow() diff --git a/framework/src/main/java/org/toop/framework/asset/ResourceManager.java b/framework/src/main/java/org/toop/framework/asset/ResourceManager.java index 7878a7e..404b2f5 100644 --- a/framework/src/main/java/org/toop/framework/asset/ResourceManager.java +++ b/framework/src/main/java/org/toop/framework/asset/ResourceManager.java @@ -9,7 +9,7 @@ import org.toop.framework.asset.resources.*; /** * Centralized manager for all loaded assets in the application. * - *

{@code ResourceManager} maintains a thread-safe registry of {@link Asset} objects and provides + *

{@code ResourceManager} maintains a thread-safe registry of {@link ResourceMeta} objects and provides * utility methods to retrieve assets by name, ID, or type. It works together with {@link * ResourceLoader} to register assets automatically when they are loaded from the file system. * @@ -50,21 +50,11 @@ import org.toop.framework.asset.resources.*; */ public class ResourceManager { private static final Logger logger = LogManager.getLogger(ResourceManager.class); - private static final ResourceManager INSTANCE = new ResourceManager(); private static final Map> assets = new ConcurrentHashMap<>(); private ResourceManager() {} - /** - * Returns the singleton instance of {@code ResourceManager}. - * - * @return the shared instance - */ - public static ResourceManager getInstance() { - return INSTANCE; - } - /** * Loads all assets from a given {@link ResourceLoader} into the manager. * diff --git a/framework/src/main/java/org/toop/framework/asset/resources/JsonAsset.java b/framework/src/main/java/org/toop/framework/asset/resources/JsonAsset.java index d5beda4..9d9c516 100644 --- a/framework/src/main/java/org/toop/framework/asset/resources/JsonAsset.java +++ b/framework/src/main/java/org/toop/framework/asset/resources/JsonAsset.java @@ -61,7 +61,8 @@ public class JsonAsset extends BaseResource implements LoadableResource { File file = getFile(); File parent = file.getParentFile(); if (parent != null && !parent.exists()) { - parent.mkdirs(); + boolean isDirectoryMade = parent.mkdirs(); + assert isDirectoryMade; } try (FileWriter writer = new FileWriter(file)) { gson.toJson(content, writer); diff --git a/framework/src/main/java/org/toop/framework/audio/SoundManager.java b/framework/src/main/java/org/toop/framework/audio/SoundManager.java index f6608ba..4e1c8b2 100644 --- a/framework/src/main/java/org/toop/framework/audio/SoundManager.java +++ b/framework/src/main/java/org/toop/framework/audio/SoundManager.java @@ -120,7 +120,7 @@ public class SoundManager { logger.info("Playing background music: {}", ma.getFile().getName()); logger.info( "Background music next in line: {}", - backgroundMusicQueue.peek().getFile().getName()); + backgroundMusicQueue.peek() != null ? backgroundMusicQueue.peek().getFile().getName() : null); } private long playSound(String audioFileName, boolean loop) diff --git a/framework/src/main/java/org/toop/framework/eventbus/ListenerHandler.java b/framework/src/main/java/org/toop/framework/eventbus/ListenerHandler.java index 8daa274..cc5fbc4 100644 --- a/framework/src/main/java/org/toop/framework/eventbus/ListenerHandler.java +++ b/framework/src/main/java/org/toop/framework/eventbus/ListenerHandler.java @@ -1,7 +1,7 @@ package org.toop.framework.eventbus; public class ListenerHandler { - private Object listener = null; + private Object listener; // private boolean unsubscribeAfterSuccess = true; diff --git a/framework/src/main/java/org/toop/framework/networking/NetworkingClient.java b/framework/src/main/java/org/toop/framework/networking/NetworkingClient.java index 74f8a9f..fd99bf7 100644 --- a/framework/src/main/java/org/toop/framework/networking/NetworkingClient.java +++ b/framework/src/main/java/org/toop/framework/networking/NetworkingClient.java @@ -84,9 +84,9 @@ public class NetworkingClient { if (isChannelActive()) { this.channel.writeAndFlush(msg); logger.info( - "Connection {} sent message: '{}'", this.channel.remoteAddress(), literalMsg); + "Connection {} sent message: '{}' ", this.channel.remoteAddress(), literalMsg); } else { - logger.warn("Cannot send message: '{}', connection inactive.", literalMsg); + logger.warn("Cannot send message: '{}', connection inactive. ", literalMsg); } } diff --git a/framework/src/main/java/org/toop/framework/networking/NetworkingGameClientHandler.java b/framework/src/main/java/org/toop/framework/networking/NetworkingGameClientHandler.java index 0b6dcaa..4e04c56 100644 --- a/framework/src/main/java/org/toop/framework/networking/NetworkingGameClientHandler.java +++ b/framework/src/main/java/org/toop/framework/networking/NetworkingGameClientHandler.java @@ -136,7 +136,7 @@ public class NetworkingGameClientHandler extends ChannelInboundHandlerAdapter { try { String[] msg = Pattern.compile( - "(?:CHALLENGER|GAMETYPE|CHALLENGENUMBER):\\s*\"?(.*?)\"?\\s*(?:,|})") + "(?:CHALLENGER|GAMETYPE|CHALLENGENUMBER):\\s*\"?(.*?)\"?\\s*[,}]") .matcher(rec) .results() .map(m -> m.group().trim())