From 303d9d353eea731c791b027043dd776661753f94 Mon Sep 17 00:00:00 2001 From: kirillsaint Date: Thu, 29 Jun 2023 00:46:18 +0600 Subject: [PATCH] Better --- autobuilder/assets/launchwrapper.jar | Bin 0 -> 33143 bytes autobuilder/index.js | 3 +++ .../client/gui/util/RenderUtil.java | 16 ++++++++++++++++ .../client/mixin/SilentClientTweaker.java | 3 +++ .../ResourcePackRepositoryEntryAccessor.java | 12 ------------ .../client/mods/hud/PackDisplayMod.java | 4 ++-- src/main/resources/mixins.SilentClient.json | 1 - 7 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 autobuilder/assets/launchwrapper.jar delete mode 100644 src/main/java/net/silentclient/client/mixin/accessors/ResourcePackRepositoryEntryAccessor.java diff --git a/autobuilder/assets/launchwrapper.jar b/autobuilder/assets/launchwrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..3bc832a12abd606ed1a127a731d73c847d3f4ad6 GIT binary patch literal 33143 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 literal 0 HcmV?d00001 diff --git a/autobuilder/index.js b/autobuilder/index.js index c2acd66..f93654d 100644 --- a/autobuilder/index.js +++ b/autobuilder/index.js @@ -64,6 +64,9 @@ async function build() { console.log("Extracting JAR"); await unzip(`../build/libs/client-${version}.jar`, tempPaths.jar); + console.log("Extracting Wrapper"); + await unzip(assetsPaths.wrapper, tempPaths.jar); + const libs = await fs.promises.readdir(assetsPaths.libs); for (const lib of libs) { console.log(`Extracting ${lib}`); diff --git a/src/main/java/net/silentclient/client/gui/util/RenderUtil.java b/src/main/java/net/silentclient/client/gui/util/RenderUtil.java index b13420f..129edf3 100644 --- a/src/main/java/net/silentclient/client/gui/util/RenderUtil.java +++ b/src/main/java/net/silentclient/client/gui/util/RenderUtil.java @@ -478,6 +478,22 @@ public class RenderUtil { setColor(-1); } + public static void drawImage(float x, float y, float width, float height) { + GL11.glPushMatrix(); + GL11.glDisable(2929); + GL11.glEnable(3042); + GL11.glDepthMask(false); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GL11.glColor4f(1f, 1f, 1f, 1); + Gui.drawModalRectWithCustomSizedTexture((int) x, (int) y, 0.0f, 0.0f, (int) width, (int) height, width, height); + GL11.glDepthMask(true); + GL11.glDisable(3042); + GL11.glEnable(2929); + GL11.glPopMatrix(); + + GL11.glColor4f(1f, 1f, 1f, 1f); + } + public static void drawImage(ResourceLocation image, float x, float y, float width, float height, float alpha) { GL11.glPushMatrix(); GL11.glDisable(2929); diff --git a/src/main/java/net/silentclient/client/mixin/SilentClientTweaker.java b/src/main/java/net/silentclient/client/mixin/SilentClientTweaker.java index d7170ab..a3587dc 100644 --- a/src/main/java/net/silentclient/client/mixin/SilentClientTweaker.java +++ b/src/main/java/net/silentclient/client/mixin/SilentClientTweaker.java @@ -54,6 +54,9 @@ public class SilentClientTweaker implements ITweaker { @Override public final void injectIntoClassLoader(LaunchClassLoader classLoader) { + if(hasOptifine) { + classLoader.registerTransformer("optifine.OptiFineClassTransformer"); + } MixinBootstrap.init(); // Retrieve the default mixin environment and register the config file diff --git a/src/main/java/net/silentclient/client/mixin/accessors/ResourcePackRepositoryEntryAccessor.java b/src/main/java/net/silentclient/client/mixin/accessors/ResourcePackRepositoryEntryAccessor.java deleted file mode 100644 index 514dd3f..0000000 --- a/src/main/java/net/silentclient/client/mixin/accessors/ResourcePackRepositoryEntryAccessor.java +++ /dev/null @@ -1,12 +0,0 @@ -package net.silentclient.client.mixin.accessors; - -import net.minecraft.client.resources.ResourcePackRepository; -import net.minecraft.util.ResourceLocation; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(ResourcePackRepository.Entry.class) -public interface ResourcePackRepositoryEntryAccessor { - @Accessor - ResourceLocation getLocationTexturePackIcon(); -} diff --git a/src/main/java/net/silentclient/client/mods/hud/PackDisplayMod.java b/src/main/java/net/silentclient/client/mods/hud/PackDisplayMod.java index 8bab9cc..672e251 100644 --- a/src/main/java/net/silentclient/client/mods/hud/PackDisplayMod.java +++ b/src/main/java/net/silentclient/client/mods/hud/PackDisplayMod.java @@ -14,7 +14,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import net.silentclient.client.Client; import net.silentclient.client.gui.util.RenderUtil; -import net.silentclient.client.mixin.accessors.ResourcePackRepositoryEntryAccessor; import net.silentclient.client.mods.CustomFontRenderer; import net.silentclient.client.mods.HudMod; import net.silentclient.client.mods.ModCategory; @@ -82,7 +81,8 @@ public class PackDisplayMod extends HudMod { ResourcePackRepository.Entry entry = rps.get(order == "First Pack" ? 0 : count - 1); entry.bindTexturePackIcon(Minecraft.getMinecraft().getTextureManager()); GlStateManager.disableLighting(); - RenderUtil.drawImage(((ResourcePackRepositoryEntryAccessor) entry).getLocationTexturePackIcon(), 0, 0, getIconHeight(), getIconHeight(), false); + entry.bindTexturePackIcon(mc.getTextureManager()); + RenderUtil.drawImage(0, 0, getIconHeight(), getIconHeight()); } else { if(defaultIcon == null) { try { diff --git a/src/main/resources/mixins.SilentClient.json b/src/main/resources/mixins.SilentClient.json index 7a51103..6fdcc48 100644 --- a/src/main/resources/mixins.SilentClient.json +++ b/src/main/resources/mixins.SilentClient.json @@ -11,7 +11,6 @@ "accessors.GuiChatAccessor", "accessors.GuiAccessor", "accessors.RenderItemAccessor", - "accessors.ResourcePackRepositoryEntryAccessor", "accessors.SimpleReloadableResourceManagerAccessor", "accessors.TextureManagerAccessor", "mixins.EntityRendererMixin",