Implemented all of the refrences
This commit is contained in:
@@ -2,9 +2,12 @@ package org.saturnclient.impl.mixins;
|
|||||||
|
|
||||||
import org.saturnclient.common.ref.asset.IdentifierRef;
|
import org.saturnclient.common.ref.asset.IdentifierRef;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
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 {
|
public abstract class IdentifierMixin implements IdentifierRef {
|
||||||
|
@Shadow
|
||||||
|
public abstract String toString();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
package org.saturnclient.impl.mixins;
|
package org.saturnclient.impl.mixins;
|
||||||
|
|
||||||
|
import org.joml.Quaternionf;
|
||||||
import org.saturnclient.common.ref.render.QuaternionfRef;
|
import org.saturnclient.common.ref.render.QuaternionfRef;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
@Mixin(Quaternionf.class)
|
||||||
|
|
||||||
@Mixin(ItemStack.class)
|
|
||||||
public abstract class QuaternionfMixin implements QuaternionfRef {
|
public abstract class QuaternionfMixin implements QuaternionfRef {
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
+3
-4
@@ -1,4 +1,4 @@
|
|||||||
package org.saturnclient.impl;
|
package org.saturnclient.impl.provider;
|
||||||
|
|
||||||
import java.awt.image.BufferedImage;
|
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.asset.IdentifierRef;
|
||||||
import org.saturnclient.common.ref.game.MinecraftClientRef;
|
import org.saturnclient.common.ref.game.MinecraftClientRef;
|
||||||
import org.saturnclient.cosmetics.cloak.utils.IdentifierUtils;
|
import org.saturnclient.cosmetics.cloak.utils.IdentifierUtils;
|
||||||
|
import org.saturnclient.impl.Fonts;
|
||||||
import org.saturnclient.saturnclient.SaturnClient;
|
import org.saturnclient.saturnclient.SaturnClient;
|
||||||
|
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
|
|
||||||
public class SaturnClientProvider implements SaturnProvider {
|
public class SaturnProviderImpl implements SaturnProvider {
|
||||||
@Override
|
@Override
|
||||||
public MinecraftClientRef getClient() {
|
public MinecraftClientRef getClient() {
|
||||||
return (MinecraftClientRef) SaturnClient.client;
|
return (MinecraftClientRef) SaturnClient.client;
|
||||||
@@ -38,8 +39,6 @@ public class SaturnClientProvider implements SaturnProvider {
|
|||||||
return GLFW.glfwGetKeyName(key, GLFW.glfwGetKeyScancode(key));
|
return GLFW.glfwGetKeyName(key, GLFW.glfwGetKeyScancode(key));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void stop() {
|
public void stop() {
|
||||||
SaturnClient.client.scheduleStop();
|
SaturnClient.client.scheduleStop();
|
||||||
@@ -12,7 +12,8 @@ import org.saturnclient.cosmetics.cloak.Cloaks;
|
|||||||
import org.saturnclient.common.bindings.SaturnClientBindings;
|
import org.saturnclient.common.bindings.SaturnClientBindings;
|
||||||
import org.saturnclient.common.provider.Providers;
|
import org.saturnclient.common.provider.Providers;
|
||||||
import org.saturnclient.impl.FabricModuleProvider;
|
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.modules.ModManager;
|
||||||
import org.saturnclient.config.Config;
|
import org.saturnclient.config.Config;
|
||||||
import org.saturnclient.config.manager.ConfigManager;
|
import org.saturnclient.config.manager.ConfigManager;
|
||||||
@@ -41,7 +42,8 @@ public class SaturnClient implements ModInitializer {
|
|||||||
LOGGER.info("Initializing " + MOD_ID);
|
LOGGER.info("Initializing " + MOD_ID);
|
||||||
client = MinecraftClient.getInstance();
|
client = MinecraftClient.getInstance();
|
||||||
|
|
||||||
Providers.saturn = new SaturnClientProvider();
|
Providers.saturn = new SaturnProviderImpl();
|
||||||
|
Providers.refConstructor = new RefConstructorImpl();
|
||||||
|
|
||||||
ElementRenderer.INSTANCE = new ElementRendererImpl();
|
ElementRenderer.INSTANCE = new ElementRendererImpl();
|
||||||
|
|
||||||
|
|||||||
@@ -4,8 +4,11 @@
|
|||||||
"package": "org.saturnclient.impl.mixins",
|
"package": "org.saturnclient.impl.mixins",
|
||||||
"compatibilityLevel": "JAVA_21",
|
"compatibilityLevel": "JAVA_21",
|
||||||
"client": [
|
"client": [
|
||||||
"MinecraftClientMixin",
|
"IdentifierMixin",
|
||||||
|
"ItemStackMixin",
|
||||||
"MatrixStackMixin",
|
"MatrixStackMixin",
|
||||||
|
"MinecraftClientMixin",
|
||||||
|
"QuaternionfMixin",
|
||||||
"WindowMixin"
|
"WindowMixin"
|
||||||
],
|
],
|
||||||
"injectors": {
|
"injectors": {
|
||||||
|
|||||||
Reference in New Issue
Block a user