diff --git a/common b/common index 799d914..4501b0c 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 799d914dba6284c098bbff70e567acd81eaef085 +Subproject commit 4501b0c35e6542e1866471ded8fcdd8718806ca1 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/SaturnClientProvider.java index e0290e4..0a20858 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/SaturnClientProvider.java @@ -5,7 +5,7 @@ import java.awt.image.BufferedImage; import org.lwjgl.glfw.GLFW; import org.saturnclient.common.IMinecraftClient; import org.saturnclient.common.MinecraftProvider; -import org.saturnclient.common.bindings.SaturnIdentifier; +import org.saturnclient.common.ref.asset.IdentifierRef; import org.saturnclient.cosmetics.cloak.utils.IdentifierUtils; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.ui.SaturnScreen; @@ -40,7 +40,7 @@ public class SaturnClientProvider extends MinecraftProvider { } @Override - public void registerBufferedImageTexture(SaturnIdentifier i, BufferedImage bi) { + public void registerBufferedImageTexture(IdentifierRef i, BufferedImage bi) { IdentifierUtils.registerBufferedImageTextureFast((Identifier) i.inner, bi); } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MatrixStackMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MatrixStackMixin.java index cfc166f..8e914c5 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MatrixStackMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MatrixStackMixin.java @@ -1,8 +1,8 @@ package org.saturnclient.impl.mixins; import org.joml.Quaternionf; -import org.saturnclient.common.bindings.SaturnQuaternionf; -import org.saturnclient.common.render.IMatrixStack; +import org.saturnclient.common.ref.render.MatrixStackRef; +import org.saturnclient.common.ref.render.SaturnQuaternionf; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.gen.Invoker; @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.gen.Invoker; import net.minecraft.client.util.math.MatrixStack; @Mixin(MatrixStack.class) -public abstract class MatrixStackMixin implements IMatrixStack { +public abstract class MatrixStackMixin implements MatrixStackRef { @Shadow public abstract void translate(double x, double y, double z); diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java index 68a3e05..c1049ea 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java @@ -4,8 +4,8 @@ import java.io.File; import java.io.InputStream; import org.saturnclient.common.IMinecraftClient; -import org.saturnclient.common.bindings.SaturnIdentifier; -import org.saturnclient.common.render.IWindow; +import org.saturnclient.common.ref.asset.IdentifierRef; +import org.saturnclient.common.ref.render.WindowRef; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -31,7 +31,7 @@ public class MinecraftClientMixin implements IMinecraftClient { } @Override - public InputStream getResource(SaturnIdentifier identifier) { + public InputStream getResource(IdentifierRef identifier) { try { return resourceManager.getResource((Identifier) identifier.inner).get().getInputStream(); } catch (Exception e) { @@ -40,7 +40,7 @@ public class MinecraftClientMixin implements IMinecraftClient { } @Override - public IWindow getWindow() { - return (IWindow) (Object) this.window; + public WindowRef getWindow() { + return (WindowRef) (Object) this.window; } } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/WindowMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/WindowMixin.java index 4f251d1..5629068 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/WindowMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/WindowMixin.java @@ -1,13 +1,13 @@ package org.saturnclient.impl.mixins; -import org.saturnclient.common.render.IWindow; +import org.saturnclient.common.ref.render.WindowRef; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import net.minecraft.client.util.Window; @Mixin(Window.class) -public abstract class WindowMixin implements IWindow { +public abstract class WindowMixin implements WindowRef { @Shadow public abstract int getWidth(); diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/ArmorDisplayFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/ArmorDisplayFabric.java index 68f73e2..ddc9a32 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/ArmorDisplayFabric.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/ArmorDisplayFabric.java @@ -1,6 +1,6 @@ package org.saturnclient.impl.modules; -import org.saturnclient.common.bindings.SaturnItemStack; +import org.saturnclient.common.ref.game.ItemStackRef; import org.saturnclient.modules.interfaces.ArmorDisplayInterface; import net.minecraft.client.MinecraftClient; @@ -15,69 +15,69 @@ public class ArmorDisplayFabric implements ArmorDisplayInterface { } @Override - public SaturnItemStack getMainHand() { - return new SaturnItemStack(get(EquipmentSlot.MAINHAND)); + public ItemStackRef getMainHand() { + return new ItemStackRef(get(EquipmentSlot.MAINHAND)); } @Override - public SaturnItemStack getHelmet() { - return new SaturnItemStack(get(EquipmentSlot.HEAD)); + public ItemStackRef getHelmet() { + return new ItemStackRef(get(EquipmentSlot.HEAD)); } @Override - public SaturnItemStack getChestplate() { - return new SaturnItemStack(get(EquipmentSlot.CHEST)); + public ItemStackRef getChestplate() { + return new ItemStackRef(get(EquipmentSlot.CHEST)); } @Override - public SaturnItemStack getLeggings() { - return new SaturnItemStack(get(EquipmentSlot.LEGS)); + public ItemStackRef getLeggings() { + return new ItemStackRef(get(EquipmentSlot.LEGS)); } @Override - public SaturnItemStack getBoots() { - return new SaturnItemStack(get(EquipmentSlot.FEET)); + public ItemStackRef getBoots() { + return new ItemStackRef(get(EquipmentSlot.FEET)); } @Override - public boolean isEmpty(SaturnItemStack stack) { + public boolean isEmpty(ItemStackRef stack) { return ((ItemStack) stack.get()).isEmpty(); } @Override - public int getMaxDamage(SaturnItemStack stack) { + public int getMaxDamage(ItemStackRef stack) { return ((ItemStack) stack.get()).getMaxDamage(); } @Override - public int getDamage(SaturnItemStack stack) { + public int getDamage(ItemStackRef stack) { return ((ItemStack) stack.get()).getDamage(); } // Dummy items @Override - public SaturnItemStack getDummyMainHand() { - return new SaturnItemStack(new ItemStack(Items.DIAMOND_SWORD)); + public ItemStackRef getDummyMainHand() { + return new ItemStackRef(new ItemStack(Items.DIAMOND_SWORD)); } @Override - public SaturnItemStack getDummyHelmet() { - return new SaturnItemStack(new ItemStack(Items.DIAMOND_HELMET)); + public ItemStackRef getDummyHelmet() { + return new ItemStackRef(new ItemStack(Items.DIAMOND_HELMET)); } @Override - public SaturnItemStack getDummyChestplate() { - return new SaturnItemStack(new ItemStack(Items.DIAMOND_CHESTPLATE)); + public ItemStackRef getDummyChestplate() { + return new ItemStackRef(new ItemStack(Items.DIAMOND_CHESTPLATE)); } @Override - public SaturnItemStack getDummyLeggings() { - return new SaturnItemStack(new ItemStack(Items.DIAMOND_LEGGINGS)); + public ItemStackRef getDummyLeggings() { + return new ItemStackRef(new ItemStack(Items.DIAMOND_LEGGINGS)); } @Override - public SaturnItemStack getDummyBoots() { - return new SaturnItemStack(new ItemStack(Items.DIAMOND_BOOTS)); + public ItemStackRef getDummyBoots() { + return new ItemStackRef(new ItemStack(Items.DIAMOND_BOOTS)); } } \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/StatusEffectsFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/StatusEffectsFabric.java index 1dc17e6..a353a05 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/StatusEffectsFabric.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/StatusEffectsFabric.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.stream.Collectors; import java.util.Arrays; +import org.saturnclient.common.ref.asset.SpriteRef; import org.saturnclient.modules.interfaces.StatusEffectsInterface; -import org.saturnclient.common.bindings.SaturnSprite; import net.minecraft.client.MinecraftClient; import net.minecraft.client.texture.StatusEffectSpriteManager; @@ -21,7 +21,7 @@ public class StatusEffectsFabric implements StatusEffectsInterface { return mc.player.getStatusEffects().stream() .filter(StatusEffectInstance::shouldShowIcon) .map(se -> new Effect( - new SaturnSprite(manager.getSprite(se.getEffectType())), + new SpriteRef(manager.getSprite(se.getEffectType())), se.getDuration() / 20, se.isInfinite(), se.shouldShowIcon(), @@ -32,7 +32,7 @@ public class StatusEffectsFabric implements StatusEffectsInterface { @Override public List getDummyEffects() { return Arrays.asList( - new Effect(new SaturnSprite(null), 600, false, true, "Infinite"), - new Effect(new SaturnSprite(null), 600, false, true, "Infinite")); + new Effect(new SpriteRef(null), 600, false, true, "Infinite"), + new Effect(new SpriteRef(null), 600, false, true, "Infinite")); } } \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java index 586797d..50b2139 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java @@ -3,7 +3,7 @@ package org.saturnclient.ui; import org.jetbrains.annotations.Nullable; import org.joml.Quaternionf; import org.joml.Vector3f; -import org.saturnclient.common.bindings.SaturnQuaternionf; +import org.saturnclient.common.ref.render.SaturnQuaternionf; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.ui.components.SkinPreview.EntityDrawer; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScopeImpl.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScopeImpl.java index bfc077e..aafeb1b 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScopeImpl.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScopeImpl.java @@ -11,10 +11,10 @@ import org.joml.Matrix4f; import com.mojang.blaze3d.systems.RenderSystem; import org.saturnclient.common.MinecraftProvider; -import org.saturnclient.common.bindings.SaturnIdentifier; -import org.saturnclient.common.bindings.SaturnItemStack; -import org.saturnclient.common.bindings.SaturnSprite; -import org.saturnclient.common.render.IMatrixStack; +import org.saturnclient.common.ref.asset.IdentifierRef; +import org.saturnclient.common.ref.asset.SpriteRef; +import org.saturnclient.common.ref.game.ItemStackRef; +import org.saturnclient.common.ref.render.MatrixStackRef; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.mixin.DrawContextAccessor; import org.saturnclient.ui.resources.Fonts; @@ -62,8 +62,8 @@ public class RenderScopeImpl implements RenderScope { } @Override - public IMatrixStack getMatrixStack() { - return (IMatrixStack) matrices; + public MatrixStackRef getMatrixStack() { + return (MatrixStackRef) matrices; } @Override @@ -218,24 +218,24 @@ public class RenderScopeImpl implements RenderScope { } @Override - public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height, int color) { + public void drawTexture(IdentifierRef sprite, int x, int y, float u, float v, int width, int height, int color) { this.drawTexture(sprite, x, y, u, v, width, height, width, height, width, height, color); } @Override - public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height) { + public void drawTexture(IdentifierRef sprite, int x, int y, float u, float v, int width, int height) { this.drawTexture(sprite, x, y, u, v, width, height, width, height, width, height); } @Override - public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height, + public void drawTexture(IdentifierRef sprite, int x, int y, float u, float v, int width, int height, int regionWith, int regionHeight, int textureWidth, int textureHeight) { this.drawTexture(sprite, x, y, u, v, width, height, regionWith, regionHeight, textureWidth, textureHeight, -1); } @Override - public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height, + public void drawTexture(IdentifierRef sprite, int x, int y, float u, float v, int width, int height, int regionWidth, int regionHeight, int textureWidth, int textureHeight, int color) { this.drawTexturedQuad((Identifier) sprite.inner, x, x + width, y, y + height, (u + 0.0F) / (float) textureWidth, @@ -270,7 +270,7 @@ public class RenderScopeImpl implements RenderScope { if (sprite.toString().endsWith(".svg")) { sprite = (Identifier) SvgTexture.getSvg(MinecraftProvider.PROVIDER.getClient(), - new SaturnIdentifier(sprite), + new IdentifierRef(sprite), (x2 - x1) * 2, (y2 - y1) * 2).inner; } @@ -371,31 +371,31 @@ public class RenderScopeImpl implements RenderScope { } @Override - public void drawItem(SaturnItemStack item, int x, int y) { + public void drawItem(ItemStackRef item, int x, int y) { this.drawItem(SaturnClient.client.player, SaturnClient.client.world, item, x, y, 0); } @Override - public void drawItem(SaturnItemStack stack, int x, int y, int seed) { + public void drawItem(ItemStackRef stack, int x, int y, int seed) { this.drawItem(SaturnClient.client.player, SaturnClient.client.world, stack, x, y, seed); } @Override - public void drawItem(SaturnItemStack stack, int x, int y, int seed, int z) { + public void drawItem(ItemStackRef stack, int x, int y, int seed, int z) { this.drawItem(SaturnClient.client.player, SaturnClient.client.world, (ItemStack) stack.inner, x, y, seed, z); } @Override - public void drawItemWithoutEntity(SaturnItemStack stack, int x, int y) { + public void drawItemWithoutEntity(ItemStackRef stack, int x, int y) { this.drawItemWithoutEntity(stack, x, y, 0); } @Override - public void drawItemWithoutEntity(SaturnItemStack stack, int x, int y, int seed) { + public void drawItemWithoutEntity(ItemStackRef stack, int x, int y, int seed) { this.drawItem((LivingEntity) null, SaturnClient.client.world, stack, x, y, seed); } - private void drawItem(@Nullable LivingEntity entity, @Nullable World world, SaturnItemStack stack, int x, int y, + private void drawItem(@Nullable LivingEntity entity, @Nullable World world, ItemStackRef stack, int x, int y, int seed) { this.drawItem(entity, world, (ItemStack) stack.inner, x, y, seed, 0); } @@ -442,12 +442,12 @@ public class RenderScopeImpl implements RenderScope { } @Override - public void drawSpriteStretched(SaturnSprite sprite, int x, int y, int width, int height) { + public void drawSpriteStretched(SpriteRef sprite, int x, int y, int width, int height) { this.drawSpriteStretched(sprite, x, y, width, height, -1); } @Override - public void drawSpriteStretched(SaturnSprite saturnSprite, int x, int y, int width, int height, int color) { + public void drawSpriteStretched(SpriteRef saturnSprite, int x, int y, int width, int height, int color) { Sprite sprite = (Sprite) saturnSprite.inner; if (color == 0) return;