From 66024ebfa2cca80a781800b941f3ee1b096cd185 Mon Sep 17 00:00:00 2001 From: Klesti Selimaj Date: Sun, 8 Mar 2026 01:53:22 +0100 Subject: [PATCH] Implemented all of the refrences --- .../impl/mixins/IdentifierMixin.java | 7 +++++-- .../impl/mixins/QuaternionfMixin.java | 5 ++--- .../impl/provider/RefConstructorImpl.java | 18 ++++++++++++++++++ .../SaturnProviderImpl.java} | 7 +++---- .../saturnclient/SaturnClient.java | 6 ++++-- .../1.21.4/src/main/resources/impl.mixins.json | 5 ++++- 6 files changed, 36 insertions(+), 12 deletions(-) create mode 100644 versions/1.21.4/src/main/java/org/saturnclient/impl/provider/RefConstructorImpl.java rename versions/1.21.4/src/main/java/org/saturnclient/impl/{SaturnClientProvider.java => provider/SaturnProviderImpl.java} (90%) diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/IdentifierMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/IdentifierMixin.java index c7ed64c..edfcdb9 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/IdentifierMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/IdentifierMixin.java @@ -2,9 +2,12 @@ package org.saturnclient.impl.mixins; import org.saturnclient.common.ref.asset.IdentifierRef; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; -import net.minecraft.client.util.Window; +import net.minecraft.util.Identifier; -@Mixin(Window.class) +@Mixin(Identifier.class) public abstract class IdentifierMixin implements IdentifierRef { + @Shadow + public abstract String toString(); } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/QuaternionfMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/QuaternionfMixin.java index b2a4d97..628e433 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/QuaternionfMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/QuaternionfMixin.java @@ -1,10 +1,9 @@ package org.saturnclient.impl.mixins; +import org.joml.Quaternionf; import org.saturnclient.common.ref.render.QuaternionfRef; import org.spongepowered.asm.mixin.Mixin; -import net.minecraft.item.ItemStack; - -@Mixin(ItemStack.class) +@Mixin(Quaternionf.class) public abstract class QuaternionfMixin implements QuaternionfRef { } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/RefConstructorImpl.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/RefConstructorImpl.java new file mode 100644 index 0000000..6f4e7dd --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/RefConstructorImpl.java @@ -0,0 +1,18 @@ +package org.saturnclient.impl.provider; + +import org.saturnclient.common.provider.RefConstructorProvider; +import org.saturnclient.common.ref.asset.IdentifierRef; + +import net.minecraft.util.Identifier; + +public class RefConstructorImpl implements RefConstructorProvider { + @Override + public IdentifierRef identifier(String fullPath) { + return (IdentifierRef) (Object) Identifier.of(fullPath); + } + + @Override + public IdentifierRef identifier(String namespace, String path) { + return (IdentifierRef) (Object) Identifier.of(namespace, path); + } +} diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/SaturnClientProvider.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java similarity index 90% rename from versions/1.21.4/src/main/java/org/saturnclient/impl/SaturnClientProvider.java rename to versions/1.21.4/src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java index 95a912b..ead7467 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/SaturnClientProvider.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/provider/SaturnProviderImpl.java @@ -1,4 +1,4 @@ -package org.saturnclient.impl; +package org.saturnclient.impl.provider; import java.awt.image.BufferedImage; @@ -7,11 +7,12 @@ import org.saturnclient.common.provider.SaturnProvider; import org.saturnclient.common.ref.asset.IdentifierRef; import org.saturnclient.common.ref.game.MinecraftClientRef; import org.saturnclient.cosmetics.cloak.utils.IdentifierUtils; +import org.saturnclient.impl.Fonts; import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.util.Identifier; -public class SaturnClientProvider implements SaturnProvider { +public class SaturnProviderImpl implements SaturnProvider { @Override public MinecraftClientRef getClient() { return (MinecraftClientRef) SaturnClient.client; @@ -38,8 +39,6 @@ public class SaturnClientProvider implements SaturnProvider { return GLFW.glfwGetKeyName(key, GLFW.glfwGetKeyScancode(key)); } - - @Override public void stop() { SaturnClient.client.scheduleStop(); diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java index 742b1fa..bfde58f 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java @@ -12,7 +12,8 @@ import org.saturnclient.cosmetics.cloak.Cloaks; import org.saturnclient.common.bindings.SaturnClientBindings; import org.saturnclient.common.provider.Providers; import org.saturnclient.impl.FabricModuleProvider; -import org.saturnclient.impl.SaturnClientProvider; +import org.saturnclient.impl.provider.RefConstructorImpl; +import org.saturnclient.impl.provider.SaturnProviderImpl; import org.saturnclient.modules.ModManager; import org.saturnclient.config.Config; import org.saturnclient.config.manager.ConfigManager; @@ -41,7 +42,8 @@ public class SaturnClient implements ModInitializer { LOGGER.info("Initializing " + MOD_ID); client = MinecraftClient.getInstance(); - Providers.saturn = new SaturnClientProvider(); + Providers.saturn = new SaturnProviderImpl(); + Providers.refConstructor = new RefConstructorImpl(); ElementRenderer.INSTANCE = new ElementRendererImpl(); diff --git a/versions/1.21.4/src/main/resources/impl.mixins.json b/versions/1.21.4/src/main/resources/impl.mixins.json index 1962c8d..4066c35 100644 --- a/versions/1.21.4/src/main/resources/impl.mixins.json +++ b/versions/1.21.4/src/main/resources/impl.mixins.json @@ -4,8 +4,11 @@ "package": "org.saturnclient.impl.mixins", "compatibilityLevel": "JAVA_21", "client": [ - "MinecraftClientMixin", + "IdentifierMixin", + "ItemStackMixin", "MatrixStackMixin", + "MinecraftClientMixin", + "QuaternionfMixin", "WindowMixin" ], "injectors": {