From cf6a7e8c1c9106a0488ed4cdb9994d8e429bb584 Mon Sep 17 00:00:00 2001 From: kirillsaint Date: Sat, 8 Jul 2023 13:15:54 +0600 Subject: [PATCH] fix? --- .github/workflows/build.yml | 8 +++-- .../java/net/silentclient/client/Client.java | 4 +-- .../client/gui/modmenu/ModMenu.java | 33 +++++++++++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c02cb3..8c1c744 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,9 +24,13 @@ jobs: - name: Execute Gradle build run: ./gradlew setupDecompWorkspace clean build --refresh-dependencies - - name: Obfuscating Jar + - name: Copying JAR to AutoBuilder working-directory: ./autobuilder - run: mkdir ./jars && java -jar obfuscator.jar --jarIn ../build/libs/client-1.8.9.jar --jarOut ./jars/Client.jar --scriptFile obfuscationScript.js --config config + run: mkdir ./jars && cp ../build/libs/client-1.8.9.jar ./jars/Client.jar + +# - name: Obfuscating Jar +# working-directory: ./autobuilder +# run: mkdir ./jars && java -jar obfuscator.jar --jarIn ../build/libs/client-1.8.9.jar --jarOut ./jars/Client.jar --scriptFile obfuscationScript.js --config config - name: Building Jar with Libraries working-directory: ./autobuilder diff --git a/src/main/java/net/silentclient/client/Client.java b/src/main/java/net/silentclient/client/Client.java index 5bb6efe..71bd4cf 100644 --- a/src/main/java/net/silentclient/client/Client.java +++ b/src/main/java/net/silentclient/client/Client.java @@ -16,10 +16,10 @@ import net.silentclient.client.event.impl.ConnectToServerEvent; import net.silentclient.client.event.impl.ServerLeaveEvent; import net.silentclient.client.event.impl.SingleplayerJoinEvent; import net.silentclient.client.gui.GuiError; -import net.silentclient.client.gui.lite.GuiNews; -import net.silentclient.client.gui.lite.clickgui.ClickGUI; import net.silentclient.client.gui.font.SilentFontRenderer; +import net.silentclient.client.gui.lite.GuiNews; import net.silentclient.client.gui.lite.LiteMainMenu; +import net.silentclient.client.gui.lite.clickgui.ClickGUI; import net.silentclient.client.gui.silentmainmenu.SilentMainMenu; import net.silentclient.client.gui.util.BackgroundPanorama; import net.silentclient.client.keybinds.KeyBindManager; diff --git a/src/main/java/net/silentclient/client/gui/modmenu/ModMenu.java b/src/main/java/net/silentclient/client/gui/modmenu/ModMenu.java index 775eee2..8bbd1e3 100644 --- a/src/main/java/net/silentclient/client/gui/modmenu/ModMenu.java +++ b/src/main/java/net/silentclient/client/gui/modmenu/ModMenu.java @@ -1,6 +1,39 @@ package net.silentclient.client.gui.modmenu; +import net.minecraft.client.gui.GuiButton; import net.silentclient.client.gui.SilentScreen; +import net.silentclient.client.mods.ModCategory; + +import java.io.IOException; public class ModMenu extends SilentScreen { + private ModCategory modCategory; + + public ModMenu() { + this(ModCategory.MODS); + } + + public ModMenu(ModCategory category) { + this.modCategory = category; + } + + @Override + public void initGui() { + super.initGui(); + } + + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + super.drawScreen(mouseX, mouseY, partialTicks); + } + + @Override + protected void actionPerformed(GuiButton button) throws IOException { + super.actionPerformed(button); + } + + @Override + protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { + super.mouseClicked(mouseX, mouseY, mouseButton); + } }