diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/AddonLoader.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/AddonLoader.java index 2dbc44b..bfd567d 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/AddonLoader.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/AddonLoader.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.addon; import dev.unlegitdqrk.unlegitlibrary.addon.events.AddonLoadedEvent; @@ -10,7 +8,6 @@ import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; import java.io.File; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; @@ -30,7 +27,7 @@ public final class AddonLoader extends DefaultMethodsOverrider { this.eventManager = eventManager; } - public final void loadAddonsFromDirectory(File addonFolder) throws IOException { + public void loadAddonsFromDirectory(File addonFolder) throws IOException { if (!addonFolder.exists()) return; if (!addonFolder.isDirectory()) return; @@ -40,7 +37,7 @@ public final class AddonLoader extends DefaultMethodsOverrider { } } - public final void loadAddonFromJar(File file) throws IOException { + public void loadAddonFromJar(File file) throws IOException { try (JarFile jarFile = new JarFile(file)) { URL[] urls = {new URL("jar:file:" + file.getAbsolutePath() + "!/")}; URLClassLoader classLoader = URLClassLoader.newInstance(urls, getClass().getClassLoader()); @@ -66,35 +63,35 @@ public final class AddonLoader extends DefaultMethodsOverrider { } } - public final void enableAddon(Addon addon) { + public void enableAddon(Addon addon) { if (!addons.contains(addon)) return; addon.enable(); } - public final void disableAddon(Addon addon) { + public void disableAddon(Addon addon) { if (!addons.contains(addon)) return; addon.disable(); } - public final void enableAll() { + public void enableAll() { addons.forEach(this::enableAddon); } - public final void disableAll() { + public void disableAll() { addons.forEach(this::disableAddon); } - public final void registerEventListener(Addon addon, Class eventListener) throws Exception { + public void registerEventListener(Addon addon, Class eventListener) throws Exception { if (!addons.contains(addon)) return; addon.registerEventListener(eventListener); } - public final void unregisterEventListener(Addon addon, Class eventListener) { + public void unregisterEventListener(Addon addon, Class eventListener) { if (!addons.contains(addon)) return; addon.unregisterEventListener(eventListener); } - public final List getLoadedAddons() { + public List getLoadedAddons() { return new ArrayList<>(addons); } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/events/AddonDisabledEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/events/AddonDisabledEvent.java index 17d7d8d..9b2f71a 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/events/AddonDisabledEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/events/AddonDisabledEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.addon.events; import dev.unlegitdqrk.unlegitlibrary.addon.impl.Addon; @@ -18,22 +16,22 @@ public final class AddonDisabledEvent extends Event { } @Override - protected final Object clone() throws CloneNotSupportedException { + protected Object clone() throws CloneNotSupportedException { return super.clone(); } @Override - public final boolean equals(Object obj) { + public boolean equals(Object obj) { return super.equals(obj); } @Override - public final String toString() { + public String toString() { return super.toString(); } @Override - public final int hashCode() { + public int hashCode() { return super.hashCode(); } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/events/AddonEnabledEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/events/AddonEnabledEvent.java index 457a75a..a0fd3d2 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/events/AddonEnabledEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/events/AddonEnabledEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.addon.events; import dev.unlegitdqrk.unlegitlibrary.addon.impl.Addon; @@ -18,22 +16,22 @@ public final class AddonEnabledEvent extends Event { } @Override - protected final Object clone() throws CloneNotSupportedException { + protected Object clone() throws CloneNotSupportedException { return super.clone(); } @Override - public final boolean equals(Object obj) { + public boolean equals(Object obj) { return super.equals(obj); } @Override - public final String toString() { + public String toString() { return super.toString(); } @Override - public final int hashCode() { + public int hashCode() { return super.hashCode(); } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/events/AddonLoadedEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/events/AddonLoadedEvent.java index df4a58a..ebcde0e 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/events/AddonLoadedEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/events/AddonLoadedEvent.java @@ -16,22 +16,22 @@ public final class AddonLoadedEvent extends Event { } @Override - protected final Object clone() throws CloneNotSupportedException { + protected Object clone() throws CloneNotSupportedException { return super.clone(); } @Override - public final boolean equals(Object obj) { + public boolean equals(Object obj) { return super.equals(obj); } @Override - public final String toString() { + public String toString() { return super.toString(); } @Override - public final int hashCode() { + public int hashCode() { return super.hashCode(); } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/impl/Addon.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/impl/Addon.java index dfa3741..1adb86e 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/impl/Addon.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/impl/Addon.java @@ -1,15 +1,10 @@ - - package dev.unlegitdqrk.unlegitlibrary.addon.impl; import dev.unlegitdqrk.unlegitlibrary.addon.events.AddonDisabledEvent; import dev.unlegitdqrk.unlegitlibrary.addon.events.AddonEnabledEvent; import dev.unlegitdqrk.unlegitlibrary.event.EventListener; -import dev.unlegitdqrk.unlegitlibrary.event.EventManager; import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; -import java.lang.reflect.InvocationTargetException; - public abstract class Addon { private final AddonInfo addonInfo; @@ -29,15 +24,15 @@ public abstract class Addon { public void executeEvent(Event event) { if (!isEnabled) return; - addonInfo.getEventManager().executeEvent(event); + addonInfo.eventManager().executeEvent(event); } public final void registerEventListener(Class eventListener) throws Exception { - addonInfo.getEventManager().registerListener(eventListener); + addonInfo.eventManager().registerListener(eventListener); } public final void unregisterEventListener(Class eventListener) { - addonInfo.getEventManager().unregisterListener(eventListener); + addonInfo.eventManager().unregisterListener(eventListener); } public abstract void onEnable(); @@ -49,7 +44,7 @@ public abstract class Addon { isEnabled = true; onEnable(); - addonInfo.getEventManager().executeEvent(new AddonEnabledEvent(this)); + addonInfo.eventManager().executeEvent(new AddonEnabledEvent(this)); } public final void disable() { @@ -57,6 +52,6 @@ public abstract class Addon { isEnabled = false; onDisable(); - addonInfo.getEventManager().executeEvent(new AddonDisabledEvent(this)); + addonInfo.eventManager().executeEvent(new AddonDisabledEvent(this)); } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/impl/AddonInfo.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/impl/AddonInfo.java index fa5b988..ddc3805 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/impl/AddonInfo.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/addon/impl/AddonInfo.java @@ -1,38 +1,8 @@ - - package dev.unlegitdqrk.unlegitlibrary.addon.impl; import dev.unlegitdqrk.unlegitlibrary.event.EventManager; -public class AddonInfo { - - private final String name; - private final String version; - private final String author; - private final EventManager eventManager; - - public AddonInfo(String name, String version, String author, EventManager eventManager) { - this.name = name; - this.version = version; - this.author = author; - this.eventManager = eventManager; - } - - public final String getAuthor() { - return author; - } - - public final String getName() { - return name; - } - - public final String getVersion() { - return version; - } - - public final EventManager getEventManager() { - return eventManager; - } +public record AddonInfo(String name, String version, String author, EventManager eventManager) { @Override protected AddonInfo clone() throws CloneNotSupportedException { @@ -41,8 +11,7 @@ public class AddonInfo { @Override public boolean equals(Object obj) { - if (!(obj instanceof AddonInfo)) return false; - AddonInfo other = (AddonInfo) obj; + if (!(obj instanceof AddonInfo other)) return false; return other.name.equalsIgnoreCase(name) && other.version.equalsIgnoreCase(version) && other.author.equalsIgnoreCase(author); } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/Command.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/Command.java index a8594ac..235a2d7 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/Command.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/Command.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.command; import javax.management.InstanceAlreadyExistsException; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/CommandExecutor.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/CommandExecutor.java index 10fa966..90e47c8 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/CommandExecutor.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/CommandExecutor.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.command; import java.util.ArrayList; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/CommandManager.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/CommandManager.java index efff3f4..4c5c441 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/CommandManager.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/CommandManager.java @@ -16,18 +16,19 @@ public final class CommandManager { } // Registriere die Klasse, instanziiere sie einmalig - public final void registerCommand(Class commandClass) { + public void registerCommand(Class commandClass) { if (commandInstances.containsKey(commandClass)) return; try { Command instance = commandClass.getDeclaredConstructor().newInstance(); commandInstances.put(commandClass, instance); - } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { + } catch (InstantiationException | IllegalAccessException | InvocationTargetException | + NoSuchMethodException e) { e.printStackTrace(); // Oder Logger verwenden } } - public final void unregisterCommand(Class commandClass) { + public void unregisterCommand(Class commandClass) { commandInstances.remove(commandClass); } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/CommandPermission.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/CommandPermission.java index 051ed1b..b844a46 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/CommandPermission.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/CommandPermission.java @@ -1,7 +1,5 @@ - - package dev.unlegitdqrk.unlegitlibrary.command; -public final record CommandPermission(String name, int level) { +public record CommandPermission(String name, int level) { } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/CommandExecuteEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/CommandExecuteEvent.java index 364bc8a..85d8668 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/CommandExecuteEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/CommandExecuteEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.command.events; import dev.unlegitdqrk.unlegitlibrary.command.Command; @@ -12,6 +10,12 @@ public final class CommandExecuteEvent extends CancellableEvent { private final CommandExecutor commandExecutor; private final Command command; + public CommandExecuteEvent(CommandManager commandManager, CommandExecutor commandExecutor, Command command) { + this.commandManager = commandManager; + this.commandExecutor = commandExecutor; + this.command = command; + } + public CommandManager getCommandManager() { return commandManager; } @@ -23,10 +27,4 @@ public final class CommandExecuteEvent extends CancellableEvent { public Command getCommand() { return command; } - - public CommandExecuteEvent(CommandManager commandManager, CommandExecutor commandExecutor, Command command) { - this.commandManager = commandManager; - this.commandExecutor = commandExecutor; - this.command = command; - } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/CommandExecutedEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/CommandExecutedEvent.java index d92e9f2..4b743f9 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/CommandExecutedEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/CommandExecutedEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.command.events; import dev.unlegitdqrk.unlegitlibrary.command.Command; @@ -12,6 +10,12 @@ public final class CommandExecutedEvent extends Event { private final CommandExecutor commandExecutor; private final Command command; + public CommandExecutedEvent(CommandManager commandManager, CommandExecutor commandExecutor, Command command) { + this.commandManager = commandManager; + this.commandExecutor = commandExecutor; + this.command = command; + } + public CommandExecutor getCommandExecutor() { return commandExecutor; } @@ -23,10 +27,4 @@ public final class CommandExecutedEvent extends Event { public Command getCommand() { return command; } - - public CommandExecutedEvent(CommandManager commandManager, CommandExecutor commandExecutor, Command command) { - this.commandManager = commandManager; - this.commandExecutor = commandExecutor; - this.command = command; - } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/CommandExecutorMissingPermissionEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/CommandExecutorMissingPermissionEvent.java index 3c4425b..969a9fc 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/CommandExecutorMissingPermissionEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/CommandExecutorMissingPermissionEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.command.events; import dev.unlegitdqrk.unlegitlibrary.command.Command; @@ -12,6 +10,12 @@ public final class CommandExecutorMissingPermissionEvent extends Event { private final CommandExecutor commandExecutor; private final Command command; + public CommandExecutorMissingPermissionEvent(CommandManager commandManager, CommandExecutor commandExecutor, Command command) { + this.commandManager = commandManager; + this.commandExecutor = commandExecutor; + this.command = command; + } + public CommandManager getCommandManager() { return commandManager; } @@ -23,10 +27,4 @@ public final class CommandExecutorMissingPermissionEvent extends Event { public CommandExecutor getCommandExecutor() { return commandExecutor; } - - public CommandExecutorMissingPermissionEvent(CommandManager commandManager, CommandExecutor commandExecutor, Command command) { - this.commandManager = commandManager; - this.commandExecutor = commandExecutor; - this.command = command; - } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/CommandNotFoundEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/CommandNotFoundEvent.java index 8b91059..3b79315 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/CommandNotFoundEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/CommandNotFoundEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.command.events; import dev.unlegitdqrk.unlegitlibrary.command.CommandExecutor; @@ -12,6 +10,13 @@ public final class CommandNotFoundEvent extends Event { private final String name; private final String[] args; + public CommandNotFoundEvent(CommandManager commandManager, CommandExecutor commandExecutor, String name, String[] args) { + this.commandManager = commandManager; + this.commandExecutor = commandExecutor; + this.name = name; + this.args = args; + } + public CommandManager getCommandManager() { return commandManager; } @@ -27,11 +32,4 @@ public final class CommandNotFoundEvent extends Event { public String[] getArgs() { return args; } - - public CommandNotFoundEvent(CommandManager commandManager, CommandExecutor commandExecutor, String name, String[] args) { - this.commandManager = commandManager; - this.commandExecutor = commandExecutor; - this.name = name; - this.args = args; - } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/PreCommandExecuteEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/PreCommandExecuteEvent.java index bbe32ea..7427371 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/PreCommandExecuteEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/command/events/PreCommandExecuteEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.command.events; import dev.unlegitdqrk.unlegitlibrary.command.Command; @@ -12,6 +10,12 @@ public final class PreCommandExecuteEvent extends CancellableEvent { private final CommandExecutor commandExecutor; private final Command command; + public PreCommandExecuteEvent(CommandManager commandManager, CommandExecutor commandExecutor, Command command) { + this.commandManager = commandManager; + this.commandExecutor = commandExecutor; + this.command = command; + } + public Command getCommand() { return command; } @@ -23,10 +27,4 @@ public final class PreCommandExecuteEvent extends CancellableEvent { public CommandManager getCommandManager() { return commandManager; } - - public PreCommandExecuteEvent(CommandManager commandManager, CommandExecutor commandExecutor, Command command) { - this.commandManager = commandManager; - this.commandExecutor = commandExecutor; - this.command = command; - } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/EventListener.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/EventListener.java index 0ecbc46..6873e29 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/EventListener.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/EventListener.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.event; public abstract class EventListener { diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/EventManager.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/EventManager.java index 89c07a0..f871410 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/EventManager.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/EventManager.java @@ -5,14 +5,17 @@ import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.*; +import java.util.Collections; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.Map; public final class EventManager extends DefaultMethodsOverrider { private final Map, Map>> registeredListener = new HashMap<>(); private final Map, Object> eventListeners = new HashMap<>(); - public final void registerListener(Class listenerClass) throws Exception { + public void registerListener(Class listenerClass) throws Exception { if (isListenerRegistered(listenerClass)) return; Object instance = listenerClass.getDeclaredConstructor().newInstance(); @@ -37,7 +40,7 @@ public final class EventManager extends DefaultMethodsOverrider { eventListeners.put(listenerClass, instance); } - public synchronized final void unregisterListener(Class listenerClass) { + public synchronized void unregisterListener(Class listenerClass) { if (!isListenerRegistered(listenerClass)) return; Object instance = eventListeners.get(listenerClass); @@ -55,11 +58,11 @@ public final class EventManager extends DefaultMethodsOverrider { eventListeners.remove(listenerClass); } - public final boolean isListenerRegistered(Class listenerClass) { + public boolean isListenerRegistered(Class listenerClass) { return eventListeners.containsKey(listenerClass); } - public final void executeEvent(Event event) { + public void executeEvent(Event event) { Map> listenersByPriority = registeredListener.get(event.getClass()); if (listenersByPriority == null) return; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/EventPriority.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/EventPriority.java index d850c1e..744bdfb 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/EventPriority.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/EventPriority.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.event; public enum EventPriority { diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/Listener.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/Listener.java index ebdcbaa..78d02e3 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/Listener.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/Listener.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.event; import java.lang.annotation.*; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/impl/CancellableEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/impl/CancellableEvent.java index 04da13c..358e332 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/impl/CancellableEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/impl/CancellableEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.event.impl; public class CancellableEvent extends Event { diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/impl/Event.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/impl/Event.java index 2466f78..1fd232a 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/impl/Event.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/event/impl/Event.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.event.impl; public abstract class Event { diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/file/ClassDefiner.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/file/ClassDefiner.java index 94d27e4..6178534 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/file/ClassDefiner.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/file/ClassDefiner.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.file; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/file/ConfigurationManager.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/file/ConfigurationManager.java index 553ee6a..2b065fd 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/file/ConfigurationManager.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/file/ConfigurationManager.java @@ -1,4 +1,3 @@ - package dev.unlegitdqrk.unlegitlibrary.file; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; @@ -18,39 +17,39 @@ public final class ConfigurationManager extends DefaultMethodsOverrider { this.configFile = configFile; } - public final boolean isSet(String key) { + public boolean isSet(String key) { return properties.containsKey(key); } - public final void loadProperties() throws IOException { + public void loadProperties() throws IOException { try (FileInputStream in = new FileInputStream(configFile)) { properties.load(in); } } - public final void saveProperties() throws IOException { + public void saveProperties() throws IOException { try (FileOutputStream out = new FileOutputStream(configFile)) { properties.store(out, null); } } - public final long getLong(String key) { + public long getLong(String key) { return Long.parseLong(properties.getProperty(key)); } - public final double getDouble(String key) { + public double getDouble(String key) { return Double.parseDouble(properties.getProperty(key)); } - public final float getFloat(String key) { + public float getFloat(String key) { return Float.parseFloat(properties.getProperty(key)); } - public final int getInt(String key) { + public int getInt(String key) { return Integer.parseInt(properties.getProperty(key)); } - public final Object getObject(String key) { + public Object getObject(String key) { return properties.getProperty(key); } @@ -70,42 +69,42 @@ public final class ConfigurationManager extends DefaultMethodsOverrider { return map; } - public final String getString(String key) { + public String getString(String key) { return properties.getProperty(key); } - public final List getList(String key) { + public List getList(String key) { String value = properties.getProperty(key); if (value != null) return Arrays.asList(value.split(",")); else return new ArrayList<>(); } - public final void set(String key, long value) { + public void set(String key, long value) { properties.setProperty(key, String.valueOf(value)); } - public final void set(String key, int value) { + public void set(String key, int value) { properties.setProperty(key, String.valueOf(value)); } - public final void set(String key, double value) { + public void set(String key, double value) { properties.setProperty(key, String.valueOf(value)); } - public final void set(String key, float value) { + public void set(String key, float value) { properties.setProperty(key, String.valueOf(value)); } - public final void set(String key, Object value) { + public void set(String key, Object value) { properties.setProperty(key, String.valueOf(value)); } - public final void set(String key, String value) { + public void set(String key, String value) { properties.setProperty(key, value); } - public final void set(String key, Map map) { + public void set(String key, Map map) { String value = map.entrySet().stream() .map(entry -> entry.getKey() + "=" + entry.getValue()) .collect(Collectors.joining(",")); @@ -113,7 +112,7 @@ public final class ConfigurationManager extends DefaultMethodsOverrider { properties.setProperty(key, value); } - public final void set(String key, List list) { + public void set(String key, List list) { String value = list.stream().collect(Collectors.joining(",")); properties.setProperty(key, value); } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/file/FileUtils.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/file/FileUtils.java index 47c00c3..1c65e36 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/file/FileUtils.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/file/FileUtils.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.file; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/file/ReflectUtils.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/file/ReflectUtils.java index 008d1bb..21ff5b1 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/file/ReflectUtils.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/file/ReflectUtils.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.file; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/NetworkClient.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/NetworkClient.java index 50f2b40..174195e 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/NetworkClient.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/NetworkClient.java @@ -1,4 +1,3 @@ - package dev.unlegitdqrk.unlegitlibrary.network.system.client; import dev.unlegitdqrk.unlegitlibrary.event.EventManager; @@ -26,13 +25,31 @@ public final class NetworkClient { private final EventManager eventManager; private final Logger logger; private final int timeout; + private final SSLSocketFactory sslSocketFactory; + private final SSLParameters sslParameters; + private final Proxy proxy; private SSLSocket socket; private ObjectOutputStream outputStream; private ObjectInputStream inputStream; - private final SSLSocketFactory sslSocketFactory; - private final SSLParameters sslParameters; private int clientID = -1; - private final Proxy proxy; + + private NetworkClient(String host, int port, PacketHandler packetHandler, + EventManager eventManager, Logger logger, + int timeout, SSLSocketFactory sslSocketFactory, + SSLParameters sslParameters, Proxy proxy) { + this.host = host; + this.port = port; + this.packetHandler = packetHandler; + this.eventManager = eventManager; + this.logger = logger; + this.timeout = timeout; + this.sslSocketFactory = sslSocketFactory; + this.sslParameters = sslParameters; + + this.packetHandler.setClientInstance(this); + this.packetHandler.registerPacket(new ClientIDPacket()); + this.proxy = proxy; + } public Proxy getProxy() { return proxy; @@ -44,9 +61,7 @@ public final class NetworkClient { public void setClientID(int clientID) { if (this.clientID == -1) this.clientID = clientID; - } - - private final Thread receiveThread = new Thread(this::receive); + } private final Thread receiveThread = new Thread(this::receive); public PacketHandler getPacketHandler() { return packetHandler; @@ -80,24 +95,6 @@ public final class NetworkClient { return host; } - private NetworkClient(String host, int port, PacketHandler packetHandler, - EventManager eventManager, Logger logger, - int timeout, SSLSocketFactory sslSocketFactory, - SSLParameters sslParameters, Proxy proxy) { - this.host = host; - this.port = port; - this.packetHandler = packetHandler; - this.eventManager = eventManager; - this.logger = logger; - this.timeout = timeout; - this.sslSocketFactory = sslSocketFactory; - this.sslParameters = sslParameters; - - this.packetHandler.setClientInstance(this); - this.packetHandler.registerPacket(new ClientIDPacket()); - this.proxy = proxy; - } - public boolean isConnected() { return socket != null && socket.isConnected() && !socket.isClosed() && receiveThread.isAlive() && !receiveThread.isInterrupted(); @@ -110,7 +107,8 @@ public final class NetworkClient { else System.out.println("Trying to connect to " + host + ":" + port + "..."); try { - if (sslSocketFactory == null) throw new ConnectException("SSL socket factory not set. Client certificate required!"); + if (sslSocketFactory == null) + throw new ConnectException("SSL socket factory not set. Client certificate required!"); if (proxy != null) { Socket rawSocket = new Socket(proxy); @@ -152,7 +150,9 @@ public final class NetworkClient { Object received = inputStream.readObject(); handleReceived(received); } - } catch (Exception e) { disconnect(); } + } catch (Exception e) { + disconnect(); + } } private void handleReceived(Object received) throws IOException, ClassNotFoundException { @@ -216,28 +216,6 @@ public final class NetworkClient { private File keyFolder; private Proxy proxy; - public ClientBuilder setHost(String host) { this.host = host; return this; } - public ClientBuilder setPort(int port) { this.port = port; return this; } - public ClientBuilder setPacketHandler(PacketHandler handler) { this.packetHandler = handler; return this; } - public ClientBuilder setEventManager(EventManager manager) { this.eventManager = manager; return this; } - public ClientBuilder setLogger(Logger logger) { this.logger = logger; return this; } - public ClientBuilder setTimeout(int timeout) { this.timeout = timeout; return this; } - public ClientBuilder setSSLSocketFactory(SSLSocketFactory factory) { this.sslSocketFactory = factory; return this; } - public ClientBuilder setSSLParameters(SSLParameters params) { this.sslParameters = params; return this; } - public ClientBuilder setRootCAFolder(File folder) { this.caFolder = folder; return this; } - public ClientBuilder setClientCertificatesFolder(File clientFolder, File keyFolder) { this.clientFolder = clientFolder; this.keyFolder = keyFolder; return this; } - public ClientBuilder setProxy(Proxy proxy) { this.proxy = proxy; return this; } - - public NetworkClient build() { - if (sslSocketFactory == null && caFolder != null) { - try { sslSocketFactory = createSSLSocketFactory(caFolder, clientFolder, keyFolder); } - catch (Exception e) { throw new RuntimeException("Failed to create SSLFactory", e); } - } - - return new NetworkClient(host, port, packetHandler, eventManager, logger, - timeout, sslSocketFactory, sslParameters, proxy); - } - public static SSLSocketFactory createSSLSocketFactory(File caFolder, File clientCertFolder, File clientKeyFolder) throws Exception { // TrustStore (Root-CAs) KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType()); @@ -278,5 +256,76 @@ public final class NetworkClient { sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); return sslContext.getSocketFactory(); } + + public ClientBuilder setHost(String host) { + this.host = host; + return this; + } + + public ClientBuilder setPort(int port) { + this.port = port; + return this; + } + + public ClientBuilder setPacketHandler(PacketHandler handler) { + this.packetHandler = handler; + return this; + } + + public ClientBuilder setEventManager(EventManager manager) { + this.eventManager = manager; + return this; + } + + public ClientBuilder setLogger(Logger logger) { + this.logger = logger; + return this; + } + + public ClientBuilder setTimeout(int timeout) { + this.timeout = timeout; + return this; + } + + public ClientBuilder setSSLSocketFactory(SSLSocketFactory factory) { + this.sslSocketFactory = factory; + return this; + } + + public ClientBuilder setSSLParameters(SSLParameters params) { + this.sslParameters = params; + return this; + } + + public ClientBuilder setRootCAFolder(File folder) { + this.caFolder = folder; + return this; + } + + public ClientBuilder setClientCertificatesFolder(File clientFolder, File keyFolder) { + this.clientFolder = clientFolder; + this.keyFolder = keyFolder; + return this; + } + + public ClientBuilder setProxy(Proxy proxy) { + this.proxy = proxy; + return this; + } + + public NetworkClient build() { + if (sslSocketFactory == null && caFolder != null) { + try { + sslSocketFactory = createSSLSocketFactory(caFolder, clientFolder, keyFolder); + } catch (Exception e) { + throw new RuntimeException("Failed to create SSLFactory", e); + } + } + + return new NetworkClient(host, port, packetHandler, eventManager, logger, + timeout, sslSocketFactory, sslParameters, proxy); + } } + + } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_PacketReceivedEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_PacketReceivedEvent.java index e1c7624..02664f3 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_PacketReceivedEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_PacketReceivedEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.client.events; import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; @@ -10,6 +8,11 @@ public final class C_PacketReceivedEvent extends Event { private final NetworkClient networkClient; private final Packet packet; + public C_PacketReceivedEvent(NetworkClient networkClient, Packet packet) { + this.networkClient = networkClient; + this.packet = packet; + } + public NetworkClient getNetworkClient() { return networkClient; } @@ -17,9 +20,4 @@ public final class C_PacketReceivedEvent extends Event { public Packet getPacket() { return packet; } - - public C_PacketReceivedEvent(NetworkClient networkClient, Packet packet) { - this.networkClient = networkClient; - this.packet = packet; - } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_PacketReceivedFailedEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_PacketReceivedFailedEvent.java index bd93cc3..a947bd9 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_PacketReceivedFailedEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_PacketReceivedFailedEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.client.events; import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; @@ -10,6 +8,11 @@ public final class C_PacketReceivedFailedEvent extends Event { private final NetworkClient networkClient; private final Packet packet; + public C_PacketReceivedFailedEvent(NetworkClient networkClient, Packet packet) { + this.networkClient = networkClient; + this.packet = packet; + } + public NetworkClient getNetworkClient() { return networkClient; } @@ -17,9 +20,4 @@ public final class C_PacketReceivedFailedEvent extends Event { public Packet getPacket() { return packet; } - - public C_PacketReceivedFailedEvent(NetworkClient networkClient, Packet packet) { - this.networkClient = networkClient; - this.packet = packet; - } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_PacketSendEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_PacketSendEvent.java index b49f27a..55b3e50 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_PacketSendEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_PacketSendEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.client.events; import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; @@ -10,6 +8,11 @@ public final class C_PacketSendEvent extends Event { private final NetworkClient networkClient; private final Packet packet; + public C_PacketSendEvent(NetworkClient networkClient, Packet packet) { + this.networkClient = networkClient; + this.packet = packet; + } + public NetworkClient getNetworkClient() { return networkClient; } @@ -17,9 +20,4 @@ public final class C_PacketSendEvent extends Event { public Packet getPacket() { return packet; } - - public C_PacketSendEvent(NetworkClient networkClient, Packet packet) { - this.networkClient = networkClient; - this.packet = packet; - } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_PacketSendFailedEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_PacketSendFailedEvent.java index b08e07f..53a269a 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_PacketSendFailedEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_PacketSendFailedEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.client.events; import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; @@ -11,6 +9,11 @@ public final class C_PacketSendFailedEvent extends Event { private final Packet packet; + public C_PacketSendFailedEvent(NetworkClient networkClient, Packet packet) { + this.networkClient = networkClient; + this.packet = packet; + } + public NetworkClient getNetworkClient() { return networkClient; } @@ -18,9 +21,4 @@ public final class C_PacketSendFailedEvent extends Event { public Packet getPacket() { return packet; } - - public C_PacketSendFailedEvent(NetworkClient networkClient, Packet packet) { - this.networkClient = networkClient; - this.packet = packet; - } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_UnknownObjectReceivedEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_UnknownObjectReceivedEvent.java index 3140422..a98262e 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_UnknownObjectReceivedEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/C_UnknownObjectReceivedEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.client.events; import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; @@ -9,6 +7,11 @@ public final class C_UnknownObjectReceivedEvent extends Event { private final NetworkClient networkClient; private final Object received; + public C_UnknownObjectReceivedEvent(NetworkClient networkClient, Object received) { + this.networkClient = networkClient; + this.received = received; + } + public NetworkClient getNetworkClient() { return networkClient; } @@ -16,9 +19,4 @@ public final class C_UnknownObjectReceivedEvent extends Event { public Object getReceived() { return received; } - - public C_UnknownObjectReceivedEvent(NetworkClient networkClient, Object received) { - this.networkClient = networkClient; - this.received = received; - } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/ClientConnectedEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/ClientConnectedEvent.java index b7f4819..8ea1100 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/ClientConnectedEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/ClientConnectedEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.client.events; import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; @@ -9,11 +7,11 @@ public final class ClientConnectedEvent extends Event { private final NetworkClient client; - public NetworkClient getClient() { - return client; - } - public ClientConnectedEvent(NetworkClient client) { this.client = client; } + + public NetworkClient getClient() { + return client; + } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/ClientDisconnectedEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/ClientDisconnectedEvent.java index a79994d..be23ef9 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/ClientDisconnectedEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/client/events/ClientDisconnectedEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.client.events; import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; @@ -8,11 +6,11 @@ import dev.unlegitdqrk.unlegitlibrary.network.system.client.NetworkClient; public final class ClientDisconnectedEvent extends Event { private final NetworkClient client; - public NetworkClient getClient() { - return client; - } - public ClientDisconnectedEvent(NetworkClient client) { this.client = client; } + + public NetworkClient getClient() { + return client; + } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/packets/Packet.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/packets/Packet.java index 92ed89b..a8b9de5 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/packets/Packet.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/packets/Packet.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.packets; import java.io.IOException; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/packets/PacketHandler.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/packets/PacketHandler.java index d5ccb67..5214013 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/packets/PacketHandler.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/packets/PacketHandler.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.packets; import dev.unlegitdqrk.unlegitlibrary.network.system.client.NetworkClient; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/packets/impl/ClientIDPacket.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/packets/impl/ClientIDPacket.java index 68d9014..dbd9580 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/packets/impl/ClientIDPacket.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/packets/impl/ClientIDPacket.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.packets.impl; import dev.unlegitdqrk.unlegitlibrary.network.system.packets.Packet; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/ConnectionHandler.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/ConnectionHandler.java index 65b816b..c434e2f 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/ConnectionHandler.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/ConnectionHandler.java @@ -1,4 +1,3 @@ - package dev.unlegitdqrk.unlegitlibrary.network.system.server; import dev.unlegitdqrk.unlegitlibrary.network.system.packets.Packet; @@ -12,36 +11,16 @@ import java.io.ObjectOutputStream; import java.net.SocketException; public final class ConnectionHandler { + private final NetworkServer server; private SSLSocket socket; private int clientID; private ObjectOutputStream outputStream; private ObjectInputStream inputStream; - private final NetworkServer server; - - @Override - public boolean equals(Object obj) { - if (!(obj instanceof ConnectionHandler target)) return false; - return target.getClientID() == clientID; - } - - public final SSLSocket getSocket() { - return socket; - } - - public final ObjectOutputStream getOutputStream() { - return outputStream; - } - - public final ObjectInputStream getInputStream() { - return inputStream; - } - - public final NetworkServer getServer() { - return server; - } public ConnectionHandler(NetworkServer server, SSLSocket socket, int clientID) throws IOException, ClassNotFoundException { - this.server = server; this.socket = socket; this.clientID = clientID; + this.server = server; + this.socket = socket; + this.clientID = clientID; outputStream = new ObjectOutputStream(socket.getOutputStream()); inputStream = new ObjectInputStream(socket.getInputStream()); @@ -52,17 +31,50 @@ public final class ConnectionHandler { server.getEventManager().executeEvent(new ConnectionHandlerConnectedEvent(this)); } - public final Thread receiveThread = new Thread(this::receive); + @Override + public boolean equals(Object obj) { + if (!(obj instanceof ConnectionHandler target)) return false; + return target.getClientID() == clientID; + } - public int getClientID() { return clientID; } - public boolean isConnected() { return socket != null && socket.isConnected() && !socket.isClosed() && receiveThread.isAlive(); } + public SSLSocket getSocket() { + return socket; + } + + public ObjectOutputStream getOutputStream() { + return outputStream; + } + + public ObjectInputStream getInputStream() { + return inputStream; + } + + public NetworkServer getServer() { + return server; + } + + public int getClientID() { + return clientID; + } public final Thread receiveThread = new Thread(this::receive); + + public boolean isConnected() { + return socket != null && socket.isConnected() && !socket.isClosed() && receiveThread.isAlive(); + } public synchronized boolean disconnect() { if (!isConnected()) return false; if (receiveThread.isAlive()) receiveThread.interrupt(); - try { outputStream.close(); inputStream.close(); socket.close(); } catch (IOException ignored) {} - socket = null; outputStream = null; inputStream = null; clientID = -1; + try { + outputStream.close(); + inputStream.close(); + socket.close(); + } catch (IOException ignored) { + } + socket = null; + outputStream = null; + inputStream = null; + clientID = -1; server.getConnectionHandlers().remove(this); server.getEventManager().executeEvent(new ConnectionHandlerDisconnectedEvent(this)); @@ -90,16 +102,21 @@ public final class ConnectionHandler { if (server.getPacketHandler().isPacketIDRegistered(id)) { Packet packet = server.getPacketHandler().getPacketByID(id); - if (server.getPacketHandler().handlePacket(id, packet, inputStream)) server.getEventManager().executeEvent(new S_PacketReceivedEvent(this, packet)); + if (server.getPacketHandler().handlePacket(id, packet, inputStream)) + server.getEventManager().executeEvent(new S_PacketReceivedEvent(this, packet)); else server.getEventManager().executeEvent(new S_PacketReceivedFailedEvent(this, packet)); } else server.getEventManager().executeEvent(new S_UnknownObjectReceivedEvent(received, this)); } else server.getEventManager().executeEvent(new S_UnknownObjectReceivedEvent(received, this)); - } catch (SocketException se) { disconnect(); } - catch (Exception ex) { - if (server.getLogger() != null) server.getLogger().exception("Receive thread exception for client " + clientID, ex); + } catch (SocketException se) { + disconnect(); + } catch (Exception ex) { + if (server.getLogger() != null) + server.getLogger().exception("Receive thread exception for client " + clientID, ex); else System.err.println("Receive thread exception for client " + clientID + ": " + ex.getMessage()); disconnect(); } } } + + } \ No newline at end of file diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/NetworkServer.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/NetworkServer.java index edf6562..09892c0 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/NetworkServer.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/NetworkServer.java @@ -1,4 +1,3 @@ - package dev.unlegitdqrk.unlegitlibrary.network.system.server; import dev.unlegitdqrk.unlegitlibrary.event.EventManager; @@ -23,18 +22,33 @@ public final class NetworkServer { private final EventManager eventManager; private final Logger logger; private final int timeout; - private SSLServerSocket serverSocket; private final SSLServerSocketFactory sslServerSocketFactory; - private final List connectionHandlers = new ArrayList<>(); + private final boolean requireClientCert; + private SSLServerSocket serverSocket; private final Thread incomingThread = new Thread(this::incomingConnections); - public final List getConnectionHandlers() { + private NetworkServer(int port, PacketHandler packetHandler, EventManager eventManager, + Logger logger, int timeout, SSLServerSocketFactory factory, boolean requireClientCert) { + this.port = port; + this.packetHandler = packetHandler; + this.eventManager = eventManager; + this.logger = logger; + this.timeout = timeout; + this.sslServerSocketFactory = factory; + + this.packetHandler.setServerInstance(this); + this.packetHandler.registerPacket(new ClientIDPacket()); + this.requireClientCert = requireClientCert; + } + + public List getConnectionHandlers() { return connectionHandlers; } public ConnectionHandler getConnectionHandlerByID(int clientID) { - for (ConnectionHandler connectionHandler : connectionHandlers) if (connectionHandler.getClientID() == clientID) return connectionHandler; + for (ConnectionHandler connectionHandler : connectionHandlers) + if (connectionHandler.getClientID() == clientID) return connectionHandler; return null; } @@ -44,7 +58,7 @@ public final class NetworkServer { return super.equals(obj); } - public final int getPort() { + public int getPort() { return port; } @@ -64,18 +78,6 @@ public final class NetworkServer { return eventManager; } - private final boolean requireClientCert; - - private NetworkServer(int port, PacketHandler packetHandler, EventManager eventManager, - Logger logger, int timeout, SSLServerSocketFactory factory, boolean requireClientCert) { - this.port = port; this.packetHandler = packetHandler; this.eventManager = eventManager; - this.logger = logger; this.timeout = timeout; this.sslServerSocketFactory = factory; - - this.packetHandler.setServerInstance(this); - this.packetHandler.registerPacket(new ClientIDPacket()); - this.requireClientCert = requireClientCert; - } - public boolean start() { try { serverSocket = (SSLServerSocket) sslServerSocketFactory.createServerSocket(port); @@ -86,19 +88,26 @@ public final class NetworkServer { if (logger != null) logger.log("Server started on port " + port); else System.out.println("Server started on port " + port); return true; - } catch (Exception e) {if (logger != null) logger.exception("Failed to start", e); - else System.err.println("Failed to start: " + e.getMessage()); return false; } + } catch (Exception e) { + if (logger != null) logger.exception("Failed to start", e); + else System.err.println("Failed to start: " + e.getMessage()); + return false; + } } private void incomingConnections() { try { while (!serverSocket.isClosed()) { Socket socket = serverSocket.accept(); - if (!(socket instanceof SSLSocket ssl)) { socket.close(); continue; } + if (!(socket instanceof SSLSocket ssl)) { + socket.close(); + continue; + } ssl.setTcpNoDelay(true); ssl.setSoTimeout(timeout); - try { ssl.startHandshake(); } - catch (Exception handshakeEx) { + try { + ssl.startHandshake(); + } catch (Exception handshakeEx) { if (logger != null) logger.exception("Handshake failed", handshakeEx); else System.err.println("Handshake failed: " + handshakeEx.getMessage()); ssl.close(); @@ -107,7 +116,10 @@ public final class NetworkServer { IncomingConnectionEvent event = new IncomingConnectionEvent(this, ssl); eventManager.executeEvent(event); - if (event.isCancelled()) { ssl.close(); continue; } + if (event.isCancelled()) { + ssl.close(); + continue; + } try { ConnectionHandler connectionHandler = new ConnectionHandler(this, ssl, connectionHandlers.size() + 1); @@ -117,7 +129,9 @@ public final class NetworkServer { continue; } } - } catch (Exception e) { e.printStackTrace(); } + } catch (Exception e) { + e.printStackTrace(); + } } // --- Builder --- @@ -133,24 +147,6 @@ public final class NetworkServer { private File serverCertFile; private File serverKeyFile; - public ServerBuilder setPort(int port) { this.port = port; return this; } - public ServerBuilder setPacketHandler(PacketHandler handler) { this.packetHandler = handler; return this; } - public ServerBuilder setEventManager(EventManager manager) { this.eventManager = manager; return this; } - public ServerBuilder setLogger(Logger logger) { this.logger = logger; return this; } - public ServerBuilder setTimeout(int timeout) { this.timeout = timeout; return this; } - public ServerBuilder setSSLServerSocketFactory(SSLServerSocketFactory factory) { this.factory = factory; return this; } - public ServerBuilder setRequireClientCertificate(boolean requireClientCertificate) { this.requireClientCert = requireClientCertificate; return this; } - public ServerBuilder setRootCAFolder(File folder) { this.caFolder = folder; return this; } - public ServerBuilder setServerCertificate(File certFile, File keyFile) { this.serverCertFile = certFile; this.serverKeyFile = keyFile; return this; } - - public NetworkServer build() { - if (factory == null && caFolder != null && serverCertFile != null && serverKeyFile != null) { - try { factory = createSSLServerSocketFactory(caFolder, serverCertFile, serverKeyFile); } - catch (Exception e) { throw new RuntimeException("Failed to create SSLServerSocketFactory", e); } - } - return new NetworkServer(port, packetHandler, eventManager, logger, timeout, factory, requireClientCert); - } - public static SSLServerSocketFactory createSSLServerSocketFactory(File caFolder, File serverCert, File serverKey) throws Exception { // TrustStore (Root-CAs) KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType()); @@ -180,5 +176,62 @@ public final class NetworkServer { sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); return sslContext.getServerSocketFactory(); } + + public ServerBuilder setPort(int port) { + this.port = port; + return this; + } + + public ServerBuilder setPacketHandler(PacketHandler handler) { + this.packetHandler = handler; + return this; + } + + public ServerBuilder setEventManager(EventManager manager) { + this.eventManager = manager; + return this; + } + + public ServerBuilder setLogger(Logger logger) { + this.logger = logger; + return this; + } + + public ServerBuilder setTimeout(int timeout) { + this.timeout = timeout; + return this; + } + + public ServerBuilder setSSLServerSocketFactory(SSLServerSocketFactory factory) { + this.factory = factory; + return this; + } + + public ServerBuilder setRequireClientCertificate(boolean requireClientCertificate) { + this.requireClientCert = requireClientCertificate; + return this; + } + + public ServerBuilder setRootCAFolder(File folder) { + this.caFolder = folder; + return this; + } + + public ServerBuilder setServerCertificate(File certFile, File keyFile) { + this.serverCertFile = certFile; + this.serverKeyFile = keyFile; + return this; + } + + public NetworkServer build() { + if (factory == null && caFolder != null && serverCertFile != null && serverKeyFile != null) { + try { + factory = createSSLServerSocketFactory(caFolder, serverCertFile, serverKeyFile); + } catch (Exception e) { + throw new RuntimeException("Failed to create SSLServerSocketFactory", e); + } + } + return new NetworkServer(port, packetHandler, eventManager, logger, timeout, factory, requireClientCert); + } } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/ConnectionHandlerConnectedEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/ConnectionHandlerConnectedEvent.java index 0f290b6..c666bf2 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/ConnectionHandlerConnectedEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/ConnectionHandlerConnectedEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.server.events; import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; @@ -8,11 +6,11 @@ import dev.unlegitdqrk.unlegitlibrary.network.system.server.ConnectionHandler; public final class ConnectionHandlerConnectedEvent extends Event { private final ConnectionHandler connectionHandler; - public ConnectionHandler getConnectionHandler() { - return connectionHandler; - } - public ConnectionHandlerConnectedEvent(ConnectionHandler connectionHandler) { this.connectionHandler = connectionHandler; } + + public ConnectionHandler getConnectionHandler() { + return connectionHandler; + } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/ConnectionHandlerDisconnectedEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/ConnectionHandlerDisconnectedEvent.java index d7d6019..714fe4c 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/ConnectionHandlerDisconnectedEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/ConnectionHandlerDisconnectedEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.server.events; import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; @@ -9,11 +7,11 @@ public final class ConnectionHandlerDisconnectedEvent extends Event { private final ConnectionHandler connectionHandler; - public ConnectionHandler getConnectionHandler() { - return connectionHandler; - } - public ConnectionHandlerDisconnectedEvent(ConnectionHandler connectionHandler) { this.connectionHandler = connectionHandler; } + + public ConnectionHandler getConnectionHandler() { + return connectionHandler; + } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/IncomingConnectionEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/IncomingConnectionEvent.java index 60bb316..bab9f27 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/IncomingConnectionEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/IncomingConnectionEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.server.events; import dev.unlegitdqrk.unlegitlibrary.event.impl.CancellableEvent; @@ -11,6 +9,11 @@ public final class IncomingConnectionEvent extends CancellableEvent { private final NetworkServer server; private final SSLSocket socket; + public IncomingConnectionEvent(NetworkServer server, SSLSocket socket) { + this.server = server; + this.socket = socket; + } + public SSLSocket getSocket() { return socket; } @@ -18,9 +21,4 @@ public final class IncomingConnectionEvent extends CancellableEvent { public NetworkServer getServer() { return server; } - - public IncomingConnectionEvent(NetworkServer server, SSLSocket socket) { - this.server = server; - this.socket = socket; - } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_PacketReceivedEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_PacketReceivedEvent.java index 3923633..40e304f 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_PacketReceivedEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_PacketReceivedEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.server.events; import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; @@ -10,6 +8,11 @@ public final class S_PacketReceivedEvent extends Event { private final ConnectionHandler connectionHandler; private final Packet packet; + public S_PacketReceivedEvent(ConnectionHandler connectionHandler, Packet packet) { + this.connectionHandler = connectionHandler; + this.packet = packet; + } + public ConnectionHandler getConnectionHandler() { return connectionHandler; } @@ -17,9 +20,4 @@ public final class S_PacketReceivedEvent extends Event { public Packet getPacket() { return packet; } - - public S_PacketReceivedEvent(ConnectionHandler connectionHandler, Packet packet) { - this.connectionHandler = connectionHandler; - this.packet = packet; - } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_PacketReceivedFailedEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_PacketReceivedFailedEvent.java index 623326f..0676327 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_PacketReceivedFailedEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_PacketReceivedFailedEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.server.events; import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; @@ -10,6 +8,11 @@ public final class S_PacketReceivedFailedEvent extends Event { private final ConnectionHandler connectionHandler; private final Packet packet; + public S_PacketReceivedFailedEvent(ConnectionHandler connectionHandler, Packet packet) { + this.connectionHandler = connectionHandler; + this.packet = packet; + } + public ConnectionHandler getConnectionHandler() { return connectionHandler; } @@ -17,9 +20,4 @@ public final class S_PacketReceivedFailedEvent extends Event { public Packet getPacket() { return packet; } - - public S_PacketReceivedFailedEvent(ConnectionHandler connectionHandler, Packet packet) { - this.connectionHandler = connectionHandler; - this.packet = packet; - } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_PacketSendEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_PacketSendEvent.java index a99ae83..697c51f 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_PacketSendEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_PacketSendEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.server.events; import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; @@ -10,6 +8,11 @@ public final class S_PacketSendEvent extends Event { private final Packet packet; private final ConnectionHandler connectionHandler; + public S_PacketSendEvent(Packet packet, ConnectionHandler connectionHandler) { + this.packet = packet; + this.connectionHandler = connectionHandler; + } + public ConnectionHandler getConnectionHandler() { return connectionHandler; } @@ -17,9 +20,4 @@ public final class S_PacketSendEvent extends Event { public Packet getPacket() { return packet; } - - public S_PacketSendEvent(Packet packet, ConnectionHandler connectionHandler) { - this.packet = packet; - this.connectionHandler = connectionHandler; - } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_PacketSendFailedEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_PacketSendFailedEvent.java index c3f981a..ce87b1a 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_PacketSendFailedEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_PacketSendFailedEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.server.events; import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; @@ -10,6 +8,11 @@ public final class S_PacketSendFailedEvent extends Event { private final Packet packet; private final ConnectionHandler connectionHandler; + public S_PacketSendFailedEvent(Packet packet, ConnectionHandler connectionHandler) { + this.packet = packet; + this.connectionHandler = connectionHandler; + } + public ConnectionHandler getConnectionHandler() { return connectionHandler; } @@ -17,9 +20,4 @@ public final class S_PacketSendFailedEvent extends Event { public Packet getPacket() { return packet; } - - public S_PacketSendFailedEvent(Packet packet, ConnectionHandler connectionHandler) { - this.packet = packet; - this.connectionHandler = connectionHandler; - } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_UnknownObjectReceivedEvent.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_UnknownObjectReceivedEvent.java index a622e07..b59d7f2 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_UnknownObjectReceivedEvent.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/system/server/events/S_UnknownObjectReceivedEvent.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.system.server.events; import dev.unlegitdqrk.unlegitlibrary.event.impl.Event; @@ -10,6 +8,11 @@ public final class S_UnknownObjectReceivedEvent extends Event { private final Object received; private final ConnectionHandler connectionHandler; + public S_UnknownObjectReceivedEvent(Object received, ConnectionHandler connectionHandler) { + this.received = received; + this.connectionHandler = connectionHandler; + } + public ConnectionHandler getConnectionHandler() { return connectionHandler; } @@ -17,9 +20,4 @@ public final class S_UnknownObjectReceivedEvent extends Event { public Object getReceived() { return received; } - - public S_UnknownObjectReceivedEvent(Object received, ConnectionHandler connectionHandler) { - this.received = received; - this.connectionHandler = connectionHandler; - } } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/utils/InputStreamUtils.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/utils/InputStreamUtils.java index 0398806..477d181 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/utils/InputStreamUtils.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/utils/InputStreamUtils.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.utils; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; @@ -47,7 +45,7 @@ public class InputStreamUtils extends DefaultMethodsOverrider { byteArrayOutputStream.close(); inputStream.close(); - return new String(byteArrayOutputStream.toByteArray(), StandardCharsets.UTF_8); + return byteArrayOutputStream.toString(StandardCharsets.UTF_8); } public static void downloadFile(String urlStr, File outputFile) throws IOException { diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/utils/NetworkUtils.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/utils/NetworkUtils.java index 584c660..0b07846 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/utils/NetworkUtils.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/utils/NetworkUtils.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.utils; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/utils/PemUtils.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/utils/PemUtils.java index 0859dc0..31a6231 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/utils/PemUtils.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/utils/PemUtils.java @@ -1,14 +1,13 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.utils; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; import java.nio.file.Files; import java.security.KeyFactory; import java.security.PrivateKey; -import java.security.spec.PKCS8EncodedKeySpec; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; +import java.security.spec.PKCS8EncodedKeySpec; import java.util.Base64; public class PemUtils { diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/utils/WebUtils.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/utils/WebUtils.java index d25beb8..504c1b8 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/utils/WebUtils.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/network/utils/WebUtils.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.network.utils; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/ByteUtils.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/ByteUtils.java index 3384220..fb9618e 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/ByteUtils.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/ByteUtils.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.number; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/NumberConversions.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/NumberConversions.java index dc6faa2..ae4491e 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/NumberConversions.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/NumberConversions.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.number; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/NumberUtils.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/NumberUtils.java index 504d873..6b994ef 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/NumberUtils.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/NumberUtils.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.number; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/RandomNumber.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/RandomNumber.java index 0cafed5..10c2658 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/RandomNumber.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/RandomNumber.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.number; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/bit/BitArray.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/bit/BitArray.java index c4fea69..1e49e53 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/bit/BitArray.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/bit/BitArray.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.number.bit; public interface BitArray { diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/bit/BitArrayVersion.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/bit/BitArrayVersion.java index eea1833..d39360e 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/bit/BitArrayVersion.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/bit/BitArrayVersion.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.number.bit; public enum BitArrayVersion { diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/bit/PaddedBitArray.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/bit/PaddedBitArray.java index 7cac930..f1081ee 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/bit/PaddedBitArray.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/bit/PaddedBitArray.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.number.bit; import dev.unlegitdqrk.unlegitlibrary.number.math.MathHelper; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/bit/Pow2BitArray.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/bit/Pow2BitArray.java index 02ef713..90091be 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/bit/Pow2BitArray.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/bit/Pow2BitArray.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.number.bit; import java.util.Arrays; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/MathHelper.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/MathHelper.java index f49aa9a..2e0f3e7 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/MathHelper.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/MathHelper.java @@ -1,7 +1,3 @@ - - - - package dev.unlegitdqrk.unlegitlibrary.number.math; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/Modulo.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/Modulo.java index 746517a..cbd200d 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/Modulo.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/Modulo.java @@ -1,7 +1,3 @@ - - - - package dev.unlegitdqrk.unlegitlibrary.number.math; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/Quaternion.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/Quaternion.java index 009e172..c8e60bf 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/Quaternion.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/Quaternion.java @@ -1,7 +1,3 @@ - - - - package dev.unlegitdqrk.unlegitlibrary.number.math; import dev.unlegitdqrk.unlegitlibrary.number.math.vector.Vector2; @@ -80,8 +76,7 @@ public class Quaternion { @Override public final boolean equals(Object obj) { - if (!(obj instanceof Quaternion)) return false; - Quaternion quaternion = (Quaternion) obj; + if (!(obj instanceof Quaternion quaternion)) return false; return quaternion.x == x && quaternion.y == y && quaternion.z == z && quaternion.w == w; } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/molecular/MolecularAdd.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/molecular/MolecularAdd.java index 5762dbd..03b8d72 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/molecular/MolecularAdd.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/molecular/MolecularAdd.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.number.math.molecular; public class MolecularAdd { diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/molecular/MolecularSubtract.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/molecular/MolecularSubtract.java index 2be3437..37f6802 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/molecular/MolecularSubtract.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/molecular/MolecularSubtract.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.number.math.molecular; import dev.unlegitdqrk.unlegitlibrary.number.math.MathHelper; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/vector/Axis.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/vector/Axis.java index 0e37494..dc4cc6d 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/vector/Axis.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/vector/Axis.java @@ -1,7 +1,3 @@ - - - - package dev.unlegitdqrk.unlegitlibrary.number.math.vector; public enum Axis { diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/vector/Vector2.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/vector/Vector2.java index 1756d51..fda76b6 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/vector/Vector2.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/vector/Vector2.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.number.math.vector; public class Vector2 { @@ -94,8 +92,7 @@ public class Vector2 { @Override public final boolean equals(Object obj) { - if (!(obj instanceof Vector2)) return false; - Vector2 vector2 = (Vector2) obj; + if (!(obj instanceof Vector2 vector2)) return false; return vector2.x == x && vector2.y == y; } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/vector/Vector3.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/vector/Vector3.java index 75692e7..77cfd07 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/vector/Vector3.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/number/math/vector/Vector3.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.number.math.vector; import dev.unlegitdqrk.unlegitlibrary.number.math.Quaternion; @@ -118,8 +116,7 @@ public class Vector3 { @Override public final boolean equals(Object obj) { - if (!(obj instanceof Vector3)) return false; - Vector3 vector3 = (Vector3) obj; + if (!(obj instanceof Vector3 vector3)) return false; return vector3.x == x && vector3.y == y && vector3.z == z; } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/RandomString.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/RandomString.java index 485a198..04f2c9c 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/RandomString.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/RandomString.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.string; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; @@ -12,8 +10,8 @@ import java.util.Random; public class RandomString extends DefaultMethodsOverrider { public static final String upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; public static final String lower = upper.toLowerCase(Locale.ROOT); - public static final String digits = "0123456789"; public static final String alphanum = upper + lower + digits; + public static final String digits = "0123456789"; private final Random random; private final char[] symbols; private final char[] buf; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/SimpleEncoderDecoder.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/SimpleEncoderDecoder.java index 928e4a6..7863636 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/SimpleEncoderDecoder.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/SimpleEncoderDecoder.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.string; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; @@ -22,7 +20,7 @@ public class SimpleEncoderDecoder extends DefaultMethodsOverrider { private static byte[] keyByte; private static void setKey(final EncoderDecoderKeys key) throws NoSuchAlgorithmException { - keyByte = key.getKey().getBytes(StandardCharsets.UTF_8); + keyByte = key.key().getBytes(StandardCharsets.UTF_8); MessageDigest sha = MessageDigest.getInstance("SHA-1"); keyByte = sha.digest(keyByte); keyByte = Arrays.copyOf(keyByte, 16); @@ -45,19 +43,10 @@ public class SimpleEncoderDecoder extends DefaultMethodsOverrider { return new String(cipher.doFinal(Base64.getDecoder().decode(toDecrypt.toString()))); } - public static class EncoderDecoderKeys { - public static final EncoderDecoderKeys BIT_KEY_128 = new EncoderDecoderKeys("Bar12345Bar12345"); - public static final EncoderDecoderKeys DEC1632DDCL542 = new EncoderDecoderKeys("Dec1632DDCL542"); - public static final EncoderDecoderKeys SSSHHHHHHHHHHH = new EncoderDecoderKeys("ssshhhhhhhhhhh!!!!"); + public record EncoderDecoderKeys(String key) { + public static final EncoderDecoderKeys BIT_KEY_128 = new EncoderDecoderKeys("Bar12345Bar12345"); + public static final EncoderDecoderKeys DEC1632DDCL542 = new EncoderDecoderKeys("Dec1632DDCL542"); + public static final EncoderDecoderKeys SSSHHHHHHHHHHH = new EncoderDecoderKeys("ssshhhhhhhhhhh!!!!"); - private final String key; - - public EncoderDecoderKeys(String key) { - this.key = key; - } - - public final String getKey() { - return key; - } } } \ No newline at end of file diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/StringUtils.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/StringUtils.java index c9cf871..9a628e2 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/StringUtils.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/StringUtils.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.string; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/color/ConsoleColor.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/color/ConsoleColor.java index 788d803..0ebe9bc 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/color/ConsoleColor.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/color/ConsoleColor.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.string.color; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/color/MinecraftColorUtils.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/color/MinecraftColorUtils.java index 192f5de..2b6bfe8 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/color/MinecraftColorUtils.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/string/color/MinecraftColorUtils.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.string.color; import dev.unlegitdqrk.unlegitlibrary.utils.DefaultMethodsOverrider; diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/Color.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/Color.java index 0b58157..6b170b8 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/Color.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/Color.java @@ -1,4 +1,3 @@ - package dev.unlegitdqrk.unlegitlibrary.utils; import dev.unlegitdqrk.unlegitlibrary.number.math.MathHelper; @@ -21,12 +20,14 @@ public class Color { public float green = 1; public float blue = 1; public float alpha = 1; + public Color(float red, float green, float blue, float alpha) { this.red = MathHelper.clamp_float(red, 0f, 1f); this.green = MathHelper.clamp_float(green, 0f, 1f); this.blue = MathHelper.clamp_float(blue, 0f, 1f); this.alpha = MathHelper.clamp_float(alpha, 0f, 1f); } + public Color(float red, float green, float blue) { this(red, green, blue, 1); } @@ -51,8 +52,7 @@ public class Color { @Override public final boolean equals(Object obj) { - if (!(obj instanceof Color)) return false; - Color equalTo = (Color) obj; + if (!(obj instanceof Color equalTo)) return false; return equalTo.alpha == alpha && equalTo.red == red && equalTo.green == green && equalTo.blue == blue; } diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/Converter.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/Converter.java index a9e9e89..90fadac 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/Converter.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/Converter.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.utils; public class Converter extends DefaultMethodsOverrider { diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/DefaultMethodsOverrider.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/DefaultMethodsOverrider.java index 1092856..791bfd2 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/DefaultMethodsOverrider.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/DefaultMethodsOverrider.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.utils; public class DefaultMethodsOverrider { diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/Logger.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/Logger.java index cfcbc9a..9bf3c95 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/Logger.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/Logger.java @@ -1,4 +1,3 @@ - package dev.unlegitdqrk.unlegitlibrary.utils; import dev.unlegitdqrk.unlegitlibrary.file.FileUtils; @@ -204,15 +203,15 @@ public final class Logger { } } - public final boolean isInitialized() { + public boolean isInitialized() { return isInitialized; } - public final File getLatestLogFile() { + public File getLatestLogFile() { return latestLogFile; } - public final File getLogFolder() { + public File getLogFolder() { return logFolder; } } \ No newline at end of file diff --git a/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/Tuple.java b/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/Tuple.java index f078762..c47a542 100644 --- a/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/Tuple.java +++ b/src/main/java/dev/unlegitdqrk/unlegitlibrary/utils/Tuple.java @@ -1,5 +1,3 @@ - - package dev.unlegitdqrk.unlegitlibrary.utils; public class Tuple extends DefaultMethodsOverrider {