From fa9b884380fafa2e575af1af8fe157e4289cd749 Mon Sep 17 00:00:00 2001 From: tikaiz Date: Wed, 21 Jan 2026 13:36:52 +0100 Subject: [PATCH] Removed Logging singleton --- src/main/java/com/tikaiz/HytaleDemo.java | 2 -- .../components/EndermanTeleportComponent.java | 2 +- .../com/tikaiz/helpers/TeleportHelper.java | 1 + .../tikaiz/singletons/LoggerSingleton.java | 25 ------------------- ...ddEndermanTeleportComponentTickSystem.java | 4 +-- .../com/tikaiz/systems/DamageEventSystem.java | 7 ------ 6 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 src/main/java/com/tikaiz/singletons/LoggerSingleton.java diff --git a/src/main/java/com/tikaiz/HytaleDemo.java b/src/main/java/com/tikaiz/HytaleDemo.java index 23c687d..eab9a63 100644 --- a/src/main/java/com/tikaiz/HytaleDemo.java +++ b/src/main/java/com/tikaiz/HytaleDemo.java @@ -4,7 +4,6 @@ import com.hypixel.hytale.server.core.plugin.JavaPlugin; import com.hypixel.hytale.server.core.plugin.JavaPluginInit; import com.tikaiz.commands.ExampleCommand; import com.tikaiz.components.EndermanTeleportComponent; -import com.tikaiz.singletons.LoggerSingleton; import com.tikaiz.systems.AddEndermanTeleportComponentTickSystem; import com.tikaiz.systems.EndermanComponentTickSystem; import com.tikaiz.systems.DamageEventSystem; @@ -15,7 +14,6 @@ public class HytaleDemo extends JavaPlugin { public HytaleDemo(@Nonnull JavaPluginInit init) { super(init); - LoggerSingleton.getInstance().setHytaleLogger(this.getLogger()); } @Override diff --git a/src/main/java/com/tikaiz/components/EndermanTeleportComponent.java b/src/main/java/com/tikaiz/components/EndermanTeleportComponent.java index 5681afe..1eb0dd8 100644 --- a/src/main/java/com/tikaiz/components/EndermanTeleportComponent.java +++ b/src/main/java/com/tikaiz/components/EndermanTeleportComponent.java @@ -49,6 +49,6 @@ public class EndermanTeleportComponent implements Component { } public void randomizeTickInterval() { - tickInterval = (float) ((Math.random()*5)+25); + tickInterval = (float) ((Math.random()*20)+10); } } \ No newline at end of file diff --git a/src/main/java/com/tikaiz/helpers/TeleportHelper.java b/src/main/java/com/tikaiz/helpers/TeleportHelper.java index a9d7e51..d38a130 100644 --- a/src/main/java/com/tikaiz/helpers/TeleportHelper.java +++ b/src/main/java/com/tikaiz/helpers/TeleportHelper.java @@ -22,5 +22,6 @@ public abstract class TeleportHelper { Teleport teleportForPlayer = Teleport.createForPlayer(newPos, new Vector3f()); commandBuffer.addComponent(ref, Teleport.getComponentType(), teleportForPlayer); + } } diff --git a/src/main/java/com/tikaiz/singletons/LoggerSingleton.java b/src/main/java/com/tikaiz/singletons/LoggerSingleton.java deleted file mode 100644 index 19b0794..0000000 --- a/src/main/java/com/tikaiz/singletons/LoggerSingleton.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.tikaiz.singletons; - -import com.hypixel.hytale.logger.HytaleLogger; - -public class LoggerSingleton { - private HytaleLogger hytaleLogger; - private static LoggerSingleton instance; - public static LoggerSingleton getInstance() { - if (instance == null) { - instance = new LoggerSingleton(); - } - return instance; - } - - private LoggerSingleton() { - } - - public HytaleLogger getHytaleLogger() { - return hytaleLogger; - } - - public void setHytaleLogger(HytaleLogger hytaleLogger) { - this.hytaleLogger = hytaleLogger; - } -} diff --git a/src/main/java/com/tikaiz/systems/AddEndermanTeleportComponentTickSystem.java b/src/main/java/com/tikaiz/systems/AddEndermanTeleportComponentTickSystem.java index 5dc6ebe..f682b45 100644 --- a/src/main/java/com/tikaiz/systems/AddEndermanTeleportComponentTickSystem.java +++ b/src/main/java/com/tikaiz/systems/AddEndermanTeleportComponentTickSystem.java @@ -3,10 +3,10 @@ package com.tikaiz.systems; import com.hypixel.hytale.component.*; import com.hypixel.hytale.component.query.Query; import com.hypixel.hytale.component.system.tick.EntityTickingSystem; +import com.hypixel.hytale.logger.HytaleLogger; import com.hypixel.hytale.server.core.modules.entity.component.DisplayNameComponent; import com.hypixel.hytale.server.core.universe.world.storage.EntityStore; import com.tikaiz.components.EndermanTeleportComponent; -import com.tikaiz.singletons.LoggerSingleton; import org.checkerframework.checker.nullness.compatqual.NonNullDecl; import org.checkerframework.checker.nullness.compatqual.NullableDecl; @@ -33,7 +33,7 @@ public class AddEndermanTeleportComponentTickSystem extends EntityTickingSystem< return; } commandBuffer.addComponent(ref, endermanComponentType, new EndermanTeleportComponent()); - LoggerSingleton.getInstance().getHytaleLogger().at(Level.INFO).log("Added Component to ref: " + displayName); + HytaleLogger.getLogger().atInfo().log("Added Component to ref: " + displayName); } @NullableDecl diff --git a/src/main/java/com/tikaiz/systems/DamageEventSystem.java b/src/main/java/com/tikaiz/systems/DamageEventSystem.java index 2cef21c..f5e19e6 100644 --- a/src/main/java/com/tikaiz/systems/DamageEventSystem.java +++ b/src/main/java/com/tikaiz/systems/DamageEventSystem.java @@ -3,21 +3,14 @@ package com.tikaiz.systems; import com.hypixel.hytale.component.*; import com.hypixel.hytale.component.query.Query; import com.hypixel.hytale.component.system.EntityEventSystem; -import com.hypixel.hytale.math.vector.Vector3d; -import com.hypixel.hytale.math.vector.Vector3f; -import com.hypixel.hytale.server.core.modules.entity.component.DisplayNameComponent; import com.hypixel.hytale.server.core.modules.entity.component.TransformComponent; import com.hypixel.hytale.server.core.modules.entity.damage.Damage; -import com.hypixel.hytale.server.core.modules.entity.teleport.Teleport; -import com.hypixel.hytale.server.core.universe.world.ParticleUtil; import com.hypixel.hytale.server.core.universe.world.storage.EntityStore; -import com.hypixel.hytale.server.core.util.NotificationUtil; import com.tikaiz.components.EndermanTeleportComponent; import org.checkerframework.checker.nullness.compatqual.NonNullDecl; import org.checkerframework.checker.nullness.compatqual.NullableDecl; import static com.tikaiz.helpers.TeleportHelper.EndermanTeleport; -import static com.tikaiz.helpers.TeleportHelper.randomTeleport; public class DamageEventSystem extends EntityEventSystem { private final ComponentType endermanTeleportComponentType;