From c15c7f0aeb12c75b25dd9d52be557a855981a8f4 Mon Sep 17 00:00:00 2001 From: Gregory Mitchell <54124162+gmitch215@users.noreply.github.com> Date: Sat, 21 Sep 2024 12:24:13 -0500 Subject: [PATCH 01/15] Update Version to v0.3.1 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 05da412..8fda786 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,7 +54,7 @@ tasks { allprojects { val mc = "1.21" - val pr = "0.3.0" + val pr = "0.3.1" project.ext["minecraft_version"] = mc project.ext["project_version"] = pr From 279fdb94e08e2dd70b3de4405dff85fdcf84452e Mon Sep 17 00:00:00 2001 From: Gregory Mitchell <54124162+gmitch215@users.noreply.github.com> Date: Sat, 21 Sep 2024 12:24:53 -0500 Subject: [PATCH 02/15] Fix LifecycleMap Concurrency (Fixes #46) + Add Unit Tests for LifecycleMap --- .../gmitch215/socketmc/util/LifecycleMap.java | 6 +- .../socketmc/util/TestLifecycleMap.java | 64 +++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 core/src/test/java/xyz/gmitch215/socketmc/util/TestLifecycleMap.java diff --git a/core/src/main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java b/core/src/main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java index a770596..9c4b510 100644 --- a/core/src/main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java +++ b/core/src/main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java @@ -38,9 +38,11 @@ public LifecycleMap(@Nullable LifecycleMap map) { * Runs the map, removing any expired values. */ public void run() { - for (T key : origin.keySet()) { + Iterator it = origin.keySet().iterator(); + while (it.hasNext()) { + T key = it.next(); if (getRemainingTime(key) <= 0) { - origin.remove(key); + it.remove(); duration.remove(key); } } diff --git a/core/src/test/java/xyz/gmitch215/socketmc/util/TestLifecycleMap.java b/core/src/test/java/xyz/gmitch215/socketmc/util/TestLifecycleMap.java new file mode 100644 index 0000000..5af84fc --- /dev/null +++ b/core/src/test/java/xyz/gmitch215/socketmc/util/TestLifecycleMap.java @@ -0,0 +1,64 @@ +package xyz.gmitch215.socketmc.util; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import java.util.function.Function; + +public class TestLifecycleMap { + + @Test + @DisplayName("Test LifecycleMap#put") + public void testPut() { + LifecycleMap map = new LifecycleMap<>(); + + map.put(1, 0, 1000); + map.put(2, 1000, 1000); + map.put(3, 2000, 1000); + + Assertions.assertEquals(3, map.size()); + for (int i = 1; i <= 3; i++) { + Assertions.assertTrue(map.containsKey(i)); + Assertions.assertEquals(1000, map.getRemainingTime(i)); + } + } + + @Test + @DisplayName("Test LifecycleMap#run") + public void testRun() { + LifecycleMap map = new LifecycleMap<>(); + + map.put(1, 0, 1000); + map.put(2, 1000, 1000); + map.put(3, 2000, 1000); + + Assertions.assertEquals(3, map.size()); + + while (map.size() > 0) { + map.run(); + } + + Assertions.assertEquals(0, map.size()); + } + + @Test + @DisplayName("Test LifecycleMap#store") + public void testStore() { + LifecycleMap> map = new LifecycleMap<>(); + + map.store(i -> i + 1, 500); + map.store(i -> i * 2, 1000); + map.store(i -> i * i, 1500); + + Assertions.assertEquals(3, map.size()); + + while (map.size() > 0) { + map.run(); + map.forEach(f -> f.apply(0)); + } + + Assertions.assertEquals(0, map.size()); + } + +} From 4792ee4166602677b1aa10a3da63f92c3d53a37e Mon Sep 17 00:00:00 2001 From: Gregory Mitchell <54124162+gmitch215@users.noreply.github.com> Date: Sat, 21 Sep 2024 12:50:59 -0500 Subject: [PATCH 03/15] Defer `window#getRefreshRate` to RenderingProperties (Fixes #48) --- .../socketmc/fabric/FabricRendering.java | 19 +++++++++++++++++++ .../socketmc/fabric/FabricRetriever.java | 3 ++- .../socketmc/fabric/FabricSocketMC.java | 2 ++ .../socketmc/forge/ForgeRendering.java | 19 +++++++++++++++++++ .../socketmc/forge/ForgeRetriever.java | 5 ++++- .../socketmc/forge/mixin/GuiMixin.java | 5 ++++- .../socketmc/neoforge/NeoForgeRendering.java | 19 +++++++++++++++++++ .../socketmc/neoforge/NeoForgeRetriever.java | 3 ++- .../socketmc/neoforge/mixin/GuiMixin.java | 3 +++ .../socketmc/util/RenderingProperties.java | 9 +++++++++ 10 files changed, 83 insertions(+), 4 deletions(-) create mode 100644 mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/FabricRendering.java create mode 100644 mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/ForgeRendering.java create mode 100644 mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/NeoForgeRendering.java create mode 100644 mod/shared/src/main/java/xyz/gmitch215/socketmc/util/RenderingProperties.java diff --git a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/FabricRendering.java b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/FabricRendering.java new file mode 100644 index 0000000..0db75c6 --- /dev/null +++ b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/FabricRendering.java @@ -0,0 +1,19 @@ +package xyz.gmitch215.socketmc.fabric; + +import com.mojang.blaze3d.platform.Window; + +import static xyz.gmitch215.socketmc.fabric.FabricSocketMC.minecraft; +import static xyz.gmitch215.socketmc.util.RenderingProperties.REFRESH_RATE; + +public final class FabricRendering { + + private FabricRendering() {} + + public static void frameTick() { + // Set Rendering Properties + Window window = minecraft.getWindow(); + + REFRESH_RATE.set(window.getRefreshRate()); + } + +} diff --git a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/FabricRetriever.java b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/FabricRetriever.java index bbb464a..f2c60f9 100644 --- a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/FabricRetriever.java +++ b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/FabricRetriever.java @@ -8,6 +8,7 @@ import xyz.gmitch215.socketmc.retriever.RetrieverType; import xyz.gmitch215.socketmc.retriever.Window; import xyz.gmitch215.socketmc.util.InputType; +import xyz.gmitch215.socketmc.util.RenderingProperties; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -44,7 +45,7 @@ private FabricRetriever() {} window.getGuiScale(), window.getFramerateLimit(), com.mojang.blaze3d.platform.Window.getPlatform(), - window.getRefreshRate() + RenderingProperties.REFRESH_RATE.get() ); }), create(RetrieverType.PAUSED, minecraft::isPaused), diff --git a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/FabricSocketMC.java b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/FabricSocketMC.java index 1c6a026..713fa39 100644 --- a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/FabricSocketMC.java +++ b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/FabricSocketMC.java @@ -41,6 +41,8 @@ public void onInitializeClient() { // Events - Machines HudRenderCallback.EVENT.register((graphics, delta) -> { + FabricRendering.frameTick(); + DrawTextMachine.frameTick(graphics, delta); DrawShapeMachine.frameTick(graphics, delta); DrawBufferMachine.frameTick(graphics, delta); diff --git a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/ForgeRendering.java b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/ForgeRendering.java new file mode 100644 index 0000000..dcff6fa --- /dev/null +++ b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/ForgeRendering.java @@ -0,0 +1,19 @@ +package xyz.gmitch215.socketmc.forge; + +import com.mojang.blaze3d.platform.Window; + +import static xyz.gmitch215.socketmc.forge.ForgeSocketMC.minecraft; +import static xyz.gmitch215.socketmc.util.RenderingProperties.REFRESH_RATE; + +public final class ForgeRendering { + + private ForgeRendering() {} + + public static void frameTick() { + // Set Rendering Properties + Window window = minecraft.getWindow(); + + REFRESH_RATE.set(window.getRefreshRate()); + } + +} diff --git a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/ForgeRetriever.java b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/ForgeRetriever.java index 2a07059..e4c3a9e 100644 --- a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/ForgeRetriever.java +++ b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/ForgeRetriever.java @@ -1,5 +1,6 @@ package xyz.gmitch215.socketmc.forge; +import com.mojang.blaze3d.systems.RenderSystem; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFuture; import net.minecraft.network.FriendlyByteBuf; @@ -8,12 +9,14 @@ import xyz.gmitch215.socketmc.retriever.RetrieverType; import xyz.gmitch215.socketmc.retriever.Window; import xyz.gmitch215.socketmc.util.InputType; +import xyz.gmitch215.socketmc.util.RenderingProperties; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; import java.util.Set; import java.util.UUID; +import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -44,7 +47,7 @@ private ForgeRetriever() {} window.getGuiScale(), window.getFramerateLimit(), com.mojang.blaze3d.platform.Window.getPlatform(), - window.getRefreshRate() + RenderingProperties.REFRESH_RATE.get() ); }), create(RetrieverType.PAUSED, minecraft::isPaused), diff --git a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/mixin/GuiMixin.java b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/mixin/GuiMixin.java index aadc119..bb80096 100644 --- a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/mixin/GuiMixin.java +++ b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/mixin/GuiMixin.java @@ -1,6 +1,5 @@ package xyz.gmitch215.socketmc.forge.mixin; -import xyz.gmitch215.socketmc.forge.machines.*; import net.minecraft.client.DeltaTracker; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiGraphics; @@ -8,12 +7,16 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import xyz.gmitch215.socketmc.forge.ForgeRendering; +import xyz.gmitch215.socketmc.forge.machines.*; @Mixin(Gui.class) public class GuiMixin { @Inject(method = "render", at = @At(value = "TAIL")) public void render(GuiGraphics drawContext, DeltaTracker tickDelta, CallbackInfo callbackInfo) { + ForgeRendering.frameTick(); + DrawTextMachine.frameTick(drawContext, tickDelta); DrawShapeMachine.frameTick(drawContext, tickDelta); DrawBufferMachine.frameTick(drawContext, tickDelta); diff --git a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/NeoForgeRendering.java b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/NeoForgeRendering.java new file mode 100644 index 0000000..4095b5c --- /dev/null +++ b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/NeoForgeRendering.java @@ -0,0 +1,19 @@ +package xyz.gmitch215.socketmc.neoforge; + +import com.mojang.blaze3d.platform.Window; + +import static xyz.gmitch215.socketmc.neoforge.NeoForgeSocketMC.minecraft; +import static xyz.gmitch215.socketmc.util.RenderingProperties.REFRESH_RATE; + +public final class NeoForgeRendering { + + private NeoForgeRendering() {} + + public static void frameTick() { + // Set Rendering Properties + Window window = minecraft.getWindow(); + + REFRESH_RATE.set(window.getRefreshRate()); + } + +} diff --git a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/NeoForgeRetriever.java b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/NeoForgeRetriever.java index 1356b09..fdecf7d 100644 --- a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/NeoForgeRetriever.java +++ b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/NeoForgeRetriever.java @@ -8,6 +8,7 @@ import xyz.gmitch215.socketmc.retriever.RetrieverType; import xyz.gmitch215.socketmc.retriever.Window; import xyz.gmitch215.socketmc.util.InputType; +import xyz.gmitch215.socketmc.util.RenderingProperties; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -44,7 +45,7 @@ private NeoForgeRetriever() {} window.getGuiScale(), window.getFramerateLimit(), com.mojang.blaze3d.platform.Window.getPlatform(), - window.getRefreshRate() + RenderingProperties.REFRESH_RATE.get() ); }), create(RetrieverType.PAUSED, minecraft::isPaused), diff --git a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/mixin/GuiMixin.java b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/mixin/GuiMixin.java index 26c5d26..e933809 100644 --- a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/mixin/GuiMixin.java +++ b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/mixin/GuiMixin.java @@ -7,6 +7,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import xyz.gmitch215.socketmc.neoforge.NeoForgeRendering; import xyz.gmitch215.socketmc.neoforge.machines.*; @Mixin(Gui.class) @@ -14,6 +15,8 @@ public class GuiMixin { @Inject(method = "render", at = @At(value = "TAIL")) public void render(GuiGraphics drawContext, DeltaTracker tickDelta, CallbackInfo callbackInfo) { + NeoForgeRendering.frameTick(); + DrawTextMachine.frameTick(drawContext, tickDelta); DrawShapeMachine.frameTick(drawContext, tickDelta); DrawBufferMachine.frameTick(drawContext, tickDelta); diff --git a/mod/shared/src/main/java/xyz/gmitch215/socketmc/util/RenderingProperties.java b/mod/shared/src/main/java/xyz/gmitch215/socketmc/util/RenderingProperties.java new file mode 100644 index 0000000..1e19753 --- /dev/null +++ b/mod/shared/src/main/java/xyz/gmitch215/socketmc/util/RenderingProperties.java @@ -0,0 +1,9 @@ +package xyz.gmitch215.socketmc.util; + +import java.util.concurrent.atomic.AtomicInteger; + +public interface RenderingProperties { + + AtomicInteger REFRESH_RATE = new AtomicInteger(0); + +} From 332730ed5678e18262ac58ddbc93b9f738b1dc8b Mon Sep 17 00:00:00 2001 From: Gregory Mitchell <54124162+gmitch215@users.noreply.github.com> Date: Sat, 21 Sep 2024 13:03:07 -0500 Subject: [PATCH 04/15] Add Identifiers to `LifecycleMap` --- .../gmitch215/socketmc/util/Identifier.java | 21 ++++ .../gmitch215/socketmc/util/LifecycleMap.java | 119 ++++++++++++++++-- 2 files changed, 130 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/xyz/gmitch215/socketmc/util/Identifier.java b/core/src/main/java/xyz/gmitch215/socketmc/util/Identifier.java index 4a2a115..1568b3e 100644 --- a/core/src/main/java/xyz/gmitch215/socketmc/util/Identifier.java +++ b/core/src/main/java/xyz/gmitch215/socketmc/util/Identifier.java @@ -5,6 +5,7 @@ import java.io.Serial; import java.io.Serializable; import java.util.Objects; +import java.util.UUID; /** *

Represents a Namespaced Identifier.

@@ -73,4 +74,24 @@ public static Identifier minecraft(@NotNull String path) { return new Identifier("minecraft", path); } + /** + * Creates a new Identifier with the namespace "socketmc". + * @param path The path of the Identifier. + * @return The new Identifier. + */ + @NotNull + public static Identifier socketmc(@NotNull String path) { + return new Identifier("socketmc", path); + } + + /** + * Creates a new random Identifier with the namespace "socketmc" and a random UUID as its path. + * @return The new random Identifier. + */ + @NotNull + public static Identifier random() { + UUID uuid = UUID.randomUUID(); + return Identifier.socketmc(uuid.toString()); + } + } diff --git a/core/src/main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java b/core/src/main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java index 9c4b510..81cb79e 100644 --- a/core/src/main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java +++ b/core/src/main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java @@ -15,6 +15,7 @@ */ public class LifecycleMap implements Iterable { + private final Map identifiers = new HashMap<>(); private final Map origin = new HashMap<>(); private final Map duration = new HashMap<>(); @@ -50,50 +51,115 @@ public void run() { /** * Associates the specified value with the specified key in this map. + * @param id The identifier for the key * @param key The key with which the specified value is to be associated * @param startMillis The start time of the value, in milliseconds * @param durationMillis The duration of the value, in milliseconds + * @return The identifier of the key */ - public void put(@NotNull T key, long startMillis, long durationMillis) { + @NotNull + public Identifier put(@NotNull Identifier id, @NotNull T key, long startMillis, long durationMillis) { + if (id == null) throw new IllegalArgumentException("Identifier cannot be null"); + if (key == null) throw new IllegalArgumentException("Key cannot be null"); + + identifiers.put(key, id); origin.put(key, startMillis); duration.put(key, durationMillis); + + return id; + } + + /** + * Associates the specified value with the specified key in this map. + * @param key The key with which the specified value is to be associated + * @param startMillis The start time of the value, in milliseconds + * @param durationMillis The duration of the value, in milliseconds + * @return The identifier of the key + */ + @NotNull + public Identifier put(@NotNull T key, long startMillis, long durationMillis) { + return put(Identifier.random(), key, startMillis, durationMillis); } /** * Stores the specified key in this map for the specified duration. + * @param id The identifier for the key * @param key The key to store * @param millis The duration to store the key for, in milliseconds + * @return The identifier of the key */ - public void store(@NotNull T key, long millis) { - put(key, System.currentTimeMillis(), millis); + @NotNull + public Identifier store(@NotNull Identifier id, @NotNull T key, long millis) { + return put(id, key, System.currentTimeMillis(), millis); } /** - * Returns the value to which the specified key is mapped, or null if this map contains no mapping for the key. + * Stores the specified key in this map for the specified duration. + * @param key The key to store + * @param millis The duration to store the key for, in milliseconds + * @return The identifier of the key + */ + @NotNull + public Identifier store(@NotNull T key, long millis) { + return store(Identifier.random(), key, millis); + } + + /** + * Stores the specified key in this map for the specified duration. + * @param id The identifier for the key * @param key The key whose associated value is to be returned * @param time The current time, in milliseconds * @param unit The time unit of the duration + * @return The identifier for the key */ - public void store(@NotNull T key, long time, @NotNull TimeUnit unit) { + @NotNull + public Identifier store(@NotNull Identifier id, @NotNull T key, long time, @NotNull TimeUnit unit) { if (unit == null) throw new IllegalArgumentException("TimeUnit cannot be null"); - put(key, System.currentTimeMillis(), unit.toMillis(time)); + return put(id, key, System.currentTimeMillis(), unit.toMillis(time)); + } + + /** + * Stores the specified key in this map for the specified duration. + * @param key The key whose associated value is to be returned + * @param time The current time, in milliseconds + * @param unit The time unit of the duration + * @return The identifier for the key + */ + @NotNull + public Identifier store(@NotNull T key, long time, @NotNull TimeUnit unit) { + return store(Identifier.random(), key, time, unit); } /** - * Returns the value to which the specified key is mapped, or null if this map contains no mapping for the key. + * Stores the specified key in this map for the specified duration. + * @param id The identifier for the key * @param key The key whose associated value is to be returned * @param duration The duration to store the key for + * @return The identifier for the key */ - public void store(@NotNull T key, @NotNull Duration duration) { + @NotNull + public Identifier store(@NotNull Identifier id, @NotNull T key, @NotNull Duration duration) { if (duration == null) throw new IllegalArgumentException("TimeUnit cannot be null"); - put(key, System.currentTimeMillis(), duration.toMillis()); + return put(id, key, System.currentTimeMillis(), duration.toMillis()); } /** - * Returns the value to which the specified key is mapped, or null if this map contains no mapping for the key. + * Stores the specified key in this map for the specified duration. + * @param key The key whose associated value is to be returned + * @param duration The duration to store the key for + * @return The identifier for the key + */ + @NotNull + public Identifier store(@NotNull T key, @NotNull Duration duration) { + return store(Identifier.random(), key, duration); + } + + /** + * Removes the mapping for the specified key from this map if present. * @param key The key whose associated value is to be returned */ public void remove(@NotNull T key) { + identifiers.remove(key); origin.remove(key); duration.remove(key); } @@ -126,6 +192,30 @@ public long getRemainingTime(@NotNull T key) { return (origin.get(key) + duration.get(key)) - System.currentTimeMillis(); } + /** + * Returns the identifier of the specified key. + * @param key The key whose identifier is to be returned + * @return The identifier of the key + */ + @NotNull + public Identifier getIdentifier(@NotNull T key) { + return identifiers.get(key); + } + + /** + * Gets the contents of the LifecycleMap as a map of identifiers to keys. + * @return The contents of the LifecycleMap + */ + @NotNull + public Map getContents() { + Map contents = new HashMap<>(); + + for (T key : origin.keySet()) + contents.put(identifiers.get(key), key); + + return contents; + } + /** * Gets the size of the map. * @return The size of the map @@ -143,6 +233,15 @@ public boolean containsKey(@NotNull T key) { return origin.containsKey(key); } + /** + * Returns true if this map contains a mapping for the specified identifier. + * @param id The identifier whose presence in this map is to be tested + * @return True if this map contains a mapping for the specified identifier + */ + public boolean containsIdentifier(@NotNull Identifier id) { + return identifiers.containsValue(id); + } + @NotNull @Override public Iterator iterator() { From 3b8336bb560f59c4033f4e8b33046ed8b3a4958e Mon Sep 17 00:00:00 2001 From: Gregory Mitchell <54124162+gmitch215@users.noreply.github.com> Date: Sat, 21 Sep 2024 13:25:22 -0500 Subject: [PATCH 05/15] Update LifecycleMap.java - Add More Utility Operations - Support Infinite Durations --- .../gmitch215/socketmc/util/LifecycleMap.java | 93 +++++++++++++++++-- 1 file changed, 86 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java b/core/src/main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java index 81cb79e..7505058 100644 --- a/core/src/main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java +++ b/core/src/main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.Set; import java.util.concurrent.TimeUnit; /** @@ -54,13 +55,15 @@ public void run() { * @param id The identifier for the key * @param key The key with which the specified value is to be associated * @param startMillis The start time of the value, in milliseconds - * @param durationMillis The duration of the value, in milliseconds + * @param durationMillis The duration of the value, in milliseconds (use {@code -1} for infinite) * @return The identifier of the key */ @NotNull public Identifier put(@NotNull Identifier id, @NotNull T key, long startMillis, long durationMillis) { if (id == null) throw new IllegalArgumentException("Identifier cannot be null"); if (key == null) throw new IllegalArgumentException("Key cannot be null"); + if (startMillis < 0) throw new IllegalArgumentException("Start time cannot be negative"); + if (durationMillis < -1) throw new IllegalArgumentException("Duration cannot be less than -1"); identifiers.put(key, id); origin.put(key, startMillis); @@ -73,7 +76,7 @@ public Identifier put(@NotNull Identifier id, @NotNull T key, long startMillis, * Associates the specified value with the specified key in this map. * @param key The key with which the specified value is to be associated * @param startMillis The start time of the value, in milliseconds - * @param durationMillis The duration of the value, in milliseconds + * @param durationMillis The duration of the value, in milliseconds (use {@code -1} for infinite) * @return The identifier of the key */ @NotNull @@ -85,7 +88,7 @@ public Identifier put(@NotNull T key, long startMillis, long durationMillis) { * Stores the specified key in this map for the specified duration. * @param id The identifier for the key * @param key The key to store - * @param millis The duration to store the key for, in milliseconds + * @param millis The duration to store the key for, in milliseconds (use {@code -1} for infinite) * @return The identifier of the key */ @NotNull @@ -96,7 +99,7 @@ public Identifier store(@NotNull Identifier id, @NotNull T key, long millis) { /** * Stores the specified key in this map for the specified duration. * @param key The key to store - * @param millis The duration to store the key for, in milliseconds + * @param millis The duration to store the key for, in milliseconds (use {@code -1} for infinite) * @return The identifier of the key */ @NotNull @@ -154,6 +157,27 @@ public Identifier store(@NotNull T key, @NotNull Duration duration) { return store(Identifier.random(), key, duration); } + /** + * Stores the specified key in this map for an infinite duration. + * @param id The identifier for the key + * @param key The key whose associated value is to be returned + * @return The identifier for the key + */ + @NotNull + public Identifier storeInfinite(@NotNull Identifier id, @NotNull T key) { + return store(id, key, -1); + } + + /** + * Stores the specified key in this map for an infinite duration. + * @param key The key whose associated value is to be returned + * @return The identifier for the key + */ + @NotNull + public Identifier storeInfinite(@NotNull T key) { + return store(key, -1); + } + /** * Removes the mapping for the specified key from this map if present. * @param key The key whose associated value is to be returned @@ -164,6 +188,24 @@ public void remove(@NotNull T key) { duration.remove(key); } + /** + * Removes the mapping for the specified identifier from this map if present. + * @param id The identifier whose associated value is to be removed + * @return The key that was removed, or null if the identifier was not present + */ + @Nullable + public T remove(@NotNull Identifier id) { + if (id == null) throw new IllegalArgumentException("Identifier cannot be null"); + T key = getContents().get(id); + + if (key != null) { + remove(key); + return key; + } + + return null; + } + /** * Returns the start time of the specified key. * @param key The key whose start time is to be returned @@ -185,13 +227,24 @@ public long getDuration(@NotNull T key) { /** * Returns the remaining time of the specified key. * @param key The key whose remaining time is to be returned - * @return The remaining time of the key, in milliseconds, or -1 if the key is not present + * @return The remaining time of the key (in milliseconds), {@code -1} if the key is not present, or {@link Long#MAX_VALUE} if the key is infinite */ public long getRemainingTime(@NotNull T key) { if (!origin.containsKey(key)) return -1; + if (duration.get(key) == -1) return Long.MAX_VALUE; + return (origin.get(key) + duration.get(key)) - System.currentTimeMillis(); } + /** + * Returns true if the specified key has an infinite duration. + * @param key The key whose duration is to be checked + * @return True if the key has an infinite duration + */ + public boolean isInfinite(@NotNull T key) { + return getDuration(key) == -1; + } + /** * Returns the identifier of the specified key. * @param key The key whose identifier is to be returned @@ -203,7 +256,7 @@ public Identifier getIdentifier(@NotNull T key) { } /** - * Gets the contents of the LifecycleMap as a map of identifiers to keys. + * Gets an immutable copy of the contents of the LifecycleMap as a map of identifiers to keys. * @return The contents of the LifecycleMap */ @NotNull @@ -213,7 +266,16 @@ public Map getContents() { for (T key : origin.keySet()) contents.put(identifiers.get(key), key); - return contents; + return Map.copyOf(contents); + } + + /** + * Fetches an immutable set of the identifiers in the map. + * @return Set of identifiers for their keys + */ + @NotNull + public Set getIdentifiers() { + return Set.copyOf(identifiers.values()); } /** @@ -247,4 +309,21 @@ public boolean containsIdentifier(@NotNull Identifier id) { public Iterator iterator() { return origin.keySet().iterator(); } + + /** + * Removes a specific key from multiple LifecycleMaps. + * @param id The identifier of the key to remove + * @param maps The LifecycleMaps to remove the key from + * @param The type of object to remove + * @throws IllegalArgumentException if the maps are null + */ + public static void removeIn(@NotNull Identifier id, @NotNull LifecycleMap... maps) { + if (id == null) throw new IllegalArgumentException("Identifier cannot be null"); + if (maps == null) throw new IllegalArgumentException("Maps cannot be null"); + + for (LifecycleMap map : maps) { + if (map.remove(id) != null) + return; + } + } } From fa89bce3c1f32228ddc07e5370e3e92d4336ebe4 Mon Sep 17 00:00:00 2001 From: Gregory Mitchell <54124162+gmitch215@users.noreply.github.com> Date: Sat, 21 Sep 2024 13:25:32 -0500 Subject: [PATCH 06/15] Update Instruction.java Add Infinite Duration Documentation --- .../java/xyz/gmitch215/socketmc/instruction/Instruction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/xyz/gmitch215/socketmc/instruction/Instruction.java b/core/src/main/java/xyz/gmitch215/socketmc/instruction/Instruction.java index 15b04c3..c52232b 100644 --- a/core/src/main/java/xyz/gmitch215/socketmc/instruction/Instruction.java +++ b/core/src/main/java/xyz/gmitch215/socketmc/instruction/Instruction.java @@ -33,7 +33,7 @@ *
  • Instructions are immutable and cannot be modified after creation.
    • *
  • Instructions are serializable and can be sent over the network as byte arrays.
    • *
  • All X, Y, Height, Width, and other measurements used in drawing instructions are in pixels.
    • - *
  • Players render things on the screen based on their own FPS (Frames Per Second), hence the provision of timed renderings in milliseconds.
    • + *
  • Players render things on the screen based on their own FPS (Frames Per Second), hence the provision of timed renderings in milliseconds. In addition, you can specify {@code -1} for an infinite duration.
    • *
  • SocketMC v0.1.3 introduced a permission system that allows or disallows specific types of Instructions. If permission is not given, the Instruction will silently fail.
    • * */ From f7c87d92801c224c4712914384c426e866523993 Mon Sep 17 00:00:00 2001 From: Gregory Mitchell <54124162+gmitch215@users.noreply.github.com> Date: Sat, 21 Sep 2024 13:25:54 -0500 Subject: [PATCH 07/15] Create `RetrieverType#DRAWN_CONTENTS` --- .../socketmc/retriever/RetrieverType.java | 17 +++++++++++++++++ .../socketmc/fabric/FabricRetriever.java | 13 ++++++++++++- .../fabric/machines/DrawBufferMachine.java | 2 +- .../fabric/machines/DrawContextMachine.java | 2 +- .../fabric/machines/DrawItemStackMachine.java | 2 +- .../fabric/machines/DrawShapeMachine.java | 2 +- .../fabric/machines/DrawTextMachine.java | 2 +- .../fabric/machines/DrawTextureMachine.java | 2 +- .../socketmc/forge/ForgeRetriever.java | 12 +++++++++++- .../forge/machines/DrawBufferMachine.java | 2 +- .../forge/machines/DrawContextMachine.java | 2 +- .../forge/machines/DrawItemStackMachine.java | 2 +- .../forge/machines/DrawShapeMachine.java | 2 +- .../forge/machines/DrawTextMachine.java | 2 +- .../forge/machines/DrawTextureMachine.java | 2 +- .../socketmc/neoforge/NeoForgeRetriever.java | 12 +++++++++++- .../neoforge/machines/DrawBufferMachine.java | 2 +- .../neoforge/machines/DrawContextMachine.java | 2 +- .../neoforge/machines/DrawItemStackMachine.java | 2 +- .../neoforge/machines/DrawShapeMachine.java | 2 +- .../neoforge/machines/DrawTextMachine.java | 2 +- .../neoforge/machines/DrawTextureMachine.java | 2 +- 22 files changed, 69 insertions(+), 21 deletions(-) diff --git a/core/src/main/java/xyz/gmitch215/socketmc/retriever/RetrieverType.java b/core/src/main/java/xyz/gmitch215/socketmc/retriever/RetrieverType.java index f949947..855e7de 100644 --- a/core/src/main/java/xyz/gmitch215/socketmc/retriever/RetrieverType.java +++ b/core/src/main/java/xyz/gmitch215/socketmc/retriever/RetrieverType.java @@ -2,7 +2,9 @@ import org.jetbrains.annotations.NotNull; import xyz.gmitch215.socketmc.config.ModPermission; +import xyz.gmitch215.socketmc.instruction.Instruction; import xyz.gmitch215.socketmc.spigot.SocketPlugin; +import xyz.gmitch215.socketmc.util.Identifier; import xyz.gmitch215.socketmc.util.InputType; import java.io.*; @@ -128,6 +130,21 @@ public final class RetrieverType implements Serializable { @RetrieverPermission(ModPermission.READ_GAME_PROPERTIES) public static final RetrieverType HIDDEN_PLAYERS = new RetrieverType<>("hidden_players", UUID[].class); + /** + *

    A retriever for all of the drawn contents on the client's screen made through SocketMC Instructions.

    + *

    This currently includes the following instructions:

    + *
      + *
    • {@link Instruction#DRAW_TEXT}
      • + *
    • {@link Instruction#DRAW_SHAPE}
      • + *
    • {@link Instruction#DRAW_TEXTURE}
      • + *
    • {@link Instruction#DRAW_BUFFER}
      • + *
    • {@link Instruction#DRAW_CONTEXT}
      • + *
    • {@link Instruction#DRAW_ITEMSTACK}
      • + *
    + */ + @RetrieverPermission(ModPermission.READ_GUI_PROPERTIES) + public static final RetrieverType DRAWN_CONTENTS = new RetrieverType<>("drawn_contents", Identifier[].class); + // private final String id; diff --git a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/FabricRetriever.java b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/FabricRetriever.java index f2c60f9..8e5a827 100644 --- a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/FabricRetriever.java +++ b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/FabricRetriever.java @@ -3,16 +3,19 @@ import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFuture; import net.minecraft.network.FriendlyByteBuf; +import xyz.gmitch215.socketmc.fabric.machines.*; import xyz.gmitch215.socketmc.retriever.ClientProperty; import xyz.gmitch215.socketmc.retriever.Retriever; import xyz.gmitch215.socketmc.retriever.RetrieverType; import xyz.gmitch215.socketmc.retriever.Window; +import xyz.gmitch215.socketmc.util.Identifier; import xyz.gmitch215.socketmc.util.InputType; import xyz.gmitch215.socketmc.util.RenderingProperties; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; +import java.util.List; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; @@ -59,7 +62,15 @@ private FabricRetriever() {} case MOUSE -> InputType.MOUSE; default -> InputType.NONE; }), - create(RetrieverType.COMMAND_HISTORY, () -> minecraft.commandHistory().history().toArray(new String[0])) + create(RetrieverType.COMMAND_HISTORY, () -> minecraft.commandHistory().history().toArray(new String[0])), + create(RetrieverType.DRAWN_CONTENTS, () -> Stream.of( + DrawTextMachine.lifecycle.getIdentifiers(), + DrawShapeMachine.lifecycle.getIdentifiers(), + DrawTextureMachine.lifecycle.getIdentifiers(), + DrawBufferMachine.lifecycle.getIdentifiers(), + DrawContextMachine.lifecycle.getIdentifiers(), + DrawItemStackMachine.lifecycle.getIdentifiers() + ).flatMap(Set::stream).distinct().toArray(Identifier[]::new)) ) ).collect(Collectors.toSet()); diff --git a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawBufferMachine.java b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawBufferMachine.java index e705dec..7608fab 100644 --- a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawBufferMachine.java +++ b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawBufferMachine.java @@ -21,7 +21,7 @@ public final class DrawBufferMachine implements Machine { private DrawBufferMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawContextMachine.java b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawContextMachine.java index a0ff3c3..bd1b746 100644 --- a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawContextMachine.java +++ b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawContextMachine.java @@ -43,7 +43,7 @@ public final class DrawContextMachine implements Machine { private DrawContextMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawItemStackMachine.java b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawItemStackMachine.java index 69d2907..77cad29 100644 --- a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawItemStackMachine.java +++ b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawItemStackMachine.java @@ -20,7 +20,7 @@ public final class DrawItemStackMachine implements Machine { private DrawItemStackMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawShapeMachine.java b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawShapeMachine.java index 379d91b..31ca488 100644 --- a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawShapeMachine.java +++ b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawShapeMachine.java @@ -17,7 +17,7 @@ public final class DrawShapeMachine implements Machine { private DrawShapeMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawTextMachine.java b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawTextMachine.java index b51d510..1ad5995 100644 --- a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawTextMachine.java +++ b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawTextMachine.java @@ -20,7 +20,7 @@ public final class DrawTextMachine implements Machine { private DrawTextMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawTextureMachine.java b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawTextureMachine.java index eed57d2..99c5ed6 100644 --- a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawTextureMachine.java +++ b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/machines/DrawTextureMachine.java @@ -19,7 +19,7 @@ public final class DrawTextureMachine implements Machine { private DrawTextureMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/ForgeRetriever.java b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/ForgeRetriever.java index e4c3a9e..ed318e3 100644 --- a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/ForgeRetriever.java +++ b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/ForgeRetriever.java @@ -4,10 +4,12 @@ import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFuture; import net.minecraft.network.FriendlyByteBuf; +import xyz.gmitch215.socketmc.forge.machines.*; import xyz.gmitch215.socketmc.retriever.ClientProperty; import xyz.gmitch215.socketmc.retriever.Retriever; import xyz.gmitch215.socketmc.retriever.RetrieverType; import xyz.gmitch215.socketmc.retriever.Window; +import xyz.gmitch215.socketmc.util.Identifier; import xyz.gmitch215.socketmc.util.InputType; import xyz.gmitch215.socketmc.util.RenderingProperties; @@ -61,7 +63,15 @@ private ForgeRetriever() {} case MOUSE -> InputType.MOUSE; default -> InputType.NONE; }), - create(RetrieverType.COMMAND_HISTORY, () -> minecraft.commandHistory().history().toArray(new String[0])) + create(RetrieverType.COMMAND_HISTORY, () -> minecraft.commandHistory().history().toArray(new String[0])), + create(RetrieverType.DRAWN_CONTENTS, () -> Stream.of( + DrawTextMachine.lifecycle.getIdentifiers(), + DrawShapeMachine.lifecycle.getIdentifiers(), + DrawTextureMachine.lifecycle.getIdentifiers(), + DrawBufferMachine.lifecycle.getIdentifiers(), + DrawContextMachine.lifecycle.getIdentifiers(), + DrawItemStackMachine.lifecycle.getIdentifiers() + ).flatMap(Set::stream).distinct().toArray(Identifier[]::new)) ) ).collect(Collectors.toSet()); diff --git a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawBufferMachine.java b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawBufferMachine.java index 2fded0b..7519fab 100644 --- a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawBufferMachine.java +++ b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawBufferMachine.java @@ -21,7 +21,7 @@ public final class DrawBufferMachine implements Machine { private DrawBufferMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawContextMachine.java b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawContextMachine.java index d2cd1b4..ca7d728 100644 --- a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawContextMachine.java +++ b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawContextMachine.java @@ -41,7 +41,7 @@ public final class DrawContextMachine implements Machine { private DrawContextMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawItemStackMachine.java b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawItemStackMachine.java index 028facf..c8376ad 100644 --- a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawItemStackMachine.java +++ b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawItemStackMachine.java @@ -20,7 +20,7 @@ public final class DrawItemStackMachine implements Machine { private DrawItemStackMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawShapeMachine.java b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawShapeMachine.java index e245282..c9d15f7 100644 --- a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawShapeMachine.java +++ b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawShapeMachine.java @@ -17,7 +17,7 @@ public final class DrawShapeMachine implements Machine { private DrawShapeMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawTextMachine.java b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawTextMachine.java index 1f454fc..ade8066 100644 --- a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawTextMachine.java +++ b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawTextMachine.java @@ -20,7 +20,7 @@ public final class DrawTextMachine implements Machine { private DrawTextMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawTextureMachine.java b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawTextureMachine.java index a2f8213..61198fe 100644 --- a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawTextureMachine.java +++ b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/machines/DrawTextureMachine.java @@ -19,7 +19,7 @@ public final class DrawTextureMachine implements Machine { private DrawTextureMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/NeoForgeRetriever.java b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/NeoForgeRetriever.java index fdecf7d..805dad9 100644 --- a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/NeoForgeRetriever.java +++ b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/NeoForgeRetriever.java @@ -3,10 +3,12 @@ import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFuture; import net.minecraft.network.FriendlyByteBuf; +import xyz.gmitch215.socketmc.neoforge.machines.*; import xyz.gmitch215.socketmc.retriever.ClientProperty; import xyz.gmitch215.socketmc.retriever.Retriever; import xyz.gmitch215.socketmc.retriever.RetrieverType; import xyz.gmitch215.socketmc.retriever.Window; +import xyz.gmitch215.socketmc.util.Identifier; import xyz.gmitch215.socketmc.util.InputType; import xyz.gmitch215.socketmc.util.RenderingProperties; @@ -59,7 +61,15 @@ private NeoForgeRetriever() {} case MOUSE -> InputType.MOUSE; default -> InputType.NONE; }), - create(RetrieverType.COMMAND_HISTORY, () -> minecraft.commandHistory().history().toArray(new String[0])) + create(RetrieverType.COMMAND_HISTORY, () -> minecraft.commandHistory().history().toArray(new String[0])), + create(RetrieverType.DRAWN_CONTENTS, () -> Stream.of( + DrawTextMachine.lifecycle.getIdentifiers(), + DrawShapeMachine.lifecycle.getIdentifiers(), + DrawTextureMachine.lifecycle.getIdentifiers(), + DrawBufferMachine.lifecycle.getIdentifiers(), + DrawContextMachine.lifecycle.getIdentifiers(), + DrawItemStackMachine.lifecycle.getIdentifiers() + ).flatMap(Set::stream).distinct().toArray(Identifier[]::new)) ) ).collect(Collectors.toSet()); diff --git a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawBufferMachine.java b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawBufferMachine.java index a2cdaf6..fbf8df6 100644 --- a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawBufferMachine.java +++ b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawBufferMachine.java @@ -21,7 +21,7 @@ public final class DrawBufferMachine implements Machine { private DrawBufferMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawContextMachine.java b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawContextMachine.java index 4717e4e..bc5184d 100644 --- a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawContextMachine.java +++ b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawContextMachine.java @@ -41,7 +41,7 @@ public final class DrawContextMachine implements Machine { private DrawContextMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawItemStackMachine.java b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawItemStackMachine.java index 26982f6..141dd88 100644 --- a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawItemStackMachine.java +++ b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawItemStackMachine.java @@ -20,7 +20,7 @@ public final class DrawItemStackMachine implements Machine { private DrawItemStackMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawShapeMachine.java b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawShapeMachine.java index d5e2a35..08f283d 100644 --- a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawShapeMachine.java +++ b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawShapeMachine.java @@ -17,7 +17,7 @@ public final class DrawShapeMachine implements Machine { private DrawShapeMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawTextMachine.java b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawTextMachine.java index 61a62dd..5401aa9 100644 --- a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawTextMachine.java +++ b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawTextMachine.java @@ -20,7 +20,7 @@ public final class DrawTextMachine implements Machine { private DrawTextMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); diff --git a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawTextureMachine.java b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawTextureMachine.java index d498056..fe7a796 100644 --- a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawTextureMachine.java +++ b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/machines/DrawTextureMachine.java @@ -19,7 +19,7 @@ public final class DrawTextureMachine implements Machine { private DrawTextureMachine() {} - private static final LifecycleMap> lifecycle = new LifecycleMap<>(); + public static final LifecycleMap> lifecycle = new LifecycleMap<>(); public static void frameTick(GuiGraphics graphics, DeltaTracker delta) { lifecycle.run(); From 268bf122e4e98f2245d4cf703b2a175ef37c2eda Mon Sep 17 00:00:00 2001 From: Gregory Mitchell <54124162+gmitch215@users.noreply.github.com> Date: Sat, 21 Sep 2024 13:43:59 -0500 Subject: [PATCH 08/15] Update TestLifecycleMap.java --- .../test/java/xyz/gmitch215/socketmc/util/TestLifecycleMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/test/java/xyz/gmitch215/socketmc/util/TestLifecycleMap.java b/core/src/test/java/xyz/gmitch215/socketmc/util/TestLifecycleMap.java index 5af84fc..ed14402 100644 --- a/core/src/test/java/xyz/gmitch215/socketmc/util/TestLifecycleMap.java +++ b/core/src/test/java/xyz/gmitch215/socketmc/util/TestLifecycleMap.java @@ -20,7 +20,7 @@ public void testPut() { Assertions.assertEquals(3, map.size()); for (int i = 1; i <= 3; i++) { Assertions.assertTrue(map.containsKey(i)); - Assertions.assertEquals(1000, map.getRemainingTime(i)); + Assertions.assertEquals(1000, map.getDuration(i)); } } From ac848fa0953a34d2ff5215c252d6c47dc776548e Mon Sep 17 00:00:00 2001 From: Gregory Mitchell <54124162+gmitch215@users.noreply.github.com> Date: Sat, 21 Sep 2024 13:44:36 -0500 Subject: [PATCH 09/15] Upgrade to Gradle 8.10.1 --- gradle/wrapper/gradle-wrapper.jar | Bin 43504 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c3521197d7c4586c843d1d3e9090525f1898cde..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch delta 3990 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41..0aaefbc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From f340a6f91bd28f07703e715078fd7e19fb7188c0 Mon Sep 17 00:00:00 2001 From: Gregory Mitchell <54124162+gmitch215@users.noreply.github.com> Date: Sat, 5 Oct 2024 22:34:05 -0500 Subject: [PATCH 10/15] Add Similar Versions --- build.gradle.kts | 1 + mod/fabric/build.gradle.kts | 17 +++++++++-------- mod/forge/build.gradle.kts | 10 ++++++---- mod/neoforge/build.gradle.kts | 8 +++++--- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8fda786..81e1200 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -73,6 +73,7 @@ allprojects { project.ext["license"] = "GPL-3.0" project.ext["github"] = "https://github.com/gmitch215/SocketMC" + project.ext["similar_versions"] = listOf("1.21.1") project.ext["version_type"] = when { version.toString().contains("SNAPSHOT") -> "alpha" version.toString().split("-")[1].startsWith("0") -> "beta" diff --git a/mod/fabric/build.gradle.kts b/mod/fabric/build.gradle.kts index a13e38a..a14fac4 100644 --- a/mod/fabric/build.gradle.kts +++ b/mod/fabric/build.gradle.kts @@ -9,7 +9,7 @@ plugins { description = "Fabric Mod for SocketMC Client-side Implementation" -val minecraft = project.ext["minecraft_version"].toString() +val mc = project.ext["minecraft_version"].toString() val parchment = project.ext["parchment"].toString() val fabric = "0.102.0" @@ -18,10 +18,10 @@ dependencies { api(project(":socketmc-core")) api(project(":socketmc-shared")) - minecraft("com.mojang:minecraft:$minecraft") + minecraft("com.mojang:minecraft:$mc") mappings(loom.layered { officialMojangMappings() - parchment("org.parchmentmc.data:parchment-$minecraft:$parchment@zip") + parchment("org.parchmentmc.data:parchment-$mc:$parchment@zip") }) modImplementation("net.fabricmc:fabric-loader:0.15.11") @@ -35,7 +35,7 @@ dependencies { "fabric-screen-api-v1", "fabric-key-binding-api-v1" ).forEach { - modImplementation(fabricApi.module(it, "$fabric+$minecraft")) + modImplementation(fabricApi.module(it, "$fabric+$mc")) } annotationProcessor("org.spongepowered:mixin:0.8.6:processor") @@ -92,13 +92,14 @@ modrinth { versionType.set(project.ext["version_type"].toString()) uploadFile.set(tasks.remapJar) - gameVersions.add(project.ext["minecraft_version"].toString()) changelog.set(project.ext["changelog"].toString()) + gameVersions.add(mc) + gameVersions.addAll((project.ext["similar_versions"] as List<*>).map { it.toString() }) + loaders.addAll(listOf("fabric", "quilt")) - dependencies { - required.project("fabric-api") - } + + required.project("fabric-api") syncBodyFrom.set(rootProject.file("README.md").bufferedReader().use { it.readText() }) } \ No newline at end of file diff --git a/mod/forge/build.gradle.kts b/mod/forge/build.gradle.kts index 40b6c93..45e4cb3 100644 --- a/mod/forge/build.gradle.kts +++ b/mod/forge/build.gradle.kts @@ -7,7 +7,7 @@ plugins { description = "Forge Mod for SocketMC Client-side Implementation" -val minecraft = project.ext["minecraft_version"].toString() +val mc = project.ext["minecraft_version"].toString() val parchment = project.ext["parchment"].toString() val forge = "51.0.0" @@ -16,13 +16,13 @@ dependencies { api(project(":socketmc-core")) api(project(":socketmc-shared")) - minecraft("net.minecraftforge:forge:$minecraft-$forge") + minecraft("net.minecraftforge:forge:$mc-$forge") annotationProcessor("org.spongepowered:mixin:0.8.6:processor") } minecraft { - mappings("parchment", "$parchment-$minecraft") + mappings("parchment", "$parchment-$mc") accessTransformer("src/main/resources/META-INF/accesstransformer.cfg") @@ -73,9 +73,11 @@ modrinth { versionType.set(project.ext["version_type"].toString()) uploadFile.set(tasks.jar.get().archiveFile.get().asFile) - gameVersions.add(project.ext["minecraft_version"].toString()) changelog.set(project.ext["changelog"].toString()) + gameVersions.add(mc) + gameVersions.addAll((project.ext["similar_versions"] as List<*>).map { it.toString() }) + loaders.add("forge") syncBodyFrom.set(rootProject.file("README.md").bufferedReader().use { it.readText() }) diff --git a/mod/neoforge/build.gradle.kts b/mod/neoforge/build.gradle.kts index 5b60a7f..02c5835 100644 --- a/mod/neoforge/build.gradle.kts +++ b/mod/neoforge/build.gradle.kts @@ -6,7 +6,7 @@ plugins { description = "NeoForge Mod for SocketMC Client-side Implementation" -val minecraft = project.ext["minecraft_version"].toString() +val mc = project.ext["minecraft_version"].toString() val parchmentV = project.ext["parchment"].toString() val neoforge = "21.0.167" @@ -26,7 +26,7 @@ minecraft { subsystems { parchment { - minecraftVersion.set(minecraft) + minecraftVersion.set(mc) mappingsVersion.set(parchmentV) } } @@ -73,9 +73,11 @@ modrinth { versionType.set(project.ext["version_type"].toString()) uploadFile.set(tasks.jar.get().archiveFile.get().asFile) - gameVersions.add(project.ext["minecraft_version"].toString()) changelog.set(project.ext["changelog"].toString()) + gameVersions.add(mc) + gameVersions.addAll((project.ext["similar_versions"] as List<*>).map { it.toString() }) + loaders.add("neoforge") syncBodyFrom.set(rootProject.file("README.md").bufferedReader().use { it.readText() }) From 8716e21ca1468fa9452578eae46755161b4138f0 Mon Sep 17 00:00:00 2001 From: Gregory Mitchell <54124162+gmitch215@users.noreply.github.com> Date: Mon, 14 Oct 2024 19:08:07 -0500 Subject: [PATCH 11/15] Add Attributes to `CustomScreen` --- .../socketmc/screen/CustomScreen.java | 89 ++++++++++++++++++- 1 file changed, 87 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/xyz/gmitch215/socketmc/screen/CustomScreen.java b/core/src/main/java/xyz/gmitch215/socketmc/screen/CustomScreen.java index 212e911..86c8c25 100644 --- a/core/src/main/java/xyz/gmitch215/socketmc/screen/CustomScreen.java +++ b/core/src/main/java/xyz/gmitch215/socketmc/screen/CustomScreen.java @@ -1,13 +1,16 @@ package xyz.gmitch215.socketmc.screen; -import xyz.gmitch215.socketmc.screen.layout.Layout; -import xyz.gmitch215.socketmc.util.render.text.Text; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; +import xyz.gmitch215.socketmc.screen.layout.Layout; +import xyz.gmitch215.socketmc.util.render.text.Text; import java.io.Serial; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * Represents a custom screen to be displayed on the client's screen. @@ -23,6 +26,7 @@ public final class CustomScreen extends AbstractScreen { private boolean closeableOnEscape = true; private final List children = new ArrayList<>(); + private final Map attributes = new HashMap<>(); /** * Constructs a new screen with the given title. @@ -174,7 +178,86 @@ public void setCloseableOnEscape(boolean closeableOnEscape) { this.closeableOnEscape = closeableOnEscape; } + /** + * Gets an immutable copy of the attributes of this screen. + * @return Map of Attributes + */ + @Unmodifiable + @NotNull + public Map getAttributes() { + return Map.copyOf(attributes); + } + + /** + * Gets an attribute from this screen. + * @param key the key of the attribute + * @return the attribute value, or null if the attribute does not exist + * @throws IllegalArgumentException if the key is null + */ + @Nullable + public Object getAttribute(@NotNull String key) throws IllegalArgumentException { + if (key == null) throw new IllegalArgumentException("Key cannot be null"); + return attributes.get(key); + } + + /** + * Gets an attribute from this screen. + * @param key the key of the attribute + * @param def the default value if the attribute does not exist + * @return the attribute value, or the default value if the attribute does not exist + * @throws IllegalArgumentException if the key is null + */ + public Object getAttribute(@NotNull String key, @Nullable Object def) throws IllegalArgumentException { + if (key == null) throw new IllegalArgumentException("Key cannot be null"); + return attributes.getOrDefault(key, def); + } + + /** + * Gets an attribute from this screen. + * @param key the key of the attribute + * @param type the type of the attribute + * @return the attribute value, or null if the attribute does not exist + * @param the type of the attribute + */ + @Nullable + public T getAttribute(@NotNull String key, @NotNull Class type) { + if (key == null) throw new IllegalArgumentException("Key cannot be null"); + if (type == null) throw new IllegalArgumentException("Type cannot be null"); + + return type.cast(attributes.get(key)); + } + + /** + * Gets an attribute from this screen. + * @param key the key of the attribute + * @param type the type of the attribute + * @param def the default value if the attribute does not exist + * @return the attribute value, or the default value if the attribute does not exist + * @param the type of the attribute + */ + @Nullable + public T getAttribute(@NotNull String key, @NotNull Class type, @Nullable T def) { + if (key == null) throw new IllegalArgumentException("Key cannot be null"); + if (type == null) throw new IllegalArgumentException("Type cannot be null"); + + return type.cast(attributes.getOrDefault(key, def)); + } + + /** + * Sets an attribute for this screen. + * @param key the key of the attribute + * @param value the value of the attribute + * @throws IllegalArgumentException if the key is null + */ + public void setAttribute(@NotNull String key, @Nullable Object value) throws IllegalArgumentException { + if (key == null) throw new IllegalArgumentException("Key cannot be null"); + + if (value == null) attributes.remove(key); + else attributes.put(key, value); + } + @Override + @NotNull public String toString() { return "CustomScreen{" + "title='" + titleJSON + '\'' + @@ -182,6 +265,8 @@ public String toString() { ", children=" + children + ", background=" + background + ", layout=" + layout + + ", closeableOnEscape=" + closeableOnEscape + + ", attributes=" + attributes + '}'; } } From 6b563d62502a9db52194ed9e00857b41d23325fc Mon Sep 17 00:00:00 2001 From: Gregory Mitchell <54124162+gmitch215@users.noreply.github.com> Date: Mon, 14 Oct 2024 19:46:48 -0500 Subject: [PATCH 12/15] Add Setting Enums --- .../java/xyz/gmitch215/socketmc/util/Arm.java | 41 +++++++++++++++++++ .../socketmc/util/option/AttackIndicator.java | 37 +++++++++++++++++ .../socketmc/util/option/ChatVisibility.java | 37 +++++++++++++++++ .../util/option/ChunkUpdatePriority.java | 37 +++++++++++++++++ .../socketmc/util/option/CloudRendering.java | 37 +++++++++++++++++ .../socketmc/util/option/GraphicsQuality.java | 37 +++++++++++++++++ .../socketmc/util/option/NarratorStatus.java | 39 ++++++++++++++++++ .../util/option/ParticleRendering.java | 37 +++++++++++++++++ .../socketmc/util/option/package-info.java | 4 ++ 9 files changed, 306 insertions(+) create mode 100644 core/src/main/java/xyz/gmitch215/socketmc/util/Arm.java create mode 100644 core/src/main/java/xyz/gmitch215/socketmc/util/option/AttackIndicator.java create mode 100644 core/src/main/java/xyz/gmitch215/socketmc/util/option/ChatVisibility.java create mode 100644 core/src/main/java/xyz/gmitch215/socketmc/util/option/ChunkUpdatePriority.java create mode 100644 core/src/main/java/xyz/gmitch215/socketmc/util/option/CloudRendering.java create mode 100644 core/src/main/java/xyz/gmitch215/socketmc/util/option/GraphicsQuality.java create mode 100644 core/src/main/java/xyz/gmitch215/socketmc/util/option/NarratorStatus.java create mode 100644 core/src/main/java/xyz/gmitch215/socketmc/util/option/ParticleRendering.java create mode 100644 core/src/main/javadoc/xyz/gmitch215/socketmc/util/option/package-info.java diff --git a/core/src/main/java/xyz/gmitch215/socketmc/util/Arm.java b/core/src/main/java/xyz/gmitch215/socketmc/util/Arm.java new file mode 100644 index 0000000..c4c0e89 --- /dev/null +++ b/core/src/main/java/xyz/gmitch215/socketmc/util/Arm.java @@ -0,0 +1,41 @@ +package xyz.gmitch215.socketmc.util; + +import org.jetbrains.annotations.NotNull; + +/** + * Represents a player's arm. + */ +public enum Arm { + + /** + * Represents the left arm. + */ + LEFT, + + /** + * Represents the right arm. + */ + RIGHT; + + /** + * Returns the opposite arm. + * @return the opposite arm + */ + @NotNull + public Arm opposite() { + return this == LEFT ? RIGHT : LEFT; + } + + /** + * Gets the Arm by its ordinal. + * @param ordinal + * @return Arm by ordinal + */ + @NotNull + public static Arm byOrdinal(int ordinal) { + return values()[ordinal]; + } + + + +} diff --git a/core/src/main/java/xyz/gmitch215/socketmc/util/option/AttackIndicator.java b/core/src/main/java/xyz/gmitch215/socketmc/util/option/AttackIndicator.java new file mode 100644 index 0000000..276ab8c --- /dev/null +++ b/core/src/main/java/xyz/gmitch215/socketmc/util/option/AttackIndicator.java @@ -0,0 +1,37 @@ +package xyz.gmitch215.socketmc.util.option; + +import org.jetbrains.annotations.NotNull; + +/** + * Represents the status of the attack indicator. + */ +public enum AttackIndicator { + + /** + * The attack indicator is disabled. + */ + OFF, + + /** + * The attack indicator is displayed in the crosshair. + */ + CROSSHAIR, + + /** + * The attack indicator is displayed in the hotbar. + */ + HOTBAR + + ; + + /** + * Gets the AttackIndicator by its ordinal. + * @param ordinal + * @return AttackIndicator by ordinal + */ + @NotNull + public static AttackIndicator byOrdinal(int ordinal) { + return values()[ordinal]; + } + +} diff --git a/core/src/main/java/xyz/gmitch215/socketmc/util/option/ChatVisibility.java b/core/src/main/java/xyz/gmitch215/socketmc/util/option/ChatVisibility.java new file mode 100644 index 0000000..3856458 --- /dev/null +++ b/core/src/main/java/xyz/gmitch215/socketmc/util/option/ChatVisibility.java @@ -0,0 +1,37 @@ +package xyz.gmitch215.socketmc.util.option; + +import org.jetbrains.annotations.NotNull; + +/** + * Represents the visibility of chat messages. + */ +public enum ChatVisibility { + + /** + * All chat messages are visible. + */ + FULL, + + /** + * Only chat messages from players that are in the same team are visible. + */ + SYSTEM, + + /** + * No chat messages are visible. + */ + HIDDEN + + ; + + /** + * Gets the ChatVisibility by its ordinal. + * @param ordinal + * @return ChatVisibility by ordinal + */ + @NotNull + public static ChatVisibility byOrdinal(int ordinal) { + return values()[ordinal]; + } + +} diff --git a/core/src/main/java/xyz/gmitch215/socketmc/util/option/ChunkUpdatePriority.java b/core/src/main/java/xyz/gmitch215/socketmc/util/option/ChunkUpdatePriority.java new file mode 100644 index 0000000..0d4ae94 --- /dev/null +++ b/core/src/main/java/xyz/gmitch215/socketmc/util/option/ChunkUpdatePriority.java @@ -0,0 +1,37 @@ +package xyz.gmitch215.socketmc.util.option; + +import org.jetbrains.annotations.NotNull; + +/** + * Represents the priority for chunk updates. + */ +public enum ChunkUpdatePriority { + + /** + * Chunk updates are not prioritized. + */ + NONE, + + /** + * Chunk updates are prioritized if a player is nearby. + */ + PLAYER_AFFECTED, + + /** + * Chunk updates are prioritized if the client is rendering the chunk. + */ + NEARBY + + ; + + /** + * Gets the ChunkUpdatePriority by its ordinal. + * @param ordinal The ordinal + * @return ChunkUpdatePriority by ordinal + */ + @NotNull + public static ChunkUpdatePriority byOrdinal(int ordinal) { + return values()[ordinal]; + } + +} diff --git a/core/src/main/java/xyz/gmitch215/socketmc/util/option/CloudRendering.java b/core/src/main/java/xyz/gmitch215/socketmc/util/option/CloudRendering.java new file mode 100644 index 0000000..bbb5631 --- /dev/null +++ b/core/src/main/java/xyz/gmitch215/socketmc/util/option/CloudRendering.java @@ -0,0 +1,37 @@ +package xyz.gmitch215.socketmc.util.option; + +import org.jetbrains.annotations.NotNull; + +/** + * Represents the status of cloud rendering. + */ +public enum CloudRendering { + + /** + * Clouds are not rendered. + */ + OFF, + + /** + * Clouds are rendered in performance mode. + */ + FAST, + + /** + * Clouds are rendered in quality mode. + */ + FANCY + + ; + + /** + * Gets the CloudRendering by its ordinal. + * @param ordinal + * @return CloudRendering by ordinal + */ + @NotNull + public static CloudRendering byOrdinal(int ordinal) { + return values()[ordinal]; + } + +} diff --git a/core/src/main/java/xyz/gmitch215/socketmc/util/option/GraphicsQuality.java b/core/src/main/java/xyz/gmitch215/socketmc/util/option/GraphicsQuality.java new file mode 100644 index 0000000..44751f2 --- /dev/null +++ b/core/src/main/java/xyz/gmitch215/socketmc/util/option/GraphicsQuality.java @@ -0,0 +1,37 @@ +package xyz.gmitch215.socketmc.util.option; + +import org.jetbrains.annotations.NotNull; + +/** + * Represents the different graphics rendering options. + */ +public enum GraphicsQuality { + + /** + * Graphics are rendered in the fastest way possible. + */ + FAST, + + /** + * Graphics are rendered in a medium quality way. + */ + FANCY, + + /** + * Graphics are rendered in the highest quality possible. + */ + FABULOUS + + ; + + /** + * Gets the GraphicsRendering by its ordinal. + * @param ordinal + * @return GraphicsRendering by ordinal + */ + @NotNull + public static GraphicsQuality byOrdinal(int ordinal) { + return values()[ordinal]; + } + +} diff --git a/core/src/main/java/xyz/gmitch215/socketmc/util/option/NarratorStatus.java b/core/src/main/java/xyz/gmitch215/socketmc/util/option/NarratorStatus.java new file mode 100644 index 0000000..8b64071 --- /dev/null +++ b/core/src/main/java/xyz/gmitch215/socketmc/util/option/NarratorStatus.java @@ -0,0 +1,39 @@ +package xyz.gmitch215.socketmc.util.option; + +/** + * Represents the status of the narrator. + */ +public enum NarratorStatus { + + /** + * The narrator is off. + */ + OFF, + + /** + * The narrator speaks on everything. + */ + ALL, + + /** + * The narrator speaks on chat messages. + */ + CHAT, + + /** + * The narrator speaks on system messages. + */ + SYSTEM + + ; + + /** + * Gets the NarratorStatus by its ordinal. + * @param ordinal the ordinal + * @return NarratorStatus by ordinal + */ + public static NarratorStatus byOrdinal(int ordinal) { + return values()[ordinal]; + } + +} diff --git a/core/src/main/java/xyz/gmitch215/socketmc/util/option/ParticleRendering.java b/core/src/main/java/xyz/gmitch215/socketmc/util/option/ParticleRendering.java new file mode 100644 index 0000000..0c5701f --- /dev/null +++ b/core/src/main/java/xyz/gmitch215/socketmc/util/option/ParticleRendering.java @@ -0,0 +1,37 @@ +package xyz.gmitch215.socketmc.util.option; + +import org.jetbrains.annotations.NotNull; + +/** + * Represents the different ways particles can be rendered. + */ +public enum ParticleRendering { + + /** + * Particles are rendered in full. + */ + ALL, + + /** + * Particles are rendered in a reduced form. + */ + DECREASED, + + /** + * Particles are not rendered at all. + */ + MINIMAL + + ; + + /** + * Gets the ParticleRendering by its ordinal. + * @param ordinal + * @return ParticleRendering by ordinal + */ + @NotNull + public static ParticleRendering byOrdinal(int ordinal) { + return values()[ordinal]; + } + +} diff --git a/core/src/main/javadoc/xyz/gmitch215/socketmc/util/option/package-info.java b/core/src/main/javadoc/xyz/gmitch215/socketmc/util/option/package-info.java new file mode 100644 index 0000000..5010bfe --- /dev/null +++ b/core/src/main/javadoc/xyz/gmitch215/socketmc/util/option/package-info.java @@ -0,0 +1,4 @@ +/** + * Package containing different client options that can be set in the game. + */ +package xyz.gmitch215.socketmc.util.option; \ No newline at end of file From e948cf3f5afd9a53dd946bd4167b00d898b93317 Mon Sep 17 00:00:00 2001 From: Gregory Mitchell <54124162+gmitch215@users.noreply.github.com> Date: Mon, 14 Oct 2024 19:47:05 -0500 Subject: [PATCH 13/15] Create AsyncPlayerChangeOptionEvent --- .../mixin/events/PlayerChangeOptionEvent.java | 73 +++++++++++++++++ .../resources/socketmc-fabric.mixins.json | 3 +- .../mixin/events/PlayerChangeOptionEvent.java | 73 +++++++++++++++++ .../main/resources/socketmc-forge.mixins.json | 3 +- .../mixin/events/PlayerChangeOptionEvent.java | 73 +++++++++++++++++ .../resources/socketmc-neoforge.mixins.json | 3 +- .../system/AsyncPlayerChangeOptionEvent.java | 81 +++++++++++++++++++ .../socketmc/spigot/EventFactory.java | 11 +++ 8 files changed, 317 insertions(+), 3 deletions(-) create mode 100644 mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/mixin/events/PlayerChangeOptionEvent.java create mode 100644 mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/mixin/events/PlayerChangeOptionEvent.java create mode 100644 mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/mixin/events/PlayerChangeOptionEvent.java create mode 100644 plugin/spigot/src/main/java/xyz/gmitch215/socketmc/events/system/AsyncPlayerChangeOptionEvent.java diff --git a/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/mixin/events/PlayerChangeOptionEvent.java b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/mixin/events/PlayerChangeOptionEvent.java new file mode 100644 index 0000000..ba2d294 --- /dev/null +++ b/mod/fabric/src/main/java/xyz/gmitch215/socketmc/fabric/mixin/events/PlayerChangeOptionEvent.java @@ -0,0 +1,73 @@ +package xyz.gmitch215.socketmc.fabric.mixin.events; + +import net.minecraft.client.*; +import net.minecraft.client.NarratorStatus; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.contents.TranslatableContents; +import net.minecraft.world.entity.HumanoidArm; +import net.minecraft.world.entity.player.ChatVisiblity; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import xyz.gmitch215.socketmc.fabric.FabricSocketMC; +import xyz.gmitch215.socketmc.util.Arm; +import xyz.gmitch215.socketmc.util.option.*; + +import java.util.Map; +import java.util.function.Function; + +@Mixin(OptionInstance.class) +public class PlayerChangeOptionEvent { + + @Final + @Shadow + Component caption; + + @Shadow + Object value; + + @Final + @Shadow + Function toString; + + @Inject(method = "set", at = @At("HEAD")) + public void onOptionChange(Object newValue, CallbackInfo ci) { + if (!FabricSocketMC.eventsEnabled) return; + + String oldValueS = toString.apply(value).getString(); + String newValueS = toString.apply(newValue).getString(); + + Object oldValue0 = socketMC$convertOptionValue(value); + Object newValue0 = socketMC$convertOptionValue(newValue); + + String key = ((TranslatableContents) caption.getContents()).getKey(); + + FabricSocketMC.sendEvent(10, Map.of( + "option", key, + "old_value", oldValue0, + "old_value_string", oldValueS, + "new_value", newValue0, + "new_value_string", newValueS + )); + } + + @Unique + private static Object socketMC$convertOptionValue(Object value) { + return switch (value) { + case AttackIndicatorStatus a -> AttackIndicator.byOrdinal(a.getId()); + case ChatVisiblity a -> ChatVisibility.byOrdinal(a.getId()); + case PrioritizeChunkUpdates a -> ChunkUpdatePriority.byOrdinal(a.getId()); + case CloudStatus a -> CloudRendering.byOrdinal(a.getId()); + case GraphicsStatus a -> GraphicsQuality.byOrdinal(a.getId()); + case NarratorStatus a -> xyz.gmitch215.socketmc.util.option.NarratorStatus.byOrdinal(a.getId()); + case ParticleStatus a -> ParticleRendering.byOrdinal(a.getId()); + case HumanoidArm a -> Arm.byOrdinal(a.getId()); + default -> value; + }; + } + +} diff --git a/mod/fabric/src/main/resources/socketmc-fabric.mixins.json b/mod/fabric/src/main/resources/socketmc-fabric.mixins.json index 1ad26b9..77820f3 100644 --- a/mod/fabric/src/main/resources/socketmc-fabric.mixins.json +++ b/mod/fabric/src/main/resources/socketmc-fabric.mixins.json @@ -10,6 +10,7 @@ "events.PlayerPressKeyEvent", "events.PlayerMouseInputEvent", - "events.PlayerChangeScreenEvent" + "events.PlayerChangeScreenEvent", + "events.PlayerChangeOptionEvent" ] } \ No newline at end of file diff --git a/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/mixin/events/PlayerChangeOptionEvent.java b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/mixin/events/PlayerChangeOptionEvent.java new file mode 100644 index 0000000..8696ffc --- /dev/null +++ b/mod/forge/src/main/java/xyz/gmitch215/socketmc/forge/mixin/events/PlayerChangeOptionEvent.java @@ -0,0 +1,73 @@ +package xyz.gmitch215.socketmc.forge.mixin.events; + +import net.minecraft.client.NarratorStatus; +import net.minecraft.client.*; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.contents.TranslatableContents; +import net.minecraft.world.entity.HumanoidArm; +import net.minecraft.world.entity.player.ChatVisiblity; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import xyz.gmitch215.socketmc.forge.ForgeSocketMC; +import xyz.gmitch215.socketmc.util.Arm; +import xyz.gmitch215.socketmc.util.option.*; + +import java.util.Map; +import java.util.function.Function; + +@Mixin(OptionInstance.class) +public class PlayerChangeOptionEvent { + + @Final + @Shadow + Component caption; + + @Shadow + Object value; + + @Final + @Shadow + Function toString; + + @Inject(method = "set", at = @At("HEAD")) + public void onOptionChange(Object newValue, CallbackInfo ci) { + if (!ForgeSocketMC.eventsEnabled) return; + + String oldValueS = toString.apply(value).getString(); + String newValueS = toString.apply(newValue).getString(); + + Object oldValue0 = socketMC$convertOptionValue(value); + Object newValue0 = socketMC$convertOptionValue(newValue); + + String key = ((TranslatableContents) caption.getContents()).getKey(); + + ForgeSocketMC.sendEvent(10, Map.of( + "option", key, + "old_value", oldValue0, + "old_value_string", oldValueS, + "new_value", newValue0, + "new_value_string", newValueS + )); + } + + @Unique + private static Object socketMC$convertOptionValue(Object value) { + return switch (value) { + case AttackIndicatorStatus a -> AttackIndicator.byOrdinal(a.getId()); + case ChatVisiblity a -> ChatVisibility.byOrdinal(a.getId()); + case PrioritizeChunkUpdates a -> ChunkUpdatePriority.byOrdinal(a.getId()); + case CloudStatus a -> CloudRendering.byOrdinal(a.getId()); + case GraphicsStatus a -> GraphicsQuality.byOrdinal(a.getId()); + case NarratorStatus a -> xyz.gmitch215.socketmc.util.option.NarratorStatus.byOrdinal(a.getId()); + case ParticleStatus a -> ParticleRendering.byOrdinal(a.getId()); + case HumanoidArm a -> Arm.byOrdinal(a.getId()); + default -> value; + }; + } + +} diff --git a/mod/forge/src/main/resources/socketmc-forge.mixins.json b/mod/forge/src/main/resources/socketmc-forge.mixins.json index f54671c..de366e0 100644 --- a/mod/forge/src/main/resources/socketmc-forge.mixins.json +++ b/mod/forge/src/main/resources/socketmc-forge.mixins.json @@ -11,6 +11,7 @@ "events.PlayerPressKeyEvent", "events.PlayerMouseInputEvent", - "events.PlayerChangeScreenEvent" + "events.PlayerChangeScreenEvent", + "events.PlayerChangeOptionEvent" ] } \ No newline at end of file diff --git a/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/mixin/events/PlayerChangeOptionEvent.java b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/mixin/events/PlayerChangeOptionEvent.java new file mode 100644 index 0000000..05a4ef2 --- /dev/null +++ b/mod/neoforge/src/main/java/xyz/gmitch215/socketmc/neoforge/mixin/events/PlayerChangeOptionEvent.java @@ -0,0 +1,73 @@ +package xyz.gmitch215.socketmc.neoforge.mixin.events; + +import net.minecraft.client.NarratorStatus; +import net.minecraft.client.*; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.contents.TranslatableContents; +import net.minecraft.world.entity.HumanoidArm; +import net.minecraft.world.entity.player.ChatVisiblity; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import xyz.gmitch215.socketmc.neoforge.NeoForgeSocketMC; +import xyz.gmitch215.socketmc.util.Arm; +import xyz.gmitch215.socketmc.util.option.*; + +import java.util.Map; +import java.util.function.Function; + +@Mixin(OptionInstance.class) +public class PlayerChangeOptionEvent { + + @Final + @Shadow + public Component caption; + + @Shadow + Object value; + + @Final + @Shadow + public Function toString; + + @Inject(method = "set", at = @At("HEAD")) + public void onOptionChange(Object newValue, CallbackInfo ci) { + if (!NeoForgeSocketMC.eventsEnabled) return; + + String oldValueS = toString.apply(value).getString(); + String newValueS = toString.apply(newValue).getString(); + + Object oldValue0 = socketMC$convertOptionValue(value); + Object newValue0 = socketMC$convertOptionValue(newValue); + + String key = ((TranslatableContents) caption.getContents()).getKey(); + + NeoForgeSocketMC.sendEvent(10, Map.of( + "option", key, + "old_value", oldValue0, + "old_value_string", oldValueS, + "new_value", newValue0, + "new_value_string", newValueS + )); + } + + @Unique + private static Object socketMC$convertOptionValue(Object value) { + return switch (value) { + case AttackIndicatorStatus a -> AttackIndicator.byOrdinal(a.getId()); + case ChatVisiblity a -> ChatVisibility.byOrdinal(a.getId()); + case PrioritizeChunkUpdates a -> ChunkUpdatePriority.byOrdinal(a.getId()); + case CloudStatus a -> CloudRendering.byOrdinal(a.getId()); + case GraphicsStatus a -> GraphicsQuality.byOrdinal(a.getId()); + case NarratorStatus a -> xyz.gmitch215.socketmc.util.option.NarratorStatus.byOrdinal(a.getId()); + case ParticleStatus a -> ParticleRendering.byOrdinal(a.getId()); + case HumanoidArm a -> Arm.byOrdinal(a.getId()); + default -> value; + }; + } + +} diff --git a/mod/neoforge/src/main/resources/socketmc-neoforge.mixins.json b/mod/neoforge/src/main/resources/socketmc-neoforge.mixins.json index dd2cc50..c2acc10 100644 --- a/mod/neoforge/src/main/resources/socketmc-neoforge.mixins.json +++ b/mod/neoforge/src/main/resources/socketmc-neoforge.mixins.json @@ -11,6 +11,7 @@ "events.PlayerPressKeyEvent", "events.PlayerMouseInputEvent", - "events.PlayerChangeScreenEvent" + "events.PlayerChangeScreenEvent", + "events.PlayerChangeOptionEvent" ] } \ No newline at end of file diff --git a/plugin/spigot/src/main/java/xyz/gmitch215/socketmc/events/system/AsyncPlayerChangeOptionEvent.java b/plugin/spigot/src/main/java/xyz/gmitch215/socketmc/events/system/AsyncPlayerChangeOptionEvent.java new file mode 100644 index 0000000..3463b01 --- /dev/null +++ b/plugin/spigot/src/main/java/xyz/gmitch215/socketmc/events/system/AsyncPlayerChangeOptionEvent.java @@ -0,0 +1,81 @@ +package xyz.gmitch215.socketmc.events.system; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import xyz.gmitch215.socketmc.events.SocketEvent; +import xyz.gmitch215.socketmc.spigot.SocketPlayer; + +/** + * Called when a player changes a game option. + */ +public class AsyncPlayerChangeOptionEvent extends SocketEvent { + + private final String key; + private final Object oldValue; + private final String oldValueString; + private final Object newValue; + private final String newValueString; + + /** + * Creates a new AsyncPlayerChangeOptionEvent. + * @param player The player associated with this event + */ + public AsyncPlayerChangeOptionEvent(@NotNull String key, @Nullable Object oldValue, @NotNull String oldValueString, @Nullable Object newValue, @NotNull String newValueString, @NotNull SocketPlayer player) { + super(player); + + if (key == null) throw new IllegalArgumentException("key cannot be null"); + if (oldValueString == null) throw new IllegalArgumentException("oldValueString cannot be null"); + if (newValueString == null) throw new IllegalArgumentException("newValueString cannot be null"); + + this.key = key; + this.oldValue = oldValue; + this.oldValueString = oldValueString; + this.newValue = newValue; + this.newValueString = newValueString; + } + + /** + * Gets the key of the option that was changed. + * @return Option Identifier Key + */ + @NotNull + public String getKey() { + return key; + } + + /** + * Gets the old value of the option. + * @return Old Value + */ + @Nullable + public Object getOldValue() { + return oldValue; + } + + /** + * Gets the old value of the option as a string. + * @return Old Value as a String + */ + @NotNull + public String getOldValueString() { + return oldValueString; + } + + /** + * Gets the new value of the option. + * @return New Value + */ + @Nullable + public Object getNewValue() { + return newValue; + } + + /** + * Gets the new value of the option as a string. + * @return New Value as a String + */ + @NotNull + public String getNewValueString() { + return newValueString; + } +} diff --git a/plugin/spigot/src/main/java/xyz/gmitch215/socketmc/spigot/EventFactory.java b/plugin/spigot/src/main/java/xyz/gmitch215/socketmc/spigot/EventFactory.java index e75a252..2c94297 100644 --- a/plugin/spigot/src/main/java/xyz/gmitch215/socketmc/spigot/EventFactory.java +++ b/plugin/spigot/src/main/java/xyz/gmitch215/socketmc/spigot/EventFactory.java @@ -3,6 +3,7 @@ import io.netty.channel.ChannelPipeline; import xyz.gmitch215.socketmc.events.SocketEvent; import xyz.gmitch215.socketmc.events.input.*; +import xyz.gmitch215.socketmc.events.system.AsyncPlayerChangeOptionEvent; import xyz.gmitch215.socketmc.screen.AbstractScreen; import xyz.gmitch215.socketmc.screen.ui.AbstractButton; import xyz.gmitch215.socketmc.screen.ui.CheckboxButton; @@ -114,6 +115,16 @@ static void addPacketInjector(SocketPlayer p) { boolean success = (boolean) params.get("success"); return new AsyncPlayerClickExternalMessageBoxEvent(success, p); + }, + // PlayerChangeOptionEvent - 10 + (p, params) -> { + String option = (String) params.get("option"); + Object oldValue = params.get("old_value"); + String oldValueS = (String) params.get("old_value_string"); + Object newValue = params.get("new_value"); + String newValueS = (String) params.get("new_value_string"); + + return new AsyncPlayerChangeOptionEvent(option, oldValue, oldValueS, newValue, newValueS, p); } ); From f96f974ca8cdda41f034b0f65b1bb8b093a7a8e6 Mon Sep 17 00:00:00 2001 From: Gregory Mitchell <54124162+gmitch215@users.noreply.github.com> Date: Fri, 18 Oct 2024 20:56:52 -0500 Subject: [PATCH 14/15] Upgrade to Gradle 8.10.2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0aaefbc..df97d72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From a8cb7d7827b06c4e3558243dbb6618d398ad0c37 Mon Sep 17 00:00:00 2001 From: Gregory Mitchell <54124162+gmitch215@users.noreply.github.com> Date: Fri, 18 Oct 2024 20:57:02 -0500 Subject: [PATCH 15/15] Cleanup JavaDocs --- .../main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java | 1 - .../xyz/gmitch215/socketmc/events/system/package-info.java | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 plugin/spigot/src/main/javadoc/xyz/gmitch215/socketmc/events/system/package-info.java diff --git a/core/src/main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java b/core/src/main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java index 7505058..b77a2ff 100644 --- a/core/src/main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java +++ b/core/src/main/java/xyz/gmitch215/socketmc/util/LifecycleMap.java @@ -314,7 +314,6 @@ public Iterator iterator() { * Removes a specific key from multiple LifecycleMaps. * @param id The identifier of the key to remove * @param maps The LifecycleMaps to remove the key from - * @param The type of object to remove * @throws IllegalArgumentException if the maps are null */ public static void removeIn(@NotNull Identifier id, @NotNull LifecycleMap... maps) { diff --git a/plugin/spigot/src/main/javadoc/xyz/gmitch215/socketmc/events/system/package-info.java b/plugin/spigot/src/main/javadoc/xyz/gmitch215/socketmc/events/system/package-info.java new file mode 100644 index 0000000..4c823a9 --- /dev/null +++ b/plugin/spigot/src/main/javadoc/xyz/gmitch215/socketmc/events/system/package-info.java @@ -0,0 +1,4 @@ +/** + * Package for client system events. + */ +package xyz.gmitch215.socketmc.events.system; \ No newline at end of file