diff --git a/src/main/java/dev/redstudio/redcore/ticking/RedClientTickEvent.java b/src/main/java/dev/redstudio/redcore/ticking/RedClientTickEvent.java index be533cf..9bc0ef9 100644 --- a/src/main/java/dev/redstudio/redcore/ticking/RedClientTickEvent.java +++ b/src/main/java/dev/redstudio/redcore/ticking/RedClientTickEvent.java @@ -1,5 +1,6 @@ package dev.redstudio.redcore.ticking; +import lombok.NoArgsConstructor; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -18,9 +19,8 @@ public class RedClientTickEvent extends Event { *

* In a client that is not lagging, it would be fired 10 times a second. */ + @NoArgsConstructor public static class BiTickEvent extends RedClientTickEvent { - public BiTickEvent() { - } } /** @@ -28,9 +28,8 @@ public BiTickEvent() { *

* In a client that is not lagging, it would be fired 4 times a second. */ + @NoArgsConstructor public static class PentaTickEvent extends RedClientTickEvent { - public PentaTickEvent() { - } } /** @@ -38,8 +37,7 @@ public PentaTickEvent() { *

* In a client that is not lagging, it would be fired 2 times a second. */ + @NoArgsConstructor public static class DecaTickEvent extends RedClientTickEvent { - public DecaTickEvent() { - } } } diff --git a/src/main/java/dev/redstudio/redcore/ticking/RedClientTicker.java b/src/main/java/dev/redstudio/redcore/ticking/RedClientTicker.java index 62d4249..0f36716 100644 --- a/src/main/java/dev/redstudio/redcore/ticking/RedClientTicker.java +++ b/src/main/java/dev/redstudio/redcore/ticking/RedClientTicker.java @@ -16,31 +16,29 @@ @SideOnly(Side.CLIENT) public class RedClientTicker { - private static boolean clientTickerStarted = false; - private static int biTickCount, pentaTickCount, decaTickCount; @SubscribeEvent(priority = EventPriority.HIGHEST) - public static void onClientTickEvent(TickEvent.ClientTickEvent clientTickEvent) { - if (clientTickEvent.phase == TickEvent.Phase.START) { - - biTickCount++; - if (biTickCount == 2) { - MinecraftForge.EVENT_BUS.post(new RedClientTickEvent.BiTickEvent()); - biTickCount = 0; - } - - pentaTickCount++; - if (pentaTickCount == 5) { - MinecraftForge.EVENT_BUS.post(new RedClientTickEvent.PentaTickEvent()); - pentaTickCount = 0; - } - - decaTickCount++; - if (decaTickCount == 10) { - MinecraftForge.EVENT_BUS.post(new RedClientTickEvent.DecaTickEvent()); - decaTickCount = 0; - } + public static void onClientTickEvent(final TickEvent.ClientTickEvent clientTickEvent) { + if (clientTickEvent.phase != TickEvent.Phase.START) + return; + + biTickCount++; + if (biTickCount == 2) { + MinecraftForge.EVENT_BUS.post(new RedClientTickEvent.BiTickEvent()); + biTickCount = 0; + } + + pentaTickCount++; + if (pentaTickCount == 5) { + MinecraftForge.EVENT_BUS.post(new RedClientTickEvent.PentaTickEvent()); + pentaTickCount = 0; + } + + decaTickCount++; + if (decaTickCount == 10) { + MinecraftForge.EVENT_BUS.post(new RedClientTickEvent.DecaTickEvent()); + decaTickCount = 0; } } diff --git a/src/main/java/dev/redstudio/redcore/utils/MathUtil.java b/src/main/java/dev/redstudio/redcore/utils/MathUtil.java index e1ea403..c87e34c 100644 --- a/src/main/java/dev/redstudio/redcore/utils/MathUtil.java +++ b/src/main/java/dev/redstudio/redcore/utils/MathUtil.java @@ -12,7 +12,7 @@ * @author Desoroxxx * @since 0.2 */ -public class MathUtil { +public final class MathUtil { /** * Clamps a value within a specified range [min, max], checking for the minimum value first.