From f2f52f94049ddf7b37b2b5afbb856ab69162f380 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 22 Mar 2023 18:43:38 +0100 Subject: [PATCH 01/45] [Wurst-Bot] Update to 23w12a --- gradle.properties | 10 +++++----- src/main/java/net/wurstclient/WurstClient.java | 2 +- .../java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- .../java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index fe99851a..56226dc3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.19.4 -yarn_mappings=1.19.4+build.1 -loader_version=0.14.17 +minecraft_version=23w12a +yarn_mappings=23w12a+build.1 +loader_version=0.14.18 #Fabric api -fabric_version=0.75.3+1.19.4 +fabric_version=0.76.1+1.20 # Mod Properties -mod_version = v7.32-MC1.19.4 +mod_version = v7.32-MC23w12a maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index 2a718480..3c7b5463 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.32"; - public static final String MC_VERSION = "1.19.4"; + public static final String MC_VERSION = "23w12a"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 187f0eed..5297484e 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.setX(width / 2 + 2); + button.method_46421(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 28488e07..87f22486 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.setY(realmsButton.getY()); + altsButton.method_46419(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index aec6fd05..0ebbbc4b 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -73,7 +73,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.setX(middleX - 100); + searchBar.method_46421(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } From a3dfa1e339678984e0a3f39cbae0d2d2d8cb19bb Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 22 Mar 2023 21:31:53 +0100 Subject: [PATCH 02/45] Update to 23w12a --- build.gradle | 2 +- src/main/java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- src/main/java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../java/net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- src/main/resources/assets/wurst/lang/de_de.json | 2 +- src/main/resources/assets/wurst/lang/en_us.json | 2 +- src/main/resources/fabric.mod.json | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index b8defa59..1c8e16ef 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { } plugins { - id 'fabric-loom' version '1.0-SNAPSHOT' + id 'fabric-loom' version '1.1-SNAPSHOT' id 'maven-publish' } diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 5297484e..187f0eed 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.method_46421(width / 2 + 2); + button.setX(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 87f22486..28488e07 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.method_46419(realmsButton.getY()); + altsButton.setY(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 0ebbbc4b..aec6fd05 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -73,7 +73,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.method_46421(middleX - 100); + searchBar.setX(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } diff --git a/src/main/resources/assets/wurst/lang/de_de.json b/src/main/resources/assets/wurst/lang/de_de.json index a4ac1131..48b5dd2c 100644 --- a/src/main/resources/assets/wurst/lang/de_de.json +++ b/src/main/resources/assets/wurst/lang/de_de.json @@ -34,7 +34,7 @@ "description.wurst.hack.autopotion": "Benutzt automatisch Wurftränke der Heilung, wenn deine Gesundheit niedrig ist.", "description.wurst.hack.autoreconnect": "Verbindet dich automatisch wieder, wenn du vom Server gekickt wirst.", "description.wurst.hack.autorespawn": "Respawnt dich automatisch, wenn du stirbst.", - "description.wurst.hack.autosign": "Schreibt einen beliebigen Text automatisch auf jedes Schild, das du platzierst.\n\nNachdem du diesen Hack aktivierst, kannst du auf ein Schild ganz normal schreiben. Der Text von diesem Schild wird dann gespeichert und auf alle Schilder kopiert, die du danach platzierst.", + "description.wurst.hack.autosign": "Schreibt einen beliebigen Text automatisch auf jedes Schild, das du platzierst oder bearbeitest.\n\nNachdem du diesen Hack aktivierst, kannst du auf ein Schild ganz normal schreiben. Der Text von diesem Schild wird dann gespeichert und auf alle Schilder kopiert, die du danach platzierst.", "description.wurst.hack.autosoup": "Isst automatisch Pilzsuppe, wenn deine Gesundheit niedrig ist.\n\n§lAchtung:§r Dieser Hack ignoriert das Hunger-System und tut so als ob Pilzsuppe direkt deine Gesundheit auffüllt. Wenn der Server auf dem du spielst das nicht so macht, solltest du stattdessen AutoEat benutzen.", "description.wurst.hack.autosprint": "Lässt dich automatisch sprinten.", "description.wurst.hack.autosteal": "Klaut automatisch alle Items aus allen Kisten und Shulkerboxen, die du öffnest.", diff --git a/src/main/resources/assets/wurst/lang/en_us.json b/src/main/resources/assets/wurst/lang/en_us.json index e47d8ee7..d9632cc8 100644 --- a/src/main/resources/assets/wurst/lang/en_us.json +++ b/src/main/resources/assets/wurst/lang/en_us.json @@ -34,7 +34,7 @@ "description.wurst.hack.autopotion": "Automatically throws splash potions of instant health when your health is low.", "description.wurst.hack.autoreconnect": "Automatically reconnects when you get kicked from the server.", "description.wurst.hack.autorespawn": "Automatically respawns you whenever you die.", - "description.wurst.hack.autosign": "Instantly writes whatever text you want on every sign you place. Once activated, you can write normally on the first sign to specify the text for all other signs.", + "description.wurst.hack.autosign": "Instantly writes whatever text you want on every sign you place or edit. Once activated, you can write normally on the first sign to specify the text for all other signs.", "description.wurst.hack.autosoup": "Automatically eats soup when your health is low.\n\n§lNote:§r This hack ignores hunger and assumes that eating soup directly refills your health. If the server you are playing on is not configured to do that, use AutoEat instead.", "description.wurst.hack.autosprint": "Makes you sprint automatically.", "description.wurst.hack.autosteal": "Automatically steals everything from all chests and shulker boxes that you open.", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 615be355..b710db59 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,9 +29,9 @@ "accessWidener" : "wurst.accesswidener", "depends": { - "fabricloader": ">=0.14.10", - "fabric-api": ">=0.75.1", - "minecraft": "~1.19.4-beta.2", + "fabricloader": ">=0.14.18", + "fabric-api": ">=0.76.1", + "minecraft": "~1.20-alpha.23.12.a", "java": ">=17" }, "suggests": { From 2285426b99161416a7e93e144950c331d101eeb6 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 29 Mar 2023 18:01:42 +0200 Subject: [PATCH 03/45] [Wurst-Bot] Update to 23w13a --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- src/main/java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- src/main/java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 56226dc3..502881c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=23w12a -yarn_mappings=23w12a+build.1 +minecraft_version=23w13a +yarn_mappings=23w13a+build.1 loader_version=0.14.18 #Fabric api -fabric_version=0.76.1+1.20 +fabric_version=0.76.2+1.20 # Mod Properties -mod_version = v7.32-MC23w12a +mod_version = v7.32-MC23w13a maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index 3c7b5463..e4043e6c 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.32"; - public static final String MC_VERSION = "23w12a"; + public static final String MC_VERSION = "23w13a"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 187f0eed..5297484e 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.setX(width / 2 + 2); + button.method_46421(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 28488e07..87f22486 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.setY(realmsButton.getY()); + altsButton.method_46419(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index aec6fd05..0ebbbc4b 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -73,7 +73,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.setX(middleX - 100); + searchBar.method_46421(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } From 6d258d75b69bd8b916636f9f02ecc26866e37ea1 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 30 Mar 2023 01:06:56 +0200 Subject: [PATCH 04/45] Update to 23w13a --- .../net/wurstclient/mixin/AbstractSignEditScreenMixin.java | 6 +++--- src/main/java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- src/main/java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../java/net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- src/main/resources/fabric.mod.json | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/wurstclient/mixin/AbstractSignEditScreenMixin.java b/src/main/java/net/wurstclient/mixin/AbstractSignEditScreenMixin.java index 5cc389cf..c6670c46 100644 --- a/src/main/java/net/wurstclient/mixin/AbstractSignEditScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/AbstractSignEditScreenMixin.java @@ -25,7 +25,7 @@ public abstract class AbstractSignEditScreenMixin extends Screen { @Shadow @Final - private String[] text; + private String[] messages; private AbstractSignEditScreenMixin(WurstClient wurst, Text text_1) { @@ -42,7 +42,7 @@ public abstract class AbstractSignEditScreenMixin extends Screen return; for(int i = 0; i < 4; i++) - text[i] = autoSignText[i]; + messages[i] = autoSignText[i]; finishEditing(); } @@ -50,7 +50,7 @@ public abstract class AbstractSignEditScreenMixin extends Screen @Inject(at = {@At("HEAD")}, method = {"finishEditing()V"}) private void onFinishEditing(CallbackInfo ci) { - WurstClient.INSTANCE.getHax().autoSignHack.setSignText(text); + WurstClient.INSTANCE.getHax().autoSignHack.setSignText(messages); } @Shadow diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 5297484e..187f0eed 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.method_46421(width / 2 + 2); + button.setX(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 87f22486..28488e07 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.method_46419(realmsButton.getY()); + altsButton.setY(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 0ebbbc4b..aec6fd05 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -73,7 +73,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.method_46421(middleX - 100); + searchBar.setX(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b710db59..1660f6f1 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,8 +30,8 @@ "depends": { "fabricloader": ">=0.14.18", - "fabric-api": ">=0.76.1", - "minecraft": "~1.20-alpha.23.12.a", + "fabric-api": ">=0.76.2", + "minecraft": "~1.20-alpha.23.13.a", "java": ">=17" }, "suggests": { From f5197413bf0733744d153c21bc264c8b2461496d Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Sat, 1 Apr 2023 22:24:47 +0200 Subject: [PATCH 05/45] [Wurst-Bot] Update to 23w13a_or_b --- gradle.properties | 10 +++++----- src/main/java/net/wurstclient/WurstClient.java | 2 +- .../java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- .../java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index 502881c3..ef4a4b57 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=23w13a -yarn_mappings=23w13a+build.1 -loader_version=0.14.18 +minecraft_version=23w13a_or_b +yarn_mappings=23w13a_or_b+build.2 +loader_version=0.14.19 #Fabric api -fabric_version=0.76.2+1.20 +fabric_version=0.76.3+23w13a_or_b # Mod Properties -mod_version = v7.32-MC23w13a +mod_version = v7.32-MC23w13a_or_b maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index e4043e6c..390728b3 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.32"; - public static final String MC_VERSION = "23w13a"; + public static final String MC_VERSION = "23w13a_or_b"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 187f0eed..5297484e 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.setX(width / 2 + 2); + button.method_46421(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 28488e07..87f22486 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.setY(realmsButton.getY()); + altsButton.method_46419(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index aec6fd05..0ebbbc4b 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -73,7 +73,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.setX(middleX - 100); + searchBar.method_46421(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } From a4b0ab03ce616231491380d07da78e971ec358f0 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Sat, 1 Apr 2023 22:31:40 +0200 Subject: [PATCH 06/45] Update to 23w13a_or_b --- src/main/java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- src/main/java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../java/net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- src/main/resources/fabric.mod.json | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 5297484e..187f0eed 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.method_46421(width / 2 + 2); + button.setX(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 87f22486..28488e07 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.method_46419(realmsButton.getY()); + altsButton.setY(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 0ebbbc4b..aec6fd05 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -73,7 +73,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.method_46421(middleX - 100); + searchBar.setX(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 1660f6f1..5f63079e 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,9 +29,9 @@ "accessWidener" : "wurst.accesswidener", "depends": { - "fabricloader": ">=0.14.18", - "fabric-api": ">=0.76.2", - "minecraft": "~1.20-alpha.23.13.a", + "fabricloader": ">=0.14.19", + "fabric-api": ">=0.76.3", + "minecraft": "~1.20-alpha.23.13.ab", "java": ">=17" }, "suggests": { From 36297be51721e51cafe21c878df180a7a01263c4 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Sat, 1 Apr 2023 22:46:01 +0200 Subject: [PATCH 07/45] Add sus gravel to X-Ray's default list of ores --- src/main/java/net/wurstclient/hacks/XRayHack.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/wurstclient/hacks/XRayHack.java b/src/main/java/net/wurstclient/hacks/XRayHack.java index 0aa07bea..117ab241 100644 --- a/src/main/java/net/wurstclient/hacks/XRayHack.java +++ b/src/main/java/net/wurstclient/hacks/XRayHack.java @@ -62,8 +62,9 @@ public final class XRayHack extends Hack implements UpdateListener, "minecraft:raw_copper_block", "minecraft:raw_gold_block", "minecraft:raw_iron_block", "minecraft:redstone_block", "minecraft:redstone_ore", "minecraft:repeating_command_block", - "minecraft:spawner", "minecraft:suspicious_sand", "minecraft:tnt", - "minecraft:torch", "minecraft:trapped_chest", "minecraft:water"); + "minecraft:spawner", "minecraft:suspicious_gravel", + "minecraft:suspicious_sand", "minecraft:tnt", "minecraft:torch", + "minecraft:trapped_chest", "minecraft:water"); private ArrayList oreNames; private final String warning; From e5d4b6c234faaabd47f93cd11e5940396c11dc3c Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 6 Apr 2023 18:26:21 +0200 Subject: [PATCH 08/45] [Wurst-Bot] Update to 23w14a --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- src/main/java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- src/main/java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index ef4a4b57..27b4962a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=23w13a_or_b -yarn_mappings=23w13a_or_b+build.2 +minecraft_version=23w14a +yarn_mappings=23w14a+build.2 loader_version=0.14.19 #Fabric api -fabric_version=0.76.3+23w13a_or_b +fabric_version=0.77.2+1.20 # Mod Properties -mod_version = v7.32-MC23w13a_or_b +mod_version = v7.32-MC23w14a maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index 390728b3..2eab5632 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.32"; - public static final String MC_VERSION = "23w13a_or_b"; + public static final String MC_VERSION = "23w14a"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 187f0eed..5297484e 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.setX(width / 2 + 2); + button.method_46421(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 28488e07..87f22486 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.setY(realmsButton.getY()); + altsButton.method_46419(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index aec6fd05..0ebbbc4b 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -73,7 +73,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.setX(middleX - 100); + searchBar.method_46421(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } From 5de649331e3c44cbac382c251278c496e9b129e6 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 6 Apr 2023 21:51:31 +0200 Subject: [PATCH 09/45] Update to 23w14a --- .../java/net/wurstclient/ai/PathFinder.java | 44 +++++++++---------- .../java/net/wurstclient/hacks/GlideHack.java | 7 ++- .../java/net/wurstclient/hacks/JesusHack.java | 10 +++-- .../net/wurstclient/hacks/NukerLegitHack.java | 4 +- .../net/wurstclient/hacks/SpeedNukerHack.java | 4 +- .../mixin/DisconnectedScreenMixin.java | 27 +++++++----- .../wurstclient/mixin/StatsScreenMixin.java | 2 +- .../wurstclient/mixin/TitleScreenMixin.java | 2 +- .../navigator/NavigatorMainScreen.java | 2 +- .../util/LastServerRememberer.java | 2 +- .../net/wurstclient/util/RenderUtils.java | 4 +- src/main/resources/fabric.mod.json | 4 +- 12 files changed, 57 insertions(+), 55 deletions(-) diff --git a/src/main/java/net/wurstclient/ai/PathFinder.java b/src/main/java/net/wurstclient/ai/PathFinder.java index 0e376972..a4799a28 100644 --- a/src/main/java/net/wurstclient/ai/PathFinder.java +++ b/src/main/java/net/wurstclient/ai/PathFinder.java @@ -19,6 +19,9 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.*; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.LavaFluid; +import net.minecraft.fluid.WaterFluid; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.wurstclient.WurstClient; @@ -197,15 +200,13 @@ public class PathFinder && (flying || canClimbUpAt(pos) || goal.equals(up) || canSafelyStandOn(north) || canSafelyStandOn(east) || canSafelyStandOn(south) || canSafelyStandOn(west)) - && (divingAllowed || BlockUtils.getState(up.up()) - .getMaterial() != Material.WATER)) + && (divingAllowed || BlockUtils.getBlock(up.up()) != Blocks.WATER)) neighbors.add(new PathPos(up, onGround)); // down if(pos.getY() > WurstClient.MC.world.getBottomY() && canGoThrough(down) && canGoAbove(down.down()) && (flying || canFallBelow(pos)) - && (divingAllowed - || BlockUtils.getState(pos).getMaterial() != Material.WATER)) + && (divingAllowed || BlockUtils.getBlock(pos) != Blocks.WATER)) neighbors.add(new PathPos(down)); return neighbors; @@ -247,8 +248,7 @@ public class PathFinder if(!canGoAbove(pos.down())) return false; - if(!divingAllowed - && BlockUtils.getState(up).getMaterial() == Material.WATER) + if(!divingAllowed && BlockUtils.getBlock(up) == Blocks.WATER) return false; return true; @@ -266,8 +266,7 @@ public class PathFinder if(!canGoAbove(pos.down())) return false; - if(!divingAllowed - && BlockUtils.getState(up).getMaterial() == Material.WATER) + if(!divingAllowed && BlockUtils.getBlock(up) == Blocks.WATER) return false; return true; @@ -286,8 +285,8 @@ public class PathFinder return material.blocksMovement() && !(block instanceof AbstractSignBlock) - || block instanceof LadderBlock || jesus - && (material == Material.WATER || material == Material.LAVA); + || block instanceof LadderBlock + || jesus && (block == Blocks.WATER || block == Blocks.LAVA); } @SuppressWarnings("deprecation") @@ -312,7 +311,7 @@ public class PathFinder // check if safe if(!invulnerable - && (material == Material.LAVA || material == Material.FIRE)) + && (block == Blocks.LAVA || block instanceof AbstractFireBlock)) return false; return true; @@ -332,13 +331,14 @@ public class PathFinder private boolean canSafelyStandOn(BlockPos pos) { // check if solid - Material material = BlockUtils.getState(pos).getMaterial(); if(!canBeSolid(pos)) return false; // check if safe - if(!invulnerable - && (material == Material.CACTUS || material == Material.LAVA)) + BlockState state = BlockUtils.getState(pos); + Fluid fluid = state.getFluidState().getFluid(); + if(!invulnerable && (state.getBlock() instanceof CactusBlock + || fluid instanceof LavaFluid)) return false; return true; @@ -381,7 +381,7 @@ public class PathFinder // check if block resets fall damage Block prevBlock = BlockUtils.getBlock(prevPos); BlockState prevState = BlockUtils.getState(prevPos); - if(prevState.getMaterial() == Material.WATER + if(prevState.getFluidState().getFluid() instanceof WaterFluid || prevBlock instanceof LadderBlock || prevBlock instanceof VineBlock || prevBlock instanceof CobwebBlock) @@ -395,8 +395,8 @@ public class PathFinder private boolean canFlyAt(BlockPos pos) { - return flying || !noWaterSlowdown - && BlockUtils.getState(pos).getMaterial() == Material.WATER; + return flying + || !noWaterSlowdown && BlockUtils.getBlock(pos) == Blocks.WATER; } private boolean canClimbUpAt(BlockPos pos) @@ -422,7 +422,7 @@ public class PathFinder { // check feet Block blockFeet = BlockUtils.getBlock(pos); - if(BlockUtils.getState(pos).getMaterial().isLiquid() + if(BlockUtils.getBlock(pos) instanceof FluidBlock || blockFeet instanceof LadderBlock || blockFeet instanceof VineBlock || blockFeet instanceof CobwebBlock) @@ -430,7 +430,7 @@ public class PathFinder // check head Block blockHead = BlockUtils.getBlock(pos.up()); - if(BlockUtils.getState(pos.up()).getMaterial().isLiquid() + if(BlockUtils.getBlock(pos.up()) instanceof FluidBlock || blockHead instanceof CobwebBlock) return true; @@ -445,12 +445,12 @@ public class PathFinder for(int i = 0; i < positions.length; i++) { BlockPos pos = positions[i]; - Material material = BlockUtils.getState(pos).getMaterial(); + Block block = BlockUtils.getBlock(pos); // liquids - if(material == Material.WATER && !noWaterSlowdown) + if(block == Blocks.WATER && !noWaterSlowdown) costs[i] *= 1.3164437838225804F; - else if(material == Material.LAVA) + else if(block == Blocks.LAVA) costs[i] *= 4.539515393656079F; // soul sand diff --git a/src/main/java/net/wurstclient/hacks/GlideHack.java b/src/main/java/net/wurstclient/hacks/GlideHack.java index 0ad91c25..702bc641 100644 --- a/src/main/java/net/wurstclient/hacks/GlideHack.java +++ b/src/main/java/net/wurstclient/hacks/GlideHack.java @@ -10,8 +10,7 @@ package net.wurstclient.hacks; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import net.minecraft.block.BlockState; -import net.minecraft.block.Material; +import net.minecraft.block.FluidBlock; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; @@ -85,8 +84,8 @@ public final class GlideHack extends Hack .stream(BlockUtils.getAllInBox(min, max).spliterator(), true); // manual collision check, since liquids don't have bounding boxes - if(stream.map(BlockUtils::getState).map(BlockState::getMaterial) - .anyMatch(Material::isLiquid)) + if(stream.map(BlockUtils::getBlock) + .anyMatch(b -> b instanceof FluidBlock)) return; } diff --git a/src/main/java/net/wurstclient/hacks/JesusHack.java b/src/main/java/net/wurstclient/hacks/JesusHack.java index ba2f53a5..69da3872 100644 --- a/src/main/java/net/wurstclient/hacks/JesusHack.java +++ b/src/main/java/net/wurstclient/hacks/JesusHack.java @@ -10,7 +10,9 @@ package net.wurstclient.hacks; import java.util.ArrayList; import java.util.stream.Collectors; -import net.minecraft.block.Material; +import net.minecraft.block.AirBlock; +import net.minecraft.block.Block; +import net.minecraft.block.FluidBlock; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; @@ -166,11 +168,11 @@ public final class JesusHack extends Hack for(Box bb : blockCollisions) { BlockPos pos = BlockPos.ofFloored(bb.getCenter()); - Material material = BlockUtils.getState(pos).getMaterial(); + Block block = BlockUtils.getBlock(pos); - if(material == Material.WATER || material == Material.LAVA) + if(block instanceof FluidBlock) foundLiquid = true; - else if(material != Material.AIR) + else if(!(block instanceof AirBlock)) foundSolid = true; } diff --git a/src/main/java/net/wurstclient/hacks/NukerLegitHack.java b/src/main/java/net/wurstclient/hacks/NukerLegitHack.java index 85a1e0a5..e7541203 100644 --- a/src/main/java/net/wurstclient/hacks/NukerLegitHack.java +++ b/src/main/java/net/wurstclient/hacks/NukerLegitHack.java @@ -20,7 +20,6 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.block.Material; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.hit.BlockHitResult; @@ -150,8 +149,7 @@ public final class NukerLegitHack extends Hack // check pos BlockPos pos = ((BlockHitResult)MC.crosshairTarget).getBlockPos(); - if(pos == null - || BlockUtils.getState(pos).getMaterial() == Material.AIR) + if(pos == null || BlockUtils.getBlock(pos) == Blocks.AIR) return; // set id diff --git a/src/main/java/net/wurstclient/hacks/SpeedNukerHack.java b/src/main/java/net/wurstclient/hacks/SpeedNukerHack.java index cee1eee7..b92de14a 100644 --- a/src/main/java/net/wurstclient/hacks/SpeedNukerHack.java +++ b/src/main/java/net/wurstclient/hacks/SpeedNukerHack.java @@ -16,7 +16,6 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import net.minecraft.block.Blocks; -import net.minecraft.block.Material; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; @@ -174,8 +173,7 @@ public final class SpeedNukerHack extends Hack // check pos BlockPos pos = ((BlockHitResult)MC.crosshairTarget).getBlockPos(); - if(pos == null - || BlockUtils.getState(pos).getMaterial() == Material.AIR) + if(pos == null || BlockUtils.getBlock(pos) == Blocks.AIR) return; // set id diff --git a/src/main/java/net/wurstclient/mixin/DisconnectedScreenMixin.java b/src/main/java/net/wurstclient/mixin/DisconnectedScreenMixin.java index 1c831acf..5095f35c 100644 --- a/src/main/java/net/wurstclient/mixin/DisconnectedScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/DisconnectedScreenMixin.java @@ -7,6 +7,8 @@ */ package net.wurstclient.mixin; +import java.util.stream.Stream; + import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -17,6 +19,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import net.minecraft.client.gui.screen.DisconnectedScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.gui.widget.GridWidget; import net.minecraft.text.Text; import net.wurstclient.WurstClient; import net.wurstclient.hacks.AutoReconnectHack; @@ -37,7 +40,8 @@ public class DisconnectedScreenMixin extends Screen @Final private Screen parent; @Shadow - private int reasonHeight; + @Final + private final GridWidget field_44552 = new GridWidget(); private DisconnectedScreenMixin(WurstClient wurst, Text title) { @@ -69,18 +73,19 @@ public class DisconnectedScreenMixin extends Screen private void addReconnectButtons() { - int backButtonX = width / 2 - 100; - int backButtonY = - Math.min(height / 2 + reasonHeight / 2 + 9, height - 30); + ButtonWidget reconnectButton = field_44552.add( + ButtonWidget.builder(Text.literal("Reconnect"), + b -> LastServerRememberer.reconnect(parent)).build(), + 3, 0, 1, 1, field_44552.copyPositioner().margin(2).marginTop(-6)); - addDrawableChild(ButtonWidget - .builder(Text.literal("Reconnect"), - b -> LastServerRememberer.reconnect(parent)) - .dimensions(backButtonX, backButtonY + 24, 200, 20).build()); + autoReconnectButton = field_44552.add( + ButtonWidget.builder(Text.literal("AutoReconnect"), + b -> pressAutoReconnect()).build(), + 4, 0, 1, 1, field_44552.copyPositioner().margin(2)); - autoReconnectButton = addDrawableChild(ButtonWidget - .builder(Text.literal("AutoReconnect"), b -> pressAutoReconnect()) - .dimensions(backButtonX, backButtonY + 48, 200, 20).build()); + field_44552.refreshPositions(); + Stream.of(reconnectButton, autoReconnectButton) + .forEach(this::addDrawableChild); AutoReconnectHack autoReconnect = WurstClient.INSTANCE.getHax().autoReconnectHack; diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 5297484e..187f0eed 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.method_46421(width / 2 + 2); + button.setX(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 87f22486..28488e07 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.method_46419(realmsButton.getY()); + altsButton.setY(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 0ebbbc4b..aec6fd05 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -73,7 +73,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.method_46421(middleX - 100); + searchBar.setX(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } diff --git a/src/main/java/net/wurstclient/util/LastServerRememberer.java b/src/main/java/net/wurstclient/util/LastServerRememberer.java index bc9bd7cf..2ac7eede 100644 --- a/src/main/java/net/wurstclient/util/LastServerRememberer.java +++ b/src/main/java/net/wurstclient/util/LastServerRememberer.java @@ -49,6 +49,6 @@ public enum LastServerRememberer return; ConnectScreen.connect(prevScreen, WurstClient.MC, - ServerAddress.parse(lastServer.address), lastServer); + ServerAddress.parse(lastServer.address), lastServer, false); } } diff --git a/src/main/java/net/wurstclient/util/RenderUtils.java b/src/main/java/net/wurstclient/util/RenderUtils.java index 06674d97..b144bfd1 100644 --- a/src/main/java/net/wurstclient/util/RenderUtils.java +++ b/src/main/java/net/wurstclient/util/RenderUtils.java @@ -873,8 +873,8 @@ public enum RenderUtils else matrixStack.scale(0.75F, 0.75F, 0.75F); - ItemStack renderStack = - stack.isEmpty() ? new ItemStack(Blocks.GRASS_BLOCK) : stack; + ItemStack renderStack = stack.isEmpty() || stack.getItem() == null + ? new ItemStack(Blocks.GRASS_BLOCK) : stack; DiffuseLighting.enableGuiDepthLighting(); WurstClient.MC.getItemRenderer().renderInGuiWithOverrides(matrixStack, diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 5f63079e..cc0b64a0 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,8 +30,8 @@ "depends": { "fabricloader": ">=0.14.19", - "fabric-api": ">=0.76.3", - "minecraft": "~1.20-alpha.23.13.ab", + "fabric-api": ">=0.77.2", + "minecraft": "~1.20-alpha.23.14.a", "java": ">=17" }, "suggests": { From 34617d70e51ab136ca604c7bfe9f4892c041a9d1 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Fri, 21 Apr 2023 12:44:30 +0200 Subject: [PATCH 10/45] [Wurst-Bot] Update to 23w16a --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- src/main/java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- src/main/java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 27b4962a..b42ee0bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=23w14a -yarn_mappings=23w14a+build.2 +minecraft_version=23w16a +yarn_mappings=23w16a+build.4 loader_version=0.14.19 #Fabric api -fabric_version=0.77.2+1.20 +fabric_version=0.78.1+1.20 # Mod Properties -mod_version = v7.32-MC23w14a +mod_version = v7.32-MC23w16a maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index 2eab5632..4ab279e3 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.32"; - public static final String MC_VERSION = "23w14a"; + public static final String MC_VERSION = "23w16a"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 187f0eed..5297484e 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.setX(width / 2 + 2); + button.method_46421(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 28488e07..87f22486 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.setY(realmsButton.getY()); + altsButton.method_46419(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index aec6fd05..0ebbbc4b 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -73,7 +73,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.setX(middleX - 100); + searchBar.method_46421(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } From 69c1cc3a1468be45b4a617c049cd806d9fa92b4f Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Sat, 22 Apr 2023 00:13:11 +0200 Subject: [PATCH 11/45] Fix 23w16a breaking all kinds of things --- .../java/net/wurstclient/ai/PathFinder.java | 11 +-- .../wurstclient/altmanager/AltRenderer.java | 93 +++++++++++++------ .../altmanager/screens/AltEditorScreen.java | 30 +++--- .../altmanager/screens/AltManagerScreen.java | 54 ++++++----- .../net/wurstclient/clickgui/ClickGui.java | 34 ++++--- .../wurstclient/clickgui/ComboBoxPopup.java | 11 ++- .../net/wurstclient/clickgui/Component.java | 4 +- .../java/net/wurstclient/clickgui/Popup.java | 5 +- .../components/AbstractListEditButton.java | 10 +- .../clickgui/components/BlockComponent.java | 10 +- .../components/CheckboxComponent.java | 10 +- .../clickgui/components/ColorComponent.java | 13 +-- .../components/ComboBoxComponent.java | 13 +-- .../clickgui/components/FeatureButton.java | 10 +- .../clickgui/components/FileComponent.java | 14 +-- .../clickgui/components/RadarComponent.java | 4 +- .../clickgui/components/SliderComponent.java | 15 +-- .../clickgui/screens/AddBookOfferScreen.java | 36 +++---- .../clickgui/screens/ClickGuiScreen.java | 8 +- .../clickgui/screens/EditBlockListScreen.java | 51 +++++----- .../clickgui/screens/EditBlockScreen.java | 36 +++---- .../clickgui/screens/EditBookOfferScreen.java | 32 ++++--- .../screens/EditBookOffersScreen.java | 24 +++-- .../clickgui/screens/EditColorScreen.java | 43 ++++----- .../clickgui/screens/EditItemListScreen.java | 51 +++++----- .../clickgui/screens/EditSliderScreen.java | 14 +-- .../clickgui/screens/SelectFileScreen.java | 25 ++--- .../net/wurstclient/commands/TacoCmd.java | 6 +- .../wurstclient/events/GUIRenderListener.java | 12 +-- .../net/wurstclient/hacks/AnchorAuraHack.java | 4 +- .../net/wurstclient/hacks/AutoBuildHack.java | 8 +- .../net/wurstclient/hacks/AutoFarmHack.java | 3 +- .../net/wurstclient/hacks/BowAimbotHack.java | 6 +- .../wurstclient/hacks/BuildRandomHack.java | 2 +- .../wurstclient/hacks/CrystalAuraHack.java | 4 +- .../net/wurstclient/hacks/ExcavatorHack.java | 6 +- .../wurstclient/hacks/InstantBunkerHack.java | 2 +- .../net/wurstclient/hacks/InvWalkHack.java | 3 +- .../wurstclient/hacks/MobSpawnEspHack.java | 3 +- .../wurstclient/hacks/ScaffoldWalkHack.java | 2 +- .../net/wurstclient/hacks/TunnellerHack.java | 4 +- .../java/net/wurstclient/hud/HackListHUD.java | 31 ++++--- .../java/net/wurstclient/hud/IngameHUD.java | 12 +-- src/main/java/net/wurstclient/hud/TabGui.java | 12 ++- .../java/net/wurstclient/hud/WurstLogo.java | 8 +- .../net/wurstclient/mixin/ChatHudMixin.java | 3 +- .../mixin/DisconnectedScreenMixin.java | 12 +-- .../mixin/GameMenuScreenMixin.java | 14 ++- .../net/wurstclient/mixin/IngameHudMixin.java | 19 ++-- .../net/wurstclient/mixin/ScreenMixin.java | 9 +- .../wurstclient/mixin/StatsScreenMixin.java | 2 +- .../wurstclient/mixin/TitleScreenMixin.java | 2 +- .../navigator/NavigatorFeatureScreen.java | 24 ++--- .../navigator/NavigatorMainScreen.java | 31 ++++--- .../navigator/NavigatorNewKeybindScreen.java | 19 ++-- .../NavigatorRemoveKeybindScreen.java | 19 ++-- .../navigator/NavigatorScreen.java | 9 +- .../ForcedChatReportsScreen.java | 13 ++- .../nochatreports/NcrModRequiredScreen.java | 13 ++- .../options/EnterProfileNameScreen.java | 12 +-- .../options/KeybindEditorScreen.java | 18 ++-- .../options/KeybindManagerScreen.java | 25 ++--- .../options/KeybindProfilesScreen.java | 28 +++--- .../wurstclient/options/PressAKeyScreen.java | 10 +- .../options/WurstOptionsScreen.java | 30 +++--- .../options/ZoomManagerScreen.java | 12 +-- .../serverfinder/CleanUpScreen.java | 20 ++-- .../serverfinder/ServerFinderScreen.java | 30 +++--- .../net/wurstclient/util/BlockPlacer.java | 4 +- .../java/net/wurstclient/util/ListWidget.java | 19 ++-- .../net/wurstclient/util/RenderUtils.java | 15 +-- src/main/resources/fabric.mod.json | 4 +- 72 files changed, 651 insertions(+), 554 deletions(-) diff --git a/src/main/java/net/wurstclient/ai/PathFinder.java b/src/main/java/net/wurstclient/ai/PathFinder.java index a4799a28..0e8b9db5 100644 --- a/src/main/java/net/wurstclient/ai/PathFinder.java +++ b/src/main/java/net/wurstclient/ai/PathFinder.java @@ -277,14 +277,13 @@ public class PathFinder return false; } + @SuppressWarnings("deprecation") protected boolean canBeSolid(BlockPos pos) { BlockState state = BlockUtils.getState(pos); - Material material = state.getMaterial(); Block block = state.getBlock(); - return material.blocksMovement() - && !(block instanceof AbstractSignBlock) + return state.method_51366() && !(block instanceof AbstractSignBlock) || block instanceof LadderBlock || jesus && (block == Blocks.WATER || block == Blocks.LAVA); } @@ -299,9 +298,9 @@ public class PathFinder return false; // check if solid - Material material = BlockUtils.getState(pos).getMaterial(); - Block block = BlockUtils.getBlock(pos); - if(material.blocksMovement() && !(block instanceof AbstractSignBlock)) + BlockState state = BlockUtils.getState(pos); + Block block = state.getBlock(); + if(state.method_51366() && !(block instanceof AbstractSignBlock)) return false; // check if trapped diff --git a/src/main/java/net/wurstclient/altmanager/AltRenderer.java b/src/main/java/net/wurstclient/altmanager/AltRenderer.java index a479d38f..a263de58 100644 --- a/src/main/java/net/wurstclient/altmanager/AltRenderer.java +++ b/src/main/java/net/wurstclient/altmanager/AltRenderer.java @@ -10,6 +10,7 @@ package net.wurstclient.altmanager; import java.util.HashMap; import java.util.UUID; +import org.joml.Matrix4f; import org.lwjgl.opengl.GL11; import com.mojang.authlib.GameProfile; @@ -17,6 +18,12 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.network.PlayerListEntry; +import net.minecraft.client.render.BufferBuilder; +import net.minecraft.client.render.BufferRenderer; +import net.minecraft.client.render.GameRenderer; +import net.minecraft.client.render.Tessellator; +import net.minecraft.client.render.VertexFormat; +import net.minecraft.client.render.VertexFormats; import net.minecraft.client.util.DefaultSkinHelper; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; @@ -46,7 +53,35 @@ public final class AltRenderer RenderSystem.setShaderTexture(0, loadedSkins.get(name)); } - public static void drawAltFace(MatrixStack matrixStack, String name, int x, + private static void drawTexture(DrawableHelper helper, int x, int y, + float u, float v, int w, int h, int fw, int fh) + { + int x2 = x + w; + int y2 = y + h; + int z = 0; + float uOverFw = u / fw; + float uPlusWOverFw = (u + w) / fw; + float vOverFh = v / fh; + float vPlusHOverFh = (v + h) / fh; + + RenderSystem.setShader(GameRenderer::getPositionTexProgram); + MatrixStack matrixStack = helper.method_51448(); + Matrix4f matrix4f = matrixStack.peek().getPositionMatrix(); + BufferBuilder bufferBuilder = Tessellator.getInstance().getBuffer(); + bufferBuilder.begin(VertexFormat.DrawMode.QUADS, + VertexFormats.POSITION_TEXTURE); + bufferBuilder.vertex(matrix4f, x, y, z).texture(uOverFw, vOverFh) + .next(); + bufferBuilder.vertex(matrix4f, x, y2, z).texture(uOverFw, vPlusHOverFh) + .next(); + bufferBuilder.vertex(matrix4f, x2, y2, z) + .texture(uPlusWOverFw, vPlusHOverFh).next(); + bufferBuilder.vertex(matrix4f, x2, y, z).texture(uPlusWOverFw, vOverFh) + .next(); + BufferRenderer.drawWithGlobalProgram(bufferBuilder.end()); + } + + public static void drawAltFace(DrawableHelper helper, String name, int x, int y, int w, int h, boolean selected) { try @@ -64,14 +99,14 @@ public final class AltRenderer int fh = 192; float u = 24; float v = 24; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Hat fw = 192; fh = 192; u = 120; v = 24; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); GL11.glDisable(GL11.GL_BLEND); @@ -81,7 +116,7 @@ public final class AltRenderer } } - public static void drawAltBody(MatrixStack matrixStack, String name, int x, + public static void drawAltBody(DrawableHelper helper, String name, int x, int y, int width, int height) { try @@ -103,7 +138,7 @@ public final class AltRenderer int fh = height * 2; float u = height / 4; float v = height / 4; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Hat x = x + 0; @@ -112,7 +147,7 @@ public final class AltRenderer h = height / 4; u = height / 4 * 5; v = height / 4; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Chest x = x + 0; @@ -121,7 +156,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 2.5F; v = height / 4 * 2.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Jacket x = x + 0; @@ -130,7 +165,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 2.5F; v = height / 4 * 4.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Left Arm x = x - width / 16 * (slim ? 3 : 4); @@ -139,7 +174,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 5.5F; v = height / 4 * 2.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Left Sleeve x = x + 0; @@ -148,7 +183,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 5.5F; v = height / 4 * 4.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Right Arm x = x + width / 16 * (slim ? 11 : 12); @@ -157,7 +192,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 5.5F; v = height / 4 * 2.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Right Sleeve x = x + 0; @@ -166,7 +201,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 5.5F; v = height / 4 * 4.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Left Leg x = x - width / 2; @@ -175,7 +210,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 0.5F; v = height / 4 * 2.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Left Pants x = x + 0; @@ -184,7 +219,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 0.5F; v = height / 4 * 4.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Right Leg x = x + width / 4; @@ -193,7 +228,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 0.5F; v = height / 4 * 2.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Right Pants x = x + 0; @@ -202,7 +237,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 0.5F; v = height / 4 * 4.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); GL11.glDisable(GL11.GL_BLEND); @@ -212,7 +247,7 @@ public final class AltRenderer } } - public static void drawAltBack(MatrixStack matrixStack, String name, int x, + public static void drawAltBack(DrawableHelper helper, String name, int x, int y, int width, int height) { try @@ -234,7 +269,7 @@ public final class AltRenderer int fh = height * 2; float u = height / 4 * 3; float v = height / 4; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Hat x = x + 0; @@ -243,7 +278,7 @@ public final class AltRenderer h = height / 4; u = height / 4 * 7; v = height / 4; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Chest x = x + 0; @@ -252,7 +287,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 4; v = height / 4 * 2.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Jacket x = x + 0; @@ -261,7 +296,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 4; v = height / 4 * 4.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Left Arm x = x - width / 16 * (slim ? 3 : 4); @@ -270,7 +305,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * (slim ? 6.375F : 6.5F); v = height / 4 * 2.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Left Sleeve x = x + 0; @@ -279,7 +314,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * (slim ? 6.375F : 6.5F); v = height / 4 * 4.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Right Arm x = x + width / 16 * (slim ? 11 : 12); @@ -288,7 +323,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * (slim ? 6.375F : 6.5F); v = height / 4 * 2.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Right Sleeve x = x + 0; @@ -297,7 +332,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * (slim ? 6.375F : 6.5F); v = height / 4 * 4.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Left Leg x = x - width / 2; @@ -306,7 +341,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 1.5F; v = height / 4 * 2.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Left Pants x = x + 0; @@ -315,7 +350,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 1.5F; v = height / 4 * 4.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Right Leg x = x + width / 4; @@ -324,7 +359,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 1.5F; v = height / 4 * 2.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); // Right Pants x = x + 0; @@ -333,7 +368,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 1.5F; v = height / 4 * 4.5F; - DrawableHelper.drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + drawTexture(helper, x, y, u, v, w, h, fw, fh); GL11.glDisable(GL11.GL_BLEND); diff --git a/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java b/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java index ac539966..474b95cd 100644 --- a/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java +++ b/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java @@ -28,6 +28,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -342,39 +343,40 @@ public abstract class AltEditorScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - renderBackground(matrixStack); + renderBackground(helper); + MatrixStack matrixStack = helper.method_51448(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); RenderSystem.setShader(GameRenderer::getPositionProgram); // skin preview - AltRenderer.drawAltBack(matrixStack, nameOrEmailBox.getText(), + AltRenderer.drawAltBack(helper, nameOrEmailBox.getText(), (width / 2 - 100) / 2 - 64, height / 2 - 128, 128, 256); - AltRenderer.drawAltBody(matrixStack, nameOrEmailBox.getText(), + AltRenderer.drawAltBody(helper, nameOrEmailBox.getText(), width - (width / 2 - 100) / 2 - 64, height / 2 - 128, 128, 256); // text - drawTextWithShadow(matrixStack, textRenderer, - "Name (for cracked alts), or", width / 2 - 100, 37, 10526880); - drawTextWithShadow(matrixStack, textRenderer, - "E-Mail (for premium alts)", width / 2 - 100, 47, 10526880); - drawTextWithShadow(matrixStack, textRenderer, + helper.drawTextWithShadow(textRenderer, "Name (for cracked alts), or", + width / 2 - 100, 37, 10526880); + helper.drawTextWithShadow(textRenderer, "E-Mail (for premium alts)", + width / 2 - 100, 47, 10526880); + helper.drawTextWithShadow(textRenderer, "Password (leave blank for cracked alts)", width / 2 - 100, 87, 10526880); String[] lines = message.split("\n"); for(int i = 0; i < lines.length; i++) - drawCenteredTextWithShadow(matrixStack, textRenderer, lines[i], - width / 2, 142 + 10 * i, 16777215); + helper.drawCenteredTextWithShadow(textRenderer, lines[i], width / 2, + 142 + 10 * i, 16777215); // text boxes - nameOrEmailBox.render(matrixStack, mouseX, mouseY, partialTicks); - passwordBox.render(matrixStack, mouseX, mouseY, partialTicks); + nameOrEmailBox.render(helper, mouseX, mouseY, partialTicks); + passwordBox.render(helper, mouseX, mouseY, partialTicks); // red flash for errors if(errorTimer > 0) @@ -397,7 +399,7 @@ public abstract class AltEditorScreen extends Screen errorTimer--; } - super.render(matrixStack, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java b/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java index c70b08ae..2a36f541 100644 --- a/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java +++ b/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java @@ -30,6 +30,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import it.unimi.dsi.fastutil.booleans.BooleanConsumer; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.NoticeScreen; import net.minecraft.client.gui.screen.Screen; @@ -408,12 +409,13 @@ public final class AltManagerScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - renderBackground(matrixStack); - listGui.render(matrixStack, mouseX, mouseY, partialTicks); + renderBackground(helper); + listGui.render(helper, mouseX, mouseY, partialTicks); + MatrixStack matrixStack = helper.method_51448(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -427,20 +429,20 @@ public final class AltManagerScreen extends Screen if(alt == null) return; - AltRenderer.drawAltBack(matrixStack, alt.getName(), + AltRenderer.drawAltBack(helper, alt.getName(), (width / 2 - 125) / 2 - 32, height / 2 - 64 - 9, 64, 128); - AltRenderer.drawAltBody(matrixStack, alt.getName(), + AltRenderer.drawAltBody(helper, alt.getName(), width - (width / 2 - 140) / 2 - 32, height / 2 - 64 - 9, 64, 128); } // title text - drawCenteredTextWithShadow(matrixStack, textRenderer, "Alt Manager", + helper.drawCenteredTextWithShadow(textRenderer, "Alt Manager", width / 2, 4, 16777215); - drawCenteredTextWithShadow(matrixStack, textRenderer, + helper.drawCenteredTextWithShadow(textRenderer, "Alts: " + altManager.getList().size(), width / 2, 14, 10526880); - drawCenteredTextWithShadow( - matrixStack, textRenderer, "premium: " + altManager.getNumPremium() + helper.drawCenteredTextWithShadow( + textRenderer, "premium: " + altManager.getNumPremium() + ", cracked: " + altManager.getNumCracked(), width / 2, 24, 10526880); @@ -466,13 +468,12 @@ public final class AltManagerScreen extends Screen errorTimer--; } - super.render(matrixStack, mouseX, mouseY, partialTicks); - renderButtonTooltip(matrixStack, mouseX, mouseY); - renderAltTooltip(matrixStack, mouseX, mouseY); + super.render(helper, mouseX, mouseY, partialTicks); + renderButtonTooltip(helper, mouseX, mouseY); + renderAltTooltip(helper, mouseX, mouseY); } - private void renderAltTooltip(MatrixStack matrixStack, int mouseX, - int mouseY) + private void renderAltTooltip(DrawableHelper helper, int mouseX, int mouseY) { if(!listGui.isMouseInList(mouseX, mouseY)) return; @@ -514,10 +515,10 @@ public final class AltManagerScreen extends Screen if(alt.isFavorite()) addTooltip(tooltip, "favorite"); - renderTooltip(matrixStack, tooltip, mouseX, mouseY); + helper.method_51434(textRenderer, tooltip, mouseX, mouseY); } - private void renderButtonTooltip(MatrixStack matrixStack, int mouseX, + private void renderButtonTooltip(DrawableHelper helper, int mouseX, int mouseY) { for(Drawable d : ((IScreen)(Object)this).getButtons()) @@ -541,7 +542,7 @@ public final class AltManagerScreen extends Screen else addTooltip(tooltip, "window_freeze"); - renderTooltip(matrixStack, tooltip, mouseX, mouseY); + helper.method_51434(textRenderer, tooltip, mouseX, mouseY); break; } } @@ -636,11 +637,12 @@ public final class AltManagerScreen extends Screen } @Override - protected void renderItem(MatrixStack matrixStack, int id, int x, int y, + protected void renderItem(DrawableHelper helper, int id, int x, int y, int var4, int var5, int var6, float partialTicks) { Alt alt = list.get(id); + MatrixStack matrixStack = helper.method_51448(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -671,16 +673,20 @@ public final class AltManagerScreen extends Screen } // face - AltRenderer.drawAltFace(matrixStack, alt.getName(), x + 1, y + 1, - 24, 24, isSelectedItem(id)); + AltRenderer.drawAltFace(helper, alt.getName(), x + 1, y + 1, 24, 24, + isSelectedItem(id)); // name / email - client.textRenderer.draw(matrixStack, - "Name: " + alt.getDisplayName(), x + 31, y + 3, 10526880); + helper.method_51433(client.textRenderer, + "Name: " + alt.getDisplayName(), x + 31, y + 3, 10526880, + false); + helper.method_51433(client.textRenderer, + "Name: " + alt.getDisplayName(), x + 31, y + 3, 10526880, + false); String bottomText = getBottomText(alt); - client.textRenderer.draw(matrixStack, bottomText, x + 31, y + 15, - 10526880); + helper.method_51433(client.textRenderer, bottomText, x + 31, y + 15, + 10526880, false); } public String getBottomText(Alt alt) diff --git a/src/main/java/net/wurstclient/clickgui/ClickGui.java b/src/main/java/net/wurstclient/clickgui/ClickGui.java index 0b8dff24..75b5eb79 100644 --- a/src/main/java/net/wurstclient/clickgui/ClickGui.java +++ b/src/main/java/net/wurstclient/clickgui/ClickGui.java @@ -28,6 +28,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -459,7 +460,7 @@ public final class ClickGui } } - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { updateColors(); @@ -493,18 +494,19 @@ public final class ClickGui else window.stopDraggingScrollbar(); - renderWindow(matrixStack, window, mouseX, mouseY, partialTicks); + renderWindow(helper, window, mouseX, mouseY, partialTicks); } - renderPopups(matrixStack, mouseX, mouseY); - renderTooltip(matrixStack, mouseX, mouseY); + renderPopups(helper, mouseX, mouseY); + renderTooltip(helper, mouseX, mouseY); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glDisable(GL11.GL_BLEND); } - public void renderPopups(MatrixStack matrixStack, int mouseX, int mouseY) + public void renderPopups(DrawableHelper helper, int mouseX, int mouseY) { + MatrixStack matrixStack = helper.method_51448(); for(Popup popup : popups) { Component owner = popup.getOwner(); @@ -519,14 +521,15 @@ public final class ClickGui int cMouseX = mouseX - x1; int cMouseY = mouseY - y1; - popup.render(matrixStack, cMouseX, cMouseY); + popup.render(helper, cMouseX, cMouseY); matrixStack.pop(); } } - public void renderTooltip(MatrixStack matrixStack, int mouseX, int mouseY) + public void renderTooltip(DrawableHelper helper, int mouseX, int mouseY) { + MatrixStack matrixStack = helper.method_51448(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -583,14 +586,14 @@ public final class ClickGui // text RenderSystem.setShaderColor(1, 1, 1, 1); for(int i = 0; i < lines.length; i++) - fr.draw(matrixStack, lines[i], xt1 + 2, yt1 + 2 + i * fr.fontHeight, - txtColor); + helper.method_51433(fr, lines[i], xt1 + 2, + yt1 + 2 + i * fr.fontHeight, txtColor, false); GL11.glEnable(GL11.GL_BLEND); matrixStack.pop(); } - public void renderPinnedWindows(MatrixStack matrixStack, float partialTicks) + public void renderPinnedWindows(DrawableHelper helper, float partialTicks) { GL11.glDisable(GL11.GL_CULL_FACE); GL11.glEnable(GL11.GL_BLEND); @@ -599,7 +602,7 @@ public final class ClickGui for(Window window : windows) if(window.isPinned() && !window.isInvisible()) - renderWindow(matrixStack, window, Integer.MIN_VALUE, + renderWindow(helper, window, Integer.MIN_VALUE, Integer.MIN_VALUE, partialTicks); GL11.glEnable(GL11.GL_CULL_FACE); @@ -623,8 +626,8 @@ public final class ClickGui acColor = clickGui.getAccentColor(); } - private void renderWindow(MatrixStack matrixStack, Window window, - int mouseX, int mouseY, float partialTicks) + private void renderWindow(DrawableHelper helper, Window window, int mouseX, + int mouseY, float partialTicks) { int x1 = window.getX(); int y1 = window.getY(); @@ -632,6 +635,7 @@ public final class ClickGui int y2 = y1 + window.getHeight(); int y3 = y1 + 13; + MatrixStack matrixStack = helper.method_51448(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -792,7 +796,7 @@ public final class ClickGui int cMouseX = mouseX - x1; int cMouseY = mouseY - y4; for(int i = 0; i < window.countChildren(); i++) - window.getChild(i).render(matrixStack, cMouseX, cMouseY, + window.getChild(i).render(helper, cMouseX, cMouseY, partialTicks); matrixStack.pop(); @@ -888,7 +892,7 @@ public final class ClickGui TextRenderer fr = MC.textRenderer; String title = fr.trimToWidth(Text.literal(window.getTitle()), x3 - x1) .getString(); - fr.draw(matrixStack, title, x1 + 2, y1 + 3, txtColor); + helper.method_51433(fr, title, x1 + 2, y1 + 3, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/ComboBoxPopup.java b/src/main/java/net/wurstclient/clickgui/ComboBoxPopup.java index 4a9a2d01..f3b634c6 100644 --- a/src/main/java/net/wurstclient/clickgui/ComboBoxPopup.java +++ b/src/main/java/net/wurstclient/clickgui/ComboBoxPopup.java @@ -13,6 +13,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -69,8 +70,9 @@ public final class ComboBoxPopup> extends Popup } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY) + public void render(DrawableHelper helper, int mouseX, int mouseY) { + MatrixStack matrixStack = helper.method_51448(); int x1 = getX(); int x2 = x1 + getWidth(); int y1 = getY(); @@ -97,7 +99,7 @@ public final class ComboBoxPopup> extends Popup boolean hValue = hovering && mouseY >= yi1 && mouseY < yi2; drawValueBackground(matrixStack, x1, x2, yi1, yi2, hValue); - drawValueName(matrixStack, x1, yi1, value); + drawValueName(helper, x1, yi1, value); } } @@ -148,14 +150,15 @@ public final class ComboBoxPopup> extends Popup tessellator.draw(); } - private void drawValueName(MatrixStack matrixStack, int x1, int yi1, + private void drawValueName(DrawableHelper helper, int x1, int yi1, Enum value) { ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); RenderSystem.setShaderColor(1, 1, 1, 1); - tr.draw(matrixStack, value.toString(), x1 + 2, yi1 + 2, txtColor); + helper.method_51433(tr, value.toString(), x1 + 2, yi1 + 2, txtColor, + false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/Component.java b/src/main/java/net/wurstclient/clickgui/Component.java index f64d522d..b2fb13e8 100644 --- a/src/main/java/net/wurstclient/clickgui/Component.java +++ b/src/main/java/net/wurstclient/clickgui/Component.java @@ -7,7 +7,7 @@ */ package net.wurstclient.clickgui; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawableHelper; public abstract class Component { @@ -23,7 +23,7 @@ public abstract class Component } - public abstract void render(MatrixStack matrixStack, int mouseX, int mouseY, + public abstract void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks); public abstract int getDefaultWidth(); diff --git a/src/main/java/net/wurstclient/clickgui/Popup.java b/src/main/java/net/wurstclient/clickgui/Popup.java index 5ac8a657..b77f62f5 100644 --- a/src/main/java/net/wurstclient/clickgui/Popup.java +++ b/src/main/java/net/wurstclient/clickgui/Popup.java @@ -7,7 +7,7 @@ */ package net.wurstclient.clickgui; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawableHelper; public abstract class Popup { @@ -27,8 +27,7 @@ public abstract class Popup public abstract void handleMouseClick(int mouseX, int mouseY, int mouseButton); - public abstract void render(MatrixStack matrixStack, int mouseX, - int mouseY); + public abstract void render(DrawableHelper helper, int mouseX, int mouseY); public abstract int getDefaultWidth(); diff --git a/src/main/java/net/wurstclient/clickgui/components/AbstractListEditButton.java b/src/main/java/net/wurstclient/clickgui/components/AbstractListEditButton.java index 6673927b..ed5597a9 100644 --- a/src/main/java/net/wurstclient/clickgui/components/AbstractListEditButton.java +++ b/src/main/java/net/wurstclient/clickgui/components/AbstractListEditButton.java @@ -14,6 +14,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -56,7 +57,7 @@ public abstract class AbstractListEditButton extends Component } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { ClickGui gui = WurstClient.INSTANCE.getGui(); @@ -79,6 +80,7 @@ public abstract class AbstractListEditButton extends Component boolean hText = hovering && mouseX < x3; boolean hBox = hovering && mouseX >= x3; + MatrixStack matrixStack = helper.method_51448(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -121,9 +123,9 @@ public abstract class AbstractListEditButton extends Component // setting name RenderSystem.setShaderColor(1, 1, 1, 1); - TextRenderer fr = MC.textRenderer; - fr.draw(matrixStack, getText(), x1, y1 + 2, txtColor); - fr.draw(matrixStack, buttonText, x3 + 2, y1 + 2, txtColor); + TextRenderer tr = MC.textRenderer; + helper.method_51433(tr, getText(), x1, y1 + 2, txtColor, false); + helper.method_51433(tr, buttonText, x3 + 2, y1 + 2, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/BlockComponent.java b/src/main/java/net/wurstclient/clickgui/components/BlockComponent.java index 65432bbb..1a97eef3 100644 --- a/src/main/java/net/wurstclient/clickgui/components/BlockComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/BlockComponent.java @@ -14,6 +14,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.Block; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; @@ -61,7 +62,7 @@ public final class BlockComponent extends Component } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { ClickGui gui = WurstClient.INSTANCE.getGui(); @@ -85,6 +86,7 @@ public final class BlockComponent extends Component ItemStack stack = new ItemStack(setting.getBlock()); + MatrixStack matrixStack = helper.method_51448(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -117,16 +119,16 @@ public final class BlockComponent extends Component // setting name RenderSystem.setShaderColor(1, 1, 1, 1); - TextRenderer fr = WurstClient.MC.textRenderer; + TextRenderer tr = WurstClient.MC.textRenderer; String text = setting.getName() + ":"; - fr.draw(matrixStack, text, x1, y1 + 2, txtColor); + helper.method_51433(tr, text, x1, y1 + 2, txtColor, false); MatrixStack modelViewStack = RenderSystem.getModelViewStack(); modelViewStack.push(); Window parent = getParent(); modelViewStack.translate(parent.getX(), parent.getY() + 13 + parent.getScrollOffset(), 0); - RenderUtils.drawItem(matrixStack, stack, x3, y1, true); + RenderUtils.drawItem(helper, stack, x3, y1, true); modelViewStack.pop(); RenderSystem.applyModelViewMatrix(); diff --git a/src/main/java/net/wurstclient/clickgui/components/CheckboxComponent.java b/src/main/java/net/wurstclient/clickgui/components/CheckboxComponent.java index 3fc6cbda..007fb867 100644 --- a/src/main/java/net/wurstclient/clickgui/components/CheckboxComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/CheckboxComponent.java @@ -13,6 +13,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -55,9 +56,10 @@ public final class CheckboxComponent extends Component } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { + MatrixStack matrixStack = helper.method_51448(); int x1 = getX(); int x2 = x1 + getWidth(); int x3 = x1 + 11; @@ -80,7 +82,7 @@ public final class CheckboxComponent extends Component if(setting.isChecked()) drawCheck(matrixStack, x1, y1, hovering); - drawName(matrixStack, x3, y1); + drawName(helper, x3, y1); } private boolean isHovering(int mouseX, int mouseY, int x1, int x2, int y1, @@ -209,7 +211,7 @@ public final class CheckboxComponent extends Component tessellator.draw(); } - private void drawName(MatrixStack matrixStack, int x3, int y1) + private void drawName(DrawableHelper helper, int x3, int y1) { ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); @@ -219,7 +221,7 @@ public final class CheckboxComponent extends Component String name = setting.getName(); int tx = x3 + 2; int ty = y1 + 2; - MC.textRenderer.draw(matrixStack, name, tx, ty, txtColor); + helper.method_51433(MC.textRenderer, name, tx, ty, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/ColorComponent.java b/src/main/java/net/wurstclient/clickgui/components/ColorComponent.java index c0557105..3bb8138f 100644 --- a/src/main/java/net/wurstclient/clickgui/components/ColorComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/ColorComponent.java @@ -14,6 +14,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -55,9 +56,10 @@ public final class ColorComponent extends Component } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { + MatrixStack matrixStack = helper.method_51448(); int x1 = getX(); int x2 = x1 + getWidth(); int y1 = getY(); @@ -84,7 +86,7 @@ public final class ColorComponent extends Component drawBackground(matrixStack, x1, x2, y1, y3); drawBox(matrixStack, x1, x2, y2, y3, hovering && mouseY >= y3); - drawNameAndValue(matrixStack, x1, x2, y1 + 2); + drawNameAndValue(helper, x1, x2, y1 + 2); } private boolean isHovering(int mouseX, int mouseY, int x1, int x2, int y1, @@ -155,8 +157,7 @@ public final class ColorComponent extends Component tessellator.draw(); } - private void drawNameAndValue(MatrixStack matrixStack, int x1, int x2, - int y1) + private void drawNameAndValue(DrawableHelper helper, int x1, int x2, int y1) { ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); @@ -164,11 +165,11 @@ public final class ColorComponent extends Component RenderSystem.setShaderColor(1, 1, 1, 1); TextRenderer tr = MC.textRenderer; - tr.draw(matrixStack, setting.getName(), x1, y1, txtColor); + helper.method_51433(tr, setting.getName(), x1, y1, txtColor, false); String value = ColorUtils.toHex(setting.getColor()); int valueWidth = tr.getWidth(value); - tr.draw(matrixStack, value, x2 - valueWidth, y1, txtColor); + helper.method_51433(tr, value, x2 - valueWidth, y1, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/ComboBoxComponent.java b/src/main/java/net/wurstclient/clickgui/components/ComboBoxComponent.java index e353cfcd..ac22c446 100644 --- a/src/main/java/net/wurstclient/clickgui/components/ComboBoxComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/ComboBoxComponent.java @@ -17,6 +17,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -102,9 +103,10 @@ public final class ComboBoxComponent> extends Component } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { + MatrixStack matrixStack = helper.method_51448(); int x1 = getX(); int x2 = x1 + getWidth(); int x3 = x2 - 11; @@ -128,7 +130,7 @@ public final class ComboBoxComponent> extends Component drawSeparator(matrixStack, x3, y1, y2); drawArrow(matrixStack, x2, x3, y1, y2, hBox); - drawNameAndValue(matrixStack, x1, x4, y1); + drawNameAndValue(helper, x1, x4, y1); } private boolean isHovering(int mouseX, int mouseY, int x1, int x2, int y1, @@ -257,8 +259,7 @@ public final class ComboBoxComponent> extends Component tessellator.draw(); } - private void drawNameAndValue(MatrixStack matrixStack, int x1, int x4, - int y1) + private void drawNameAndValue(DrawableHelper helper, int x1, int x4, int y1) { ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); @@ -268,8 +269,8 @@ public final class ComboBoxComponent> extends Component String name = setting.getName(); String value = "" + setting.getSelected(); - tr.draw(matrixStack, name, x1, y1 + 2, txtColor); - tr.draw(matrixStack, value, x4 + 2, y1 + 2, txtColor); + helper.method_51433(tr, name, x1, y1 + 2, txtColor, false); + helper.method_51433(tr, value, x4 + 2, y1 + 2, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/FeatureButton.java b/src/main/java/net/wurstclient/clickgui/components/FeatureButton.java index 5b029a0c..2a0eb737 100644 --- a/src/main/java/net/wurstclient/clickgui/components/FeatureButton.java +++ b/src/main/java/net/wurstclient/clickgui/components/FeatureButton.java @@ -16,6 +16,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -95,9 +96,10 @@ public final class FeatureButton extends Component } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { + MatrixStack matrixStack = helper.method_51448(); int x1 = getX(); int x2 = x1 + getWidth(); int x3 = hasSettings ? x2 - 11 : x2; @@ -126,7 +128,7 @@ public final class FeatureButton extends Component drawSettingsArrow(matrixStack, x2, x3, y1, y2, hSettings); } - drawName(matrixStack, x1, x3, y1); + drawName(helper, x1, x3, y1); } private boolean isHovering(int mouseX, int mouseY, int x1, int x2, int y1, @@ -288,7 +290,7 @@ public final class FeatureButton extends Component tessellator.draw(); } - private void drawName(MatrixStack matrixStack, int x1, int x3, int y1) + private void drawName(DrawableHelper helper, int x1, int x3, int y1) { ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); @@ -301,7 +303,7 @@ public final class FeatureButton extends Component int tx = x1 + (x3 - x1 - nameWidth) / 2; int ty = y1 + 2; - tr.draw(matrixStack, name, tx, ty, txtColor); + helper.method_51433(tr, name, tx, ty, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/FileComponent.java b/src/main/java/net/wurstclient/clickgui/components/FileComponent.java index ab38ad6d..02504a78 100644 --- a/src/main/java/net/wurstclient/clickgui/components/FileComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/FileComponent.java @@ -13,6 +13,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -54,7 +55,7 @@ public final class FileComponent extends Component } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { ClickGui gui = WurstClient.INSTANCE.getGui(); @@ -63,8 +64,8 @@ public final class FileComponent extends Component int txtColor = gui.getTxtColor(); float opacity = gui.getOpacity(); - TextRenderer fr = WurstClient.MC.textRenderer; - int buttonWidth = fr.getWidth(setting.getSelectedFileName()); + TextRenderer tr = WurstClient.MC.textRenderer; + int buttonWidth = tr.getWidth(setting.getSelectedFileName()); int x1 = getX(); int x2 = x1 + getWidth(); @@ -80,6 +81,7 @@ public final class FileComponent extends Component boolean hText = hovering && mouseX < x3; boolean hBox = hovering && mouseX >= x3; + MatrixStack matrixStack = helper.method_51448(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -128,9 +130,9 @@ public final class FileComponent extends Component // setting name RenderSystem.setShaderColor(1, 1, 1, 1); String text = setting.getName() + ": "; - fr.draw(matrixStack, text, x1, y1 + 2, txtColor); - fr.draw(matrixStack, setting.getSelectedFileName(), x3 + 2, y1 + 2, - txtColor); + helper.method_51433(tr, text, x1, y1 + 2, txtColor, false); + helper.method_51433(tr, setting.getSelectedFileName(), x3 + 2, y1 + 2, + txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/RadarComponent.java b/src/main/java/net/wurstclient/clickgui/components/RadarComponent.java index 086d5332..2c337f3f 100644 --- a/src/main/java/net/wurstclient/clickgui/components/RadarComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/RadarComponent.java @@ -12,6 +12,7 @@ import org.joml.Quaternionf; import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; @@ -43,7 +44,7 @@ public final class RadarComponent extends Component } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { ClickGui gui = WurstClient.INSTANCE.getGui(); @@ -62,6 +63,7 @@ public final class RadarComponent extends Component && mouseY < y2 && mouseY >= -scroll && mouseY < getParent().getHeight() - 13 - scroll; + MatrixStack matrixStack = helper.method_51448(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); diff --git a/src/main/java/net/wurstclient/clickgui/components/SliderComponent.java b/src/main/java/net/wurstclient/clickgui/components/SliderComponent.java index 82503737..93122af3 100644 --- a/src/main/java/net/wurstclient/clickgui/components/SliderComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/SliderComponent.java @@ -14,6 +14,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; @@ -75,9 +76,10 @@ public final class SliderComponent extends Component } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { + MatrixStack matrixStack = helper.method_51448(); int x1 = getX(); int x2 = x1 + getWidth(); int x3 = x1 + 2; @@ -112,7 +114,7 @@ public final class SliderComponent extends Component drawBackground(matrixStack, x1, x2, x3, x4, y1, y2, y4, y5); drawRail(matrixStack, x3, x4, y4, y5, hSlider, renderAsDisabled); drawKnob(matrixStack, x1, x2, y2, y3, hSlider, renderAsDisabled); - drawNameAndValue(matrixStack, x1, x2, y1, renderAsDisabled); + drawNameAndValue(helper, x1, x2, y1, renderAsDisabled); } private void handleDragging(int mouseX, int x3, int x4) @@ -300,8 +302,8 @@ public final class SliderComponent extends Component tessellator.draw(); } - private void drawNameAndValue(MatrixStack matrixStack, int x1, int x2, - int y1, boolean renderAsDisabled) + private void drawNameAndValue(DrawableHelper helper, int x1, int x2, int y1, + boolean renderAsDisabled) { ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); @@ -312,8 +314,9 @@ public final class SliderComponent extends Component String name = setting.getName(); String value = setting.getValueString(); int valueWidth = tr.getWidth(value); - tr.draw(matrixStack, name, x1, y1 + 2, txtColor); - tr.draw(matrixStack, value, x2 - valueWidth, y1 + 2, txtColor); + helper.method_51433(tr, name, x1, y1 + 2, txtColor, false); + helper.method_51433(tr, value, x2 - valueWidth, y1 + 2, txtColor, + false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/screens/AddBookOfferScreen.java b/src/main/java/net/wurstclient/clickgui/screens/AddBookOfferScreen.java index 93383713..6fa8c5ff 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/AddBookOfferScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/AddBookOfferScreen.java @@ -14,6 +14,7 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -286,40 +287,39 @@ public final class AddBookOfferScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - listGui.render(matrixStack, mouseX, mouseY, partialTicks); + MatrixStack matrixStack = helper.method_51448(); + listGui.render(helper, mouseX, mouseY, partialTicks); matrixStack.push(); matrixStack.translate(0, 0, 300); TextRenderer tr = client.textRenderer; String titleText = "Available Books (" + listGui.getItemCount() + ")"; - drawCenteredTextWithShadow(matrixStack, tr, titleText, width / 2, 12, + helper.drawCenteredTextWithShadow(tr, titleText, width / 2, 12, 0xffffff); - levelField.render(matrixStack, mouseX, mouseY, partialTicks); - priceField.render(matrixStack, mouseX, mouseY, partialTicks); - super.render(matrixStack, mouseX, mouseY, partialTicks); + levelField.render(helper, mouseX, mouseY, partialTicks); + priceField.render(helper, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); matrixStack.translate(width / 2 - 100, 0, 0); - drawTextWithShadow(matrixStack, tr, "Level:", 0, height - 72, 0xf0f0f0); - drawTextWithShadow(matrixStack, tr, "Max price:", 0, height - 56, - 0xf0f0f0); + helper.drawTextWithShadow(tr, "Level:", 0, height - 72, 0xf0f0f0); + helper.drawTextWithShadow(tr, "Max price:", 0, height - 56, 0xf0f0f0); if(alreadyAdded && offerToAdd != null) { String errorText = offerToAdd.getEnchantmentNameWithLevel() + " is already on your list!"; - drawTextWithShadow(matrixStack, tr, errorText, 0, height - 40, - 0xff5555); + helper.drawTextWithShadow(tr, errorText, 0, height - 40, 0xff5555); } matrixStack.pop(); - RenderUtils.drawItem(matrixStack, new ItemStack(Items.EMERALD), + RenderUtils.drawItem(helper, new ItemStack(Items.EMERALD), width / 2 - 16, height - 58, false); } @@ -393,15 +393,16 @@ public final class AddBookOfferScreen extends Screen } @Override - protected void renderItem(MatrixStack matrixStack, int index, int x, + protected void renderItem(DrawableHelper helper, int index, int x, int y, int var4, int mouseX, int mouseY, float partialTicks) { + MatrixStack matrixStack = helper.method_51448(); if(isSelectedItem(index)) drawSelectionOutline(matrixStack, x, y); Item item = Registries.ITEM.get(new Identifier("enchanted_book")); ItemStack stack = new ItemStack(item); - RenderUtils.drawItem(matrixStack, stack, x + 1, y + 1, true); + RenderUtils.drawItem(helper, stack, x + 1, y + 1, true); TextRenderer tr = mc.textRenderer; BookOffer bookOffer = list.get(index); @@ -409,13 +410,14 @@ public final class AddBookOfferScreen extends Screen String name = bookOffer.getEnchantmentName(); int nameColor = enchantment.isCursed() ? 0xff5555 : 0xf0f0f0; - tr.draw(matrixStack, name, x + 28, y, nameColor); + helper.method_51433(tr, name, x + 28, y, nameColor, false); - tr.draw(matrixStack, bookOffer.id(), x + 28, y + 9, 0xa0a0a0); + helper.method_51433(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, + false); int maxLevel = enchantment.getMaxLevel(); String levels = maxLevel + (maxLevel == 1 ? " level" : " levels"); - tr.draw(matrixStack, levels, x + 28, y + 18, 0xa0a0a0); + helper.method_51433(tr, levels, x + 28, y + 18, 0xa0a0a0, false); } } } diff --git a/src/main/java/net/wurstclient/clickgui/screens/ClickGuiScreen.java b/src/main/java/net/wurstclient/clickgui/screens/ClickGuiScreen.java index 65e9256f..ef040239 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/ClickGuiScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/ClickGuiScreen.java @@ -7,8 +7,8 @@ */ package net.wurstclient.clickgui.screens; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.wurstclient.clickgui.ClickGui; @@ -50,10 +50,10 @@ public final class ClickGuiScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - super.render(matrixStack, mouseX, mouseY, partialTicks); - gui.render(matrixStack, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); + gui.render(helper, mouseX, mouseY, partialTicks); } } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java index df7bb84a..3db8f5c3 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java @@ -14,6 +14,7 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.block.Block; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -160,43 +161,45 @@ public final class EditBlockListScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - listGui.render(matrixStack, mouseX, mouseY, partialTicks); + MatrixStack matrixStack = helper.method_51448(); + listGui.render(helper, mouseX, mouseY, partialTicks); - drawCenteredTextWithShadow(matrixStack, client.textRenderer, + helper.drawCenteredTextWithShadow(client.textRenderer, blockList.getName() + " (" + listGui.getItemCount() + ")", width / 2, 12, 0xffffff); matrixStack.push(); matrixStack.translate(0, 0, 300); - blockNameField.render(matrixStack, mouseX, mouseY, partialTicks); - super.render(matrixStack, mouseX, mouseY, partialTicks); + blockNameField.render(helper, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); matrixStack.translate(-64 + width / 2 - 152, 0, 0); if(blockNameField.getText().isEmpty() && !blockNameField.isFocused()) - drawTextWithShadow(matrixStack, client.textRenderer, - "block name or ID", 68, height - 50, 0x808080); + helper.drawTextWithShadow(client.textRenderer, "block name or ID", + 68, height - 50, 0x808080); int border = blockNameField.isFocused() ? 0xffffffff : 0xffa0a0a0; int black = 0xff000000; - fill(matrixStack, 48, height - 56, 64, height - 36, border); - fill(matrixStack, 49, height - 55, 64, height - 37, black); - fill(matrixStack, 214, height - 56, 244, height - 55, border); - fill(matrixStack, 214, height - 37, 244, height - 36, border); - fill(matrixStack, 244, height - 56, 246, height - 36, border); - fill(matrixStack, 214, height - 55, 243, height - 52, black); - fill(matrixStack, 214, height - 40, 243, height - 37, black); - fill(matrixStack, 214, height - 55, 216, height - 37, black); - fill(matrixStack, 242, height - 55, 245, height - 37, black); + helper.fill(48, height - 56, 64, height - 36, border); + helper.fill(49, height - 55, 64, height - 37, black); + helper.fill(214, height - 56, 244, height - 55, border); + helper.fill(214, height - 37, 244, height - 36, border); + helper.fill(244, height - 56, 246, height - 36, border); + helper.fill(214, height - 55, 243, height - 52, black); + helper.fill(214, height - 40, 243, height - 37, black); + helper.fill(214, height - 55, 216, height - 37, black); + helper.fill(242, height - 55, 245, height - 37, black); matrixStack.pop(); - RenderUtils.drawItem(matrixStack, new ItemStack(blockToAdd), + RenderUtils.drawItem(helper, + blockToAdd == null ? ItemStack.EMPTY : new ItemStack(blockToAdd), width / 2 - 164, height - 52, false); } @@ -255,22 +258,22 @@ public final class EditBlockListScreen extends Screen } @Override - protected void renderItem(MatrixStack matrixStack, int index, int x, + protected void renderItem(DrawableHelper helper, int index, int x, int y, int var4, int var5, int var6, float partialTicks) { String name = list.get(index); Block block = BlockUtils.getBlockFromName(name); ItemStack stack = new ItemStack(block); - TextRenderer fr = mc.textRenderer; + TextRenderer tr = mc.textRenderer; - RenderUtils.drawItem(matrixStack, stack, x + 1, y + 1, true); + RenderUtils.drawItem(helper, stack, x + 1, y + 1, true); String displayName = stack.isEmpty() ? "\u00a7ounknown block\u00a7r" : stack.getName().getString(); - fr.draw(matrixStack, displayName, x + 28, y, 0xf0f0f0); - fr.draw(matrixStack, name, x + 28, y + 9, 0xa0a0a0); - fr.draw(matrixStack, + helper.method_51433(tr, displayName, x + 28, y, 0xf0f0f0, false); + helper.method_51433(tr, name, x + 28, y + 9, 0xa0a0a0, false); + helper.method_51433(tr, "ID: " + Block.getRawIdFromState(block.getDefaultState()), - x + 28, y + 18, 0xa0a0a0); + x + 28, y + 18, 0xa0a0a0, false); } } } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java index 2a63c817..3ab6b616 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java @@ -12,6 +12,7 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -96,17 +97,18 @@ public final class EditBlockScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { + MatrixStack matrixStack = helper.method_51448(); TextRenderer tr = client.textRenderer; - renderBackground(matrixStack); - drawCenteredTextWithShadow(matrixStack, tr, setting.getName(), - width / 2, 20, 0xFFFFFF); + renderBackground(helper); + helper.drawCenteredTextWithShadow(tr, setting.getName(), width / 2, 20, + 0xFFFFFF); - blockField.render(matrixStack, mouseX, mouseY, partialTicks); - super.render(matrixStack, mouseX, mouseY, partialTicks); + blockField.render(helper, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); matrixStack.push(); matrixStack.translate(-64 + width / 2 - 100, 115, 0); @@ -118,20 +120,20 @@ public final class EditBlockScreen extends Screen int lblX = lblAbove ? 50 : 68; int lblY = lblAbove ? -66 : -50; int lblColor = lblAbove ? 0xF0F0F0 : 0x808080; - drawTextWithShadow(matrixStack, tr, lblText, lblX, lblY, lblColor); + helper.drawTextWithShadow(tr, lblText, lblX, lblY, lblColor); int border = blockField.isFocused() ? 0xffffffff : 0xffa0a0a0; int black = 0xff000000; - fill(matrixStack, 48, -56, 64, -36, border); - fill(matrixStack, 49, -55, 64, -37, black); - fill(matrixStack, 214, -56, 244, -55, border); - fill(matrixStack, 214, -37, 244, -36, border); - fill(matrixStack, 244, -56, 246, -36, border); - fill(matrixStack, 214, -55, 243, -52, black); - fill(matrixStack, 214, -40, 243, -37, black); - fill(matrixStack, 215, -55, 216, -37, black); - fill(matrixStack, 242, -55, 245, -37, black); + helper.fill(48, -56, 64, -36, border); + helper.fill(49, -55, 64, -37, black); + helper.fill(214, -56, 244, -55, border); + helper.fill(214, -37, 244, -36, border); + helper.fill(244, -56, 246, -36, border); + helper.fill(214, -55, 243, -52, black); + helper.fill(214, -40, 243, -37, black); + helper.fill(215, -55, 216, -37, black); + helper.fill(242, -55, 245, -37, black); matrixStack.pop(); @@ -141,7 +143,7 @@ public final class EditBlockScreen extends Screen if(blockToAdd == null) blockToAdd = Blocks.AIR; - RenderUtils.drawItem(matrixStack, new ItemStack(blockToAdd), + RenderUtils.drawItem(helper, new ItemStack(blockToAdd), -64 + width / 2 - 100 + 52, 115 - 52, false); } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditBookOfferScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditBookOfferScreen.java index bfa0bcb5..4660b830 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditBookOfferScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditBookOfferScreen.java @@ -10,6 +10,7 @@ package net.wurstclient.clickgui.screens; import org.lwjgl.glfw.GLFW; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -251,17 +252,18 @@ public final class EditBookOfferScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - renderBackgroundTexture(matrixStack); + MatrixStack matrixStack = helper.method_51448(); + renderBackgroundTexture(helper); matrixStack.push(); matrixStack.translate(0, 0, 300); TextRenderer tr = client.textRenderer; String titleText = "Edit Book Offer"; - drawCenteredTextWithShadow(matrixStack, tr, titleText, width / 2, 12, + helper.drawCenteredTextWithShadow(tr, titleText, width / 2, 12, 0xffffff); int x = width / 2 - 100; @@ -269,16 +271,16 @@ public final class EditBookOfferScreen extends Screen Item item = Registries.ITEM.get(new Identifier("enchanted_book")); ItemStack stack = new ItemStack(item); - RenderUtils.drawItem(matrixStack, stack, x + 1, y + 1, true); + RenderUtils.drawItem(helper, stack, x + 1, y + 1, true); BookOffer bookOffer = offerToSave; String name = bookOffer.getEnchantmentNameWithLevel(); Enchantment enchantment = bookOffer.getEnchantment(); int nameColor = enchantment.isCursed() ? 0xff5555 : 0xffffff; - tr.drawWithShadow(matrixStack, name, x + 28, y, nameColor); + helper.drawTextWithShadow(tr, name, x + 28, y, nameColor); - tr.draw(matrixStack, bookOffer.id(), x + 28, y + 9, 0xa0a0a0); + helper.method_51433(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, false); String price; if(bookOffer.price() >= 64) @@ -286,31 +288,31 @@ public final class EditBookOfferScreen extends Screen else { price = "max " + bookOffer.price(); - RenderUtils.drawItem(matrixStack, new ItemStack(Items.EMERALD), + RenderUtils.drawItem(helper, new ItemStack(Items.EMERALD), x + 28 + tr.getWidth(price), y + 16, false); } - tr.draw(matrixStack, price, x + 28, y + 18, 0xa0a0a0); + helper.method_51433(tr, price, x + 28, y + 18, 0xa0a0a0, false); - levelField.render(matrixStack, mouseX, mouseY, partialTicks); - priceField.render(matrixStack, mouseX, mouseY, partialTicks); - super.render(matrixStack, mouseX, mouseY, partialTicks); + levelField.render(helper, mouseX, mouseY, partialTicks); + priceField.render(helper, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); matrixStack.translate(width / 2 - 100, 112, 0); - drawTextWithShadow(matrixStack, tr, "Level:", 0, 0, 0xf0f0f0); - drawTextWithShadow(matrixStack, tr, "Max price:", 0, 16, 0xf0f0f0); + helper.drawTextWithShadow(tr, "Level:", 0, 0, 0xf0f0f0); + helper.drawTextWithShadow(tr, "Max price:", 0, 16, 0xf0f0f0); if(alreadyAdded && offerToSave != null) { String errorText = offerToSave.getEnchantmentNameWithLevel() + " is already on your list!"; - drawTextWithShadow(matrixStack, tr, errorText, 0, 32, 0xff5555); + helper.drawTextWithShadow(tr, errorText, 0, 32, 0xff5555); } matrixStack.pop(); - RenderUtils.drawItem(matrixStack, new ItemStack(Items.EMERALD), + RenderUtils.drawItem(helper, new ItemStack(Items.EMERALD), width / 2 - 16, 126, false); } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditBookOffersScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditBookOffersScreen.java index cc455a1b..2af5011a 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditBookOffersScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditBookOffersScreen.java @@ -13,6 +13,7 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -176,19 +177,20 @@ public final class EditBookOffersScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - listGui.render(matrixStack, mouseX, mouseY, partialTicks); + MatrixStack matrixStack = helper.method_51448(); + listGui.render(helper, mouseX, mouseY, partialTicks); matrixStack.push(); matrixStack.translate(0, 0, 300); - drawCenteredTextWithShadow(matrixStack, client.textRenderer, + helper.drawCenteredTextWithShadow(client.textRenderer, bookOffers.getName() + " (" + listGui.getItemCount() + ")", width / 2, 12, 0xffffff); - super.render(matrixStack, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); matrixStack.pop(); } @@ -248,15 +250,16 @@ public final class EditBookOffersScreen extends Screen } @Override - protected void renderItem(MatrixStack matrixStack, int index, int x, + protected void renderItem(DrawableHelper helper, int index, int x, int y, int var4, int var5, int var6, float partialTicks) { + MatrixStack matrixStack = helper.method_51448(); if(isSelectedItem(index)) drawSelectionOutline(matrixStack, x, y); Item item = Registries.ITEM.get(new Identifier("enchanted_book")); ItemStack stack = new ItemStack(item); - RenderUtils.drawItem(matrixStack, stack, x + 1, y + 1, true); + RenderUtils.drawItem(helper, stack, x + 1, y + 1, true); TextRenderer tr = mc.textRenderer; BookOffer bookOffer = list.get(index); @@ -264,9 +267,10 @@ public final class EditBookOffersScreen extends Screen Enchantment enchantment = bookOffer.getEnchantment(); int nameColor = enchantment.isCursed() ? 0xff5555 : 0xf0f0f0; - tr.draw(matrixStack, name, x + 28, y, nameColor); + helper.method_51433(tr, name, x + 28, y, nameColor, false); - tr.draw(matrixStack, bookOffer.id(), x + 28, y + 9, 0xa0a0a0); + helper.method_51433(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, + false); String price; if(bookOffer.price() >= 64) @@ -274,11 +278,11 @@ public final class EditBookOffersScreen extends Screen else { price = "max " + bookOffer.price(); - RenderUtils.drawItem(matrixStack, new ItemStack(Items.EMERALD), + RenderUtils.drawItem(helper, new ItemStack(Items.EMERALD), x + 28 + tr.getWidth(price), y + 16, false); } - tr.draw(matrixStack, price, x + 28, y + 18, 0xa0a0a0); + helper.method_51433(tr, price, x + 28, y + 18, 0xa0a0a0, false); } } } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditColorScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditColorScreen.java index e9d98897..40d4028d 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditColorScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditColorScreen.java @@ -16,14 +16,12 @@ import javax.imageio.ImageIO; import org.lwjgl.glfw.GLFW; -import com.mojang.blaze3d.systems.RenderSystem; - import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.wurstclient.settings.ColorSetting; @@ -167,17 +165,16 @@ public final class EditColorScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { TextRenderer tr = client.textRenderer; - renderBackground(matrixStack); - drawCenteredTextWithShadow(matrixStack, client.textRenderer, + renderBackground(helper); + helper.drawCenteredTextWithShadow(client.textRenderer, colorSetting.getName(), width / 2, 16, 0xF0F0F0); // Draw palette - RenderSystem.setShaderTexture(0, paletteIdentifier); int x = paletteX; int y = paletteY; int w = paletteWidth; @@ -186,22 +183,22 @@ public final class EditColorScreen extends Screen int fh = paletteHeight; float u = 0; float v = 0; - drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + helper.drawTexture(paletteIdentifier, x, y, u, v, w, h, fw, fh); // RGB letters - tr.draw(matrixStack, "#", fieldsX - 3 - tr.getWidth("#"), fieldsY + 6, - 0xF0F0F0); - tr.draw(matrixStack, "R:", fieldsX - 3 - tr.getWidth("R:"), - fieldsY + 6 + 35, 0xFF0000); - tr.draw(matrixStack, "G:", fieldsX + 75 - 3 - tr.getWidth("G:"), - fieldsY + 6 + 35, 0x00FF00); - tr.draw(matrixStack, "B:", fieldsX + 150 - 3 - tr.getWidth("B:"), - fieldsY + 6 + 35, 0x0000FF); + helper.method_51433(tr, "#", fieldsX - 3 - tr.getWidth("#"), + fieldsY + 6, 0xF0F0F0, false); + helper.method_51433(tr, "R:", fieldsX - 3 - tr.getWidth("R:"), + fieldsY + 6 + 35, 0xFF0000, false); + helper.method_51433(tr, "G:", fieldsX + 75 - 3 - tr.getWidth("G:"), + fieldsY + 6 + 35, 0x00FF00, false); + helper.method_51433(tr, "B:", fieldsX + 150 - 3 - tr.getWidth("B:"), + fieldsY + 6 + 35, 0x0000FF, false); - hexValueField.render(matrixStack, mouseX, mouseY, partialTicks); - redValueField.render(matrixStack, mouseX, mouseY, partialTicks); - greenValueField.render(matrixStack, mouseX, mouseY, partialTicks); - blueValueField.render(matrixStack, mouseX, mouseY, partialTicks); + hexValueField.render(helper, mouseX, mouseY, partialTicks); + redValueField.render(helper, mouseX, mouseY, partialTicks); + greenValueField.render(helper, mouseX, mouseY, partialTicks); + blueValueField.render(helper, mouseX, mouseY, partialTicks); // Color preview @@ -212,15 +209,15 @@ public final class EditColorScreen extends Screen int boxY = fieldsY; // Border - fill(matrixStack, boxX - borderSize, boxY - borderSize, + helper.fill(boxX - borderSize, boxY - borderSize, boxX + boxWidth + borderSize, boxY + boxHeight + borderSize, 0xFFAAAAAA); // Color box - fill(matrixStack, boxX, boxY, boxX + boxWidth, boxY + boxHeight, + helper.fill(boxX, boxY, boxX + boxWidth, boxY + boxHeight, color.getRGB()); - super.render(matrixStack, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java index d25cdb50..6de47482 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java @@ -13,6 +13,7 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -162,20 +163,21 @@ public final class EditItemListScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - listGui.render(matrixStack, mouseX, mouseY, partialTicks); + MatrixStack matrixStack = helper.method_51448(); + listGui.render(helper, mouseX, mouseY, partialTicks); - drawCenteredTextWithShadow(matrixStack, client.textRenderer, + helper.drawCenteredTextWithShadow(client.textRenderer, itemList.getName() + " (" + listGui.getItemCount() + ")", width / 2, 12, 0xffffff); matrixStack.push(); matrixStack.translate(0, 0, 300); - itemNameField.render(matrixStack, mouseX, mouseY, partialTicks); - super.render(matrixStack, mouseX, mouseY, partialTicks); + itemNameField.render(helper, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); matrixStack.translate(-64 + width / 2 - 152, 0, 0); @@ -183,27 +185,28 @@ public final class EditItemListScreen extends Screen { matrixStack.push(); matrixStack.translate(0, 0, 300); - drawTextWithShadow(matrixStack, client.textRenderer, - "item name or ID", 68, height - 50, 0x808080); + helper.drawTextWithShadow(client.textRenderer, "item name or ID", + 68, height - 50, 0x808080); matrixStack.pop(); } int border = itemNameField.isFocused() ? 0xffffffff : 0xffa0a0a0; int black = 0xff000000; - fill(matrixStack, 48, height - 56, 64, height - 36, border); - fill(matrixStack, 49, height - 55, 64, height - 37, black); - fill(matrixStack, 214, height - 56, 244, height - 55, border); - fill(matrixStack, 214, height - 37, 244, height - 36, border); - fill(matrixStack, 244, height - 56, 246, height - 36, border); - fill(matrixStack, 214, height - 55, 243, height - 52, black); - fill(matrixStack, 214, height - 40, 243, height - 37, black); - fill(matrixStack, 215, height - 55, 216, height - 37, black); - fill(matrixStack, 242, height - 55, 245, height - 37, black); + helper.fill(48, height - 56, 64, height - 36, border); + helper.fill(49, height - 55, 64, height - 37, black); + helper.fill(214, height - 56, 244, height - 55, border); + helper.fill(214, height - 37, 244, height - 36, border); + helper.fill(244, height - 56, 246, height - 36, border); + helper.fill(214, height - 55, 243, height - 52, black); + helper.fill(214, height - 40, 243, height - 37, black); + helper.fill(215, height - 55, 216, height - 37, black); + helper.fill(242, height - 55, 245, height - 37, black); matrixStack.pop(); - RenderUtils.drawItem(matrixStack, new ItemStack(itemToAdd), + RenderUtils.drawItem(helper, + itemToAdd == null ? ItemStack.EMPTY : new ItemStack(itemToAdd), width / 2 - 164, height - 52, false); } @@ -262,21 +265,21 @@ public final class EditItemListScreen extends Screen } @Override - protected void renderItem(MatrixStack matrixStack, int index, int x, + protected void renderItem(DrawableHelper helper, int index, int x, int y, int var4, int var5, int var6, float partialTicks) { String name = list.get(index); Item item = Registries.ITEM.get(new Identifier(name)); ItemStack stack = new ItemStack(item); - TextRenderer fr = mc.textRenderer; + TextRenderer tr = mc.textRenderer; - RenderUtils.drawItem(matrixStack, stack, x + 1, y + 1, true); + RenderUtils.drawItem(helper, stack, x + 1, y + 1, true); String displayName = stack.isEmpty() ? "\u00a7ounknown item\u00a7r" : stack.getName().getString(); - fr.draw(matrixStack, displayName, x + 28, y, 0xf0f0f0); - fr.draw(matrixStack, name, x + 28, y + 9, 0xa0a0a0); - fr.draw(matrixStack, "ID: " + Registries.ITEM.getRawId(item), - x + 28, y + 18, 0xa0a0a0); + helper.method_51433(tr, displayName, x + 28, y, 0xf0f0f0, false); + helper.method_51433(tr, name, x + 28, y + 9, 0xa0a0a0, false); + helper.method_51433(tr, "ID: " + Registries.ITEM.getRawId(item), + x + 28, y + 18, 0xa0a0a0, false); } } } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java index 70cf8fbc..47bf7d62 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java @@ -10,10 +10,10 @@ package net.wurstclient.clickgui.screens; import org.lwjgl.glfw.GLFW; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.wurstclient.settings.SliderSetting; import net.wurstclient.settings.SliderSetting.ValueDisplay; @@ -92,15 +92,15 @@ public final class EditSliderScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - renderBackground(matrixStack); - drawCenteredTextWithShadow(matrixStack, client.textRenderer, - slider.getName(), width / 2, 20, 0xFFFFFF); + renderBackground(helper); + helper.drawCenteredTextWithShadow(client.textRenderer, slider.getName(), + width / 2, 20, 0xFFFFFF); - valueField.render(matrixStack, mouseX, mouseY, partialTicks); - super.render(matrixStack, mouseX, mouseY, partialTicks); + valueField.render(helper, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java b/src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java index bc372d87..95926532 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java @@ -16,10 +16,10 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.minecraft.util.Util; import net.wurstclient.settings.FileSetting; @@ -162,19 +162,19 @@ public final class SelectFileScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - renderBackground(matrixStack); - listGui.render(matrixStack, mouseX, mouseY, partialTicks); + renderBackground(helper); + listGui.render(helper, mouseX, mouseY, partialTicks); - drawCenteredTextWithShadow(matrixStack, client.textRenderer, + helper.drawCenteredTextWithShadow(client.textRenderer, setting.getName(), width / 2, 12, 0xffffff); - super.render(matrixStack, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); if(doneButton.isSelected() && !doneButton.active) - renderTooltip(matrixStack, + helper.method_51434(textRenderer, Arrays.asList(Text.literal("You must first select a file.")), mouseX, mouseY); } @@ -234,16 +234,17 @@ public final class SelectFileScreen extends Screen } @Override - protected void renderItem(MatrixStack matrixStack, int index, int x, + protected void renderItem(DrawableHelper helper, int index, int x, int y, int var4, int var5, int var6, float partialTicks) { - TextRenderer fr = mc.textRenderer; + TextRenderer tr = mc.textRenderer; Path path = list.get(index); - fr.draw(matrixStack, "" + path.getFileName(), x + 28, y, 0xf0f0f0); - fr.draw(matrixStack, + helper.method_51433(tr, "" + path.getFileName(), x + 28, y, + 0xf0f0f0, false); + helper.method_51433(tr, "" + client.runDirectory.toPath().relativize(path), x + 28, - y + 9, 0xa0a0a0); + y + 9, 0xa0a0a0, false); } } } diff --git a/src/main/java/net/wurstclient/commands/TacoCmd.java b/src/main/java/net/wurstclient/commands/TacoCmd.java index 314bcb97..7ec114c0 100644 --- a/src/main/java/net/wurstclient/commands/TacoCmd.java +++ b/src/main/java/net/wurstclient/commands/TacoCmd.java @@ -13,7 +13,6 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.util.Window; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; import net.wurstclient.Category; import net.wurstclient.command.CmdException; @@ -83,7 +82,7 @@ public final class TacoCmd extends Command } @Override - public void onRenderGUI(MatrixStack matrixStack, float partialTicks) + public void onRenderGUI(DrawableHelper helper, float partialTicks) { GL11.glEnable(GL11.GL_BLEND); GL11.glDisable(GL11.GL_CULL_FACE); @@ -97,13 +96,12 @@ public final class TacoCmd extends Command }else RenderSystem.setShaderColor(1, 1, 1, 1); - RenderSystem.setShaderTexture(0, tacos[ticks / 8]); Window sr = MC.getWindow(); int x = sr.getScaledWidth() / 2 - 32 + 76; int y = sr.getScaledHeight() - 32 - 19; int w = 64; int h = 32; - DrawableHelper.drawTexture(matrixStack, x, y, 0, 0, w, h, w, h); + helper.drawTexture(tacos[ticks / 8], x, y, 0, 0, w, h, w, h); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glDisable(GL11.GL_BLEND); diff --git a/src/main/java/net/wurstclient/events/GUIRenderListener.java b/src/main/java/net/wurstclient/events/GUIRenderListener.java index 9d784ba4..f6959922 100644 --- a/src/main/java/net/wurstclient/events/GUIRenderListener.java +++ b/src/main/java/net/wurstclient/events/GUIRenderListener.java @@ -9,22 +9,22 @@ package net.wurstclient.events; import java.util.ArrayList; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawableHelper; import net.wurstclient.event.Event; import net.wurstclient.event.Listener; public interface GUIRenderListener extends Listener { - public void onRenderGUI(MatrixStack matrixStack, float partialTicks); + public void onRenderGUI(DrawableHelper helper, float partialTicks); public static class GUIRenderEvent extends Event { private final float partialTicks; - private final MatrixStack matrixStack; + private final DrawableHelper helper; - public GUIRenderEvent(MatrixStack matrixStack, float partialTicks) + public GUIRenderEvent(DrawableHelper helper, float partialTicks) { - this.matrixStack = matrixStack; + this.helper = helper; this.partialTicks = partialTicks; } @@ -32,7 +32,7 @@ public interface GUIRenderListener extends Listener public void fire(ArrayList listeners) { for(GUIRenderListener listener : listeners) - listener.onRenderGUI(matrixStack, partialTicks); + listener.onRenderGUI(helper, partialTicks); } @Override diff --git a/src/main/java/net/wurstclient/hacks/AnchorAuraHack.java b/src/main/java/net/wurstclient/hacks/AnchorAuraHack.java index 66ee780f..4828baf5 100644 --- a/src/main/java/net/wurstclient/hacks/AnchorAuraHack.java +++ b/src/main/java/net/wurstclient/hacks/AnchorAuraHack.java @@ -427,7 +427,7 @@ public final class AnchorAuraHack extends Hack implements UpdateListener private boolean isReplaceable(BlockPos pos) { - return BlockUtils.getState(pos).getMaterial().isReplaceable(); + return BlockUtils.getState(pos).isReplaceable(); } private boolean hasClickableNeighbor(BlockPos pos) @@ -442,7 +442,7 @@ public final class AnchorAuraHack extends Hack implements UpdateListener private boolean isClickableNeighbor(BlockPos pos) { return BlockUtils.canBeClicked(pos) - && !BlockUtils.getState(pos).getMaterial().isReplaceable(); + && !BlockUtils.getState(pos).isReplaceable(); } private boolean isChargedAnchor(BlockPos pos) diff --git a/src/main/java/net/wurstclient/hacks/AutoBuildHack.java b/src/main/java/net/wurstclient/hacks/AutoBuildHack.java index 8b9d0dcb..644a5074 100644 --- a/src/main/java/net/wurstclient/hacks/AutoBuildHack.java +++ b/src/main/java/net/wurstclient/hacks/AutoBuildHack.java @@ -211,7 +211,7 @@ public final class AutoBuildHack extends Hack BlockPos pos = itr.next(); BlockState state = BlockUtils.getState(pos); - if(!state.getMaterial().isReplaceable()) + if(!state.isReplaceable()) itr.remove(); } } @@ -237,7 +237,7 @@ public final class AutoBuildHack extends Hack // check if neighbor can be right clicked if(!BlockUtils.canBeClicked(neighbor) - || BlockUtils.getState(neighbor).getMaterial().isReplaceable()) + || BlockUtils.getState(neighbor).isReplaceable()) continue; Vec3d dirVec = Vec3d.of(side.getVector()); @@ -313,7 +313,7 @@ public final class AutoBuildHack extends Hack for(BlockPos pos : remainingBlocks) { - if(!BlockUtils.getState(pos).getMaterial().isReplaceable()) + if(!BlockUtils.getState(pos).isReplaceable()) continue; Vec3d posVec = Vec3d.ofCenter(pos); @@ -374,7 +374,7 @@ public final class AutoBuildHack extends Hack && blocksDrawn < 1024;) { BlockPos pos = itr.next(); - if(!BlockUtils.getState(pos).getMaterial().isReplaceable()) + if(!BlockUtils.getState(pos).isReplaceable()) continue; matrixStack.push(); diff --git a/src/main/java/net/wurstclient/hacks/AutoFarmHack.java b/src/main/java/net/wurstclient/hacks/AutoFarmHack.java index cd29061e..9fe956e0 100644 --- a/src/main/java/net/wurstclient/hacks/AutoFarmHack.java +++ b/src/main/java/net/wurstclient/hacks/AutoFarmHack.java @@ -175,8 +175,7 @@ public final class AutoFarmHack extends Hack { return getBlockStream(eyesBlock, blockRange) .filter(pos -> eyesVec.squaredDistanceTo(Vec3d.of(pos)) <= rangeSq) - .filter( - pos -> BlockUtils.getState(pos).getMaterial().isReplaceable()) + .filter(pos -> BlockUtils.getState(pos).isReplaceable()) .filter(pos -> plants.containsKey(pos)).filter(this::canBeReplanted) .sorted(Comparator.comparingDouble( pos -> eyesVec.squaredDistanceTo(Vec3d.of(pos)))) diff --git a/src/main/java/net/wurstclient/hacks/BowAimbotHack.java b/src/main/java/net/wurstclient/hacks/BowAimbotHack.java index 55b76bbb..bdec313c 100644 --- a/src/main/java/net/wurstclient/hacks/BowAimbotHack.java +++ b/src/main/java/net/wurstclient/hacks/BowAimbotHack.java @@ -18,6 +18,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; @@ -242,8 +243,9 @@ public final class BowAimbotHack extends Hack } @Override - public void onRenderGUI(MatrixStack matrixStack, float partialTicks) + public void onRenderGUI(DrawableHelper helper, float partialTicks) { + MatrixStack matrixStack = helper.method_51448(); if(target == null) return; @@ -281,7 +283,7 @@ public final class BowAimbotHack extends Hack tessellator.draw(); // text - MC.textRenderer.draw(matrixStack, message, 2, 1, 0xffffffff); + helper.method_51433(MC.textRenderer, message, 2, 1, 0xffffffff, false); matrixStack.pop(); diff --git a/src/main/java/net/wurstclient/hacks/BuildRandomHack.java b/src/main/java/net/wurstclient/hacks/BuildRandomHack.java index 18c371e1..6b27f9ec 100644 --- a/src/main/java/net/wurstclient/hacks/BuildRandomHack.java +++ b/src/main/java/net/wurstclient/hacks/BuildRandomHack.java @@ -171,7 +171,7 @@ public final class BuildRandomHack extends Hack private boolean tryToPlaceBlock(boolean legitMode, BlockPos pos) { - if(!BlockUtils.getState(pos).getMaterial().isReplaceable()) + if(!BlockUtils.getState(pos).isReplaceable()) return false; if(legitMode) diff --git a/src/main/java/net/wurstclient/hacks/CrystalAuraHack.java b/src/main/java/net/wurstclient/hacks/CrystalAuraHack.java index c36be761..3fffb32a 100644 --- a/src/main/java/net/wurstclient/hacks/CrystalAuraHack.java +++ b/src/main/java/net/wurstclient/hacks/CrystalAuraHack.java @@ -343,7 +343,7 @@ public final class CrystalAuraHack extends Hack implements UpdateListener private boolean isReplaceable(BlockPos pos) { - return BlockUtils.getState(pos).getMaterial().isReplaceable(); + return BlockUtils.getState(pos).isReplaceable(); } private boolean hasCrystalBase(BlockPos pos) @@ -355,7 +355,7 @@ public final class CrystalAuraHack extends Hack implements UpdateListener private boolean isClickableNeighbor(BlockPos pos) { return BlockUtils.canBeClicked(pos) - && !BlockUtils.getState(pos).getMaterial().isReplaceable(); + && !BlockUtils.getState(pos).isReplaceable(); } private enum FaceBlocks diff --git a/src/main/java/net/wurstclient/hacks/ExcavatorHack.java b/src/main/java/net/wurstclient/hacks/ExcavatorHack.java index 973d7a95..9154b01a 100644 --- a/src/main/java/net/wurstclient/hacks/ExcavatorHack.java +++ b/src/main/java/net/wurstclient/hacks/ExcavatorHack.java @@ -21,6 +21,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -324,13 +325,14 @@ public final class ExcavatorHack extends Hack } @Override - public void onRenderGUI(MatrixStack matrixStack, float partialTicks) + public void onRenderGUI(DrawableHelper helper, float partialTicks) { // GL settings GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glDisable(GL11.GL_CULL_FACE); + MatrixStack matrixStack = helper.method_51448(); matrixStack.push(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); @@ -363,7 +365,7 @@ public final class ExcavatorHack extends Hack tessellator.draw(); // text - tr.draw(matrixStack, message, 2, 1, 0xffffffff); + helper.method_51433(tr, message, 2, 1, 0xffffffff, false); matrixStack.pop(); diff --git a/src/main/java/net/wurstclient/hacks/InstantBunkerHack.java b/src/main/java/net/wurstclient/hacks/InstantBunkerHack.java index a6fd8997..0592e6c4 100644 --- a/src/main/java/net/wurstclient/hacks/InstantBunkerHack.java +++ b/src/main/java/net/wurstclient/hacks/InstantBunkerHack.java @@ -131,7 +131,7 @@ public final class InstantBunkerHack extends Hack if(!building && startTimer <= 0) { for(BlockPos pos : positions) - if(BlockUtils.getState(pos).getMaterial().isReplaceable() + if(BlockUtils.getState(pos).isReplaceable() && !MC.player.getBoundingBox().intersects(new Box(pos))) placeBlockSimple(pos); MC.player.swingHand(Hand.MAIN_HAND); diff --git a/src/main/java/net/wurstclient/hacks/InvWalkHack.java b/src/main/java/net/wurstclient/hacks/InvWalkHack.java index 2113b67e..ebbafe43 100644 --- a/src/main/java/net/wurstclient/hacks/InvWalkHack.java +++ b/src/main/java/net/wurstclient/hacks/InvWalkHack.java @@ -117,7 +117,8 @@ public final class InvWalkHack extends Hack implements UpdateListener if(!(screen instanceof CreativeInventoryScreen)) return false; - return CreativeInventoryScreen.selectedTab == ItemGroups.SEARCH; + return CreativeInventoryScreen.selectedTab == ItemGroups + .getSearchGroup(); } private boolean hasTextBox(Screen screen) diff --git a/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java b/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java index 6774286e..64f9c428 100644 --- a/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java +++ b/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java @@ -279,6 +279,7 @@ public final class MobSpawnEspHack extends Hack this.chunk = chunk; } + @SuppressWarnings("deprecation") private void scan() { ClientWorld world = MC.world; @@ -298,7 +299,7 @@ public final class MobSpawnEspHack extends Hack BlockPos pos = new BlockPos(x, y, z); BlockState state = world.getBlockState(pos); - if(state.getMaterial().blocksMovement()) + if(state.method_51366()) continue; if(!state.getFluidState().isEmpty()) continue; diff --git a/src/main/java/net/wurstclient/hacks/ScaffoldWalkHack.java b/src/main/java/net/wurstclient/hacks/ScaffoldWalkHack.java index c363038a..098bbd34 100644 --- a/src/main/java/net/wurstclient/hacks/ScaffoldWalkHack.java +++ b/src/main/java/net/wurstclient/hacks/ScaffoldWalkHack.java @@ -56,7 +56,7 @@ public final class ScaffoldWalkHack extends Hack implements UpdateListener BlockPos belowPlayer = BlockPos.ofFloored(MC.player.getPos()).down(); // check if block is already placed - if(!BlockUtils.getState(belowPlayer).getMaterial().isReplaceable()) + if(!BlockUtils.getState(belowPlayer).isReplaceable()) return; // search blocks in hotbar diff --git a/src/main/java/net/wurstclient/hacks/TunnellerHack.java b/src/main/java/net/wurstclient/hacks/TunnellerHack.java index 1889edb9..fea7d0b0 100644 --- a/src/main/java/net/wurstclient/hacks/TunnellerHack.java +++ b/src/main/java/net/wurstclient/hacks/TunnellerHack.java @@ -557,7 +557,7 @@ public final class TunnellerHack extends Hack return; } - if(BlockUtils.getState(pos).getMaterial().isReplaceable()) + if(BlockUtils.getState(pos).isReplaceable()) placeBlockSimple(pos); else { @@ -764,7 +764,7 @@ public final class TunnellerHack extends Hack return false; BlockState state = BlockUtils.getState(nextTorch); - if(!state.getMaterial().isReplaceable()) + if(!state.isReplaceable()) return false; // Can't see why canPlaceAt() is deprecated. Still seems to be diff --git a/src/main/java/net/wurstclient/hud/HackListHUD.java b/src/main/java/net/wurstclient/hud/HackListHUD.java index 2b50db49..01b40163 100644 --- a/src/main/java/net/wurstclient/hud/HackListHUD.java +++ b/src/main/java/net/wurstclient/hud/HackListHUD.java @@ -13,8 +13,8 @@ import java.util.Comparator; import java.util.Iterator; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.util.Window; -import net.minecraft.client.util.math.MatrixStack; import net.wurstclient.WurstClient; import net.wurstclient.events.UpdateListener; import net.wurstclient.hack.Hack; @@ -34,7 +34,7 @@ public final class HackListHUD implements UpdateListener WurstClient.INSTANCE.getEventManager().add(UpdateListener.class, this); } - public void render(MatrixStack matrixStack, float partialTicks) + public void render(DrawableHelper helper, float partialTicks) { if(otf.getMode() == Mode.HIDDEN) return; @@ -59,26 +59,26 @@ public final class HackListHUD implements UpdateListener Window sr = WurstClient.MC.getWindow(); if(otf.getMode() == Mode.COUNT || height > sr.getScaledHeight()) - drawCounter(matrixStack); + drawCounter(helper); else - drawHackList(matrixStack, partialTicks); + drawHackList(helper, partialTicks); } - private void drawCounter(MatrixStack matrixStack) + private void drawCounter(DrawableHelper helper) { long size = activeHax.stream().filter(e -> e.hack.isEnabled()).count(); String s = size + " hack" + (size != 1 ? "s" : "") + " active"; - drawString(matrixStack, s); + drawString(helper, s); } - private void drawHackList(MatrixStack matrixStack, float partialTicks) + private void drawHackList(DrawableHelper helper, float partialTicks) { if(otf.isAnimations()) for(HackListEntry e : activeHax) - drawWithOffset(matrixStack, e, partialTicks); + drawWithOffset(helper, e, partialTicks); else for(HackListEntry e : activeHax) - drawString(matrixStack, e.hack.getRenderName()); + drawString(helper, e.hack.getRenderName()); } public void updateState(Hack hack) @@ -129,7 +129,7 @@ public final class HackListHUD implements UpdateListener } } - private void drawString(MatrixStack matrixStack, String s) + private void drawString(DrawableHelper helper, String s) { TextRenderer tr = WurstClient.MC.textRenderer; int posX; @@ -144,13 +144,13 @@ public final class HackListHUD implements UpdateListener posX = screenWidth - stringWidth - 2; } - tr.draw(matrixStack, s, posX + 1, posY + 1, 0xff000000); - tr.draw(matrixStack, s, posX, posY, textColor | 0xff000000); + helper.method_51433(tr, s, posX + 1, posY + 1, 0xff000000, false); + helper.method_51433(tr, s, posX, posY, textColor | 0xff000000, false); posY += 9; } - private void drawWithOffset(MatrixStack matrixStack, HackListEntry e, + private void drawWithOffset(DrawableHelper helper, HackListEntry e, float partialTicks) { TextRenderer tr = WurstClient.MC.textRenderer; @@ -171,8 +171,9 @@ public final class HackListHUD implements UpdateListener } int alpha = (int)(255 * (1 - offset / 4)) << 24; - tr.draw(matrixStack, s, posX + 1, posY + 1, 0x04000000 | alpha); - tr.draw(matrixStack, s, posX, posY, textColor | alpha); + helper.method_51433(tr, s, (int)posX + 1, posY + 1, 0x04000000 | alpha, + false); + helper.method_51433(tr, s, (int)posX, posY, textColor | alpha, false); posY += 9; } diff --git a/src/main/java/net/wurstclient/hud/IngameHUD.java b/src/main/java/net/wurstclient/hud/IngameHUD.java index 8677218b..cd96e069 100644 --- a/src/main/java/net/wurstclient/hud/IngameHUD.java +++ b/src/main/java/net/wurstclient/hud/IngameHUD.java @@ -11,7 +11,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawableHelper; import net.wurstclient.WurstClient; import net.wurstclient.clickgui.ClickGui; import net.wurstclient.clickgui.screens.ClickGuiScreen; @@ -24,7 +24,7 @@ public final class IngameHUD implements GUIRenderListener private TabGui tabGui; @Override - public void onRenderGUI(MatrixStack matrixStack, float partialTicks) + public void onRenderGUI(DrawableHelper helper, float partialTicks) { if(!WurstClient.INSTANCE.isEnabled()) return; @@ -40,13 +40,13 @@ public final class IngameHUD implements GUIRenderListener clickGui.updateColors(); - wurstLogo.render(matrixStack); - hackList.render(matrixStack, partialTicks); - tabGui.render(matrixStack, partialTicks); + wurstLogo.render(helper); + hackList.render(helper, partialTicks); + tabGui.render(helper, partialTicks); // pinned windows if(!(WurstClient.MC.currentScreen instanceof ClickGuiScreen)) - clickGui.renderPinnedWindows(matrixStack, partialTicks); + clickGui.renderPinnedWindows(helper, partialTicks); // GL resets GL11.glEnable(GL11.GL_DEPTH_TEST); diff --git a/src/main/java/net/wurstclient/hud/TabGui.java b/src/main/java/net/wurstclient/hud/TabGui.java index a0c1324d..06b0c645 100644 --- a/src/main/java/net/wurstclient/hud/TabGui.java +++ b/src/main/java/net/wurstclient/hud/TabGui.java @@ -16,6 +16,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -121,8 +122,9 @@ public final class TabGui implements KeyPressListener } } - public void render(MatrixStack matrixStack, float partialTicks) + public void render(DrawableHelper helper, float partialTicks) { + MatrixStack matrixStack = helper.method_51448(); if(tabGuiOtf.isHidden()) return; @@ -156,8 +158,8 @@ public final class TabGui implements KeyPressListener if(i == selected) tabName = (tabOpened ? "<" : ">") + tabName; - WurstClient.MC.textRenderer.draw(matrixStack, tabName, 2, textY, - txtColor); + helper.method_51433(WurstClient.MC.textRenderer, tabName, 2, textY, + txtColor, false); textY += 10; } GL11.glEnable(GL11.GL_BLEND); @@ -191,8 +193,8 @@ public final class TabGui implements KeyPressListener if(i == tab.selected) fName = ">" + fName; - WurstClient.MC.textRenderer.draw(matrixStack, fName, 2, - tabTextY, txtColor); + helper.method_51433(WurstClient.MC.textRenderer, fName, 2, + tabTextY, txtColor, false); tabTextY += 10; } GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/net/wurstclient/hud/WurstLogo.java b/src/main/java/net/wurstclient/hud/WurstLogo.java index 30c3d3d4..d9488530 100644 --- a/src/main/java/net/wurstclient/hud/WurstLogo.java +++ b/src/main/java/net/wurstclient/hud/WurstLogo.java @@ -29,8 +29,9 @@ public final class WurstLogo private static final Identifier texture = new Identifier("wurst", "wurst_128.png"); - public void render(MatrixStack matrixStack) + public void render(DrawableHelper helper) { + MatrixStack matrixStack = helper.method_51448(); WurstLogoOtf otf = WurstClient.INSTANCE.getOtfs().wurstLogoOtf; if(!otf.isVisible()) return; @@ -54,13 +55,12 @@ public final class WurstLogo // draw version string GL11.glEnable(GL11.GL_CULL_FACE); GL11.glDisable(GL11.GL_DEPTH_TEST); - tr.draw(matrixStack, version, 74, 8, otf.getTextColor()); + helper.method_51433(tr, version, 74, 8, otf.getTextColor(), false); // draw Wurst logo RenderSystem.setShaderColor(1, 1, 1, 1); GL11.glEnable(GL11.GL_BLEND); - RenderSystem.setShaderTexture(0, texture); - DrawableHelper.drawTexture(matrixStack, 0, 3, 0, 0, 72, 18, 72, 18); + helper.drawTexture(texture, 0, 3, 0, 0, 72, 18, 72, 18); } private String getVersionString() diff --git a/src/main/java/net/wurstclient/mixin/ChatHudMixin.java b/src/main/java/net/wurstclient/mixin/ChatHudMixin.java index 7e147706..c67ee259 100644 --- a/src/main/java/net/wurstclient/mixin/ChatHudMixin.java +++ b/src/main/java/net/wurstclient/mixin/ChatHudMixin.java @@ -17,7 +17,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.hud.ChatHud; import net.minecraft.client.gui.hud.ChatHudLine; import net.minecraft.client.gui.hud.MessageIndicator; @@ -28,7 +27,7 @@ import net.wurstclient.event.EventManager; import net.wurstclient.events.ChatInputListener.ChatInputEvent; @Mixin(ChatHud.class) -public class ChatHudMixin extends DrawableHelper +public class ChatHudMixin { @Shadow private List visibleMessages; diff --git a/src/main/java/net/wurstclient/mixin/DisconnectedScreenMixin.java b/src/main/java/net/wurstclient/mixin/DisconnectedScreenMixin.java index 5095f35c..6783df71 100644 --- a/src/main/java/net/wurstclient/mixin/DisconnectedScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/DisconnectedScreenMixin.java @@ -41,7 +41,7 @@ public class DisconnectedScreenMixin extends Screen private Screen parent; @Shadow @Final - private final GridWidget field_44552 = new GridWidget(); + private final GridWidget grid = new GridWidget(); private DisconnectedScreenMixin(WurstClient wurst, Text title) { @@ -73,17 +73,17 @@ public class DisconnectedScreenMixin extends Screen private void addReconnectButtons() { - ButtonWidget reconnectButton = field_44552.add( + ButtonWidget reconnectButton = grid.add( ButtonWidget.builder(Text.literal("Reconnect"), b -> LastServerRememberer.reconnect(parent)).build(), - 3, 0, 1, 1, field_44552.copyPositioner().margin(2).marginTop(-6)); + 3, 0, 1, 1, grid.copyPositioner().margin(2).marginTop(-6)); - autoReconnectButton = field_44552.add( + autoReconnectButton = grid.add( ButtonWidget.builder(Text.literal("AutoReconnect"), b -> pressAutoReconnect()).build(), - 4, 0, 1, 1, field_44552.copyPositioner().margin(2)); + 4, 0, 1, 1, grid.copyPositioner().margin(2)); - field_44552.refreshPositions(); + grid.refreshPositions(); Stream.of(reconnectButton, autoReconnectButton) .forEach(this::addDrawableChild); diff --git a/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java b/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java index 1fb745db..54f152b2 100644 --- a/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java @@ -18,12 +18,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.mojang.blaze3d.systems.RenderSystem; import net.fabricmc.fabric.api.client.screen.v1.Screens; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.GameMenuScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.resource.language.I18n; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraft.util.crash.CrashException; @@ -44,7 +44,7 @@ public abstract class GameMenuScreenMixin extends Screen super(text_1); } - @Inject(at = {@At("TAIL")}, method = {"initWidgets()V"}) + @Inject(at = @At("TAIL"), method = "initWidgets()V") private void onInitWidgets(CallbackInfo ci) { if(!WurstClient.INSTANCE.isEnabled()) @@ -110,9 +110,9 @@ public abstract class GameMenuScreenMixin extends Screen client.setScreen(new WurstOptionsScreen(this)); } - @Inject(at = {@At("TAIL")}, - method = {"render(Lnet/minecraft/client/util/math/MatrixStack;IIF)V"}) - private void onRender(MatrixStack matrixStack, int mouseX, int mouseY, + @Inject(at = @At("TAIL"), + method = "render(Lnet/minecraft/client/gui/DrawableHelper;IIF)V") + private void onRender(DrawableHelper helper, int mouseX, int mouseY, float partialTicks, CallbackInfo ci) { if(!WurstClient.INSTANCE.isEnabled() || wurstOptionsButton == null) @@ -125,8 +125,6 @@ public abstract class GameMenuScreenMixin extends Screen GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); RenderSystem.setShaderColor(1, 1, 1, 1); - RenderSystem.setShaderTexture(0, wurstTexture); - int x = wurstOptionsButton.getX() + 34; int y = wurstOptionsButton.getY() + 2; int w = 63; @@ -135,6 +133,6 @@ public abstract class GameMenuScreenMixin extends Screen int fh = 16; float u = 0; float v = 0; - drawTexture(matrixStack, x, y, u, v, w, h, fw, fh); + helper.drawTexture(wurstTexture, x, y, u, v, w, h, fw, fh); } } diff --git a/src/main/java/net/wurstclient/mixin/IngameHudMixin.java b/src/main/java/net/wurstclient/mixin/IngameHudMixin.java index 5f43072f..417e8eaf 100644 --- a/src/main/java/net/wurstclient/mixin/IngameHudMixin.java +++ b/src/main/java/net/wurstclient/mixin/IngameHudMixin.java @@ -14,41 +14,40 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.hud.InGameHud; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; import net.wurstclient.WurstClient; import net.wurstclient.event.EventManager; import net.wurstclient.events.GUIRenderListener.GUIRenderEvent; @Mixin(InGameHud.class) -public class IngameHudMixin extends DrawableHelper +public class IngameHudMixin { @Inject( at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;enableBlend()V", remap = false, ordinal = 3), - method = "render(Lnet/minecraft/client/util/math/MatrixStack;F)V") - private void onRender(MatrixStack matrixStack, float partialTicks, + method = "render(Lnet/minecraft/client/gui/DrawableHelper;F)V") + private void onRender(DrawableHelper helper, float partialTicks, CallbackInfo ci) { if(WurstClient.MC.options.debugEnabled) return; - GUIRenderEvent event = new GUIRenderEvent(matrixStack, partialTicks); + GUIRenderEvent event = new GUIRenderEvent(helper, partialTicks); EventManager.fire(event); } @Inject(at = @At("HEAD"), - method = "renderOverlay(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/util/Identifier;F)V", + method = "renderOverlay(Lnet/minecraft/client/gui/DrawableHelper;Lnet/minecraft/util/Identifier;F)V", cancellable = true) - private void onRenderOverlay(MatrixStack matrixStack, Identifier identifier, - float f, CallbackInfo ci) + private void onRenderOverlay(DrawableHelper helper, Identifier texture, + float opacity, CallbackInfo ci) { - if(identifier == null || identifier.getPath() == null) + if(texture == null || texture.getPath() == null) return; - if(!identifier.getPath().equals("textures/misc/pumpkinblur.png")) + if(!texture.getPath().equals("textures/misc/pumpkinblur.png")) return; if(!WurstClient.INSTANCE.getHax().noPumpkinHack.isEnabled()) diff --git a/src/main/java/net/wurstclient/mixin/ScreenMixin.java b/src/main/java/net/wurstclient/mixin/ScreenMixin.java index 36fa5fc8..f0dbc160 100644 --- a/src/main/java/net/wurstclient/mixin/ScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/ScreenMixin.java @@ -18,8 +18,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import net.minecraft.client.gui.AbstractParentElement; import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.util.math.MatrixStack; import net.wurstclient.WurstClient; import net.wurstclient.mixinterface.IScreen; @@ -31,11 +31,10 @@ public abstract class ScreenMixin extends AbstractParentElement @Final private List drawables; - @Inject(at = {@At("HEAD")}, - method = { - "renderBackground(Lnet/minecraft/client/util/math/MatrixStack;)V"}, + @Inject(at = @At("HEAD"), + method = "renderBackground(Lnet/minecraft/client/gui/DrawableHelper;)V", cancellable = true) - public void onRenderBackground(MatrixStack matrices, CallbackInfo ci) + public void onRenderBackground(DrawableHelper helper, CallbackInfo ci) { if(WurstClient.INSTANCE.getHax().noBackgroundHack .shouldCancelBackground((Screen)(Object)this)) diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 5297484e..187f0eed 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.method_46421(width / 2 + 2); + button.setX(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 87f22486..28488e07 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.method_46419(realmsButton.getY()); + altsButton.setY(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java index a6f9a6bf..69cb4829 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java @@ -22,6 +22,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.render.BufferBuilder; @@ -318,14 +319,15 @@ public final class NavigatorFeatureScreen extends NavigatorScreen } @Override - protected void onRender(MatrixStack matrixStack, int mouseX, int mouseY, + protected void onRender(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { + MatrixStack matrixStack = helper.method_51448(); ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); // title bar - drawCenteredTextWithShadow(matrixStack, client.textRenderer, + helper.drawCenteredTextWithShadow(client.textRenderer, feature.getName(), middleX, 32, txtColor); GL11.glEnable(GL11.GL_BLEND); @@ -431,8 +433,8 @@ public final class NavigatorFeatureScreen extends NavigatorScreen } for(int i = 0; i < window.countChildren(); i++) - window.getChild(i).render(matrixStack, mouseX - bgx1, - mouseY - windowY, partialTicks); + window.getChild(i).render(helper, mouseX - bgx1, mouseY - windowY, + partialTicks); matrixStack.pop(); // buttons @@ -463,7 +465,7 @@ public final class NavigatorFeatureScreen extends NavigatorScreen drawBox(matrixStack, x1, y1, x2, y2); // text - drawCenteredTextWithShadow(matrixStack, client.textRenderer, + helper.drawCenteredTextWithShadow(client.textRenderer, buttonData.buttonText, (x1 + x2) / 2, y1 + (buttonData.height - 10) / 2 + 1, buttonData.isLocked() ? 0xaaaaaa : buttonData.textColor); @@ -474,8 +476,8 @@ public final class NavigatorFeatureScreen extends NavigatorScreen int textY = bgy1 + scroll + 2; for(String line : text.split("\n")) { - client.textRenderer.draw(matrixStack, line, bgx1 + 2, textY, - txtColor); + helper.method_51433(client.textRenderer, line, bgx1 + 2, textY, + txtColor, false); textY += client.textRenderer.fontHeight; } GL11.glEnable(GL11.GL_BLEND); @@ -517,15 +519,15 @@ public final class NavigatorFeatureScreen extends NavigatorScreen // text String buttonText = button.getMessage().getString(); - client.textRenderer.draw(matrixStack, buttonText, + helper.method_51433(client.textRenderer, buttonText, (x1 + x2 - client.textRenderer.getWidth(buttonText)) / 2, - y1 + 5, txtColor); + y1 + 5, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } // popups & tooltip - gui.renderPopups(matrixStack, mouseX, mouseY); - gui.renderTooltip(matrixStack, mouseX, mouseY); + gui.renderPopups(helper, mouseX, mouseY); + gui.renderTooltip(helper, mouseX, mouseY); // GL resets GL11.glEnable(GL11.GL_CULL_FACE); diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 0ebbbc4b..ab6690b6 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -17,6 +17,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.render.BufferBuilder; @@ -73,7 +74,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.method_46421(middleX - 100); + searchBar.setX(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } @@ -227,9 +228,10 @@ public final class NavigatorMainScreen extends NavigatorScreen } @Override - protected void onRender(MatrixStack matrixStack, int mouseX, int mouseY, + protected void onRender(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { + MatrixStack matrixStack = helper.method_51448(); ClickGui gui = WurstClient.INSTANCE.getGui(); float[] bgColor = gui.getBgColor(); float[] acColor = gui.getAcColor(); @@ -242,9 +244,9 @@ public final class NavigatorMainScreen extends NavigatorScreen if(!clickTimerRunning) { RenderSystem.setShaderColor(1, 1, 1, 1); - WurstClient.MC.textRenderer.drawWithShadow(matrixStack, "Search: ", + helper.drawTextWithShadow(WurstClient.MC.textRenderer, "Search: ", middleX - 150, 32, txtColor); - searchBar.render(matrixStack, mouseX, mouseY, partialTicks); + searchBar.render(helper, mouseX, mouseY, partialTicks); GL11.glEnable(GL11.GL_BLEND); } @@ -267,8 +269,8 @@ public final class NavigatorMainScreen extends NavigatorScreen if(featureY > height - 40) break; - renderFeature(matrixStack, mouseX, mouseY, partialTicks, i, - featureX, featureY); + renderFeature(helper, mouseX, mouseY, partialTicks, i, featureX, + featureY); } GL11.glDisable(GL11.GL_SCISSOR_TEST); @@ -277,13 +279,13 @@ public final class NavigatorMainScreen extends NavigatorScreen if(tooltip != null) { String[] lines = tooltip.split("\n"); - TextRenderer fr = client.textRenderer; + TextRenderer tr = client.textRenderer; int tw = 0; - int th = lines.length * fr.fontHeight; + int th = lines.length * tr.fontHeight; for(String line : lines) { - int lw = fr.getWidth(line); + int lw = tr.getWidth(line); if(lw > tw) tw = lw; } @@ -327,14 +329,15 @@ public final class NavigatorMainScreen extends NavigatorScreen // text for(int i = 0; i < lines.length; i++) - fr.draw(matrixStack, lines[i], xt1 + 2, - yt1 + 2 + i * fr.fontHeight, txtColor); + helper.method_51433(tr, lines[i], xt1 + 2, + yt1 + 2 + i * tr.fontHeight, txtColor, false); } } - private void renderFeature(MatrixStack matrixStack, int mouseX, int mouseY, + private void renderFeature(DrawableHelper helper, int mouseX, int mouseY, float partialTicks, int i, int x, int y) { + MatrixStack matrixStack = helper.method_51448(); ClickGui gui = WurstClient.INSTANCE.getGui(); float[] bgColor = gui.getBgColor(); int txtColor = gui.getTxtColor(); @@ -472,8 +475,8 @@ public final class NavigatorMainScreen extends NavigatorScreen RenderSystem.setShader(GameRenderer::getPositionProgram); RenderSystem.setShaderColor(1, 1, 1, 1); String buttonText = feature.getName(); - client.textRenderer.draw(matrixStack, buttonText, area.x + 4, - area.y + 4, txtColor); + helper.method_51433(client.textRenderer, buttonText, area.x + 4, + area.y + 4, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } } diff --git a/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java index 1518c7aa..e98cb71f 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java @@ -16,6 +16,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.util.InputUtil; @@ -156,15 +157,16 @@ public class NavigatorNewKeybindScreen extends NavigatorScreen } @Override - protected void onRender(MatrixStack matrixStack, int mouseX, int mouseY, + protected void onRender(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { + MatrixStack matrixStack = helper.method_51448(); ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); // title bar - drawCenteredTextWithShadow(matrixStack, client.textRenderer, - "New Keybind", middleX, 32, txtColor); + helper.drawCenteredTextWithShadow(client.textRenderer, "New Keybind", + middleX, 32, txtColor); GL11.glEnable(GL11.GL_BLEND); // background @@ -212,11 +214,10 @@ public class NavigatorNewKeybindScreen extends NavigatorScreen drawBox(matrixStack, x1, y1, x2, y2); // text - drawTextWithShadow(matrixStack, client.textRenderer, + helper.drawTextWithShadow(client.textRenderer, pkb.getDescription(), x1 + 1, y1 + 1, txtColor); - drawTextWithShadow(matrixStack, client.textRenderer, - pkb.getCommand(), x1 + 1, - y1 + 1 + client.textRenderer.fontHeight, txtColor); + helper.drawTextWithShadow(client.textRenderer, pkb.getCommand(), + x1 + 1, y1 + 1 + client.textRenderer.fontHeight, txtColor); GL11.glEnable(GL11.GL_BLEND); } } @@ -225,7 +226,7 @@ public class NavigatorNewKeybindScreen extends NavigatorScreen int textY = bgy1 + scroll + 2; for(String line : text.split("\n")) { - drawTextWithShadow(matrixStack, client.textRenderer, line, bgx1 + 2, + helper.drawTextWithShadow(client.textRenderer, line, bgx1 + 2, textY, txtColor); textY += client.textRenderer.fontHeight; } @@ -261,7 +262,7 @@ public class NavigatorNewKeybindScreen extends NavigatorScreen drawBox(matrixStack, x1, y1, x2, y2); // text - drawCenteredTextWithShadow(matrixStack, client.textRenderer, + helper.drawCenteredTextWithShadow(client.textRenderer, button.getMessage().getString(), (x1 + x2) / 2, y1 + 5, txtColor); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java index d8caf8d2..5b7d762e 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java @@ -18,6 +18,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.util.math.MatrixStack; @@ -128,15 +129,16 @@ public class NavigatorRemoveKeybindScreen extends NavigatorScreen } @Override - protected void onRender(MatrixStack matrixStack, int mouseX, int mouseY, + protected void onRender(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { + MatrixStack matrixStack = helper.method_51448(); ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); // title bar - drawCenteredTextWithShadow(matrixStack, client.textRenderer, - "Remove Keybind", middleX, 32, txtColor); + helper.drawCenteredTextWithShadow(client.textRenderer, "Remove Keybind", + middleX, 32, txtColor); GL11.glEnable(GL11.GL_BLEND); // background @@ -182,13 +184,12 @@ public class NavigatorRemoveKeybindScreen extends NavigatorScreen drawBox(matrixStack, x1, y1, x2, y2); // text - drawTextWithShadow(matrixStack, client.textRenderer, + helper.drawTextWithShadow(client.textRenderer, key.replace("key.keyboard.", "") + ": " + keybind.getDescription(), x1 + 1, y1 + 1, txtColor); - drawTextWithShadow(matrixStack, client.textRenderer, - keybind.getCommand(), x1 + 1, - y1 + 1 + client.textRenderer.fontHeight, txtColor); + helper.drawTextWithShadow(client.textRenderer, keybind.getCommand(), + x1 + 1, y1 + 1 + client.textRenderer.fontHeight, txtColor); GL11.glEnable(GL11.GL_BLEND); } @@ -196,7 +197,7 @@ public class NavigatorRemoveKeybindScreen extends NavigatorScreen int textY = bgy1 + scroll + 2; for(String line : text.split("\n")) { - drawTextWithShadow(matrixStack, client.textRenderer, line, bgx1 + 2, + helper.drawTextWithShadow(client.textRenderer, line, bgx1 + 2, textY, txtColor); textY += client.textRenderer.fontHeight; } @@ -232,7 +233,7 @@ public class NavigatorRemoveKeybindScreen extends NavigatorScreen drawBox(matrixStack, x1, y1, x2, y2); // text - drawCenteredTextWithShadow(matrixStack, client.textRenderer, + helper.drawCenteredTextWithShadow(client.textRenderer, button.getMessage().getString(), (x1 + x2) / 2, y1 + 5, txtColor); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/net/wurstclient/navigator/NavigatorScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorScreen.java index 814a5eea..b08a07f8 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorScreen.java @@ -14,6 +14,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; @@ -142,9 +143,11 @@ public abstract class NavigatorScreen extends Screen } @Override - public final void render(MatrixStack matrixStack, int mouseX, int mouseY, + public final void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { + MatrixStack matrixStack = helper.method_51448(); + // GL settings GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -180,7 +183,7 @@ public abstract class NavigatorScreen extends Screen drawDownShadow(matrixStack, x1, y1, x2, y2); } - onRender(matrixStack, mouseX, mouseY, partialTicks); + onRender(helper, mouseX, mouseY, partialTicks); // GL resets GL11.glEnable(GL11.GL_CULL_FACE); @@ -206,7 +209,7 @@ public abstract class NavigatorScreen extends Screen protected abstract void onUpdate(); - protected abstract void onRender(MatrixStack matrixStack, int mouseX, + protected abstract void onRender(DrawableHelper helper, int mouseX, int mouseY, float partialTicks); protected final int getStringHeight(String s) diff --git a/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java b/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java index 1c7736ff..9918364e 100644 --- a/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java +++ b/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java @@ -15,7 +15,6 @@ import net.minecraft.client.font.MultilineText; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.LiteralTextContent; import net.minecraft.text.Text; import net.minecraft.text.TranslatableTextContent; @@ -102,20 +101,20 @@ public final class ForcedChatReportsScreen extends Screen } @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float delta) { - renderBackground(matrices); + renderBackground(helper); int centerX = width / 2; int reasonY = (height - 68) / 2 - reasonHeight / 2; int titleY = reasonY - textRenderer.fontHeight * 2; - DrawableHelper.drawCenteredTextWithShadow(matrices, textRenderer, title, - centerX, titleY, 0xAAAAAA); - reasonFormatted.drawCenterWithShadow(matrices, centerX, reasonY); + helper.drawCenteredTextWithShadow(textRenderer, title, centerX, titleY, + 0xAAAAAA); + reasonFormatted.drawCenterWithShadow(helper, centerX, reasonY); - super.render(matrices, mouseX, mouseY, delta); + super.render(helper, mouseX, mouseY, delta); } @Override diff --git a/src/main/java/net/wurstclient/nochatreports/NcrModRequiredScreen.java b/src/main/java/net/wurstclient/nochatreports/NcrModRequiredScreen.java index 7b9e6942..695fa6cc 100644 --- a/src/main/java/net/wurstclient/nochatreports/NcrModRequiredScreen.java +++ b/src/main/java/net/wurstclient/nochatreports/NcrModRequiredScreen.java @@ -15,7 +15,6 @@ import net.minecraft.client.font.MultilineText; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.minecraft.util.StringHelper; import net.wurstclient.WurstClient; @@ -118,20 +117,20 @@ public final class NcrModRequiredScreen extends Screen } @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float delta) { - renderBackground(matrices); + renderBackground(helper); int centerX = width / 2; int reasonY = (height - 68) / 2 - reasonHeight / 2; int titleY = reasonY - textRenderer.fontHeight * 2; - DrawableHelper.drawCenteredTextWithShadow(matrices, textRenderer, title, - centerX, titleY, 0xAAAAAA); - reasonFormatted.drawCenterWithShadow(matrices, centerX, reasonY); + helper.drawCenteredTextWithShadow(textRenderer, title, centerX, titleY, + 0xAAAAAA); + reasonFormatted.drawCenterWithShadow(helper, centerX, reasonY); - super.render(matrices, mouseX, mouseY, delta); + super.render(helper, mouseX, mouseY, delta); } @Override diff --git a/src/main/java/net/wurstclient/options/EnterProfileNameScreen.java b/src/main/java/net/wurstclient/options/EnterProfileNameScreen.java index 9ec31492..7804ea79 100644 --- a/src/main/java/net/wurstclient/options/EnterProfileNameScreen.java +++ b/src/main/java/net/wurstclient/options/EnterProfileNameScreen.java @@ -12,10 +12,10 @@ import java.util.function.Consumer; import org.lwjgl.glfw.GLFW; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; public final class EnterProfileNameScreen extends Screen @@ -88,15 +88,15 @@ public final class EnterProfileNameScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - renderBackground(matrixStack); - drawCenteredTextWithShadow(matrixStack, client.textRenderer, + renderBackground(helper); + helper.drawCenteredTextWithShadow(client.textRenderer, "Name your new profile", width / 2, 20, 0xFFFFFF); - valueField.render(matrixStack, mouseX, mouseY, partialTicks); - super.render(matrixStack, mouseX, mouseY, partialTicks); + valueField.render(helper, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/net/wurstclient/options/KeybindEditorScreen.java b/src/main/java/net/wurstclient/options/KeybindEditorScreen.java index f87246da..0be5f364 100644 --- a/src/main/java/net/wurstclient/options/KeybindEditorScreen.java +++ b/src/main/java/net/wurstclient/options/KeybindEditorScreen.java @@ -7,10 +7,10 @@ */ package net.wurstclient.options; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.wurstclient.WurstClient; @@ -94,23 +94,23 @@ public final class KeybindEditorScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - renderBackground(matrixStack); + renderBackground(helper); - drawCenteredTextWithShadow(matrixStack, textRenderer, + helper.drawCenteredTextWithShadow(textRenderer, (oldKey != null ? "Edit" : "Add") + " Keybind", width / 2, 20, 0xffffff); - drawTextWithShadow(matrixStack, textRenderer, + helper.drawTextWithShadow(textRenderer, "Key: " + key.replace("key.keyboard.", ""), width / 2 - 100, 47, 0xa0a0a0); - drawTextWithShadow(matrixStack, textRenderer, - "Commands (separated by ';')", width / 2 - 100, 87, 0xa0a0a0); + helper.drawTextWithShadow(textRenderer, "Commands (separated by ';')", + width / 2 - 100, 87, 0xa0a0a0); - commandField.render(matrixStack, mouseX, mouseY, partialTicks); - super.render(matrixStack, mouseX, mouseY, partialTicks); + commandField.render(helper, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/net/wurstclient/options/KeybindManagerScreen.java b/src/main/java/net/wurstclient/options/KeybindManagerScreen.java index 016523b6..b693a227 100644 --- a/src/main/java/net/wurstclient/options/KeybindManagerScreen.java +++ b/src/main/java/net/wurstclient/options/KeybindManagerScreen.java @@ -10,10 +10,10 @@ package net.wurstclient.options; import org.lwjgl.glfw.GLFW; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.wurstclient.WurstClient; import net.wurstclient.keybinds.Keybind; @@ -163,18 +163,18 @@ public final class KeybindManagerScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - renderBackground(matrixStack); - listGui.render(matrixStack, mouseX, mouseY, partialTicks); + renderBackground(helper); + listGui.render(helper, mouseX, mouseY, partialTicks); - drawCenteredTextWithShadow(matrixStack, textRenderer, "Keybind Manager", + helper.drawCenteredTextWithShadow(textRenderer, "Keybind Manager", width / 2, 8, 0xffffff); - drawCenteredTextWithShadow(matrixStack, textRenderer, + helper.drawCenteredTextWithShadow(textRenderer, "Keybinds: " + listGui.getItemCount(), width / 2, 20, 0xffffff); - super.render(matrixStack, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); } @Override @@ -222,17 +222,18 @@ public final class KeybindManagerScreen extends Screen } @Override - protected void renderItem(MatrixStack matrixStack, int index, int x, + protected void renderItem(DrawableHelper helper, int index, int x, int y, int slotHeight, int mouseX, int mouseY, float partialTicks) { Keybind keybind = WurstClient.INSTANCE.getKeybinds().getAllKeybinds().get(index); - client.textRenderer.draw(matrixStack, + helper.method_51433(client.textRenderer, "Key: " + keybind.getKey().replace("key.keyboard.", ""), x + 3, - y + 3, 0xa0a0a0); - client.textRenderer.draw(matrixStack, - "Commands: " + keybind.getCommands(), x + 3, y + 15, 0xa0a0a0); + y + 3, 0xa0a0a0, false); + helper.method_51433(client.textRenderer, + "Commands: " + keybind.getCommands(), x + 3, y + 15, 0xa0a0a0, + false); } } } diff --git a/src/main/java/net/wurstclient/options/KeybindProfilesScreen.java b/src/main/java/net/wurstclient/options/KeybindProfilesScreen.java index 6c5fc30d..8b29b381 100644 --- a/src/main/java/net/wurstclient/options/KeybindProfilesScreen.java +++ b/src/main/java/net/wurstclient/options/KeybindProfilesScreen.java @@ -17,9 +17,9 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.minecraft.util.Util; import net.wurstclient.WurstClient; @@ -170,19 +170,19 @@ public final class KeybindProfilesScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - renderBackground(matrixStack); - listGui.render(matrixStack, mouseX, mouseY, partialTicks); + renderBackground(helper); + listGui.render(helper, mouseX, mouseY, partialTicks); - drawCenteredTextWithShadow(matrixStack, client.textRenderer, + helper.drawCenteredTextWithShadow(client.textRenderer, "Keybind Profiles", width / 2, 12, 0xffffff); - super.render(matrixStack, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); if(loadButton.isSelected() && !loadButton.active) - renderTooltip(matrixStack, + helper.method_51434(textRenderer, Arrays.asList(Text.literal("You must first select a file.")), mouseX, mouseY); } @@ -236,14 +236,20 @@ public final class KeybindProfilesScreen extends Screen } @Override - protected void renderItem(MatrixStack matrixStack, int index, int x, + protected void renderItem(DrawableHelper helper, int index, int x, int y, int var4, int var5, int var6, float partialTicks) { - TextRenderer fr = mc.textRenderer; + TextRenderer tr = mc.textRenderer; Path path = list.get(index); - fr.draw(matrixStack, "" + path.getFileName(), x + 28, y, 0xf0f0f0); - fr.draw(matrixStack, + // tr.draw(matrixStack, "" + path.getFileName(), x + 28, y, + // 0xf0f0f0); + helper.drawTextWithShadow(tr, "" + path.getFileName(), x + 28, y, + 0xf0f0f0); + // tr.draw(matrixStack, "" + + // client.runDirectory.toPath().relativize(path), x + 28, y + 9, + // 0xa0a0a0); + helper.drawTextWithShadow(tr, "" + client.runDirectory.toPath().relativize(path), x + 28, y + 9, 0xa0a0a0); } diff --git a/src/main/java/net/wurstclient/options/PressAKeyScreen.java b/src/main/java/net/wurstclient/options/PressAKeyScreen.java index 0258413e..aa425a46 100644 --- a/src/main/java/net/wurstclient/options/PressAKeyScreen.java +++ b/src/main/java/net/wurstclient/options/PressAKeyScreen.java @@ -9,9 +9,9 @@ package net.wurstclient.options; import org.lwjgl.glfw.GLFW; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.InputUtil; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; public class PressAKeyScreen extends Screen @@ -50,12 +50,12 @@ public class PressAKeyScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - renderBackground(matrixStack); - drawCenteredTextWithShadow(matrixStack, textRenderer, "Press a key", + renderBackground(helper); + helper.drawCenteredTextWithShadow(textRenderer, "Press a key", width / 2, height / 4 + 48, 16777215); - super.render(matrixStack, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); } } diff --git a/src/main/java/net/wurstclient/options/WurstOptionsScreen.java b/src/main/java/net/wurstclient/options/WurstOptionsScreen.java index 18d1c06f..156b066d 100644 --- a/src/main/java/net/wurstclient/options/WurstOptionsScreen.java +++ b/src/main/java/net/wurstclient/options/WurstOptionsScreen.java @@ -13,10 +13,10 @@ import java.util.function.Supplier; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ClickableWidget; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.minecraft.util.Util; import net.minecraft.util.Util.OperatingSystem; @@ -146,34 +146,34 @@ public class WurstOptionsScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - renderBackground(matrixStack); - renderTitles(matrixStack); - super.render(matrixStack, mouseX, mouseY, partialTicks); - renderButtonTooltip(matrixStack, mouseX, mouseY); + renderBackground(helper); + renderTitles(helper); + super.render(helper, mouseX, mouseY, partialTicks); + renderButtonTooltip(helper, mouseX, mouseY); } - private void renderTitles(MatrixStack matrixStack) + private void renderTitles(DrawableHelper helper) { TextRenderer tr = client.textRenderer; int middleX = width / 2; int y1 = 40; int y2 = height / 4 + 24 - 28; - drawCenteredTextWithShadow(matrixStack, tr, "Wurst Options", middleX, - y1, 0xffffff); + helper.drawCenteredTextWithShadow(tr, "Wurst Options", middleX, y1, + 0xffffff); - drawCenteredTextWithShadow(matrixStack, tr, "Settings", middleX - 104, - y2, 0xcccccc); - drawCenteredTextWithShadow(matrixStack, tr, "Managers", middleX, y2, + helper.drawCenteredTextWithShadow(tr, "Settings", middleX - 104, y2, 0xcccccc); - drawCenteredTextWithShadow(matrixStack, tr, "Links", middleX + 104, y2, + helper.drawCenteredTextWithShadow(tr, "Managers", middleX, y2, + 0xcccccc); + helper.drawCenteredTextWithShadow(tr, "Links", middleX + 104, y2, 0xcccccc); } - private void renderButtonTooltip(MatrixStack matrixStack, int mouseX, + private void renderButtonTooltip(DrawableHelper helper, int mouseX, int mouseY) { for(Drawable d : ((IScreen)this).getButtons()) @@ -191,7 +191,7 @@ public class WurstOptionsScreen extends Screen if(woButton.tooltip.isEmpty()) continue; - renderTooltip(matrixStack, woButton.tooltip, mouseX, mouseY); + helper.method_51434(textRenderer, woButton.tooltip, mouseX, mouseY); break; } } diff --git a/src/main/java/net/wurstclient/options/ZoomManagerScreen.java b/src/main/java/net/wurstclient/options/ZoomManagerScreen.java index bcd30a0d..22246d4d 100644 --- a/src/main/java/net/wurstclient/options/ZoomManagerScreen.java +++ b/src/main/java/net/wurstclient/options/ZoomManagerScreen.java @@ -7,11 +7,11 @@ */ package net.wurstclient.options; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.wurstclient.WurstClient; import net.wurstclient.other_features.ZoomOtf; @@ -94,20 +94,20 @@ public class ZoomManagerScreen extends Screen implements PressAKeyCallback } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { ZoomOtf zoom = WurstClient.INSTANCE.getOtfs().zoomOtf; SliderSetting level = zoom.getLevelSetting(); - renderBackground(matrixStack); - drawCenteredTextWithShadow(matrixStack, textRenderer, "Zoom Manager", + renderBackground(helper); + helper.drawCenteredTextWithShadow(textRenderer, "Zoom Manager", width / 2, 40, 0xffffff); - drawTextWithShadow(matrixStack, textRenderer, + helper.drawTextWithShadow(textRenderer, "Zoom Level: " + level.getValueString(), width / 2 - 75, height / 4 + 44, 0xcccccc); - super.render(matrixStack, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java b/src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java index d87cb8d5..5f802849 100644 --- a/src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java +++ b/src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java @@ -15,13 +15,13 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.SharedConstants; import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; import net.minecraft.client.gui.screen.multiplayer.MultiplayerServerListWidget; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.network.ServerInfo; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.wurstclient.mixinterface.IMultiplayerScreen; import net.wurstclient.mixinterface.IScreen; @@ -201,21 +201,21 @@ public class CleanUpScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - renderBackground(matrixStack); - drawCenteredTextWithShadow(matrixStack, textRenderer, "Clean Up", - width / 2, 20, 16777215); - drawCenteredTextWithShadow(matrixStack, textRenderer, + renderBackground(helper); + helper.drawCenteredTextWithShadow(textRenderer, "Clean Up", width / 2, + 20, 16777215); + helper.drawCenteredTextWithShadow(textRenderer, "Please select the servers you want to remove:", width / 2, 36, 10526880); - super.render(matrixStack, mouseX, mouseY, partialTicks); - renderButtonTooltip(matrixStack, mouseX, mouseY); + super.render(helper, mouseX, mouseY, partialTicks); + renderButtonTooltip(helper, mouseX, mouseY); } - private void renderButtonTooltip(MatrixStack matrixStack, int mouseX, + private void renderButtonTooltip(DrawableHelper helper, int mouseX, int mouseY) { for(Drawable d : ((IScreen)this).getButtons()) @@ -233,7 +233,7 @@ public class CleanUpScreen extends Screen if(cuButton.tooltip.isEmpty()) continue; - renderTooltip(matrixStack, cuButton.tooltip, mouseX, mouseY); + helper.method_51434(textRenderer, cuButton.tooltip, mouseX, mouseY); break; } } diff --git a/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java b/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java index 94a1f2da..179693b6 100644 --- a/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java +++ b/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java @@ -13,12 +13,12 @@ import java.util.ArrayList; import org.lwjgl.glfw.GLFW; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.network.ServerInfo; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.minecraft.util.Util; import net.wurstclient.mixinterface.IMultiplayerScreen; @@ -214,41 +214,41 @@ public class ServerFinderScreen extends Screen } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float partialTicks) { - renderBackground(matrixStack); + renderBackground(helper); - drawCenteredTextWithShadow(matrixStack, textRenderer, "Server Finder", + helper.drawCenteredTextWithShadow(textRenderer, "Server Finder", width / 2, 20, 16777215); - drawCenteredTextWithShadow(matrixStack, textRenderer, + helper.drawCenteredTextWithShadow(textRenderer, "This will search for servers with similar IPs", width / 2, 40, 10526880); - drawCenteredTextWithShadow(matrixStack, textRenderer, + helper.drawCenteredTextWithShadow(textRenderer, "to the IP you type into the field below.", width / 2, 50, 10526880); - drawCenteredTextWithShadow(matrixStack, textRenderer, + helper.drawCenteredTextWithShadow(textRenderer, "The servers it finds will be added to your server list.", width / 2, 60, 10526880); - drawTextWithShadow(matrixStack, textRenderer, "Server address:", + helper.drawTextWithShadow(textRenderer, "Server address:", width / 2 - 100, height / 4 + 24, 10526880); - ipBox.render(matrixStack, mouseX, mouseY, partialTicks); + ipBox.render(helper, mouseX, mouseY, partialTicks); - drawTextWithShadow(matrixStack, textRenderer, "Max. threads:", + helper.drawTextWithShadow(textRenderer, "Max. threads:", width / 2 - 100, height / 4 + 60, 10526880); - maxThreadsBox.render(matrixStack, mouseX, mouseY, partialTicks); + maxThreadsBox.render(helper, mouseX, mouseY, partialTicks); - drawCenteredTextWithShadow(matrixStack, textRenderer, state.toString(), + helper.drawCenteredTextWithShadow(textRenderer, state.toString(), width / 2, height / 4 + 73, 10526880); - drawTextWithShadow(matrixStack, textRenderer, + helper.drawTextWithShadow(textRenderer, "Checked: " + checked + " / 1792", width / 2 - 100, height / 4 + 84, 10526880); - drawTextWithShadow(matrixStack, textRenderer, "Working: " + working, + helper.drawTextWithShadow(textRenderer, "Working: " + working, width / 2 - 100, height / 4 + 94, 10526880); - super.render(matrixStack, mouseX, mouseY, partialTicks); + super.render(helper, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/net/wurstclient/util/BlockPlacer.java b/src/main/java/net/wurstclient/util/BlockPlacer.java index 91144943..b7eebd44 100644 --- a/src/main/java/net/wurstclient/util/BlockPlacer.java +++ b/src/main/java/net/wurstclient/util/BlockPlacer.java @@ -57,7 +57,7 @@ public enum BlockPlacer // if there is a replaceable block at the position, we need to place // against the block itself instead of a neighbor if(BlockUtils.canBeClicked(pos) - && BlockUtils.getState(pos).getMaterial().isReplaceable()) + && BlockUtils.getState(pos).isReplaceable()) { // the parameters for this happen to be the same as for breaking // the block, so we can just use BlockBreaker to get them @@ -84,7 +84,7 @@ public enum BlockPlacer VoxelShape shape = state.getOutlineShape(MC.world, neighbor); // if neighbor has no shape or is replaceable, it can't be used - if(shape.isEmpty() || state.getMaterial().isReplaceable()) + if(shape.isEmpty() || state.isReplaceable()) continue; Vec3d relCenter = shape.getBoundingBox().getCenter(); diff --git a/src/main/java/net/wurstclient/util/ListWidget.java b/src/main/java/net/wurstclient/util/ListWidget.java index 7ea2c82b..f012a253 100644 --- a/src/main/java/net/wurstclient/util/ListWidget.java +++ b/src/main/java/net/wurstclient/util/ListWidget.java @@ -21,6 +21,7 @@ import net.minecraft.client.gui.AbstractParentElement; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -93,7 +94,7 @@ public abstract class ListWidget extends AbstractParentElement protected void updateItemPosition(int index, int x, int y, float delta) {} - protected abstract void renderItem(MatrixStack matrixStack, int x, int y, + protected abstract void renderItem(DrawableHelper helper, int x, int y, int itemHeight, int mouseX, int mouseY, int i, float f); protected void renderHeader(int x, int y, Tessellator tessellator) @@ -133,7 +134,7 @@ public abstract class ListWidget extends AbstractParentElement } @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, + public void render(DrawableHelper helper, int mouseX, int mouseY, float delta) { if(visible) @@ -144,8 +145,7 @@ public abstract class ListWidget extends AbstractParentElement capYPosition(); Tessellator tessellator = Tessellator.getInstance(); BufferBuilder bufferBuilder = tessellator.getBuffer(); - RenderSystem.setShaderTexture(0, - DrawableHelper.OPTIONS_BACKGROUND_TEXTURE); + RenderSystem.setShaderTexture(0, Screen.field_44669); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); RenderSystem.setShader(GameRenderer::getPositionTexColorProgram); bufferBuilder.begin(VertexFormat.DrawMode.QUADS, @@ -168,7 +168,7 @@ public abstract class ListWidget extends AbstractParentElement if(renderHeader) renderHeader(k, l, tessellator); - renderList(matrices, k, l, mouseX, mouseY, delta); + renderList(helper, k, l, mouseX, mouseY, delta); RenderSystem.disableDepthTest(); renderHoleBackground(0, top, 255, 255); renderHoleBackground(bottom, height, 255, 255); @@ -374,8 +374,8 @@ public abstract class ListWidget extends AbstractParentElement return 220; } - protected void renderList(MatrixStack matrixStack, int i, int j, int k, - int l, float f) + protected void renderList(DrawableHelper helper, int i, int j, int k, int l, + float f) { int m = getItemCount(); Tessellator tessellator = Tessellator.getInstance(); @@ -414,7 +414,7 @@ public abstract class ListWidget extends AbstractParentElement } RenderSystem.setShaderColor(1, 1, 1, 1); - renderItem(matrixStack, n, i, o, p, k, l, f); + renderItem(helper, n, i, o, p, k, l, f); } } @@ -435,8 +435,7 @@ public abstract class ListWidget extends AbstractParentElement { Tessellator tessellator = Tessellator.getInstance(); BufferBuilder bufferBuilder = tessellator.getBuffer(); - RenderSystem.setShaderTexture(0, - DrawableHelper.OPTIONS_BACKGROUND_TEXTURE); + RenderSystem.setShaderTexture(0, Screen.field_44669); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); RenderSystem.setShader(GameRenderer::getPositionTexColorProgram); bufferBuilder.begin(VertexFormat.DrawMode.QUADS, diff --git a/src/main/java/net/wurstclient/util/RenderUtils.java b/src/main/java/net/wurstclient/util/RenderUtils.java index b144bfd1..e1da84d9 100644 --- a/src/main/java/net/wurstclient/util/RenderUtils.java +++ b/src/main/java/net/wurstclient/util/RenderUtils.java @@ -16,6 +16,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.Blocks; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gl.VertexBuffer; +import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.BufferBuilder.BuiltBuffer; import net.minecraft.client.render.Camera; @@ -863,9 +864,11 @@ public enum RenderUtils bufferBuilder.vertex(matrix, 0, 2, 1).next(); } - public static void drawItem(MatrixStack matrixStack, ItemStack stack, int x, + public static void drawItem(DrawableHelper helper, ItemStack stack, int x, int y, boolean large) { + MatrixStack matrixStack = helper.method_51448(); + matrixStack.push(); matrixStack.translate(x, y, 0); if(large) @@ -877,8 +880,7 @@ public enum RenderUtils ? new ItemStack(Blocks.GRASS_BLOCK) : stack; DiffuseLighting.enableGuiDepthLighting(); - WurstClient.MC.getItemRenderer().renderInGuiWithOverrides(matrixStack, - renderStack, 0, 0); + helper.method_51427(renderStack, 0, 0); DiffuseLighting.disableGuiDepthLighting(); matrixStack.pop(); @@ -891,12 +893,13 @@ public enum RenderUtils matrixStack.scale(2, 2, 2); GL11.glDisable(GL11.GL_DEPTH_TEST); - TextRenderer fr = WurstClient.MC.textRenderer; - fr.drawWithShadow(matrixStack, "?", 3, 2, 0xf0f0f0); + TextRenderer tr = WurstClient.MC.textRenderer; + helper.method_51433(tr, "?", 3, 2, 0xf0f0f0, false); GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_BLEND); matrixStack.pop(); } + + RenderSystem.setShaderColor(1, 1, 1, 1); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index cc0b64a0..305d6924 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,8 +30,8 @@ "depends": { "fabricloader": ">=0.14.19", - "fabric-api": ">=0.77.2", - "minecraft": "~1.20-alpha.23.14.a", + "fabric-api": ">=0.78.1", + "minecraft": "~1.20-alpha.23.16.a", "java": ">=17" }, "suggests": { From 5910942e0e092a8f5131896ad01b82443ed2aa74 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 27 Apr 2023 09:54:11 +0200 Subject: [PATCH 12/45] [Wurst-Bot] Update to 23w17a --- gradle.properties | 8 +++---- .../java/net/wurstclient/WurstClient.java | 2 +- .../java/net/wurstclient/ai/PathFinder.java | 4 ++-- .../wurstclient/altmanager/AltRenderer.java | 13 +++++----- .../altmanager/screens/AltEditorScreen.java | 7 +++--- .../altmanager/screens/AltManagerScreen.java | 24 +++++++++---------- .../net/wurstclient/clickgui/ClickGui.java | 22 ++++++++--------- .../wurstclient/clickgui/ComboBoxPopup.java | 10 ++++---- .../net/wurstclient/clickgui/Component.java | 4 ++-- .../java/net/wurstclient/clickgui/Popup.java | 4 ++-- .../components/AbstractListEditButton.java | 10 ++++---- .../clickgui/components/BlockComponent.java | 8 +++---- .../components/CheckboxComponent.java | 10 ++++---- .../clickgui/components/ColorComponent.java | 12 +++++----- .../components/ComboBoxComponent.java | 12 +++++----- .../clickgui/components/FeatureButton.java | 10 ++++---- .../clickgui/components/FileComponent.java | 10 ++++---- .../clickgui/components/RadarComponent.java | 7 +++--- .../clickgui/components/SliderComponent.java | 12 +++++----- .../clickgui/screens/AddBookOfferScreen.java | 16 ++++++------- .../clickgui/screens/ClickGuiScreen.java | 4 ++-- .../clickgui/screens/EditBlockListScreen.java | 14 +++++------ .../clickgui/screens/EditBlockScreen.java | 6 ++--- .../clickgui/screens/EditBookOfferScreen.java | 10 ++++---- .../screens/EditBookOffersScreen.java | 16 ++++++------- .../clickgui/screens/EditColorScreen.java | 12 +++++----- .../clickgui/screens/EditItemListScreen.java | 14 +++++------ .../clickgui/screens/EditSliderScreen.java | 4 ++-- .../clickgui/screens/SelectFileScreen.java | 12 +++++----- .../net/wurstclient/commands/TacoCmd.java | 5 ++-- .../wurstclient/events/GUIRenderListener.java | 9 ++++--- .../net/wurstclient/hacks/BowAimbotHack.java | 9 ++++--- .../net/wurstclient/hacks/ExcavatorHack.java | 8 +++---- .../wurstclient/hacks/MobSpawnEspHack.java | 2 +- .../java/net/wurstclient/hud/HackListHUD.java | 20 ++++++++-------- .../java/net/wurstclient/hud/IngameHUD.java | 5 ++-- src/main/java/net/wurstclient/hud/TabGui.java | 11 ++++----- .../java/net/wurstclient/hud/WurstLogo.java | 8 +++---- .../mixin/GameMenuScreenMixin.java | 4 ++-- .../net/wurstclient/mixin/IngameHudMixin.java | 7 +++--- .../net/wurstclient/mixin/ScreenMixin.java | 4 ++-- .../wurstclient/mixin/StatsScreenMixin.java | 2 +- .../wurstclient/mixin/TitleScreenMixin.java | 2 +- .../navigator/NavigatorFeatureScreen.java | 11 ++++----- .../navigator/NavigatorMainScreen.java | 16 ++++++------- .../navigator/NavigatorNewKeybindScreen.java | 7 +++--- .../NavigatorRemoveKeybindScreen.java | 7 +++--- .../navigator/NavigatorScreen.java | 9 ++++--- .../ForcedChatReportsScreen.java | 4 ++-- .../nochatreports/NcrModRequiredScreen.java | 4 ++-- .../options/EnterProfileNameScreen.java | 4 ++-- .../options/KeybindEditorScreen.java | 4 ++-- .../options/KeybindManagerScreen.java | 10 ++++---- .../options/KeybindProfilesScreen.java | 8 +++---- .../wurstclient/options/PressAKeyScreen.java | 5 ++-- .../options/WurstOptionsScreen.java | 10 ++++---- .../options/ZoomManagerScreen.java | 4 ++-- .../serverfinder/CleanUpScreen.java | 8 +++---- .../serverfinder/ServerFinderScreen.java | 5 ++-- .../java/net/wurstclient/util/ListWidget.java | 12 +++++----- .../net/wurstclient/util/RenderUtils.java | 10 ++++---- 61 files changed, 258 insertions(+), 273 deletions(-) diff --git a/gradle.properties b/gradle.properties index b42ee0bf..7e6c86a2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=23w16a -yarn_mappings=23w16a+build.4 +minecraft_version=23w17a +yarn_mappings=23w17a+build.4 loader_version=0.14.19 #Fabric api -fabric_version=0.78.1+1.20 +fabric_version=0.79.1+1.20 # Mod Properties -mod_version = v7.32-MC23w16a +mod_version = v7.32-MC23w17a maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index 4ab279e3..1d1b8add 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.32"; - public static final String MC_VERSION = "23w16a"; + public static final String MC_VERSION = "23w17a"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/ai/PathFinder.java b/src/main/java/net/wurstclient/ai/PathFinder.java index 0e8b9db5..8e088a29 100644 --- a/src/main/java/net/wurstclient/ai/PathFinder.java +++ b/src/main/java/net/wurstclient/ai/PathFinder.java @@ -283,7 +283,7 @@ public class PathFinder BlockState state = BlockUtils.getState(pos); Block block = state.getBlock(); - return state.method_51366() && !(block instanceof AbstractSignBlock) + return state.blocksMovement() && !(block instanceof AbstractSignBlock) || block instanceof LadderBlock || jesus && (block == Blocks.WATER || block == Blocks.LAVA); } @@ -300,7 +300,7 @@ public class PathFinder // check if solid BlockState state = BlockUtils.getState(pos); Block block = state.getBlock(); - if(state.method_51366() && !(block instanceof AbstractSignBlock)) + if(state.blocksMovement() && !(block instanceof AbstractSignBlock)) return false; // check if trapped diff --git a/src/main/java/net/wurstclient/altmanager/AltRenderer.java b/src/main/java/net/wurstclient/altmanager/AltRenderer.java index a263de58..685e1842 100644 --- a/src/main/java/net/wurstclient/altmanager/AltRenderer.java +++ b/src/main/java/net/wurstclient/altmanager/AltRenderer.java @@ -15,8 +15,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.authlib.GameProfile; import com.mojang.blaze3d.systems.RenderSystem; - -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.network.PlayerListEntry; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.BufferRenderer; @@ -53,7 +52,7 @@ public final class AltRenderer RenderSystem.setShaderTexture(0, loadedSkins.get(name)); } - private static void drawTexture(DrawableHelper helper, int x, int y, + private static void drawTexture(DrawContext helper, int x, int y, float u, float v, int w, int h, int fw, int fh) { int x2 = x + w; @@ -65,7 +64,7 @@ public final class AltRenderer float vPlusHOverFh = (v + h) / fh; RenderSystem.setShader(GameRenderer::getPositionTexProgram); - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); Matrix4f matrix4f = matrixStack.peek().getPositionMatrix(); BufferBuilder bufferBuilder = Tessellator.getInstance().getBuffer(); bufferBuilder.begin(VertexFormat.DrawMode.QUADS, @@ -81,7 +80,7 @@ public final class AltRenderer BufferRenderer.drawWithGlobalProgram(bufferBuilder.end()); } - public static void drawAltFace(DrawableHelper helper, String name, int x, + public static void drawAltFace(DrawContext helper, String name, int x, int y, int w, int h, boolean selected) { try @@ -116,7 +115,7 @@ public final class AltRenderer } } - public static void drawAltBody(DrawableHelper helper, String name, int x, + public static void drawAltBody(DrawContext helper, String name, int x, int y, int width, int height) { try @@ -247,7 +246,7 @@ public final class AltRenderer } } - public static void drawAltBack(DrawableHelper helper, String name, int x, + public static void drawAltBack(DrawContext helper, String name, int x, int y, int width, int height) { try diff --git a/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java b/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java index 474b95cd..2ef9b5f7 100644 --- a/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java +++ b/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java @@ -27,8 +27,7 @@ import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.mojang.blaze3d.systems.RenderSystem; - -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -343,12 +342,12 @@ public abstract class AltEditorScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { renderBackground(helper); - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); diff --git a/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java b/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java index 2a36f541..07a85536 100644 --- a/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java +++ b/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java @@ -29,8 +29,8 @@ import com.mojang.blaze3d.systems.RenderSystem; import it.unimi.dsi.fastutil.booleans.BooleanConsumer; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.NoticeScreen; import net.minecraft.client.gui.screen.Screen; @@ -409,13 +409,13 @@ public final class AltManagerScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { renderBackground(helper); listGui.render(helper, mouseX, mouseY, partialTicks); - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -473,7 +473,7 @@ public final class AltManagerScreen extends Screen renderAltTooltip(helper, mouseX, mouseY); } - private void renderAltTooltip(DrawableHelper helper, int mouseX, int mouseY) + private void renderAltTooltip(DrawContext helper, int mouseX, int mouseY) { if(!listGui.isMouseInList(mouseX, mouseY)) return; @@ -515,10 +515,10 @@ public final class AltManagerScreen extends Screen if(alt.isFavorite()) addTooltip(tooltip, "favorite"); - helper.method_51434(textRenderer, tooltip, mouseX, mouseY); + helper.drawTooltip(textRenderer, tooltip, mouseX, mouseY); } - private void renderButtonTooltip(DrawableHelper helper, int mouseX, + private void renderButtonTooltip(DrawContext helper, int mouseX, int mouseY) { for(Drawable d : ((IScreen)(Object)this).getButtons()) @@ -542,7 +542,7 @@ public final class AltManagerScreen extends Screen else addTooltip(tooltip, "window_freeze"); - helper.method_51434(textRenderer, tooltip, mouseX, mouseY); + helper.drawTooltip(textRenderer, tooltip, mouseX, mouseY); break; } } @@ -637,12 +637,12 @@ public final class AltManagerScreen extends Screen } @Override - protected void renderItem(DrawableHelper helper, int id, int x, int y, + protected void renderItem(DrawContext helper, int id, int x, int y, int var4, int var5, int var6, float partialTicks) { Alt alt = list.get(id); - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -677,15 +677,15 @@ public final class AltManagerScreen extends Screen isSelectedItem(id)); // name / email - helper.method_51433(client.textRenderer, + helper.drawText(client.textRenderer, "Name: " + alt.getDisplayName(), x + 31, y + 3, 10526880, false); - helper.method_51433(client.textRenderer, + helper.drawText(client.textRenderer, "Name: " + alt.getDisplayName(), x + 31, y + 3, 10526880, false); String bottomText = getBottomText(alt); - helper.method_51433(client.textRenderer, bottomText, x + 31, y + 15, + helper.drawText(client.textRenderer, bottomText, x + 31, y + 15, 10526880, false); } diff --git a/src/main/java/net/wurstclient/clickgui/ClickGui.java b/src/main/java/net/wurstclient/clickgui/ClickGui.java index 75b5eb79..d2d9369b 100644 --- a/src/main/java/net/wurstclient/clickgui/ClickGui.java +++ b/src/main/java/net/wurstclient/clickgui/ClickGui.java @@ -28,7 +28,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -460,7 +460,7 @@ public final class ClickGui } } - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { updateColors(); @@ -504,9 +504,9 @@ public final class ClickGui GL11.glDisable(GL11.GL_BLEND); } - public void renderPopups(DrawableHelper helper, int mouseX, int mouseY) + public void renderPopups(DrawContext helper, int mouseX, int mouseY) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); for(Popup popup : popups) { Component owner = popup.getOwner(); @@ -527,9 +527,9 @@ public final class ClickGui } } - public void renderTooltip(DrawableHelper helper, int mouseX, int mouseY) + public void renderTooltip(DrawContext helper, int mouseX, int mouseY) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -586,14 +586,14 @@ public final class ClickGui // text RenderSystem.setShaderColor(1, 1, 1, 1); for(int i = 0; i < lines.length; i++) - helper.method_51433(fr, lines[i], xt1 + 2, + helper.drawText(fr, lines[i], xt1 + 2, yt1 + 2 + i * fr.fontHeight, txtColor, false); GL11.glEnable(GL11.GL_BLEND); matrixStack.pop(); } - public void renderPinnedWindows(DrawableHelper helper, float partialTicks) + public void renderPinnedWindows(DrawContext helper, float partialTicks) { GL11.glDisable(GL11.GL_CULL_FACE); GL11.glEnable(GL11.GL_BLEND); @@ -626,7 +626,7 @@ public final class ClickGui acColor = clickGui.getAccentColor(); } - private void renderWindow(DrawableHelper helper, Window window, int mouseX, + private void renderWindow(DrawContext helper, Window window, int mouseX, int mouseY, float partialTicks) { int x1 = window.getX(); @@ -635,7 +635,7 @@ public final class ClickGui int y2 = y1 + window.getHeight(); int y3 = y1 + 13; - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -892,7 +892,7 @@ public final class ClickGui TextRenderer fr = MC.textRenderer; String title = fr.trimToWidth(Text.literal(window.getTitle()), x3 - x1) .getString(); - helper.method_51433(fr, title, x1 + 2, y1 + 3, txtColor, false); + helper.drawText(fr, title, x1 + 2, y1 + 3, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/ComboBoxPopup.java b/src/main/java/net/wurstclient/clickgui/ComboBoxPopup.java index f3b634c6..674699b0 100644 --- a/src/main/java/net/wurstclient/clickgui/ComboBoxPopup.java +++ b/src/main/java/net/wurstclient/clickgui/ComboBoxPopup.java @@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -70,9 +70,9 @@ public final class ComboBoxPopup> extends Popup } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY) + public void render(DrawContext helper, int mouseX, int mouseY) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); int x1 = getX(); int x2 = x1 + getWidth(); int y1 = getY(); @@ -150,14 +150,14 @@ public final class ComboBoxPopup> extends Popup tessellator.draw(); } - private void drawValueName(DrawableHelper helper, int x1, int yi1, + private void drawValueName(DrawContext helper, int x1, int yi1, Enum value) { ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); RenderSystem.setShaderColor(1, 1, 1, 1); - helper.method_51433(tr, value.toString(), x1 + 2, yi1 + 2, txtColor, + helper.drawText(tr, value.toString(), x1 + 2, yi1 + 2, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/Component.java b/src/main/java/net/wurstclient/clickgui/Component.java index b2fb13e8..52b98005 100644 --- a/src/main/java/net/wurstclient/clickgui/Component.java +++ b/src/main/java/net/wurstclient/clickgui/Component.java @@ -7,7 +7,7 @@ */ package net.wurstclient.clickgui; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; public abstract class Component { @@ -23,7 +23,7 @@ public abstract class Component } - public abstract void render(DrawableHelper helper, int mouseX, int mouseY, + public abstract void render(DrawContext helper, int mouseX, int mouseY, float partialTicks); public abstract int getDefaultWidth(); diff --git a/src/main/java/net/wurstclient/clickgui/Popup.java b/src/main/java/net/wurstclient/clickgui/Popup.java index b77f62f5..296b5f34 100644 --- a/src/main/java/net/wurstclient/clickgui/Popup.java +++ b/src/main/java/net/wurstclient/clickgui/Popup.java @@ -7,7 +7,7 @@ */ package net.wurstclient.clickgui; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; public abstract class Popup { @@ -27,7 +27,7 @@ public abstract class Popup public abstract void handleMouseClick(int mouseX, int mouseY, int mouseButton); - public abstract void render(DrawableHelper helper, int mouseX, int mouseY); + public abstract void render(DrawContext helper, int mouseX, int mouseY); public abstract int getDefaultWidth(); diff --git a/src/main/java/net/wurstclient/clickgui/components/AbstractListEditButton.java b/src/main/java/net/wurstclient/clickgui/components/AbstractListEditButton.java index ed5597a9..b9c0c763 100644 --- a/src/main/java/net/wurstclient/clickgui/components/AbstractListEditButton.java +++ b/src/main/java/net/wurstclient/clickgui/components/AbstractListEditButton.java @@ -14,7 +14,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -57,7 +57,7 @@ public abstract class AbstractListEditButton extends Component } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { ClickGui gui = WurstClient.INSTANCE.getGui(); @@ -80,7 +80,7 @@ public abstract class AbstractListEditButton extends Component boolean hText = hovering && mouseX < x3; boolean hBox = hovering && mouseX >= x3; - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -124,8 +124,8 @@ public abstract class AbstractListEditButton extends Component // setting name RenderSystem.setShaderColor(1, 1, 1, 1); TextRenderer tr = MC.textRenderer; - helper.method_51433(tr, getText(), x1, y1 + 2, txtColor, false); - helper.method_51433(tr, buttonText, x3 + 2, y1 + 2, txtColor, false); + helper.drawText(tr, getText(), x1, y1 + 2, txtColor, false); + helper.drawText(tr, buttonText, x3 + 2, y1 + 2, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/BlockComponent.java b/src/main/java/net/wurstclient/clickgui/components/BlockComponent.java index 1a97eef3..fb6d61f0 100644 --- a/src/main/java/net/wurstclient/clickgui/components/BlockComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/BlockComponent.java @@ -14,7 +14,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.Block; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; @@ -62,7 +62,7 @@ public final class BlockComponent extends Component } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { ClickGui gui = WurstClient.INSTANCE.getGui(); @@ -86,7 +86,7 @@ public final class BlockComponent extends Component ItemStack stack = new ItemStack(setting.getBlock()); - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -121,7 +121,7 @@ public final class BlockComponent extends Component RenderSystem.setShaderColor(1, 1, 1, 1); TextRenderer tr = WurstClient.MC.textRenderer; String text = setting.getName() + ":"; - helper.method_51433(tr, text, x1, y1 + 2, txtColor, false); + helper.drawText(tr, text, x1, y1 + 2, txtColor, false); MatrixStack modelViewStack = RenderSystem.getModelViewStack(); modelViewStack.push(); diff --git a/src/main/java/net/wurstclient/clickgui/components/CheckboxComponent.java b/src/main/java/net/wurstclient/clickgui/components/CheckboxComponent.java index 007fb867..ed37d1de 100644 --- a/src/main/java/net/wurstclient/clickgui/components/CheckboxComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/CheckboxComponent.java @@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -56,10 +56,10 @@ public final class CheckboxComponent extends Component } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); int x1 = getX(); int x2 = x1 + getWidth(); int x3 = x1 + 11; @@ -211,7 +211,7 @@ public final class CheckboxComponent extends Component tessellator.draw(); } - private void drawName(DrawableHelper helper, int x3, int y1) + private void drawName(DrawContext helper, int x3, int y1) { ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); @@ -221,7 +221,7 @@ public final class CheckboxComponent extends Component String name = setting.getName(); int tx = x3 + 2; int ty = y1 + 2; - helper.method_51433(MC.textRenderer, name, tx, ty, txtColor, false); + helper.drawText(MC.textRenderer, name, tx, ty, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/ColorComponent.java b/src/main/java/net/wurstclient/clickgui/components/ColorComponent.java index 3bb8138f..5cfcea46 100644 --- a/src/main/java/net/wurstclient/clickgui/components/ColorComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/ColorComponent.java @@ -14,7 +14,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -56,10 +56,10 @@ public final class ColorComponent extends Component } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); int x1 = getX(); int x2 = x1 + getWidth(); int y1 = getY(); @@ -157,7 +157,7 @@ public final class ColorComponent extends Component tessellator.draw(); } - private void drawNameAndValue(DrawableHelper helper, int x1, int x2, int y1) + private void drawNameAndValue(DrawContext helper, int x1, int x2, int y1) { ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); @@ -165,11 +165,11 @@ public final class ColorComponent extends Component RenderSystem.setShaderColor(1, 1, 1, 1); TextRenderer tr = MC.textRenderer; - helper.method_51433(tr, setting.getName(), x1, y1, txtColor, false); + helper.drawText(tr, setting.getName(), x1, y1, txtColor, false); String value = ColorUtils.toHex(setting.getColor()); int valueWidth = tr.getWidth(value); - helper.method_51433(tr, value, x2 - valueWidth, y1, txtColor, false); + helper.drawText(tr, value, x2 - valueWidth, y1, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/ComboBoxComponent.java b/src/main/java/net/wurstclient/clickgui/components/ComboBoxComponent.java index ac22c446..b3788a49 100644 --- a/src/main/java/net/wurstclient/clickgui/components/ComboBoxComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/ComboBoxComponent.java @@ -17,7 +17,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -103,10 +103,10 @@ public final class ComboBoxComponent> extends Component } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); int x1 = getX(); int x2 = x1 + getWidth(); int x3 = x2 - 11; @@ -259,7 +259,7 @@ public final class ComboBoxComponent> extends Component tessellator.draw(); } - private void drawNameAndValue(DrawableHelper helper, int x1, int x4, int y1) + private void drawNameAndValue(DrawContext helper, int x1, int x4, int y1) { ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); @@ -269,8 +269,8 @@ public final class ComboBoxComponent> extends Component String name = setting.getName(); String value = "" + setting.getSelected(); - helper.method_51433(tr, name, x1, y1 + 2, txtColor, false); - helper.method_51433(tr, value, x4 + 2, y1 + 2, txtColor, false); + helper.drawText(tr, name, x1, y1 + 2, txtColor, false); + helper.drawText(tr, value, x4 + 2, y1 + 2, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/FeatureButton.java b/src/main/java/net/wurstclient/clickgui/components/FeatureButton.java index 2a0eb737..f1be4e3b 100644 --- a/src/main/java/net/wurstclient/clickgui/components/FeatureButton.java +++ b/src/main/java/net/wurstclient/clickgui/components/FeatureButton.java @@ -16,7 +16,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -96,10 +96,10 @@ public final class FeatureButton extends Component } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); int x1 = getX(); int x2 = x1 + getWidth(); int x3 = hasSettings ? x2 - 11 : x2; @@ -290,7 +290,7 @@ public final class FeatureButton extends Component tessellator.draw(); } - private void drawName(DrawableHelper helper, int x1, int x3, int y1) + private void drawName(DrawContext helper, int x1, int x3, int y1) { ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); @@ -303,7 +303,7 @@ public final class FeatureButton extends Component int tx = x1 + (x3 - x1 - nameWidth) / 2; int ty = y1 + 2; - helper.method_51433(tr, name, tx, ty, txtColor, false); + helper.drawText(tr, name, tx, ty, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/FileComponent.java b/src/main/java/net/wurstclient/clickgui/components/FileComponent.java index 02504a78..44e2e54e 100644 --- a/src/main/java/net/wurstclient/clickgui/components/FileComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/FileComponent.java @@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -55,7 +55,7 @@ public final class FileComponent extends Component } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { ClickGui gui = WurstClient.INSTANCE.getGui(); @@ -81,7 +81,7 @@ public final class FileComponent extends Component boolean hText = hovering && mouseX < x3; boolean hBox = hovering && mouseX >= x3; - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -130,8 +130,8 @@ public final class FileComponent extends Component // setting name RenderSystem.setShaderColor(1, 1, 1, 1); String text = setting.getName() + ": "; - helper.method_51433(tr, text, x1, y1 + 2, txtColor, false); - helper.method_51433(tr, setting.getSelectedFileName(), x3 + 2, y1 + 2, + helper.drawText(tr, text, x1, y1 + 2, txtColor, false); + helper.drawText(tr, setting.getSelectedFileName(), x3 + 2, y1 + 2, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/RadarComponent.java b/src/main/java/net/wurstclient/clickgui/components/RadarComponent.java index 2c337f3f..fc12728d 100644 --- a/src/main/java/net/wurstclient/clickgui/components/RadarComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/RadarComponent.java @@ -11,8 +11,7 @@ import org.joml.Matrix4f; import org.joml.Quaternionf; import com.mojang.blaze3d.systems.RenderSystem; - -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; @@ -44,7 +43,7 @@ public final class RadarComponent extends Component } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { ClickGui gui = WurstClient.INSTANCE.getGui(); @@ -63,7 +62,7 @@ public final class RadarComponent extends Component && mouseY < y2 && mouseY >= -scroll && mouseY < getParent().getHeight() - 13 - scroll; - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); diff --git a/src/main/java/net/wurstclient/clickgui/components/SliderComponent.java b/src/main/java/net/wurstclient/clickgui/components/SliderComponent.java index 93122af3..9a3d7ed1 100644 --- a/src/main/java/net/wurstclient/clickgui/components/SliderComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/SliderComponent.java @@ -14,7 +14,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; @@ -76,10 +76,10 @@ public final class SliderComponent extends Component } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); int x1 = getX(); int x2 = x1 + getWidth(); int x3 = x1 + 2; @@ -302,7 +302,7 @@ public final class SliderComponent extends Component tessellator.draw(); } - private void drawNameAndValue(DrawableHelper helper, int x1, int x2, int y1, + private void drawNameAndValue(DrawContext helper, int x1, int x2, int y1, boolean renderAsDisabled) { ClickGui gui = WurstClient.INSTANCE.getGui(); @@ -314,8 +314,8 @@ public final class SliderComponent extends Component String name = setting.getName(); String value = setting.getValueString(); int valueWidth = tr.getWidth(value); - helper.method_51433(tr, name, x1, y1 + 2, txtColor, false); - helper.method_51433(tr, value, x2 - valueWidth, y1 + 2, txtColor, + helper.drawText(tr, name, x1, y1 + 2, txtColor, false); + helper.drawText(tr, value, x2 - valueWidth, y1 + 2, txtColor, false); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/net/wurstclient/clickgui/screens/AddBookOfferScreen.java b/src/main/java/net/wurstclient/clickgui/screens/AddBookOfferScreen.java index 6fa8c5ff..8b26104d 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/AddBookOfferScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/AddBookOfferScreen.java @@ -14,7 +14,7 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -287,10 +287,10 @@ public final class AddBookOfferScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); listGui.render(helper, mouseX, mouseY, partialTicks); matrixStack.push(); @@ -393,10 +393,10 @@ public final class AddBookOfferScreen extends Screen } @Override - protected void renderItem(DrawableHelper helper, int index, int x, + protected void renderItem(DrawContext helper, int index, int x, int y, int var4, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); if(isSelectedItem(index)) drawSelectionOutline(matrixStack, x, y); @@ -410,14 +410,14 @@ public final class AddBookOfferScreen extends Screen String name = bookOffer.getEnchantmentName(); int nameColor = enchantment.isCursed() ? 0xff5555 : 0xf0f0f0; - helper.method_51433(tr, name, x + 28, y, nameColor, false); + helper.drawText(tr, name, x + 28, y, nameColor, false); - helper.method_51433(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, + helper.drawText(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, false); int maxLevel = enchantment.getMaxLevel(); String levels = maxLevel + (maxLevel == 1 ? " level" : " levels"); - helper.method_51433(tr, levels, x + 28, y + 18, 0xa0a0a0, false); + helper.drawText(tr, levels, x + 28, y + 18, 0xa0a0a0, false); } } } diff --git a/src/main/java/net/wurstclient/clickgui/screens/ClickGuiScreen.java b/src/main/java/net/wurstclient/clickgui/screens/ClickGuiScreen.java index ef040239..f6fbce0f 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/ClickGuiScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/ClickGuiScreen.java @@ -7,7 +7,7 @@ */ package net.wurstclient.clickgui.screens; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.text.Text; import net.wurstclient.clickgui.ClickGui; @@ -50,7 +50,7 @@ public final class ClickGuiScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { super.render(helper, mouseX, mouseY, partialTicks); diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java index 3db8f5c3..0efbbdd0 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java @@ -14,7 +14,7 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.block.Block; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -161,10 +161,10 @@ public final class EditBlockListScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); listGui.render(helper, mouseX, mouseY, partialTicks); helper.drawCenteredTextWithShadow(client.textRenderer, @@ -258,7 +258,7 @@ public final class EditBlockListScreen extends Screen } @Override - protected void renderItem(DrawableHelper helper, int index, int x, + protected void renderItem(DrawContext helper, int index, int x, int y, int var4, int var5, int var6, float partialTicks) { String name = list.get(index); @@ -269,9 +269,9 @@ public final class EditBlockListScreen extends Screen RenderUtils.drawItem(helper, stack, x + 1, y + 1, true); String displayName = stack.isEmpty() ? "\u00a7ounknown block\u00a7r" : stack.getName().getString(); - helper.method_51433(tr, displayName, x + 28, y, 0xf0f0f0, false); - helper.method_51433(tr, name, x + 28, y + 9, 0xa0a0a0, false); - helper.method_51433(tr, + helper.drawText(tr, displayName, x + 28, y, 0xf0f0f0, false); + helper.drawText(tr, name, x + 28, y + 9, 0xa0a0a0, false); + helper.drawText(tr, "ID: " + Block.getRawIdFromState(block.getDefaultState()), x + 28, y + 18, 0xa0a0a0, false); } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java index 3ab6b616..462d01a2 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java @@ -12,7 +12,7 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -97,10 +97,10 @@ public final class EditBlockScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); TextRenderer tr = client.textRenderer; renderBackground(helper); diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditBookOfferScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditBookOfferScreen.java index 4660b830..ebeba9dc 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditBookOfferScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditBookOfferScreen.java @@ -10,7 +10,7 @@ package net.wurstclient.clickgui.screens; import org.lwjgl.glfw.GLFW; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -252,10 +252,10 @@ public final class EditBookOfferScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); renderBackgroundTexture(helper); matrixStack.push(); @@ -280,7 +280,7 @@ public final class EditBookOfferScreen extends Screen int nameColor = enchantment.isCursed() ? 0xff5555 : 0xffffff; helper.drawTextWithShadow(tr, name, x + 28, y, nameColor); - helper.method_51433(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, false); + helper.drawText(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, false); String price; if(bookOffer.price() >= 64) @@ -292,7 +292,7 @@ public final class EditBookOfferScreen extends Screen x + 28 + tr.getWidth(price), y + 16, false); } - helper.method_51433(tr, price, x + 28, y + 18, 0xa0a0a0, false); + helper.drawText(tr, price, x + 28, y + 18, 0xa0a0a0, false); levelField.render(helper, mouseX, mouseY, partialTicks); priceField.render(helper, mouseX, mouseY, partialTicks); diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditBookOffersScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditBookOffersScreen.java index 2af5011a..fc310196 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditBookOffersScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditBookOffersScreen.java @@ -13,7 +13,7 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -177,10 +177,10 @@ public final class EditBookOffersScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); listGui.render(helper, mouseX, mouseY, partialTicks); matrixStack.push(); @@ -250,10 +250,10 @@ public final class EditBookOffersScreen extends Screen } @Override - protected void renderItem(DrawableHelper helper, int index, int x, + protected void renderItem(DrawContext helper, int index, int x, int y, int var4, int var5, int var6, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); if(isSelectedItem(index)) drawSelectionOutline(matrixStack, x, y); @@ -267,9 +267,9 @@ public final class EditBookOffersScreen extends Screen Enchantment enchantment = bookOffer.getEnchantment(); int nameColor = enchantment.isCursed() ? 0xff5555 : 0xf0f0f0; - helper.method_51433(tr, name, x + 28, y, nameColor, false); + helper.drawText(tr, name, x + 28, y, nameColor, false); - helper.method_51433(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, + helper.drawText(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, false); String price; @@ -282,7 +282,7 @@ public final class EditBookOffersScreen extends Screen x + 28 + tr.getWidth(price), y + 16, false); } - helper.method_51433(tr, price, x + 28, y + 18, 0xa0a0a0, false); + helper.drawText(tr, price, x + 28, y + 18, 0xa0a0a0, false); } } } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditColorScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditColorScreen.java index 40d4028d..0af94448 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditColorScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditColorScreen.java @@ -18,7 +18,7 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -165,7 +165,7 @@ public final class EditColorScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { TextRenderer tr = client.textRenderer; @@ -186,13 +186,13 @@ public final class EditColorScreen extends Screen helper.drawTexture(paletteIdentifier, x, y, u, v, w, h, fw, fh); // RGB letters - helper.method_51433(tr, "#", fieldsX - 3 - tr.getWidth("#"), + helper.drawText(tr, "#", fieldsX - 3 - tr.getWidth("#"), fieldsY + 6, 0xF0F0F0, false); - helper.method_51433(tr, "R:", fieldsX - 3 - tr.getWidth("R:"), + helper.drawText(tr, "R:", fieldsX - 3 - tr.getWidth("R:"), fieldsY + 6 + 35, 0xFF0000, false); - helper.method_51433(tr, "G:", fieldsX + 75 - 3 - tr.getWidth("G:"), + helper.drawText(tr, "G:", fieldsX + 75 - 3 - tr.getWidth("G:"), fieldsY + 6 + 35, 0x00FF00, false); - helper.method_51433(tr, "B:", fieldsX + 150 - 3 - tr.getWidth("B:"), + helper.drawText(tr, "B:", fieldsX + 150 - 3 - tr.getWidth("B:"), fieldsY + 6 + 35, 0x0000FF, false); hexValueField.render(helper, mouseX, mouseY, partialTicks); diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java index 6de47482..57eb5fe8 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java @@ -13,7 +13,7 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -163,10 +163,10 @@ public final class EditItemListScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); listGui.render(helper, mouseX, mouseY, partialTicks); helper.drawCenteredTextWithShadow(client.textRenderer, @@ -265,7 +265,7 @@ public final class EditItemListScreen extends Screen } @Override - protected void renderItem(DrawableHelper helper, int index, int x, + protected void renderItem(DrawContext helper, int index, int x, int y, int var4, int var5, int var6, float partialTicks) { String name = list.get(index); @@ -276,9 +276,9 @@ public final class EditItemListScreen extends Screen RenderUtils.drawItem(helper, stack, x + 1, y + 1, true); String displayName = stack.isEmpty() ? "\u00a7ounknown item\u00a7r" : stack.getName().getString(); - helper.method_51433(tr, displayName, x + 28, y, 0xf0f0f0, false); - helper.method_51433(tr, name, x + 28, y + 9, 0xa0a0a0, false); - helper.method_51433(tr, "ID: " + Registries.ITEM.getRawId(item), + helper.drawText(tr, displayName, x + 28, y, 0xf0f0f0, false); + helper.drawText(tr, name, x + 28, y + 9, 0xa0a0a0, false); + helper.drawText(tr, "ID: " + Registries.ITEM.getRawId(item), x + 28, y + 18, 0xa0a0a0, false); } } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java index 47bf7d62..3cc13393 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java @@ -10,7 +10,7 @@ package net.wurstclient.clickgui.screens; import org.lwjgl.glfw.GLFW; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -92,7 +92,7 @@ public final class EditSliderScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { renderBackground(helper); diff --git a/src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java b/src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java index 95926532..b165b42c 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java @@ -16,7 +16,7 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -162,7 +162,7 @@ public final class SelectFileScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { renderBackground(helper); @@ -174,7 +174,7 @@ public final class SelectFileScreen extends Screen super.render(helper, mouseX, mouseY, partialTicks); if(doneButton.isSelected() && !doneButton.active) - helper.method_51434(textRenderer, + helper.drawTooltip(textRenderer, Arrays.asList(Text.literal("You must first select a file.")), mouseX, mouseY); } @@ -234,15 +234,15 @@ public final class SelectFileScreen extends Screen } @Override - protected void renderItem(DrawableHelper helper, int index, int x, + protected void renderItem(DrawContext helper, int index, int x, int y, int var4, int var5, int var6, float partialTicks) { TextRenderer tr = mc.textRenderer; Path path = list.get(index); - helper.method_51433(tr, "" + path.getFileName(), x + 28, y, + helper.drawText(tr, "" + path.getFileName(), x + 28, y, 0xf0f0f0, false); - helper.method_51433(tr, + helper.drawText(tr, "" + client.runDirectory.toPath().relativize(path), x + 28, y + 9, 0xa0a0a0, false); } diff --git a/src/main/java/net/wurstclient/commands/TacoCmd.java b/src/main/java/net/wurstclient/commands/TacoCmd.java index 7ec114c0..c91a524a 100644 --- a/src/main/java/net/wurstclient/commands/TacoCmd.java +++ b/src/main/java/net/wurstclient/commands/TacoCmd.java @@ -10,8 +10,7 @@ package net.wurstclient.commands; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; - -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.Window; import net.minecraft.util.Identifier; import net.wurstclient.Category; @@ -82,7 +81,7 @@ public final class TacoCmd extends Command } @Override - public void onRenderGUI(DrawableHelper helper, float partialTicks) + public void onRenderGUI(DrawContext helper, float partialTicks) { GL11.glEnable(GL11.GL_BLEND); GL11.glDisable(GL11.GL_CULL_FACE); diff --git a/src/main/java/net/wurstclient/events/GUIRenderListener.java b/src/main/java/net/wurstclient/events/GUIRenderListener.java index f6959922..94402380 100644 --- a/src/main/java/net/wurstclient/events/GUIRenderListener.java +++ b/src/main/java/net/wurstclient/events/GUIRenderListener.java @@ -8,21 +8,20 @@ package net.wurstclient.events; import java.util.ArrayList; - -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.wurstclient.event.Event; import net.wurstclient.event.Listener; public interface GUIRenderListener extends Listener { - public void onRenderGUI(DrawableHelper helper, float partialTicks); + public void onRenderGUI(DrawContext helper, float partialTicks); public static class GUIRenderEvent extends Event { private final float partialTicks; - private final DrawableHelper helper; + private final DrawContext helper; - public GUIRenderEvent(DrawableHelper helper, float partialTicks) + public GUIRenderEvent(DrawContext helper, float partialTicks) { this.helper = helper; this.partialTicks = partialTicks; diff --git a/src/main/java/net/wurstclient/hacks/BowAimbotHack.java b/src/main/java/net/wurstclient/hacks/BowAimbotHack.java index bdec313c..449e3053 100644 --- a/src/main/java/net/wurstclient/hacks/BowAimbotHack.java +++ b/src/main/java/net/wurstclient/hacks/BowAimbotHack.java @@ -17,8 +17,7 @@ import org.joml.Matrix4f; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; - -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; @@ -243,9 +242,9 @@ public final class BowAimbotHack extends Hack } @Override - public void onRenderGUI(DrawableHelper helper, float partialTicks) + public void onRenderGUI(DrawContext helper, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); if(target == null) return; @@ -283,7 +282,7 @@ public final class BowAimbotHack extends Hack tessellator.draw(); // text - helper.method_51433(MC.textRenderer, message, 2, 1, 0xffffffff, false); + helper.drawText(MC.textRenderer, message, 2, 1, 0xffffffff, false); matrixStack.pop(); diff --git a/src/main/java/net/wurstclient/hacks/ExcavatorHack.java b/src/main/java/net/wurstclient/hacks/ExcavatorHack.java index 9154b01a..4e610615 100644 --- a/src/main/java/net/wurstclient/hacks/ExcavatorHack.java +++ b/src/main/java/net/wurstclient/hacks/ExcavatorHack.java @@ -21,7 +21,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -325,14 +325,14 @@ public final class ExcavatorHack extends Hack } @Override - public void onRenderGUI(DrawableHelper helper, float partialTicks) + public void onRenderGUI(DrawContext helper, float partialTicks) { // GL settings GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glDisable(GL11.GL_CULL_FACE); - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); matrixStack.push(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); @@ -365,7 +365,7 @@ public final class ExcavatorHack extends Hack tessellator.draw(); // text - helper.method_51433(tr, message, 2, 1, 0xffffffff, false); + helper.drawText(tr, message, 2, 1, 0xffffffff, false); matrixStack.pop(); diff --git a/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java b/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java index 64f9c428..658f81c2 100644 --- a/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java +++ b/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java @@ -299,7 +299,7 @@ public final class MobSpawnEspHack extends Hack BlockPos pos = new BlockPos(x, y, z); BlockState state = world.getBlockState(pos); - if(state.method_51366()) + if(state.blocksMovement()) continue; if(!state.getFluidState().isEmpty()) continue; diff --git a/src/main/java/net/wurstclient/hud/HackListHUD.java b/src/main/java/net/wurstclient/hud/HackListHUD.java index 01b40163..c350b8f8 100644 --- a/src/main/java/net/wurstclient/hud/HackListHUD.java +++ b/src/main/java/net/wurstclient/hud/HackListHUD.java @@ -13,7 +13,7 @@ import java.util.Comparator; import java.util.Iterator; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.Window; import net.wurstclient.WurstClient; import net.wurstclient.events.UpdateListener; @@ -34,7 +34,7 @@ public final class HackListHUD implements UpdateListener WurstClient.INSTANCE.getEventManager().add(UpdateListener.class, this); } - public void render(DrawableHelper helper, float partialTicks) + public void render(DrawContext helper, float partialTicks) { if(otf.getMode() == Mode.HIDDEN) return; @@ -64,14 +64,14 @@ public final class HackListHUD implements UpdateListener drawHackList(helper, partialTicks); } - private void drawCounter(DrawableHelper helper) + private void drawCounter(DrawContext helper) { long size = activeHax.stream().filter(e -> e.hack.isEnabled()).count(); String s = size + " hack" + (size != 1 ? "s" : "") + " active"; drawString(helper, s); } - private void drawHackList(DrawableHelper helper, float partialTicks) + private void drawHackList(DrawContext helper, float partialTicks) { if(otf.isAnimations()) for(HackListEntry e : activeHax) @@ -129,7 +129,7 @@ public final class HackListHUD implements UpdateListener } } - private void drawString(DrawableHelper helper, String s) + private void drawString(DrawContext helper, String s) { TextRenderer tr = WurstClient.MC.textRenderer; int posX; @@ -144,13 +144,13 @@ public final class HackListHUD implements UpdateListener posX = screenWidth - stringWidth - 2; } - helper.method_51433(tr, s, posX + 1, posY + 1, 0xff000000, false); - helper.method_51433(tr, s, posX, posY, textColor | 0xff000000, false); + helper.drawText(tr, s, posX + 1, posY + 1, 0xff000000, false); + helper.drawText(tr, s, posX, posY, textColor | 0xff000000, false); posY += 9; } - private void drawWithOffset(DrawableHelper helper, HackListEntry e, + private void drawWithOffset(DrawContext helper, HackListEntry e, float partialTicks) { TextRenderer tr = WurstClient.MC.textRenderer; @@ -171,9 +171,9 @@ public final class HackListHUD implements UpdateListener } int alpha = (int)(255 * (1 - offset / 4)) << 24; - helper.method_51433(tr, s, (int)posX + 1, posY + 1, 0x04000000 | alpha, + helper.drawText(tr, s, (int)posX + 1, posY + 1, 0x04000000 | alpha, false); - helper.method_51433(tr, s, (int)posX, posY, textColor | alpha, false); + helper.drawText(tr, s, (int)posX, posY, textColor | alpha, false); posY += 9; } diff --git a/src/main/java/net/wurstclient/hud/IngameHUD.java b/src/main/java/net/wurstclient/hud/IngameHUD.java index cd96e069..b0aa82d9 100644 --- a/src/main/java/net/wurstclient/hud/IngameHUD.java +++ b/src/main/java/net/wurstclient/hud/IngameHUD.java @@ -10,8 +10,7 @@ package net.wurstclient.hud; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; - -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.wurstclient.WurstClient; import net.wurstclient.clickgui.ClickGui; import net.wurstclient.clickgui.screens.ClickGuiScreen; @@ -24,7 +23,7 @@ public final class IngameHUD implements GUIRenderListener private TabGui tabGui; @Override - public void onRenderGUI(DrawableHelper helper, float partialTicks) + public void onRenderGUI(DrawContext helper, float partialTicks) { if(!WurstClient.INSTANCE.isEnabled()) return; diff --git a/src/main/java/net/wurstclient/hud/TabGui.java b/src/main/java/net/wurstclient/hud/TabGui.java index 06b0c645..c9950f6e 100644 --- a/src/main/java/net/wurstclient/hud/TabGui.java +++ b/src/main/java/net/wurstclient/hud/TabGui.java @@ -15,8 +15,7 @@ import org.lwjgl.glfw.GLFW; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; - -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -122,9 +121,9 @@ public final class TabGui implements KeyPressListener } } - public void render(DrawableHelper helper, float partialTicks) + public void render(DrawContext helper, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); if(tabGuiOtf.isHidden()) return; @@ -158,7 +157,7 @@ public final class TabGui implements KeyPressListener if(i == selected) tabName = (tabOpened ? "<" : ">") + tabName; - helper.method_51433(WurstClient.MC.textRenderer, tabName, 2, textY, + helper.drawText(WurstClient.MC.textRenderer, tabName, 2, textY, txtColor, false); textY += 10; } @@ -193,7 +192,7 @@ public final class TabGui implements KeyPressListener if(i == tab.selected) fName = ">" + fName; - helper.method_51433(WurstClient.MC.textRenderer, fName, 2, + helper.drawText(WurstClient.MC.textRenderer, fName, 2, tabTextY, txtColor, false); tabTextY += 10; } diff --git a/src/main/java/net/wurstclient/hud/WurstLogo.java b/src/main/java/net/wurstclient/hud/WurstLogo.java index d9488530..670fabcb 100644 --- a/src/main/java/net/wurstclient/hud/WurstLogo.java +++ b/src/main/java/net/wurstclient/hud/WurstLogo.java @@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -29,9 +29,9 @@ public final class WurstLogo private static final Identifier texture = new Identifier("wurst", "wurst_128.png"); - public void render(DrawableHelper helper) + public void render(DrawContext helper) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); WurstLogoOtf otf = WurstClient.INSTANCE.getOtfs().wurstLogoOtf; if(!otf.isVisible()) return; @@ -55,7 +55,7 @@ public final class WurstLogo // draw version string GL11.glEnable(GL11.GL_CULL_FACE); GL11.glDisable(GL11.GL_DEPTH_TEST); - helper.method_51433(tr, version, 74, 8, otf.getTextColor(), false); + helper.drawText(tr, version, 74, 8, otf.getTextColor(), false); // draw Wurst logo RenderSystem.setShaderColor(1, 1, 1, 1); diff --git a/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java b/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java index 54f152b2..4bafc9e6 100644 --- a/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java @@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.mojang.blaze3d.systems.RenderSystem; import net.fabricmc.fabric.api.client.screen.v1.Screens; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.GameMenuScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -112,7 +112,7 @@ public abstract class GameMenuScreenMixin extends Screen @Inject(at = @At("TAIL"), method = "render(Lnet/minecraft/client/gui/DrawableHelper;IIF)V") - private void onRender(DrawableHelper helper, int mouseX, int mouseY, + private void onRender(DrawContext helper, int mouseX, int mouseY, float partialTicks, CallbackInfo ci) { if(!WurstClient.INSTANCE.isEnabled() || wurstOptionsButton == null) diff --git a/src/main/java/net/wurstclient/mixin/IngameHudMixin.java b/src/main/java/net/wurstclient/mixin/IngameHudMixin.java index 417e8eaf..81ca18f9 100644 --- a/src/main/java/net/wurstclient/mixin/IngameHudMixin.java +++ b/src/main/java/net/wurstclient/mixin/IngameHudMixin.java @@ -11,8 +11,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.hud.InGameHud; import net.minecraft.util.Identifier; import net.wurstclient.WurstClient; @@ -28,7 +27,7 @@ public class IngameHudMixin remap = false, ordinal = 3), method = "render(Lnet/minecraft/client/gui/DrawableHelper;F)V") - private void onRender(DrawableHelper helper, float partialTicks, + private void onRender(DrawContext helper, float partialTicks, CallbackInfo ci) { if(WurstClient.MC.options.debugEnabled) @@ -41,7 +40,7 @@ public class IngameHudMixin @Inject(at = @At("HEAD"), method = "renderOverlay(Lnet/minecraft/client/gui/DrawableHelper;Lnet/minecraft/util/Identifier;F)V", cancellable = true) - private void onRenderOverlay(DrawableHelper helper, Identifier texture, + private void onRenderOverlay(DrawContext helper, Identifier texture, float opacity, CallbackInfo ci) { if(texture == null || texture.getPath() == null) diff --git a/src/main/java/net/wurstclient/mixin/ScreenMixin.java b/src/main/java/net/wurstclient/mixin/ScreenMixin.java index f0dbc160..070993fc 100644 --- a/src/main/java/net/wurstclient/mixin/ScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/ScreenMixin.java @@ -17,8 +17,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import net.minecraft.client.gui.AbstractParentElement; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.wurstclient.WurstClient; import net.wurstclient.mixinterface.IScreen; @@ -34,7 +34,7 @@ public abstract class ScreenMixin extends AbstractParentElement @Inject(at = @At("HEAD"), method = "renderBackground(Lnet/minecraft/client/gui/DrawableHelper;)V", cancellable = true) - public void onRenderBackground(DrawableHelper helper, CallbackInfo ci) + public void onRenderBackground(DrawContext helper, CallbackInfo ci) { if(WurstClient.INSTANCE.getHax().noBackgroundHack .shouldCancelBackground((Screen)(Object)this)) diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 187f0eed..5297484e 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.setX(width / 2 + 2); + button.method_46421(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 28488e07..87f22486 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.setY(realmsButton.getY()); + altsButton.method_46419(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java index 69cb4829..a848dbb3 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java @@ -20,9 +20,8 @@ import org.lwjgl.glfw.GLFW; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; - +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.render.BufferBuilder; @@ -319,10 +318,10 @@ public final class NavigatorFeatureScreen extends NavigatorScreen } @Override - protected void onRender(DrawableHelper helper, int mouseX, int mouseY, + protected void onRender(DrawContext helper, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); @@ -476,7 +475,7 @@ public final class NavigatorFeatureScreen extends NavigatorScreen int textY = bgy1 + scroll + 2; for(String line : text.split("\n")) { - helper.method_51433(client.textRenderer, line, bgx1 + 2, textY, + helper.drawText(client.textRenderer, line, bgx1 + 2, textY, txtColor, false); textY += client.textRenderer.fontHeight; } @@ -519,7 +518,7 @@ public final class NavigatorFeatureScreen extends NavigatorScreen // text String buttonText = button.getMessage().getString(); - helper.method_51433(client.textRenderer, buttonText, + helper.drawText(client.textRenderer, buttonText, (x1 + x2 - client.textRenderer.getWidth(buttonText)) / 2, y1 + 5, txtColor, false); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index ab6690b6..98051679 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -17,7 +17,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.render.BufferBuilder; @@ -74,7 +74,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.setX(middleX - 100); + searchBar.method_46421(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } @@ -228,10 +228,10 @@ public final class NavigatorMainScreen extends NavigatorScreen } @Override - protected void onRender(DrawableHelper helper, int mouseX, int mouseY, + protected void onRender(DrawContext helper, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); ClickGui gui = WurstClient.INSTANCE.getGui(); float[] bgColor = gui.getBgColor(); float[] acColor = gui.getAcColor(); @@ -329,15 +329,15 @@ public final class NavigatorMainScreen extends NavigatorScreen // text for(int i = 0; i < lines.length; i++) - helper.method_51433(tr, lines[i], xt1 + 2, + helper.drawText(tr, lines[i], xt1 + 2, yt1 + 2 + i * tr.fontHeight, txtColor, false); } } - private void renderFeature(DrawableHelper helper, int mouseX, int mouseY, + private void renderFeature(DrawContext helper, int mouseX, int mouseY, float partialTicks, int i, int x, int y) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); ClickGui gui = WurstClient.INSTANCE.getGui(); float[] bgColor = gui.getBgColor(); int txtColor = gui.getTxtColor(); @@ -475,7 +475,7 @@ public final class NavigatorMainScreen extends NavigatorScreen RenderSystem.setShader(GameRenderer::getPositionProgram); RenderSystem.setShaderColor(1, 1, 1, 1); String buttonText = feature.getName(); - helper.method_51433(client.textRenderer, buttonText, area.x + 4, + helper.drawText(client.textRenderer, buttonText, area.x + 4, area.y + 4, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java index e98cb71f..71e1df6e 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java @@ -14,9 +14,8 @@ import org.lwjgl.glfw.GLFW; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; - +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.util.InputUtil; @@ -157,10 +156,10 @@ public class NavigatorNewKeybindScreen extends NavigatorScreen } @Override - protected void onRender(DrawableHelper helper, int mouseX, int mouseY, + protected void onRender(DrawContext helper, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); diff --git a/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java index 5b7d762e..521a9025 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java @@ -16,9 +16,8 @@ import org.lwjgl.glfw.GLFW; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; - +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.util.math.MatrixStack; @@ -129,10 +128,10 @@ public class NavigatorRemoveKeybindScreen extends NavigatorScreen } @Override - protected void onRender(DrawableHelper helper, int mouseX, int mouseY, + protected void onRender(DrawContext helper, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); diff --git a/src/main/java/net/wurstclient/navigator/NavigatorScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorScreen.java index b08a07f8..3b7d48b0 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorScreen.java @@ -13,8 +13,7 @@ import org.joml.Matrix4f; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; - -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; @@ -143,10 +142,10 @@ public abstract class NavigatorScreen extends Screen } @Override - public final void render(DrawableHelper helper, int mouseX, int mouseY, + public final void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); // GL settings GL11.glEnable(GL11.GL_BLEND); @@ -209,7 +208,7 @@ public abstract class NavigatorScreen extends Screen protected abstract void onUpdate(); - protected abstract void onRender(DrawableHelper helper, int mouseX, + protected abstract void onRender(DrawContext helper, int mouseX, int mouseY, float partialTicks); protected final int getStringHeight(String s) diff --git a/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java b/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java index 9918364e..f97bb64b 100644 --- a/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java +++ b/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.function.Supplier; import net.minecraft.client.font.MultilineText; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.text.LiteralTextContent; @@ -101,7 +101,7 @@ public final class ForcedChatReportsScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float delta) { renderBackground(helper); diff --git a/src/main/java/net/wurstclient/nochatreports/NcrModRequiredScreen.java b/src/main/java/net/wurstclient/nochatreports/NcrModRequiredScreen.java index 695fa6cc..0db22a89 100644 --- a/src/main/java/net/wurstclient/nochatreports/NcrModRequiredScreen.java +++ b/src/main/java/net/wurstclient/nochatreports/NcrModRequiredScreen.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.function.Supplier; import net.minecraft.client.font.MultilineText; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.text.Text; @@ -117,7 +117,7 @@ public final class NcrModRequiredScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float delta) { renderBackground(helper); diff --git a/src/main/java/net/wurstclient/options/EnterProfileNameScreen.java b/src/main/java/net/wurstclient/options/EnterProfileNameScreen.java index 7804ea79..fb59d506 100644 --- a/src/main/java/net/wurstclient/options/EnterProfileNameScreen.java +++ b/src/main/java/net/wurstclient/options/EnterProfileNameScreen.java @@ -12,7 +12,7 @@ import java.util.function.Consumer; import org.lwjgl.glfw.GLFW; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -88,7 +88,7 @@ public final class EnterProfileNameScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { renderBackground(helper); diff --git a/src/main/java/net/wurstclient/options/KeybindEditorScreen.java b/src/main/java/net/wurstclient/options/KeybindEditorScreen.java index 0be5f364..9de18f58 100644 --- a/src/main/java/net/wurstclient/options/KeybindEditorScreen.java +++ b/src/main/java/net/wurstclient/options/KeybindEditorScreen.java @@ -7,7 +7,7 @@ */ package net.wurstclient.options; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -94,7 +94,7 @@ public final class KeybindEditorScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { renderBackground(helper); diff --git a/src/main/java/net/wurstclient/options/KeybindManagerScreen.java b/src/main/java/net/wurstclient/options/KeybindManagerScreen.java index b693a227..41aef4b3 100644 --- a/src/main/java/net/wurstclient/options/KeybindManagerScreen.java +++ b/src/main/java/net/wurstclient/options/KeybindManagerScreen.java @@ -10,7 +10,7 @@ package net.wurstclient.options; import org.lwjgl.glfw.GLFW; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -163,7 +163,7 @@ public final class KeybindManagerScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { renderBackground(helper); @@ -222,16 +222,16 @@ public final class KeybindManagerScreen extends Screen } @Override - protected void renderItem(DrawableHelper helper, int index, int x, + protected void renderItem(DrawContext helper, int index, int x, int y, int slotHeight, int mouseX, int mouseY, float partialTicks) { Keybind keybind = WurstClient.INSTANCE.getKeybinds().getAllKeybinds().get(index); - helper.method_51433(client.textRenderer, + helper.drawText(client.textRenderer, "Key: " + keybind.getKey().replace("key.keyboard.", ""), x + 3, y + 3, 0xa0a0a0, false); - helper.method_51433(client.textRenderer, + helper.drawText(client.textRenderer, "Commands: " + keybind.getCommands(), x + 3, y + 15, 0xa0a0a0, false); } diff --git a/src/main/java/net/wurstclient/options/KeybindProfilesScreen.java b/src/main/java/net/wurstclient/options/KeybindProfilesScreen.java index 8b29b381..93eaecee 100644 --- a/src/main/java/net/wurstclient/options/KeybindProfilesScreen.java +++ b/src/main/java/net/wurstclient/options/KeybindProfilesScreen.java @@ -17,7 +17,7 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.text.Text; @@ -170,7 +170,7 @@ public final class KeybindProfilesScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { renderBackground(helper); @@ -182,7 +182,7 @@ public final class KeybindProfilesScreen extends Screen super.render(helper, mouseX, mouseY, partialTicks); if(loadButton.isSelected() && !loadButton.active) - helper.method_51434(textRenderer, + helper.drawTooltip(textRenderer, Arrays.asList(Text.literal("You must first select a file.")), mouseX, mouseY); } @@ -236,7 +236,7 @@ public final class KeybindProfilesScreen extends Screen } @Override - protected void renderItem(DrawableHelper helper, int index, int x, + protected void renderItem(DrawContext helper, int index, int x, int y, int var4, int var5, int var6, float partialTicks) { TextRenderer tr = mc.textRenderer; diff --git a/src/main/java/net/wurstclient/options/PressAKeyScreen.java b/src/main/java/net/wurstclient/options/PressAKeyScreen.java index aa425a46..abc05fee 100644 --- a/src/main/java/net/wurstclient/options/PressAKeyScreen.java +++ b/src/main/java/net/wurstclient/options/PressAKeyScreen.java @@ -8,8 +8,7 @@ package net.wurstclient.options; import org.lwjgl.glfw.GLFW; - -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.InputUtil; import net.minecraft.text.Text; @@ -50,7 +49,7 @@ public class PressAKeyScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { renderBackground(helper); diff --git a/src/main/java/net/wurstclient/options/WurstOptionsScreen.java b/src/main/java/net/wurstclient/options/WurstOptionsScreen.java index 156b066d..5dfd7eb7 100644 --- a/src/main/java/net/wurstclient/options/WurstOptionsScreen.java +++ b/src/main/java/net/wurstclient/options/WurstOptionsScreen.java @@ -12,8 +12,8 @@ import java.util.List; import java.util.function.Supplier; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ClickableWidget; @@ -146,7 +146,7 @@ public class WurstOptionsScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { renderBackground(helper); @@ -155,7 +155,7 @@ public class WurstOptionsScreen extends Screen renderButtonTooltip(helper, mouseX, mouseY); } - private void renderTitles(DrawableHelper helper) + private void renderTitles(DrawContext helper) { TextRenderer tr = client.textRenderer; int middleX = width / 2; @@ -173,7 +173,7 @@ public class WurstOptionsScreen extends Screen 0xcccccc); } - private void renderButtonTooltip(DrawableHelper helper, int mouseX, + private void renderButtonTooltip(DrawContext helper, int mouseX, int mouseY) { for(Drawable d : ((IScreen)this).getButtons()) @@ -191,7 +191,7 @@ public class WurstOptionsScreen extends Screen if(woButton.tooltip.isEmpty()) continue; - helper.method_51434(textRenderer, woButton.tooltip, mouseX, mouseY); + helper.drawTooltip(textRenderer, woButton.tooltip, mouseX, mouseY); break; } } diff --git a/src/main/java/net/wurstclient/options/ZoomManagerScreen.java b/src/main/java/net/wurstclient/options/ZoomManagerScreen.java index 22246d4d..5d644838 100644 --- a/src/main/java/net/wurstclient/options/ZoomManagerScreen.java +++ b/src/main/java/net/wurstclient/options/ZoomManagerScreen.java @@ -7,7 +7,7 @@ */ package net.wurstclient.options; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.option.KeyBinding; @@ -94,7 +94,7 @@ public class ZoomManagerScreen extends Screen implements PressAKeyCallback } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { ZoomOtf zoom = WurstClient.INSTANCE.getOtfs().zoomOtf; diff --git a/src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java b/src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java index 5f802849..813031e0 100644 --- a/src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java +++ b/src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java @@ -14,8 +14,8 @@ import java.util.function.Supplier; import org.lwjgl.glfw.GLFW; import net.minecraft.SharedConstants; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; import net.minecraft.client.gui.screen.multiplayer.MultiplayerServerListWidget; @@ -201,7 +201,7 @@ public class CleanUpScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { renderBackground(helper); @@ -215,7 +215,7 @@ public class CleanUpScreen extends Screen renderButtonTooltip(helper, mouseX, mouseY); } - private void renderButtonTooltip(DrawableHelper helper, int mouseX, + private void renderButtonTooltip(DrawContext helper, int mouseX, int mouseY) { for(Drawable d : ((IScreen)this).getButtons()) @@ -233,7 +233,7 @@ public class CleanUpScreen extends Screen if(cuButton.tooltip.isEmpty()) continue; - helper.method_51434(textRenderer, cuButton.tooltip, mouseX, mouseY); + helper.drawTooltip(textRenderer, cuButton.tooltip, mouseX, mouseY); break; } } diff --git a/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java b/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java index 179693b6..cadec82f 100644 --- a/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java +++ b/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java @@ -12,8 +12,7 @@ import java.net.UnknownHostException; import java.util.ArrayList; import org.lwjgl.glfw.GLFW; - -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -214,7 +213,7 @@ public class ServerFinderScreen extends Screen } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float partialTicks) { renderBackground(helper); diff --git a/src/main/java/net/wurstclient/util/ListWidget.java b/src/main/java/net/wurstclient/util/ListWidget.java index f012a253..1420112a 100644 --- a/src/main/java/net/wurstclient/util/ListWidget.java +++ b/src/main/java/net/wurstclient/util/ListWidget.java @@ -18,8 +18,8 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.AbstractParentElement; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.render.BufferBuilder; @@ -94,7 +94,7 @@ public abstract class ListWidget extends AbstractParentElement protected void updateItemPosition(int index, int x, int y, float delta) {} - protected abstract void renderItem(DrawableHelper helper, int x, int y, + protected abstract void renderItem(DrawContext helper, int x, int y, int itemHeight, int mouseX, int mouseY, int i, float f); protected void renderHeader(int x, int y, Tessellator tessellator) @@ -134,7 +134,7 @@ public abstract class ListWidget extends AbstractParentElement } @Override - public void render(DrawableHelper helper, int mouseX, int mouseY, + public void render(DrawContext helper, int mouseX, int mouseY, float delta) { if(visible) @@ -145,7 +145,7 @@ public abstract class ListWidget extends AbstractParentElement capYPosition(); Tessellator tessellator = Tessellator.getInstance(); BufferBuilder bufferBuilder = tessellator.getBuffer(); - RenderSystem.setShaderTexture(0, Screen.field_44669); + RenderSystem.setShaderTexture(0, Screen.OPTIONS_BACKGROUND_TEXTURE); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); RenderSystem.setShader(GameRenderer::getPositionTexColorProgram); bufferBuilder.begin(VertexFormat.DrawMode.QUADS, @@ -374,7 +374,7 @@ public abstract class ListWidget extends AbstractParentElement return 220; } - protected void renderList(DrawableHelper helper, int i, int j, int k, int l, + protected void renderList(DrawContext helper, int i, int j, int k, int l, float f) { int m = getItemCount(); @@ -435,7 +435,7 @@ public abstract class ListWidget extends AbstractParentElement { Tessellator tessellator = Tessellator.getInstance(); BufferBuilder bufferBuilder = tessellator.getBuffer(); - RenderSystem.setShaderTexture(0, Screen.field_44669); + RenderSystem.setShaderTexture(0, Screen.OPTIONS_BACKGROUND_TEXTURE); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); RenderSystem.setShader(GameRenderer::getPositionTexColorProgram); bufferBuilder.begin(VertexFormat.DrawMode.QUADS, diff --git a/src/main/java/net/wurstclient/util/RenderUtils.java b/src/main/java/net/wurstclient/util/RenderUtils.java index e1da84d9..dd1e2583 100644 --- a/src/main/java/net/wurstclient/util/RenderUtils.java +++ b/src/main/java/net/wurstclient/util/RenderUtils.java @@ -16,7 +16,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.Blocks; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gl.VertexBuffer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.BufferBuilder.BuiltBuffer; import net.minecraft.client.render.Camera; @@ -864,10 +864,10 @@ public enum RenderUtils bufferBuilder.vertex(matrix, 0, 2, 1).next(); } - public static void drawItem(DrawableHelper helper, ItemStack stack, int x, + public static void drawItem(DrawContext helper, ItemStack stack, int x, int y, boolean large) { - MatrixStack matrixStack = helper.method_51448(); + MatrixStack matrixStack = helper.getMatrices(); matrixStack.push(); matrixStack.translate(x, y, 0); @@ -880,7 +880,7 @@ public enum RenderUtils ? new ItemStack(Blocks.GRASS_BLOCK) : stack; DiffuseLighting.enableGuiDepthLighting(); - helper.method_51427(renderStack, 0, 0); + helper.drawItem(renderStack, 0, 0); DiffuseLighting.disableGuiDepthLighting(); matrixStack.pop(); @@ -894,7 +894,7 @@ public enum RenderUtils GL11.glDisable(GL11.GL_DEPTH_TEST); TextRenderer tr = WurstClient.MC.textRenderer; - helper.method_51433(tr, "?", 3, 2, 0xf0f0f0, false); + helper.drawText(tr, "?", 3, 2, 0xf0f0f0, false); GL11.glEnable(GL11.GL_DEPTH_TEST); matrixStack.pop(); From 844fd142866d5a457709c4156b6984b314eb45b0 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 27 Apr 2023 14:10:20 +0200 Subject: [PATCH 13/45] Update to 23w17a --- .../wurstclient/altmanager/AltRenderer.java | 65 ++++++++++--------- .../altmanager/screens/AltEditorScreen.java | 27 ++++---- .../altmanager/screens/AltManagerScreen.java | 46 ++++++------- .../net/wurstclient/clickgui/ClickGui.java | 34 +++++----- .../wurstclient/clickgui/ComboBoxPopup.java | 10 +-- .../net/wurstclient/clickgui/Component.java | 2 +- .../java/net/wurstclient/clickgui/Popup.java | 2 +- .../components/AbstractListEditButton.java | 8 +-- .../clickgui/components/BlockComponent.java | 8 +-- .../components/CheckboxComponent.java | 10 +-- .../clickgui/components/ColorComponent.java | 12 ++-- .../components/ComboBoxComponent.java | 12 ++-- .../clickgui/components/FeatureButton.java | 10 +-- .../clickgui/components/FileComponent.java | 8 +-- .../clickgui/components/RadarComponent.java | 5 +- .../clickgui/components/SliderComponent.java | 13 ++-- .../clickgui/screens/AddBookOfferScreen.java | 36 +++++----- .../clickgui/screens/ClickGuiScreen.java | 6 +- .../clickgui/screens/EditBlockListScreen.java | 46 ++++++------- .../clickgui/screens/EditBlockScreen.java | 34 +++++----- .../clickgui/screens/EditBookOfferScreen.java | 32 ++++----- .../screens/EditBookOffersScreen.java | 26 ++++---- .../clickgui/screens/EditColorScreen.java | 32 ++++----- .../clickgui/screens/EditItemListScreen.java | 46 ++++++------- .../clickgui/screens/EditSliderScreen.java | 12 ++-- .../clickgui/screens/SelectFileScreen.java | 22 +++---- .../net/wurstclient/commands/TacoCmd.java | 5 +- .../wurstclient/events/GUIRenderListener.java | 11 ++-- .../net/wurstclient/hacks/BowAimbotHack.java | 7 +- .../net/wurstclient/hacks/ExcavatorHack.java | 6 +- .../net/wurstclient/hacks/NewChunksHack.java | 3 +- .../java/net/wurstclient/hud/HackListHUD.java | 28 ++++---- .../java/net/wurstclient/hud/IngameHUD.java | 11 ++-- src/main/java/net/wurstclient/hud/TabGui.java | 9 +-- .../java/net/wurstclient/hud/WurstLogo.java | 8 +-- .../mixin/GameMenuScreenMixin.java | 6 +- .../net/wurstclient/mixin/IngameHudMixin.java | 11 ++-- .../mixin/PlayerSkinProviderMixin.java | 16 ++--- .../net/wurstclient/mixin/ScreenMixin.java | 4 +- .../wurstclient/mixin/StatsScreenMixin.java | 2 +- .../wurstclient/mixin/TitleScreenMixin.java | 2 +- .../navigator/NavigatorFeatureScreen.java | 19 +++--- .../navigator/NavigatorMainScreen.java | 20 +++--- .../navigator/NavigatorNewKeybindScreen.java | 18 ++--- .../NavigatorRemoveKeybindScreen.java | 20 +++--- .../navigator/NavigatorScreen.java | 9 +-- .../ForcedChatReportsScreen.java | 11 ++-- .../nochatreports/NcrModRequiredScreen.java | 11 ++-- .../options/EnterProfileNameScreen.java | 10 +-- .../options/KeybindEditorScreen.java | 14 ++-- .../options/KeybindManagerScreen.java | 20 +++--- .../options/KeybindProfilesScreen.java | 20 +++--- .../wurstclient/options/PressAKeyScreen.java | 9 +-- .../options/WurstOptionsScreen.java | 24 +++---- .../options/ZoomManagerScreen.java | 10 +-- .../serverfinder/CleanUpScreen.java | 16 ++--- .../serverfinder/ServerFinderScreen.java | 29 +++++---- .../java/net/wurstclient/util/ChunkUtils.java | 19 ++++++ .../java/net/wurstclient/util/ListWidget.java | 11 ++-- .../net/wurstclient/util/RenderUtils.java | 8 +-- src/main/resources/fabric.mod.json | 2 +- 61 files changed, 511 insertions(+), 482 deletions(-) diff --git a/src/main/java/net/wurstclient/altmanager/AltRenderer.java b/src/main/java/net/wurstclient/altmanager/AltRenderer.java index 685e1842..5d83d0ad 100644 --- a/src/main/java/net/wurstclient/altmanager/AltRenderer.java +++ b/src/main/java/net/wurstclient/altmanager/AltRenderer.java @@ -15,6 +15,7 @@ import org.lwjgl.opengl.GL11; import com.mojang.authlib.GameProfile; import com.mojang.blaze3d.systems.RenderSystem; + import net.minecraft.client.gui.DrawContext; import net.minecraft.client.network.PlayerListEntry; import net.minecraft.client.render.BufferBuilder; @@ -52,8 +53,8 @@ public final class AltRenderer RenderSystem.setShaderTexture(0, loadedSkins.get(name)); } - private static void drawTexture(DrawContext helper, int x, int y, - float u, float v, int w, int h, int fw, int fh) + private static void drawTexture(DrawContext context, int x, int y, float u, + float v, int w, int h, int fw, int fh) { int x2 = x + w; int y2 = y + h; @@ -64,7 +65,7 @@ public final class AltRenderer float vPlusHOverFh = (v + h) / fh; RenderSystem.setShader(GameRenderer::getPositionTexProgram); - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); Matrix4f matrix4f = matrixStack.peek().getPositionMatrix(); BufferBuilder bufferBuilder = Tessellator.getInstance().getBuffer(); bufferBuilder.begin(VertexFormat.DrawMode.QUADS, @@ -80,7 +81,7 @@ public final class AltRenderer BufferRenderer.drawWithGlobalProgram(bufferBuilder.end()); } - public static void drawAltFace(DrawContext helper, String name, int x, + public static void drawAltFace(DrawContext context, String name, int x, int y, int w, int h, boolean selected) { try @@ -98,14 +99,14 @@ public final class AltRenderer int fh = 192; float u = 24; float v = 24; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Hat fw = 192; fh = 192; u = 120; v = 24; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); GL11.glDisable(GL11.GL_BLEND); @@ -115,7 +116,7 @@ public final class AltRenderer } } - public static void drawAltBody(DrawContext helper, String name, int x, + public static void drawAltBody(DrawContext context, String name, int x, int y, int width, int height) { try @@ -137,7 +138,7 @@ public final class AltRenderer int fh = height * 2; float u = height / 4; float v = height / 4; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Hat x = x + 0; @@ -146,7 +147,7 @@ public final class AltRenderer h = height / 4; u = height / 4 * 5; v = height / 4; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Chest x = x + 0; @@ -155,7 +156,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 2.5F; v = height / 4 * 2.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Jacket x = x + 0; @@ -164,7 +165,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 2.5F; v = height / 4 * 4.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Left Arm x = x - width / 16 * (slim ? 3 : 4); @@ -173,7 +174,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 5.5F; v = height / 4 * 2.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Left Sleeve x = x + 0; @@ -182,7 +183,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 5.5F; v = height / 4 * 4.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Right Arm x = x + width / 16 * (slim ? 11 : 12); @@ -191,7 +192,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 5.5F; v = height / 4 * 2.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Right Sleeve x = x + 0; @@ -200,7 +201,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 5.5F; v = height / 4 * 4.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Left Leg x = x - width / 2; @@ -209,7 +210,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 0.5F; v = height / 4 * 2.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Left Pants x = x + 0; @@ -218,7 +219,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 0.5F; v = height / 4 * 4.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Right Leg x = x + width / 4; @@ -227,7 +228,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 0.5F; v = height / 4 * 2.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Right Pants x = x + 0; @@ -236,7 +237,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 0.5F; v = height / 4 * 4.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); GL11.glDisable(GL11.GL_BLEND); @@ -246,7 +247,7 @@ public final class AltRenderer } } - public static void drawAltBack(DrawContext helper, String name, int x, + public static void drawAltBack(DrawContext context, String name, int x, int y, int width, int height) { try @@ -268,7 +269,7 @@ public final class AltRenderer int fh = height * 2; float u = height / 4 * 3; float v = height / 4; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Hat x = x + 0; @@ -277,7 +278,7 @@ public final class AltRenderer h = height / 4; u = height / 4 * 7; v = height / 4; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Chest x = x + 0; @@ -286,7 +287,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 4; v = height / 4 * 2.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Jacket x = x + 0; @@ -295,7 +296,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 4; v = height / 4 * 4.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Left Arm x = x - width / 16 * (slim ? 3 : 4); @@ -304,7 +305,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * (slim ? 6.375F : 6.5F); v = height / 4 * 2.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Left Sleeve x = x + 0; @@ -313,7 +314,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * (slim ? 6.375F : 6.5F); v = height / 4 * 4.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Right Arm x = x + width / 16 * (slim ? 11 : 12); @@ -322,7 +323,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * (slim ? 6.375F : 6.5F); v = height / 4 * 2.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Right Sleeve x = x + 0; @@ -331,7 +332,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * (slim ? 6.375F : 6.5F); v = height / 4 * 4.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Left Leg x = x - width / 2; @@ -340,7 +341,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 1.5F; v = height / 4 * 2.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Left Pants x = x + 0; @@ -349,7 +350,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 1.5F; v = height / 4 * 4.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Right Leg x = x + width / 4; @@ -358,7 +359,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 1.5F; v = height / 4 * 2.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); // Right Pants x = x + 0; @@ -367,7 +368,7 @@ public final class AltRenderer h = height / 8 * 3; u = height / 4 * 1.5F; v = height / 4 * 4.5F; - drawTexture(helper, x, y, u, v, w, h, fw, fh); + drawTexture(context, x, y, u, v, w, h, fw, fh); GL11.glDisable(GL11.GL_BLEND); diff --git a/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java b/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java index 2ef9b5f7..1a0d3bb7 100644 --- a/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java +++ b/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java @@ -27,6 +27,7 @@ import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.mojang.blaze3d.systems.RenderSystem; + import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -342,40 +343,40 @@ public abstract class AltEditorScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - renderBackground(helper); + renderBackground(context); - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); RenderSystem.setShader(GameRenderer::getPositionProgram); // skin preview - AltRenderer.drawAltBack(helper, nameOrEmailBox.getText(), + AltRenderer.drawAltBack(context, nameOrEmailBox.getText(), (width / 2 - 100) / 2 - 64, height / 2 - 128, 128, 256); - AltRenderer.drawAltBody(helper, nameOrEmailBox.getText(), + AltRenderer.drawAltBody(context, nameOrEmailBox.getText(), width - (width / 2 - 100) / 2 - 64, height / 2 - 128, 128, 256); // text - helper.drawTextWithShadow(textRenderer, "Name (for cracked alts), or", + context.drawTextWithShadow(textRenderer, "Name (for cracked alts), or", width / 2 - 100, 37, 10526880); - helper.drawTextWithShadow(textRenderer, "E-Mail (for premium alts)", + context.drawTextWithShadow(textRenderer, "E-Mail (for premium alts)", width / 2 - 100, 47, 10526880); - helper.drawTextWithShadow(textRenderer, + context.drawTextWithShadow(textRenderer, "Password (leave blank for cracked alts)", width / 2 - 100, 87, 10526880); String[] lines = message.split("\n"); for(int i = 0; i < lines.length; i++) - helper.drawCenteredTextWithShadow(textRenderer, lines[i], width / 2, - 142 + 10 * i, 16777215); + context.drawCenteredTextWithShadow(textRenderer, lines[i], + width / 2, 142 + 10 * i, 16777215); // text boxes - nameOrEmailBox.render(helper, mouseX, mouseY, partialTicks); - passwordBox.render(helper, mouseX, mouseY, partialTicks); + nameOrEmailBox.render(context, mouseX, mouseY, partialTicks); + passwordBox.render(context, mouseX, mouseY, partialTicks); // red flash for errors if(errorTimer > 0) @@ -398,7 +399,7 @@ public abstract class AltEditorScreen extends Screen errorTimer--; } - super.render(helper, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java b/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java index 07a85536..12656b70 100644 --- a/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java +++ b/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java @@ -409,13 +409,13 @@ public final class AltManagerScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - renderBackground(helper); - listGui.render(helper, mouseX, mouseY, partialTicks); + renderBackground(context); + listGui.render(context, mouseX, mouseY, partialTicks); - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -429,19 +429,19 @@ public final class AltManagerScreen extends Screen if(alt == null) return; - AltRenderer.drawAltBack(helper, alt.getName(), + AltRenderer.drawAltBack(context, alt.getName(), (width / 2 - 125) / 2 - 32, height / 2 - 64 - 9, 64, 128); - AltRenderer.drawAltBody(helper, alt.getName(), + AltRenderer.drawAltBody(context, alt.getName(), width - (width / 2 - 140) / 2 - 32, height / 2 - 64 - 9, 64, 128); } // title text - helper.drawCenteredTextWithShadow(textRenderer, "Alt Manager", + context.drawCenteredTextWithShadow(textRenderer, "Alt Manager", width / 2, 4, 16777215); - helper.drawCenteredTextWithShadow(textRenderer, + context.drawCenteredTextWithShadow(textRenderer, "Alts: " + altManager.getList().size(), width / 2, 14, 10526880); - helper.drawCenteredTextWithShadow( + context.drawCenteredTextWithShadow( textRenderer, "premium: " + altManager.getNumPremium() + ", cracked: " + altManager.getNumCracked(), width / 2, 24, 10526880); @@ -468,12 +468,12 @@ public final class AltManagerScreen extends Screen errorTimer--; } - super.render(helper, mouseX, mouseY, partialTicks); - renderButtonTooltip(helper, mouseX, mouseY); - renderAltTooltip(helper, mouseX, mouseY); + super.render(context, mouseX, mouseY, partialTicks); + renderButtonTooltip(context, mouseX, mouseY); + renderAltTooltip(context, mouseX, mouseY); } - private void renderAltTooltip(DrawContext helper, int mouseX, int mouseY) + private void renderAltTooltip(DrawContext context, int mouseX, int mouseY) { if(!listGui.isMouseInList(mouseX, mouseY)) return; @@ -515,10 +515,10 @@ public final class AltManagerScreen extends Screen if(alt.isFavorite()) addTooltip(tooltip, "favorite"); - helper.drawTooltip(textRenderer, tooltip, mouseX, mouseY); + context.drawTooltip(textRenderer, tooltip, mouseX, mouseY); } - private void renderButtonTooltip(DrawContext helper, int mouseX, + private void renderButtonTooltip(DrawContext context, int mouseX, int mouseY) { for(Drawable d : ((IScreen)(Object)this).getButtons()) @@ -542,7 +542,7 @@ public final class AltManagerScreen extends Screen else addTooltip(tooltip, "window_freeze"); - helper.drawTooltip(textRenderer, tooltip, mouseX, mouseY); + context.drawTooltip(textRenderer, tooltip, mouseX, mouseY); break; } } @@ -637,12 +637,12 @@ public final class AltManagerScreen extends Screen } @Override - protected void renderItem(DrawContext helper, int id, int x, int y, + protected void renderItem(DrawContext context, int id, int x, int y, int var4, int var5, int var6, float partialTicks) { Alt alt = list.get(id); - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -673,19 +673,19 @@ public final class AltManagerScreen extends Screen } // face - AltRenderer.drawAltFace(helper, alt.getName(), x + 1, y + 1, 24, 24, - isSelectedItem(id)); + AltRenderer.drawAltFace(context, alt.getName(), x + 1, y + 1, 24, + 24, isSelectedItem(id)); // name / email - helper.drawText(client.textRenderer, + context.drawText(client.textRenderer, "Name: " + alt.getDisplayName(), x + 31, y + 3, 10526880, false); - helper.drawText(client.textRenderer, + context.drawText(client.textRenderer, "Name: " + alt.getDisplayName(), x + 31, y + 3, 10526880, false); String bottomText = getBottomText(alt); - helper.drawText(client.textRenderer, bottomText, x + 31, y + 15, + context.drawText(client.textRenderer, bottomText, x + 31, y + 15, 10526880, false); } diff --git a/src/main/java/net/wurstclient/clickgui/ClickGui.java b/src/main/java/net/wurstclient/clickgui/ClickGui.java index d2d9369b..7b28bd9e 100644 --- a/src/main/java/net/wurstclient/clickgui/ClickGui.java +++ b/src/main/java/net/wurstclient/clickgui/ClickGui.java @@ -460,7 +460,7 @@ public final class ClickGui } } - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { updateColors(); @@ -494,19 +494,19 @@ public final class ClickGui else window.stopDraggingScrollbar(); - renderWindow(helper, window, mouseX, mouseY, partialTicks); + renderWindow(context, window, mouseX, mouseY, partialTicks); } - renderPopups(helper, mouseX, mouseY); - renderTooltip(helper, mouseX, mouseY); + renderPopups(context, mouseX, mouseY); + renderTooltip(context, mouseX, mouseY); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glDisable(GL11.GL_BLEND); } - public void renderPopups(DrawContext helper, int mouseX, int mouseY) + public void renderPopups(DrawContext context, int mouseX, int mouseY) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); for(Popup popup : popups) { Component owner = popup.getOwner(); @@ -521,15 +521,15 @@ public final class ClickGui int cMouseX = mouseX - x1; int cMouseY = mouseY - y1; - popup.render(helper, cMouseX, cMouseY); + popup.render(context, cMouseX, cMouseY); matrixStack.pop(); } } - public void renderTooltip(DrawContext helper, int mouseX, int mouseY) + public void renderTooltip(DrawContext context, int mouseX, int mouseY) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -586,14 +586,14 @@ public final class ClickGui // text RenderSystem.setShaderColor(1, 1, 1, 1); for(int i = 0; i < lines.length; i++) - helper.drawText(fr, lines[i], xt1 + 2, - yt1 + 2 + i * fr.fontHeight, txtColor, false); + context.drawText(fr, lines[i], xt1 + 2, yt1 + 2 + i * fr.fontHeight, + txtColor, false); GL11.glEnable(GL11.GL_BLEND); matrixStack.pop(); } - public void renderPinnedWindows(DrawContext helper, float partialTicks) + public void renderPinnedWindows(DrawContext context, float partialTicks) { GL11.glDisable(GL11.GL_CULL_FACE); GL11.glEnable(GL11.GL_BLEND); @@ -602,7 +602,7 @@ public final class ClickGui for(Window window : windows) if(window.isPinned() && !window.isInvisible()) - renderWindow(helper, window, Integer.MIN_VALUE, + renderWindow(context, window, Integer.MIN_VALUE, Integer.MIN_VALUE, partialTicks); GL11.glEnable(GL11.GL_CULL_FACE); @@ -626,7 +626,7 @@ public final class ClickGui acColor = clickGui.getAccentColor(); } - private void renderWindow(DrawContext helper, Window window, int mouseX, + private void renderWindow(DrawContext context, Window window, int mouseX, int mouseY, float partialTicks) { int x1 = window.getX(); @@ -635,7 +635,7 @@ public final class ClickGui int y2 = y1 + window.getHeight(); int y3 = y1 + 13; - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -796,7 +796,7 @@ public final class ClickGui int cMouseX = mouseX - x1; int cMouseY = mouseY - y4; for(int i = 0; i < window.countChildren(); i++) - window.getChild(i).render(helper, cMouseX, cMouseY, + window.getChild(i).render(context, cMouseX, cMouseY, partialTicks); matrixStack.pop(); @@ -892,7 +892,7 @@ public final class ClickGui TextRenderer fr = MC.textRenderer; String title = fr.trimToWidth(Text.literal(window.getTitle()), x3 - x1) .getString(); - helper.drawText(fr, title, x1 + 2, y1 + 3, txtColor, false); + context.drawText(fr, title, x1 + 2, y1 + 3, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/ComboBoxPopup.java b/src/main/java/net/wurstclient/clickgui/ComboBoxPopup.java index 674699b0..0587f5db 100644 --- a/src/main/java/net/wurstclient/clickgui/ComboBoxPopup.java +++ b/src/main/java/net/wurstclient/clickgui/ComboBoxPopup.java @@ -70,9 +70,9 @@ public final class ComboBoxPopup> extends Popup } @Override - public void render(DrawContext helper, int mouseX, int mouseY) + public void render(DrawContext context, int mouseX, int mouseY) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); int x1 = getX(); int x2 = x1 + getWidth(); int y1 = getY(); @@ -99,7 +99,7 @@ public final class ComboBoxPopup> extends Popup boolean hValue = hovering && mouseY >= yi1 && mouseY < yi2; drawValueBackground(matrixStack, x1, x2, yi1, yi2, hValue); - drawValueName(helper, x1, yi1, value); + drawValueName(context, x1, yi1, value); } } @@ -150,14 +150,14 @@ public final class ComboBoxPopup> extends Popup tessellator.draw(); } - private void drawValueName(DrawContext helper, int x1, int yi1, + private void drawValueName(DrawContext context, int x1, int yi1, Enum value) { ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); RenderSystem.setShaderColor(1, 1, 1, 1); - helper.drawText(tr, value.toString(), x1 + 2, yi1 + 2, txtColor, + context.drawText(tr, value.toString(), x1 + 2, yi1 + 2, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/Component.java b/src/main/java/net/wurstclient/clickgui/Component.java index 52b98005..b826fd84 100644 --- a/src/main/java/net/wurstclient/clickgui/Component.java +++ b/src/main/java/net/wurstclient/clickgui/Component.java @@ -23,7 +23,7 @@ public abstract class Component } - public abstract void render(DrawContext helper, int mouseX, int mouseY, + public abstract void render(DrawContext context, int mouseX, int mouseY, float partialTicks); public abstract int getDefaultWidth(); diff --git a/src/main/java/net/wurstclient/clickgui/Popup.java b/src/main/java/net/wurstclient/clickgui/Popup.java index 296b5f34..240f7ba3 100644 --- a/src/main/java/net/wurstclient/clickgui/Popup.java +++ b/src/main/java/net/wurstclient/clickgui/Popup.java @@ -27,7 +27,7 @@ public abstract class Popup public abstract void handleMouseClick(int mouseX, int mouseY, int mouseButton); - public abstract void render(DrawContext helper, int mouseX, int mouseY); + public abstract void render(DrawContext context, int mouseX, int mouseY); public abstract int getDefaultWidth(); diff --git a/src/main/java/net/wurstclient/clickgui/components/AbstractListEditButton.java b/src/main/java/net/wurstclient/clickgui/components/AbstractListEditButton.java index b9c0c763..37ab63e9 100644 --- a/src/main/java/net/wurstclient/clickgui/components/AbstractListEditButton.java +++ b/src/main/java/net/wurstclient/clickgui/components/AbstractListEditButton.java @@ -57,7 +57,7 @@ public abstract class AbstractListEditButton extends Component } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { ClickGui gui = WurstClient.INSTANCE.getGui(); @@ -80,7 +80,7 @@ public abstract class AbstractListEditButton extends Component boolean hText = hovering && mouseX < x3; boolean hBox = hovering && mouseX >= x3; - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -124,8 +124,8 @@ public abstract class AbstractListEditButton extends Component // setting name RenderSystem.setShaderColor(1, 1, 1, 1); TextRenderer tr = MC.textRenderer; - helper.drawText(tr, getText(), x1, y1 + 2, txtColor, false); - helper.drawText(tr, buttonText, x3 + 2, y1 + 2, txtColor, false); + context.drawText(tr, getText(), x1, y1 + 2, txtColor, false); + context.drawText(tr, buttonText, x3 + 2, y1 + 2, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/BlockComponent.java b/src/main/java/net/wurstclient/clickgui/components/BlockComponent.java index fb6d61f0..890f1e8c 100644 --- a/src/main/java/net/wurstclient/clickgui/components/BlockComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/BlockComponent.java @@ -62,7 +62,7 @@ public final class BlockComponent extends Component } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { ClickGui gui = WurstClient.INSTANCE.getGui(); @@ -86,7 +86,7 @@ public final class BlockComponent extends Component ItemStack stack = new ItemStack(setting.getBlock()); - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -121,14 +121,14 @@ public final class BlockComponent extends Component RenderSystem.setShaderColor(1, 1, 1, 1); TextRenderer tr = WurstClient.MC.textRenderer; String text = setting.getName() + ":"; - helper.drawText(tr, text, x1, y1 + 2, txtColor, false); + context.drawText(tr, text, x1, y1 + 2, txtColor, false); MatrixStack modelViewStack = RenderSystem.getModelViewStack(); modelViewStack.push(); Window parent = getParent(); modelViewStack.translate(parent.getX(), parent.getY() + 13 + parent.getScrollOffset(), 0); - RenderUtils.drawItem(helper, stack, x3, y1, true); + RenderUtils.drawItem(context, stack, x3, y1, true); modelViewStack.pop(); RenderSystem.applyModelViewMatrix(); diff --git a/src/main/java/net/wurstclient/clickgui/components/CheckboxComponent.java b/src/main/java/net/wurstclient/clickgui/components/CheckboxComponent.java index ed37d1de..c1f4cf71 100644 --- a/src/main/java/net/wurstclient/clickgui/components/CheckboxComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/CheckboxComponent.java @@ -56,10 +56,10 @@ public final class CheckboxComponent extends Component } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); int x1 = getX(); int x2 = x1 + getWidth(); int x3 = x1 + 11; @@ -82,7 +82,7 @@ public final class CheckboxComponent extends Component if(setting.isChecked()) drawCheck(matrixStack, x1, y1, hovering); - drawName(helper, x3, y1); + drawName(context, x3, y1); } private boolean isHovering(int mouseX, int mouseY, int x1, int x2, int y1, @@ -211,7 +211,7 @@ public final class CheckboxComponent extends Component tessellator.draw(); } - private void drawName(DrawContext helper, int x3, int y1) + private void drawName(DrawContext context, int x3, int y1) { ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); @@ -221,7 +221,7 @@ public final class CheckboxComponent extends Component String name = setting.getName(); int tx = x3 + 2; int ty = y1 + 2; - helper.drawText(MC.textRenderer, name, tx, ty, txtColor, false); + context.drawText(MC.textRenderer, name, tx, ty, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/ColorComponent.java b/src/main/java/net/wurstclient/clickgui/components/ColorComponent.java index 5cfcea46..52da223c 100644 --- a/src/main/java/net/wurstclient/clickgui/components/ColorComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/ColorComponent.java @@ -56,10 +56,10 @@ public final class ColorComponent extends Component } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); int x1 = getX(); int x2 = x1 + getWidth(); int y1 = getY(); @@ -86,7 +86,7 @@ public final class ColorComponent extends Component drawBackground(matrixStack, x1, x2, y1, y3); drawBox(matrixStack, x1, x2, y2, y3, hovering && mouseY >= y3); - drawNameAndValue(helper, x1, x2, y1 + 2); + drawNameAndValue(context, x1, x2, y1 + 2); } private boolean isHovering(int mouseX, int mouseY, int x1, int x2, int y1, @@ -157,7 +157,7 @@ public final class ColorComponent extends Component tessellator.draw(); } - private void drawNameAndValue(DrawContext helper, int x1, int x2, int y1) + private void drawNameAndValue(DrawContext context, int x1, int x2, int y1) { ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); @@ -165,11 +165,11 @@ public final class ColorComponent extends Component RenderSystem.setShaderColor(1, 1, 1, 1); TextRenderer tr = MC.textRenderer; - helper.drawText(tr, setting.getName(), x1, y1, txtColor, false); + context.drawText(tr, setting.getName(), x1, y1, txtColor, false); String value = ColorUtils.toHex(setting.getColor()); int valueWidth = tr.getWidth(value); - helper.drawText(tr, value, x2 - valueWidth, y1, txtColor, false); + context.drawText(tr, value, x2 - valueWidth, y1, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/ComboBoxComponent.java b/src/main/java/net/wurstclient/clickgui/components/ComboBoxComponent.java index b3788a49..330e51fd 100644 --- a/src/main/java/net/wurstclient/clickgui/components/ComboBoxComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/ComboBoxComponent.java @@ -103,10 +103,10 @@ public final class ComboBoxComponent> extends Component } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); int x1 = getX(); int x2 = x1 + getWidth(); int x3 = x2 - 11; @@ -130,7 +130,7 @@ public final class ComboBoxComponent> extends Component drawSeparator(matrixStack, x3, y1, y2); drawArrow(matrixStack, x2, x3, y1, y2, hBox); - drawNameAndValue(helper, x1, x4, y1); + drawNameAndValue(context, x1, x4, y1); } private boolean isHovering(int mouseX, int mouseY, int x1, int x2, int y1, @@ -259,7 +259,7 @@ public final class ComboBoxComponent> extends Component tessellator.draw(); } - private void drawNameAndValue(DrawContext helper, int x1, int x4, int y1) + private void drawNameAndValue(DrawContext context, int x1, int x4, int y1) { ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); @@ -269,8 +269,8 @@ public final class ComboBoxComponent> extends Component String name = setting.getName(); String value = "" + setting.getSelected(); - helper.drawText(tr, name, x1, y1 + 2, txtColor, false); - helper.drawText(tr, value, x4 + 2, y1 + 2, txtColor, false); + context.drawText(tr, name, x1, y1 + 2, txtColor, false); + context.drawText(tr, value, x4 + 2, y1 + 2, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/FeatureButton.java b/src/main/java/net/wurstclient/clickgui/components/FeatureButton.java index f1be4e3b..85f26915 100644 --- a/src/main/java/net/wurstclient/clickgui/components/FeatureButton.java +++ b/src/main/java/net/wurstclient/clickgui/components/FeatureButton.java @@ -96,10 +96,10 @@ public final class FeatureButton extends Component } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); int x1 = getX(); int x2 = x1 + getWidth(); int x3 = hasSettings ? x2 - 11 : x2; @@ -128,7 +128,7 @@ public final class FeatureButton extends Component drawSettingsArrow(matrixStack, x2, x3, y1, y2, hSettings); } - drawName(helper, x1, x3, y1); + drawName(context, x1, x3, y1); } private boolean isHovering(int mouseX, int mouseY, int x1, int x2, int y1, @@ -290,7 +290,7 @@ public final class FeatureButton extends Component tessellator.draw(); } - private void drawName(DrawContext helper, int x1, int x3, int y1) + private void drawName(DrawContext context, int x1, int x3, int y1) { ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); @@ -303,7 +303,7 @@ public final class FeatureButton extends Component int tx = x1 + (x3 - x1 - nameWidth) / 2; int ty = y1 + 2; - helper.drawText(tr, name, tx, ty, txtColor, false); + context.drawText(tr, name, tx, ty, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/FileComponent.java b/src/main/java/net/wurstclient/clickgui/components/FileComponent.java index 44e2e54e..853e9c7c 100644 --- a/src/main/java/net/wurstclient/clickgui/components/FileComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/FileComponent.java @@ -55,7 +55,7 @@ public final class FileComponent extends Component } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { ClickGui gui = WurstClient.INSTANCE.getGui(); @@ -81,7 +81,7 @@ public final class FileComponent extends Component boolean hText = hovering && mouseX < x3; boolean hBox = hovering && mouseX >= x3; - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); @@ -130,8 +130,8 @@ public final class FileComponent extends Component // setting name RenderSystem.setShaderColor(1, 1, 1, 1); String text = setting.getName() + ": "; - helper.drawText(tr, text, x1, y1 + 2, txtColor, false); - helper.drawText(tr, setting.getSelectedFileName(), x3 + 2, y1 + 2, + context.drawText(tr, text, x1, y1 + 2, txtColor, false); + context.drawText(tr, setting.getSelectedFileName(), x3 + 2, y1 + 2, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/components/RadarComponent.java b/src/main/java/net/wurstclient/clickgui/components/RadarComponent.java index fc12728d..9e2bf0be 100644 --- a/src/main/java/net/wurstclient/clickgui/components/RadarComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/RadarComponent.java @@ -11,6 +11,7 @@ import org.joml.Matrix4f; import org.joml.Quaternionf; import com.mojang.blaze3d.systems.RenderSystem; + import net.minecraft.client.gui.DrawContext; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.render.BufferBuilder; @@ -43,7 +44,7 @@ public final class RadarComponent extends Component } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { ClickGui gui = WurstClient.INSTANCE.getGui(); @@ -62,7 +63,7 @@ public final class RadarComponent extends Component && mouseY < y2 && mouseY >= -scroll && mouseY < getParent().getHeight() - 13 - scroll; - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); diff --git a/src/main/java/net/wurstclient/clickgui/components/SliderComponent.java b/src/main/java/net/wurstclient/clickgui/components/SliderComponent.java index 9a3d7ed1..ef4d3f04 100644 --- a/src/main/java/net/wurstclient/clickgui/components/SliderComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/SliderComponent.java @@ -76,10 +76,10 @@ public final class SliderComponent extends Component } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); int x1 = getX(); int x2 = x1 + getWidth(); int x3 = x1 + 2; @@ -114,7 +114,7 @@ public final class SliderComponent extends Component drawBackground(matrixStack, x1, x2, x3, x4, y1, y2, y4, y5); drawRail(matrixStack, x3, x4, y4, y5, hSlider, renderAsDisabled); drawKnob(matrixStack, x1, x2, y2, y3, hSlider, renderAsDisabled); - drawNameAndValue(helper, x1, x2, y1, renderAsDisabled); + drawNameAndValue(context, x1, x2, y1, renderAsDisabled); } private void handleDragging(int mouseX, int x3, int x4) @@ -302,7 +302,7 @@ public final class SliderComponent extends Component tessellator.draw(); } - private void drawNameAndValue(DrawContext helper, int x1, int x2, int y1, + private void drawNameAndValue(DrawContext context, int x1, int x2, int y1, boolean renderAsDisabled) { ClickGui gui = WurstClient.INSTANCE.getGui(); @@ -314,9 +314,8 @@ public final class SliderComponent extends Component String name = setting.getName(); String value = setting.getValueString(); int valueWidth = tr.getWidth(value); - helper.drawText(tr, name, x1, y1 + 2, txtColor, false); - helper.drawText(tr, value, x2 - valueWidth, y1 + 2, txtColor, - false); + context.drawText(tr, name, x1, y1 + 2, txtColor, false); + context.drawText(tr, value, x2 - valueWidth, y1 + 2, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/clickgui/screens/AddBookOfferScreen.java b/src/main/java/net/wurstclient/clickgui/screens/AddBookOfferScreen.java index 8b26104d..b822164d 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/AddBookOfferScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/AddBookOfferScreen.java @@ -287,39 +287,39 @@ public final class AddBookOfferScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); - listGui.render(helper, mouseX, mouseY, partialTicks); + MatrixStack matrixStack = context.getMatrices(); + listGui.render(context, mouseX, mouseY, partialTicks); matrixStack.push(); matrixStack.translate(0, 0, 300); TextRenderer tr = client.textRenderer; String titleText = "Available Books (" + listGui.getItemCount() + ")"; - helper.drawCenteredTextWithShadow(tr, titleText, width / 2, 12, + context.drawCenteredTextWithShadow(tr, titleText, width / 2, 12, 0xffffff); - levelField.render(helper, mouseX, mouseY, partialTicks); - priceField.render(helper, mouseX, mouseY, partialTicks); - super.render(helper, mouseX, mouseY, partialTicks); + levelField.render(context, mouseX, mouseY, partialTicks); + priceField.render(context, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); matrixStack.translate(width / 2 - 100, 0, 0); - helper.drawTextWithShadow(tr, "Level:", 0, height - 72, 0xf0f0f0); - helper.drawTextWithShadow(tr, "Max price:", 0, height - 56, 0xf0f0f0); + context.drawTextWithShadow(tr, "Level:", 0, height - 72, 0xf0f0f0); + context.drawTextWithShadow(tr, "Max price:", 0, height - 56, 0xf0f0f0); if(alreadyAdded && offerToAdd != null) { String errorText = offerToAdd.getEnchantmentNameWithLevel() + " is already on your list!"; - helper.drawTextWithShadow(tr, errorText, 0, height - 40, 0xff5555); + context.drawTextWithShadow(tr, errorText, 0, height - 40, 0xff5555); } matrixStack.pop(); - RenderUtils.drawItem(helper, new ItemStack(Items.EMERALD), + RenderUtils.drawItem(context, new ItemStack(Items.EMERALD), width / 2 - 16, height - 58, false); } @@ -393,16 +393,16 @@ public final class AddBookOfferScreen extends Screen } @Override - protected void renderItem(DrawContext helper, int index, int x, - int y, int var4, int mouseX, int mouseY, float partialTicks) + protected void renderItem(DrawContext context, int index, int x, int y, + int var4, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); if(isSelectedItem(index)) drawSelectionOutline(matrixStack, x, y); Item item = Registries.ITEM.get(new Identifier("enchanted_book")); ItemStack stack = new ItemStack(item); - RenderUtils.drawItem(helper, stack, x + 1, y + 1, true); + RenderUtils.drawItem(context, stack, x + 1, y + 1, true); TextRenderer tr = mc.textRenderer; BookOffer bookOffer = list.get(index); @@ -410,14 +410,14 @@ public final class AddBookOfferScreen extends Screen String name = bookOffer.getEnchantmentName(); int nameColor = enchantment.isCursed() ? 0xff5555 : 0xf0f0f0; - helper.drawText(tr, name, x + 28, y, nameColor, false); + context.drawText(tr, name, x + 28, y, nameColor, false); - helper.drawText(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, + context.drawText(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, false); int maxLevel = enchantment.getMaxLevel(); String levels = maxLevel + (maxLevel == 1 ? " level" : " levels"); - helper.drawText(tr, levels, x + 28, y + 18, 0xa0a0a0, false); + context.drawText(tr, levels, x + 28, y + 18, 0xa0a0a0, false); } } } diff --git a/src/main/java/net/wurstclient/clickgui/screens/ClickGuiScreen.java b/src/main/java/net/wurstclient/clickgui/screens/ClickGuiScreen.java index f6fbce0f..67dffd84 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/ClickGuiScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/ClickGuiScreen.java @@ -50,10 +50,10 @@ public final class ClickGuiScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - super.render(helper, mouseX, mouseY, partialTicks); - gui.render(helper, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); + gui.render(context, mouseX, mouseY, partialTicks); } } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java index 0efbbdd0..03767f4b 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java @@ -161,44 +161,44 @@ public final class EditBlockListScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); - listGui.render(helper, mouseX, mouseY, partialTicks); + MatrixStack matrixStack = context.getMatrices(); + listGui.render(context, mouseX, mouseY, partialTicks); - helper.drawCenteredTextWithShadow(client.textRenderer, + context.drawCenteredTextWithShadow(client.textRenderer, blockList.getName() + " (" + listGui.getItemCount() + ")", width / 2, 12, 0xffffff); matrixStack.push(); matrixStack.translate(0, 0, 300); - blockNameField.render(helper, mouseX, mouseY, partialTicks); - super.render(helper, mouseX, mouseY, partialTicks); + blockNameField.render(context, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); matrixStack.translate(-64 + width / 2 - 152, 0, 0); if(blockNameField.getText().isEmpty() && !blockNameField.isFocused()) - helper.drawTextWithShadow(client.textRenderer, "block name or ID", + context.drawTextWithShadow(client.textRenderer, "block name or ID", 68, height - 50, 0x808080); int border = blockNameField.isFocused() ? 0xffffffff : 0xffa0a0a0; int black = 0xff000000; - helper.fill(48, height - 56, 64, height - 36, border); - helper.fill(49, height - 55, 64, height - 37, black); - helper.fill(214, height - 56, 244, height - 55, border); - helper.fill(214, height - 37, 244, height - 36, border); - helper.fill(244, height - 56, 246, height - 36, border); - helper.fill(214, height - 55, 243, height - 52, black); - helper.fill(214, height - 40, 243, height - 37, black); - helper.fill(214, height - 55, 216, height - 37, black); - helper.fill(242, height - 55, 245, height - 37, black); + context.fill(48, height - 56, 64, height - 36, border); + context.fill(49, height - 55, 64, height - 37, black); + context.fill(214, height - 56, 244, height - 55, border); + context.fill(214, height - 37, 244, height - 36, border); + context.fill(244, height - 56, 246, height - 36, border); + context.fill(214, height - 55, 243, height - 52, black); + context.fill(214, height - 40, 243, height - 37, black); + context.fill(214, height - 55, 216, height - 37, black); + context.fill(242, height - 55, 245, height - 37, black); matrixStack.pop(); - RenderUtils.drawItem(helper, + RenderUtils.drawItem(context, blockToAdd == null ? ItemStack.EMPTY : new ItemStack(blockToAdd), width / 2 - 164, height - 52, false); } @@ -258,20 +258,20 @@ public final class EditBlockListScreen extends Screen } @Override - protected void renderItem(DrawContext helper, int index, int x, - int y, int var4, int var5, int var6, float partialTicks) + protected void renderItem(DrawContext context, int index, int x, int y, + int var4, int var5, int var6, float partialTicks) { String name = list.get(index); Block block = BlockUtils.getBlockFromName(name); ItemStack stack = new ItemStack(block); TextRenderer tr = mc.textRenderer; - RenderUtils.drawItem(helper, stack, x + 1, y + 1, true); + RenderUtils.drawItem(context, stack, x + 1, y + 1, true); String displayName = stack.isEmpty() ? "\u00a7ounknown block\u00a7r" : stack.getName().getString(); - helper.drawText(tr, displayName, x + 28, y, 0xf0f0f0, false); - helper.drawText(tr, name, x + 28, y + 9, 0xa0a0a0, false); - helper.drawText(tr, + context.drawText(tr, displayName, x + 28, y, 0xf0f0f0, false); + context.drawText(tr, name, x + 28, y + 9, 0xa0a0a0, false); + context.drawText(tr, "ID: " + Block.getRawIdFromState(block.getDefaultState()), x + 28, y + 18, 0xa0a0a0, false); } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java index 462d01a2..15ba4775 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java @@ -97,18 +97,18 @@ public final class EditBlockScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); TextRenderer tr = client.textRenderer; - renderBackground(helper); - helper.drawCenteredTextWithShadow(tr, setting.getName(), width / 2, 20, + renderBackground(context); + context.drawCenteredTextWithShadow(tr, setting.getName(), width / 2, 20, 0xFFFFFF); - blockField.render(helper, mouseX, mouseY, partialTicks); - super.render(helper, mouseX, mouseY, partialTicks); + blockField.render(context, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); matrixStack.push(); matrixStack.translate(-64 + width / 2 - 100, 115, 0); @@ -120,20 +120,20 @@ public final class EditBlockScreen extends Screen int lblX = lblAbove ? 50 : 68; int lblY = lblAbove ? -66 : -50; int lblColor = lblAbove ? 0xF0F0F0 : 0x808080; - helper.drawTextWithShadow(tr, lblText, lblX, lblY, lblColor); + context.drawTextWithShadow(tr, lblText, lblX, lblY, lblColor); int border = blockField.isFocused() ? 0xffffffff : 0xffa0a0a0; int black = 0xff000000; - helper.fill(48, -56, 64, -36, border); - helper.fill(49, -55, 64, -37, black); - helper.fill(214, -56, 244, -55, border); - helper.fill(214, -37, 244, -36, border); - helper.fill(244, -56, 246, -36, border); - helper.fill(214, -55, 243, -52, black); - helper.fill(214, -40, 243, -37, black); - helper.fill(215, -55, 216, -37, black); - helper.fill(242, -55, 245, -37, black); + context.fill(48, -56, 64, -36, border); + context.fill(49, -55, 64, -37, black); + context.fill(214, -56, 244, -55, border); + context.fill(214, -37, 244, -36, border); + context.fill(244, -56, 246, -36, border); + context.fill(214, -55, 243, -52, black); + context.fill(214, -40, 243, -37, black); + context.fill(215, -55, 216, -37, black); + context.fill(242, -55, 245, -37, black); matrixStack.pop(); @@ -143,7 +143,7 @@ public final class EditBlockScreen extends Screen if(blockToAdd == null) blockToAdd = Blocks.AIR; - RenderUtils.drawItem(helper, new ItemStack(blockToAdd), + RenderUtils.drawItem(context, new ItemStack(blockToAdd), -64 + width / 2 - 100 + 52, 115 - 52, false); } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditBookOfferScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditBookOfferScreen.java index ebeba9dc..e3f66b5c 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditBookOfferScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditBookOfferScreen.java @@ -252,18 +252,18 @@ public final class EditBookOfferScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); - renderBackgroundTexture(helper); + MatrixStack matrixStack = context.getMatrices(); + renderBackgroundTexture(context); matrixStack.push(); matrixStack.translate(0, 0, 300); TextRenderer tr = client.textRenderer; String titleText = "Edit Book Offer"; - helper.drawCenteredTextWithShadow(tr, titleText, width / 2, 12, + context.drawCenteredTextWithShadow(tr, titleText, width / 2, 12, 0xffffff); int x = width / 2 - 100; @@ -271,16 +271,16 @@ public final class EditBookOfferScreen extends Screen Item item = Registries.ITEM.get(new Identifier("enchanted_book")); ItemStack stack = new ItemStack(item); - RenderUtils.drawItem(helper, stack, x + 1, y + 1, true); + RenderUtils.drawItem(context, stack, x + 1, y + 1, true); BookOffer bookOffer = offerToSave; String name = bookOffer.getEnchantmentNameWithLevel(); Enchantment enchantment = bookOffer.getEnchantment(); int nameColor = enchantment.isCursed() ? 0xff5555 : 0xffffff; - helper.drawTextWithShadow(tr, name, x + 28, y, nameColor); + context.drawTextWithShadow(tr, name, x + 28, y, nameColor); - helper.drawText(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, false); + context.drawText(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, false); String price; if(bookOffer.price() >= 64) @@ -288,31 +288,31 @@ public final class EditBookOfferScreen extends Screen else { price = "max " + bookOffer.price(); - RenderUtils.drawItem(helper, new ItemStack(Items.EMERALD), + RenderUtils.drawItem(context, new ItemStack(Items.EMERALD), x + 28 + tr.getWidth(price), y + 16, false); } - helper.drawText(tr, price, x + 28, y + 18, 0xa0a0a0, false); + context.drawText(tr, price, x + 28, y + 18, 0xa0a0a0, false); - levelField.render(helper, mouseX, mouseY, partialTicks); - priceField.render(helper, mouseX, mouseY, partialTicks); - super.render(helper, mouseX, mouseY, partialTicks); + levelField.render(context, mouseX, mouseY, partialTicks); + priceField.render(context, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); matrixStack.translate(width / 2 - 100, 112, 0); - helper.drawTextWithShadow(tr, "Level:", 0, 0, 0xf0f0f0); - helper.drawTextWithShadow(tr, "Max price:", 0, 16, 0xf0f0f0); + context.drawTextWithShadow(tr, "Level:", 0, 0, 0xf0f0f0); + context.drawTextWithShadow(tr, "Max price:", 0, 16, 0xf0f0f0); if(alreadyAdded && offerToSave != null) { String errorText = offerToSave.getEnchantmentNameWithLevel() + " is already on your list!"; - helper.drawTextWithShadow(tr, errorText, 0, 32, 0xff5555); + context.drawTextWithShadow(tr, errorText, 0, 32, 0xff5555); } matrixStack.pop(); - RenderUtils.drawItem(helper, new ItemStack(Items.EMERALD), + RenderUtils.drawItem(context, new ItemStack(Items.EMERALD), width / 2 - 16, 126, false); } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditBookOffersScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditBookOffersScreen.java index fc310196..f65894db 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditBookOffersScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditBookOffersScreen.java @@ -177,20 +177,20 @@ public final class EditBookOffersScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); - listGui.render(helper, mouseX, mouseY, partialTicks); + MatrixStack matrixStack = context.getMatrices(); + listGui.render(context, mouseX, mouseY, partialTicks); matrixStack.push(); matrixStack.translate(0, 0, 300); - helper.drawCenteredTextWithShadow(client.textRenderer, + context.drawCenteredTextWithShadow(client.textRenderer, bookOffers.getName() + " (" + listGui.getItemCount() + ")", width / 2, 12, 0xffffff); - super.render(helper, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); matrixStack.pop(); } @@ -250,16 +250,16 @@ public final class EditBookOffersScreen extends Screen } @Override - protected void renderItem(DrawContext helper, int index, int x, - int y, int var4, int var5, int var6, float partialTicks) + protected void renderItem(DrawContext context, int index, int x, int y, + int var4, int var5, int var6, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); if(isSelectedItem(index)) drawSelectionOutline(matrixStack, x, y); Item item = Registries.ITEM.get(new Identifier("enchanted_book")); ItemStack stack = new ItemStack(item); - RenderUtils.drawItem(helper, stack, x + 1, y + 1, true); + RenderUtils.drawItem(context, stack, x + 1, y + 1, true); TextRenderer tr = mc.textRenderer; BookOffer bookOffer = list.get(index); @@ -267,9 +267,9 @@ public final class EditBookOffersScreen extends Screen Enchantment enchantment = bookOffer.getEnchantment(); int nameColor = enchantment.isCursed() ? 0xff5555 : 0xf0f0f0; - helper.drawText(tr, name, x + 28, y, nameColor, false); + context.drawText(tr, name, x + 28, y, nameColor, false); - helper.drawText(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, + context.drawText(tr, bookOffer.id(), x + 28, y + 9, 0xa0a0a0, false); String price; @@ -278,11 +278,11 @@ public final class EditBookOffersScreen extends Screen else { price = "max " + bookOffer.price(); - RenderUtils.drawItem(helper, new ItemStack(Items.EMERALD), + RenderUtils.drawItem(context, new ItemStack(Items.EMERALD), x + 28 + tr.getWidth(price), y + 16, false); } - helper.drawText(tr, price, x + 28, y + 18, 0xa0a0a0, false); + context.drawText(tr, price, x + 28, y + 18, 0xa0a0a0, false); } } } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditColorScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditColorScreen.java index 0af94448..787cc1bf 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditColorScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditColorScreen.java @@ -165,13 +165,13 @@ public final class EditColorScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { TextRenderer tr = client.textRenderer; - renderBackground(helper); - helper.drawCenteredTextWithShadow(client.textRenderer, + renderBackground(context); + context.drawCenteredTextWithShadow(client.textRenderer, colorSetting.getName(), width / 2, 16, 0xF0F0F0); // Draw palette @@ -183,22 +183,22 @@ public final class EditColorScreen extends Screen int fh = paletteHeight; float u = 0; float v = 0; - helper.drawTexture(paletteIdentifier, x, y, u, v, w, h, fw, fh); + context.drawTexture(paletteIdentifier, x, y, u, v, w, h, fw, fh); // RGB letters - helper.drawText(tr, "#", fieldsX - 3 - tr.getWidth("#"), - fieldsY + 6, 0xF0F0F0, false); - helper.drawText(tr, "R:", fieldsX - 3 - tr.getWidth("R:"), + context.drawText(tr, "#", fieldsX - 3 - tr.getWidth("#"), fieldsY + 6, + 0xF0F0F0, false); + context.drawText(tr, "R:", fieldsX - 3 - tr.getWidth("R:"), fieldsY + 6 + 35, 0xFF0000, false); - helper.drawText(tr, "G:", fieldsX + 75 - 3 - tr.getWidth("G:"), + context.drawText(tr, "G:", fieldsX + 75 - 3 - tr.getWidth("G:"), fieldsY + 6 + 35, 0x00FF00, false); - helper.drawText(tr, "B:", fieldsX + 150 - 3 - tr.getWidth("B:"), + context.drawText(tr, "B:", fieldsX + 150 - 3 - tr.getWidth("B:"), fieldsY + 6 + 35, 0x0000FF, false); - hexValueField.render(helper, mouseX, mouseY, partialTicks); - redValueField.render(helper, mouseX, mouseY, partialTicks); - greenValueField.render(helper, mouseX, mouseY, partialTicks); - blueValueField.render(helper, mouseX, mouseY, partialTicks); + hexValueField.render(context, mouseX, mouseY, partialTicks); + redValueField.render(context, mouseX, mouseY, partialTicks); + greenValueField.render(context, mouseX, mouseY, partialTicks); + blueValueField.render(context, mouseX, mouseY, partialTicks); // Color preview @@ -209,15 +209,15 @@ public final class EditColorScreen extends Screen int boxY = fieldsY; // Border - helper.fill(boxX - borderSize, boxY - borderSize, + context.fill(boxX - borderSize, boxY - borderSize, boxX + boxWidth + borderSize, boxY + boxHeight + borderSize, 0xFFAAAAAA); // Color box - helper.fill(boxX, boxY, boxX + boxWidth, boxY + boxHeight, + context.fill(boxX, boxY, boxX + boxWidth, boxY + boxHeight, color.getRGB()); - super.render(helper, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java index 57eb5fe8..be3fafc5 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java @@ -163,21 +163,21 @@ public final class EditItemListScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); - listGui.render(helper, mouseX, mouseY, partialTicks); + MatrixStack matrixStack = context.getMatrices(); + listGui.render(context, mouseX, mouseY, partialTicks); - helper.drawCenteredTextWithShadow(client.textRenderer, + context.drawCenteredTextWithShadow(client.textRenderer, itemList.getName() + " (" + listGui.getItemCount() + ")", width / 2, 12, 0xffffff); matrixStack.push(); matrixStack.translate(0, 0, 300); - itemNameField.render(helper, mouseX, mouseY, partialTicks); - super.render(helper, mouseX, mouseY, partialTicks); + itemNameField.render(context, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); matrixStack.translate(-64 + width / 2 - 152, 0, 0); @@ -185,7 +185,7 @@ public final class EditItemListScreen extends Screen { matrixStack.push(); matrixStack.translate(0, 0, 300); - helper.drawTextWithShadow(client.textRenderer, "item name or ID", + context.drawTextWithShadow(client.textRenderer, "item name or ID", 68, height - 50, 0x808080); matrixStack.pop(); } @@ -193,19 +193,19 @@ public final class EditItemListScreen extends Screen int border = itemNameField.isFocused() ? 0xffffffff : 0xffa0a0a0; int black = 0xff000000; - helper.fill(48, height - 56, 64, height - 36, border); - helper.fill(49, height - 55, 64, height - 37, black); - helper.fill(214, height - 56, 244, height - 55, border); - helper.fill(214, height - 37, 244, height - 36, border); - helper.fill(244, height - 56, 246, height - 36, border); - helper.fill(214, height - 55, 243, height - 52, black); - helper.fill(214, height - 40, 243, height - 37, black); - helper.fill(215, height - 55, 216, height - 37, black); - helper.fill(242, height - 55, 245, height - 37, black); + context.fill(48, height - 56, 64, height - 36, border); + context.fill(49, height - 55, 64, height - 37, black); + context.fill(214, height - 56, 244, height - 55, border); + context.fill(214, height - 37, 244, height - 36, border); + context.fill(244, height - 56, 246, height - 36, border); + context.fill(214, height - 55, 243, height - 52, black); + context.fill(214, height - 40, 243, height - 37, black); + context.fill(215, height - 55, 216, height - 37, black); + context.fill(242, height - 55, 245, height - 37, black); matrixStack.pop(); - RenderUtils.drawItem(helper, + RenderUtils.drawItem(context, itemToAdd == null ? ItemStack.EMPTY : new ItemStack(itemToAdd), width / 2 - 164, height - 52, false); } @@ -265,20 +265,20 @@ public final class EditItemListScreen extends Screen } @Override - protected void renderItem(DrawContext helper, int index, int x, - int y, int var4, int var5, int var6, float partialTicks) + protected void renderItem(DrawContext context, int index, int x, int y, + int var4, int var5, int var6, float partialTicks) { String name = list.get(index); Item item = Registries.ITEM.get(new Identifier(name)); ItemStack stack = new ItemStack(item); TextRenderer tr = mc.textRenderer; - RenderUtils.drawItem(helper, stack, x + 1, y + 1, true); + RenderUtils.drawItem(context, stack, x + 1, y + 1, true); String displayName = stack.isEmpty() ? "\u00a7ounknown item\u00a7r" : stack.getName().getString(); - helper.drawText(tr, displayName, x + 28, y, 0xf0f0f0, false); - helper.drawText(tr, name, x + 28, y + 9, 0xa0a0a0, false); - helper.drawText(tr, "ID: " + Registries.ITEM.getRawId(item), + context.drawText(tr, displayName, x + 28, y, 0xf0f0f0, false); + context.drawText(tr, name, x + 28, y + 9, 0xa0a0a0, false); + context.drawText(tr, "ID: " + Registries.ITEM.getRawId(item), x + 28, y + 18, 0xa0a0a0, false); } } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java index 3cc13393..29e70034 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java @@ -92,15 +92,15 @@ public final class EditSliderScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - renderBackground(helper); - helper.drawCenteredTextWithShadow(client.textRenderer, slider.getName(), - width / 2, 20, 0xFFFFFF); + renderBackground(context); + context.drawCenteredTextWithShadow(client.textRenderer, + slider.getName(), width / 2, 20, 0xFFFFFF); - valueField.render(helper, mouseX, mouseY, partialTicks); - super.render(helper, mouseX, mouseY, partialTicks); + valueField.render(context, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java b/src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java index b165b42c..231dfd5c 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java @@ -162,19 +162,19 @@ public final class SelectFileScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - renderBackground(helper); - listGui.render(helper, mouseX, mouseY, partialTicks); + renderBackground(context); + listGui.render(context, mouseX, mouseY, partialTicks); - helper.drawCenteredTextWithShadow(client.textRenderer, + context.drawCenteredTextWithShadow(client.textRenderer, setting.getName(), width / 2, 12, 0xffffff); - super.render(helper, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); if(doneButton.isSelected() && !doneButton.active) - helper.drawTooltip(textRenderer, + context.drawTooltip(textRenderer, Arrays.asList(Text.literal("You must first select a file.")), mouseX, mouseY); } @@ -234,15 +234,15 @@ public final class SelectFileScreen extends Screen } @Override - protected void renderItem(DrawContext helper, int index, int x, - int y, int var4, int var5, int var6, float partialTicks) + protected void renderItem(DrawContext context, int index, int x, int y, + int var4, int var5, int var6, float partialTicks) { TextRenderer tr = mc.textRenderer; Path path = list.get(index); - helper.drawText(tr, "" + path.getFileName(), x + 28, y, - 0xf0f0f0, false); - helper.drawText(tr, + context.drawText(tr, "" + path.getFileName(), x + 28, y, 0xf0f0f0, + false); + context.drawText(tr, "" + client.runDirectory.toPath().relativize(path), x + 28, y + 9, 0xa0a0a0, false); } diff --git a/src/main/java/net/wurstclient/commands/TacoCmd.java b/src/main/java/net/wurstclient/commands/TacoCmd.java index c91a524a..2a5745ef 100644 --- a/src/main/java/net/wurstclient/commands/TacoCmd.java +++ b/src/main/java/net/wurstclient/commands/TacoCmd.java @@ -10,6 +10,7 @@ package net.wurstclient.commands; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; + import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.Window; import net.minecraft.util.Identifier; @@ -81,7 +82,7 @@ public final class TacoCmd extends Command } @Override - public void onRenderGUI(DrawContext helper, float partialTicks) + public void onRenderGUI(DrawContext context, float partialTicks) { GL11.glEnable(GL11.GL_BLEND); GL11.glDisable(GL11.GL_CULL_FACE); @@ -100,7 +101,7 @@ public final class TacoCmd extends Command int y = sr.getScaledHeight() - 32 - 19; int w = 64; int h = 32; - helper.drawTexture(tacos[ticks / 8], x, y, 0, 0, w, h, w, h); + context.drawTexture(tacos[ticks / 8], x, y, 0, 0, w, h, w, h); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glDisable(GL11.GL_BLEND); diff --git a/src/main/java/net/wurstclient/events/GUIRenderListener.java b/src/main/java/net/wurstclient/events/GUIRenderListener.java index 94402380..8fd0a170 100644 --- a/src/main/java/net/wurstclient/events/GUIRenderListener.java +++ b/src/main/java/net/wurstclient/events/GUIRenderListener.java @@ -8,22 +8,23 @@ package net.wurstclient.events; import java.util.ArrayList; + import net.minecraft.client.gui.DrawContext; import net.wurstclient.event.Event; import net.wurstclient.event.Listener; public interface GUIRenderListener extends Listener { - public void onRenderGUI(DrawContext helper, float partialTicks); + public void onRenderGUI(DrawContext context, float partialTicks); public static class GUIRenderEvent extends Event { private final float partialTicks; - private final DrawContext helper; + private final DrawContext context; - public GUIRenderEvent(DrawContext helper, float partialTicks) + public GUIRenderEvent(DrawContext context, float partialTicks) { - this.helper = helper; + this.context = context; this.partialTicks = partialTicks; } @@ -31,7 +32,7 @@ public interface GUIRenderListener extends Listener public void fire(ArrayList listeners) { for(GUIRenderListener listener : listeners) - listener.onRenderGUI(helper, partialTicks); + listener.onRenderGUI(context, partialTicks); } @Override diff --git a/src/main/java/net/wurstclient/hacks/BowAimbotHack.java b/src/main/java/net/wurstclient/hacks/BowAimbotHack.java index 449e3053..ac1b86cd 100644 --- a/src/main/java/net/wurstclient/hacks/BowAimbotHack.java +++ b/src/main/java/net/wurstclient/hacks/BowAimbotHack.java @@ -17,6 +17,7 @@ import org.joml.Matrix4f; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; + import net.minecraft.client.gui.DrawContext; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.render.BufferBuilder; @@ -242,9 +243,9 @@ public final class BowAimbotHack extends Hack } @Override - public void onRenderGUI(DrawContext helper, float partialTicks) + public void onRenderGUI(DrawContext context, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); if(target == null) return; @@ -282,7 +283,7 @@ public final class BowAimbotHack extends Hack tessellator.draw(); // text - helper.drawText(MC.textRenderer, message, 2, 1, 0xffffffff, false); + context.drawText(MC.textRenderer, message, 2, 1, 0xffffffff, false); matrixStack.pop(); diff --git a/src/main/java/net/wurstclient/hacks/ExcavatorHack.java b/src/main/java/net/wurstclient/hacks/ExcavatorHack.java index 4e610615..0773b85f 100644 --- a/src/main/java/net/wurstclient/hacks/ExcavatorHack.java +++ b/src/main/java/net/wurstclient/hacks/ExcavatorHack.java @@ -325,14 +325,14 @@ public final class ExcavatorHack extends Hack } @Override - public void onRenderGUI(DrawContext helper, float partialTicks) + public void onRenderGUI(DrawContext context, float partialTicks) { // GL settings GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glDisable(GL11.GL_CULL_FACE); - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); matrixStack.push(); Matrix4f matrix = matrixStack.peek().getPositionMatrix(); @@ -365,7 +365,7 @@ public final class ExcavatorHack extends Hack tessellator.draw(); // text - helper.drawText(tr, message, 2, 1, 0xffffffff, false); + context.drawText(tr, message, 2, 1, 0xffffffff, false); matrixStack.pop(); diff --git a/src/main/java/net/wurstclient/hacks/NewChunksHack.java b/src/main/java/net/wurstclient/hacks/NewChunksHack.java index 4fa0709e..cfa22185 100644 --- a/src/main/java/net/wurstclient/hacks/NewChunksHack.java +++ b/src/main/java/net/wurstclient/hacks/NewChunksHack.java @@ -32,6 +32,7 @@ import net.wurstclient.settings.ColorSetting; import net.wurstclient.settings.SliderSetting; import net.wurstclient.settings.SliderSetting.ValueDisplay; import net.wurstclient.util.BlockUtils; +import net.wurstclient.util.ChunkUtils; import net.wurstclient.util.RenderUtils; public final class NewChunksHack extends Hack @@ -184,7 +185,7 @@ public final class NewChunksHack extends Hack int minY = chunk.getBottomY(); int minZ = chunkPos.getStartZ(); int maxX = chunkPos.getEndX(); - int maxY = chunk.getHighestNonEmptySectionYOffset() + 16; + int maxY = ChunkUtils.getHighestNonEmptySectionYOffset(chunk) + 16; int maxZ = chunkPos.getEndZ(); for(int x = minX; x <= maxX; x++) diff --git a/src/main/java/net/wurstclient/hud/HackListHUD.java b/src/main/java/net/wurstclient/hud/HackListHUD.java index c350b8f8..2386687c 100644 --- a/src/main/java/net/wurstclient/hud/HackListHUD.java +++ b/src/main/java/net/wurstclient/hud/HackListHUD.java @@ -34,7 +34,7 @@ public final class HackListHUD implements UpdateListener WurstClient.INSTANCE.getEventManager().add(UpdateListener.class, this); } - public void render(DrawContext helper, float partialTicks) + public void render(DrawContext context, float partialTicks) { if(otf.getMode() == Mode.HIDDEN) return; @@ -59,26 +59,26 @@ public final class HackListHUD implements UpdateListener Window sr = WurstClient.MC.getWindow(); if(otf.getMode() == Mode.COUNT || height > sr.getScaledHeight()) - drawCounter(helper); + drawCounter(context); else - drawHackList(helper, partialTicks); + drawHackList(context, partialTicks); } - private void drawCounter(DrawContext helper) + private void drawCounter(DrawContext context) { long size = activeHax.stream().filter(e -> e.hack.isEnabled()).count(); String s = size + " hack" + (size != 1 ? "s" : "") + " active"; - drawString(helper, s); + drawString(context, s); } - private void drawHackList(DrawContext helper, float partialTicks) + private void drawHackList(DrawContext context, float partialTicks) { if(otf.isAnimations()) for(HackListEntry e : activeHax) - drawWithOffset(helper, e, partialTicks); + drawWithOffset(context, e, partialTicks); else for(HackListEntry e : activeHax) - drawString(helper, e.hack.getRenderName()); + drawString(context, e.hack.getRenderName()); } public void updateState(Hack hack) @@ -129,7 +129,7 @@ public final class HackListHUD implements UpdateListener } } - private void drawString(DrawContext helper, String s) + private void drawString(DrawContext context, String s) { TextRenderer tr = WurstClient.MC.textRenderer; int posX; @@ -144,13 +144,13 @@ public final class HackListHUD implements UpdateListener posX = screenWidth - stringWidth - 2; } - helper.drawText(tr, s, posX + 1, posY + 1, 0xff000000, false); - helper.drawText(tr, s, posX, posY, textColor | 0xff000000, false); + context.drawText(tr, s, posX + 1, posY + 1, 0xff000000, false); + context.drawText(tr, s, posX, posY, textColor | 0xff000000, false); posY += 9; } - private void drawWithOffset(DrawContext helper, HackListEntry e, + private void drawWithOffset(DrawContext context, HackListEntry e, float partialTicks) { TextRenderer tr = WurstClient.MC.textRenderer; @@ -171,9 +171,9 @@ public final class HackListHUD implements UpdateListener } int alpha = (int)(255 * (1 - offset / 4)) << 24; - helper.drawText(tr, s, (int)posX + 1, posY + 1, 0x04000000 | alpha, + context.drawText(tr, s, (int)posX + 1, posY + 1, 0x04000000 | alpha, false); - helper.drawText(tr, s, (int)posX, posY, textColor | alpha, false); + context.drawText(tr, s, (int)posX, posY, textColor | alpha, false); posY += 9; } diff --git a/src/main/java/net/wurstclient/hud/IngameHUD.java b/src/main/java/net/wurstclient/hud/IngameHUD.java index b0aa82d9..81a577cc 100644 --- a/src/main/java/net/wurstclient/hud/IngameHUD.java +++ b/src/main/java/net/wurstclient/hud/IngameHUD.java @@ -10,6 +10,7 @@ package net.wurstclient.hud; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; + import net.minecraft.client.gui.DrawContext; import net.wurstclient.WurstClient; import net.wurstclient.clickgui.ClickGui; @@ -23,7 +24,7 @@ public final class IngameHUD implements GUIRenderListener private TabGui tabGui; @Override - public void onRenderGUI(DrawContext helper, float partialTicks) + public void onRenderGUI(DrawContext context, float partialTicks) { if(!WurstClient.INSTANCE.isEnabled()) return; @@ -39,13 +40,13 @@ public final class IngameHUD implements GUIRenderListener clickGui.updateColors(); - wurstLogo.render(helper); - hackList.render(helper, partialTicks); - tabGui.render(helper, partialTicks); + wurstLogo.render(context); + hackList.render(context, partialTicks); + tabGui.render(context, partialTicks); // pinned windows if(!(WurstClient.MC.currentScreen instanceof ClickGuiScreen)) - clickGui.renderPinnedWindows(helper, partialTicks); + clickGui.renderPinnedWindows(context, partialTicks); // GL resets GL11.glEnable(GL11.GL_DEPTH_TEST); diff --git a/src/main/java/net/wurstclient/hud/TabGui.java b/src/main/java/net/wurstclient/hud/TabGui.java index c9950f6e..f5b67fce 100644 --- a/src/main/java/net/wurstclient/hud/TabGui.java +++ b/src/main/java/net/wurstclient/hud/TabGui.java @@ -15,6 +15,7 @@ import org.lwjgl.glfw.GLFW; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; + import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.GameRenderer; @@ -121,9 +122,9 @@ public final class TabGui implements KeyPressListener } } - public void render(DrawContext helper, float partialTicks) + public void render(DrawContext context, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); if(tabGuiOtf.isHidden()) return; @@ -157,7 +158,7 @@ public final class TabGui implements KeyPressListener if(i == selected) tabName = (tabOpened ? "<" : ">") + tabName; - helper.drawText(WurstClient.MC.textRenderer, tabName, 2, textY, + context.drawText(WurstClient.MC.textRenderer, tabName, 2, textY, txtColor, false); textY += 10; } @@ -192,7 +193,7 @@ public final class TabGui implements KeyPressListener if(i == tab.selected) fName = ">" + fName; - helper.drawText(WurstClient.MC.textRenderer, fName, 2, + context.drawText(WurstClient.MC.textRenderer, fName, 2, tabTextY, txtColor, false); tabTextY += 10; } diff --git a/src/main/java/net/wurstclient/hud/WurstLogo.java b/src/main/java/net/wurstclient/hud/WurstLogo.java index 670fabcb..1efea4e5 100644 --- a/src/main/java/net/wurstclient/hud/WurstLogo.java +++ b/src/main/java/net/wurstclient/hud/WurstLogo.java @@ -29,9 +29,9 @@ public final class WurstLogo private static final Identifier texture = new Identifier("wurst", "wurst_128.png"); - public void render(DrawContext helper) + public void render(DrawContext context) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); WurstLogoOtf otf = WurstClient.INSTANCE.getOtfs().wurstLogoOtf; if(!otf.isVisible()) return; @@ -55,12 +55,12 @@ public final class WurstLogo // draw version string GL11.glEnable(GL11.GL_CULL_FACE); GL11.glDisable(GL11.GL_DEPTH_TEST); - helper.drawText(tr, version, 74, 8, otf.getTextColor(), false); + context.drawText(tr, version, 74, 8, otf.getTextColor(), false); // draw Wurst logo RenderSystem.setShaderColor(1, 1, 1, 1); GL11.glEnable(GL11.GL_BLEND); - helper.drawTexture(texture, 0, 3, 0, 0, 72, 18, 72, 18); + context.drawTexture(texture, 0, 3, 0, 0, 72, 18, 72, 18); } private String getVersionString() diff --git a/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java b/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java index 4bafc9e6..9a291f6a 100644 --- a/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java @@ -111,8 +111,8 @@ public abstract class GameMenuScreenMixin extends Screen } @Inject(at = @At("TAIL"), - method = "render(Lnet/minecraft/client/gui/DrawableHelper;IIF)V") - private void onRender(DrawContext helper, int mouseX, int mouseY, + method = "render(Lnet/minecraft/client/gui/DrawContext;IIF)V") + private void onRender(DrawContext context, int mouseX, int mouseY, float partialTicks, CallbackInfo ci) { if(!WurstClient.INSTANCE.isEnabled() || wurstOptionsButton == null) @@ -133,6 +133,6 @@ public abstract class GameMenuScreenMixin extends Screen int fh = 16; float u = 0; float v = 0; - helper.drawTexture(wurstTexture, x, y, u, v, w, h, fw, fh); + context.drawTexture(wurstTexture, x, y, u, v, w, h, fw, fh); } } diff --git a/src/main/java/net/wurstclient/mixin/IngameHudMixin.java b/src/main/java/net/wurstclient/mixin/IngameHudMixin.java index 81ca18f9..76457ac4 100644 --- a/src/main/java/net/wurstclient/mixin/IngameHudMixin.java +++ b/src/main/java/net/wurstclient/mixin/IngameHudMixin.java @@ -11,6 +11,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.hud.InGameHud; import net.minecraft.util.Identifier; @@ -26,21 +27,21 @@ public class IngameHudMixin target = "Lcom/mojang/blaze3d/systems/RenderSystem;enableBlend()V", remap = false, ordinal = 3), - method = "render(Lnet/minecraft/client/gui/DrawableHelper;F)V") - private void onRender(DrawContext helper, float partialTicks, + method = "render(Lnet/minecraft/client/gui/DrawContext;F)V") + private void onRender(DrawContext context, float partialTicks, CallbackInfo ci) { if(WurstClient.MC.options.debugEnabled) return; - GUIRenderEvent event = new GUIRenderEvent(helper, partialTicks); + GUIRenderEvent event = new GUIRenderEvent(context, partialTicks); EventManager.fire(event); } @Inject(at = @At("HEAD"), - method = "renderOverlay(Lnet/minecraft/client/gui/DrawableHelper;Lnet/minecraft/util/Identifier;F)V", + method = "renderOverlay(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/util/Identifier;F)V", cancellable = true) - private void onRenderOverlay(DrawContext helper, Identifier texture, + private void onRenderOverlay(DrawContext context, Identifier texture, float opacity, CallbackInfo ci) { if(texture == null || texture.getPath() == null) diff --git a/src/main/java/net/wurstclient/mixin/PlayerSkinProviderMixin.java b/src/main/java/net/wurstclient/mixin/PlayerSkinProviderMixin.java index 492b0253..ebd56e03 100644 --- a/src/main/java/net/wurstclient/mixin/PlayerSkinProviderMixin.java +++ b/src/main/java/net/wurstclient/mixin/PlayerSkinProviderMixin.java @@ -25,7 +25,7 @@ import com.google.common.collect.Maps; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.mojang.authlib.GameProfile; -import com.mojang.authlib.minecraft.InsecureTextureException; +import com.mojang.authlib.minecraft.InsecurePublicKeyException; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; import com.mojang.authlib.minecraft.MinecraftSessionService; @@ -45,9 +45,8 @@ public class PlayerSkinProviderMixin private static JsonObject capes; - @Inject(at = {@At("HEAD")}, - method = { - "loadSkin(Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/texture/PlayerSkinProvider$SkinTextureAvailableCallback;Z)V"}, + @Inject(at = @At("HEAD"), + method = "loadSkin(Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/texture/PlayerSkinProvider$SkinTextureAvailableCallback;Z)V", cancellable = true) private void onLoadSkin(GameProfile profile, PlayerSkinProvider.SkinTextureAvailableCallback callback, @@ -59,15 +58,13 @@ public class PlayerSkinProviderMixin Runnable runnable = () -> { HashMap map = Maps.newHashMap(); - try { map.putAll(sessionService.getTextures(profile, requireSecure)); - }catch(InsecureTextureException var7) + }catch(InsecurePublicKeyException e) { - + // empty catch block } - if(map.isEmpty()) { profile.getProperties().clear(); @@ -81,12 +78,11 @@ public class PlayerSkinProviderMixin { sessionService.fillProfileProperties(profile, requireSecure); - try { map.putAll( sessionService.getTextures(profile, requireSecure)); - }catch(InsecureTextureException var6) + }catch(InsecurePublicKeyException e) { } diff --git a/src/main/java/net/wurstclient/mixin/ScreenMixin.java b/src/main/java/net/wurstclient/mixin/ScreenMixin.java index 070993fc..31c44b1e 100644 --- a/src/main/java/net/wurstclient/mixin/ScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/ScreenMixin.java @@ -32,9 +32,9 @@ public abstract class ScreenMixin extends AbstractParentElement private List drawables; @Inject(at = @At("HEAD"), - method = "renderBackground(Lnet/minecraft/client/gui/DrawableHelper;)V", + method = "renderBackground(Lnet/minecraft/client/gui/DrawContext;)V", cancellable = true) - public void onRenderBackground(DrawContext helper, CallbackInfo ci) + public void onRenderBackground(DrawContext context, CallbackInfo ci) { if(WurstClient.INSTANCE.getHax().noBackgroundHack .shouldCancelBackground((Screen)(Object)this)) diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 5297484e..187f0eed 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.method_46421(width / 2 + 2); + button.setX(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 87f22486..28488e07 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.method_46419(realmsButton.getY()); + altsButton.setY(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java index a848dbb3..99be6592 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java @@ -20,6 +20,7 @@ import org.lwjgl.glfw.GLFW; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; + import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.widget.ButtonWidget; @@ -318,15 +319,15 @@ public final class NavigatorFeatureScreen extends NavigatorScreen } @Override - protected void onRender(DrawContext helper, int mouseX, int mouseY, + protected void onRender(DrawContext context, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); // title bar - helper.drawCenteredTextWithShadow(client.textRenderer, + context.drawCenteredTextWithShadow(client.textRenderer, feature.getName(), middleX, 32, txtColor); GL11.glEnable(GL11.GL_BLEND); @@ -432,7 +433,7 @@ public final class NavigatorFeatureScreen extends NavigatorScreen } for(int i = 0; i < window.countChildren(); i++) - window.getChild(i).render(helper, mouseX - bgx1, mouseY - windowY, + window.getChild(i).render(context, mouseX - bgx1, mouseY - windowY, partialTicks); matrixStack.pop(); @@ -464,7 +465,7 @@ public final class NavigatorFeatureScreen extends NavigatorScreen drawBox(matrixStack, x1, y1, x2, y2); // text - helper.drawCenteredTextWithShadow(client.textRenderer, + context.drawCenteredTextWithShadow(client.textRenderer, buttonData.buttonText, (x1 + x2) / 2, y1 + (buttonData.height - 10) / 2 + 1, buttonData.isLocked() ? 0xaaaaaa : buttonData.textColor); @@ -475,7 +476,7 @@ public final class NavigatorFeatureScreen extends NavigatorScreen int textY = bgy1 + scroll + 2; for(String line : text.split("\n")) { - helper.drawText(client.textRenderer, line, bgx1 + 2, textY, + context.drawText(client.textRenderer, line, bgx1 + 2, textY, txtColor, false); textY += client.textRenderer.fontHeight; } @@ -518,15 +519,15 @@ public final class NavigatorFeatureScreen extends NavigatorScreen // text String buttonText = button.getMessage().getString(); - helper.drawText(client.textRenderer, buttonText, + context.drawText(client.textRenderer, buttonText, (x1 + x2 - client.textRenderer.getWidth(buttonText)) / 2, y1 + 5, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } // popups & tooltip - gui.renderPopups(helper, mouseX, mouseY); - gui.renderTooltip(helper, mouseX, mouseY); + gui.renderPopups(context, mouseX, mouseY); + gui.renderTooltip(context, mouseX, mouseY); // GL resets GL11.glEnable(GL11.GL_CULL_FACE); diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 98051679..70cd9d69 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -74,7 +74,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.method_46421(middleX - 100); + searchBar.setX(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } @@ -228,10 +228,10 @@ public final class NavigatorMainScreen extends NavigatorScreen } @Override - protected void onRender(DrawContext helper, int mouseX, int mouseY, + protected void onRender(DrawContext context, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); ClickGui gui = WurstClient.INSTANCE.getGui(); float[] bgColor = gui.getBgColor(); float[] acColor = gui.getAcColor(); @@ -244,9 +244,9 @@ public final class NavigatorMainScreen extends NavigatorScreen if(!clickTimerRunning) { RenderSystem.setShaderColor(1, 1, 1, 1); - helper.drawTextWithShadow(WurstClient.MC.textRenderer, "Search: ", + context.drawTextWithShadow(WurstClient.MC.textRenderer, "Search: ", middleX - 150, 32, txtColor); - searchBar.render(helper, mouseX, mouseY, partialTicks); + searchBar.render(context, mouseX, mouseY, partialTicks); GL11.glEnable(GL11.GL_BLEND); } @@ -269,7 +269,7 @@ public final class NavigatorMainScreen extends NavigatorScreen if(featureY > height - 40) break; - renderFeature(helper, mouseX, mouseY, partialTicks, i, featureX, + renderFeature(context, mouseX, mouseY, partialTicks, i, featureX, featureY); } @@ -329,15 +329,15 @@ public final class NavigatorMainScreen extends NavigatorScreen // text for(int i = 0; i < lines.length; i++) - helper.drawText(tr, lines[i], xt1 + 2, + context.drawText(tr, lines[i], xt1 + 2, yt1 + 2 + i * tr.fontHeight, txtColor, false); } } - private void renderFeature(DrawContext helper, int mouseX, int mouseY, + private void renderFeature(DrawContext context, int mouseX, int mouseY, float partialTicks, int i, int x, int y) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); ClickGui gui = WurstClient.INSTANCE.getGui(); float[] bgColor = gui.getBgColor(); int txtColor = gui.getTxtColor(); @@ -475,7 +475,7 @@ public final class NavigatorMainScreen extends NavigatorScreen RenderSystem.setShader(GameRenderer::getPositionProgram); RenderSystem.setShaderColor(1, 1, 1, 1); String buttonText = feature.getName(); - helper.drawText(client.textRenderer, buttonText, area.x + 4, + context.drawText(client.textRenderer, buttonText, area.x + 4, area.y + 4, txtColor, false); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java index 71e1df6e..2392e5c3 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java @@ -14,6 +14,7 @@ import org.lwjgl.glfw.GLFW; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; + import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.widget.ButtonWidget; @@ -156,15 +157,15 @@ public class NavigatorNewKeybindScreen extends NavigatorScreen } @Override - protected void onRender(DrawContext helper, int mouseX, int mouseY, + protected void onRender(DrawContext context, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); // title bar - helper.drawCenteredTextWithShadow(client.textRenderer, "New Keybind", + context.drawCenteredTextWithShadow(client.textRenderer, "New Keybind", middleX, 32, txtColor); GL11.glEnable(GL11.GL_BLEND); @@ -213,10 +214,11 @@ public class NavigatorNewKeybindScreen extends NavigatorScreen drawBox(matrixStack, x1, y1, x2, y2); // text - helper.drawTextWithShadow(client.textRenderer, + context.drawTextWithShadow(client.textRenderer, pkb.getDescription(), x1 + 1, y1 + 1, txtColor); - helper.drawTextWithShadow(client.textRenderer, pkb.getCommand(), - x1 + 1, y1 + 1 + client.textRenderer.fontHeight, txtColor); + context.drawTextWithShadow(client.textRenderer, + pkb.getCommand(), x1 + 1, + y1 + 1 + client.textRenderer.fontHeight, txtColor); GL11.glEnable(GL11.GL_BLEND); } } @@ -225,7 +227,7 @@ public class NavigatorNewKeybindScreen extends NavigatorScreen int textY = bgy1 + scroll + 2; for(String line : text.split("\n")) { - helper.drawTextWithShadow(client.textRenderer, line, bgx1 + 2, + context.drawTextWithShadow(client.textRenderer, line, bgx1 + 2, textY, txtColor); textY += client.textRenderer.fontHeight; } @@ -261,7 +263,7 @@ public class NavigatorNewKeybindScreen extends NavigatorScreen drawBox(matrixStack, x1, y1, x2, y2); // text - helper.drawCenteredTextWithShadow(client.textRenderer, + context.drawCenteredTextWithShadow(client.textRenderer, button.getMessage().getString(), (x1 + x2) / 2, y1 + 5, txtColor); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java index 521a9025..645bec4c 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java @@ -16,6 +16,7 @@ import org.lwjgl.glfw.GLFW; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; + import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.widget.ButtonWidget; @@ -128,16 +129,16 @@ public class NavigatorRemoveKeybindScreen extends NavigatorScreen } @Override - protected void onRender(DrawContext helper, int mouseX, int mouseY, + protected void onRender(DrawContext context, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); ClickGui gui = WurstClient.INSTANCE.getGui(); int txtColor = gui.getTxtColor(); // title bar - helper.drawCenteredTextWithShadow(client.textRenderer, "Remove Keybind", - middleX, 32, txtColor); + context.drawCenteredTextWithShadow(client.textRenderer, + "Remove Keybind", middleX, 32, txtColor); GL11.glEnable(GL11.GL_BLEND); // background @@ -183,12 +184,13 @@ public class NavigatorRemoveKeybindScreen extends NavigatorScreen drawBox(matrixStack, x1, y1, x2, y2); // text - helper.drawTextWithShadow(client.textRenderer, + context.drawTextWithShadow(client.textRenderer, key.replace("key.keyboard.", "") + ": " + keybind.getDescription(), x1 + 1, y1 + 1, txtColor); - helper.drawTextWithShadow(client.textRenderer, keybind.getCommand(), - x1 + 1, y1 + 1 + client.textRenderer.fontHeight, txtColor); + context.drawTextWithShadow(client.textRenderer, + keybind.getCommand(), x1 + 1, + y1 + 1 + client.textRenderer.fontHeight, txtColor); GL11.glEnable(GL11.GL_BLEND); } @@ -196,7 +198,7 @@ public class NavigatorRemoveKeybindScreen extends NavigatorScreen int textY = bgy1 + scroll + 2; for(String line : text.split("\n")) { - helper.drawTextWithShadow(client.textRenderer, line, bgx1 + 2, + context.drawTextWithShadow(client.textRenderer, line, bgx1 + 2, textY, txtColor); textY += client.textRenderer.fontHeight; } @@ -232,7 +234,7 @@ public class NavigatorRemoveKeybindScreen extends NavigatorScreen drawBox(matrixStack, x1, y1, x2, y2); // text - helper.drawCenteredTextWithShadow(client.textRenderer, + context.drawCenteredTextWithShadow(client.textRenderer, button.getMessage().getString(), (x1 + x2) / 2, y1 + 5, txtColor); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/net/wurstclient/navigator/NavigatorScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorScreen.java index 3b7d48b0..556bf174 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorScreen.java @@ -13,6 +13,7 @@ import org.joml.Matrix4f; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.systems.RenderSystem; + import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.render.BufferBuilder; @@ -142,10 +143,10 @@ public abstract class NavigatorScreen extends Screen } @Override - public final void render(DrawContext helper, int mouseX, int mouseY, + public final void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); // GL settings GL11.glEnable(GL11.GL_BLEND); @@ -182,7 +183,7 @@ public abstract class NavigatorScreen extends Screen drawDownShadow(matrixStack, x1, y1, x2, y2); } - onRender(helper, mouseX, mouseY, partialTicks); + onRender(context, mouseX, mouseY, partialTicks); // GL resets GL11.glEnable(GL11.GL_CULL_FACE); @@ -208,7 +209,7 @@ public abstract class NavigatorScreen extends Screen protected abstract void onUpdate(); - protected abstract void onRender(DrawContext helper, int mouseX, + protected abstract void onRender(DrawContext context, int mouseX, int mouseY, float partialTicks); protected final int getStringHeight(String s) diff --git a/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java b/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java index f97bb64b..88864e7c 100644 --- a/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java +++ b/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java @@ -101,20 +101,19 @@ public final class ForcedChatReportsScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, - float delta) + public void render(DrawContext context, int mouseX, int mouseY, float delta) { - renderBackground(helper); + renderBackground(context); int centerX = width / 2; int reasonY = (height - 68) / 2 - reasonHeight / 2; int titleY = reasonY - textRenderer.fontHeight * 2; - helper.drawCenteredTextWithShadow(textRenderer, title, centerX, titleY, + context.drawCenteredTextWithShadow(textRenderer, title, centerX, titleY, 0xAAAAAA); - reasonFormatted.drawCenterWithShadow(helper, centerX, reasonY); + reasonFormatted.drawCenterWithShadow(context, centerX, reasonY); - super.render(helper, mouseX, mouseY, delta); + super.render(context, mouseX, mouseY, delta); } @Override diff --git a/src/main/java/net/wurstclient/nochatreports/NcrModRequiredScreen.java b/src/main/java/net/wurstclient/nochatreports/NcrModRequiredScreen.java index 0db22a89..fe212eb8 100644 --- a/src/main/java/net/wurstclient/nochatreports/NcrModRequiredScreen.java +++ b/src/main/java/net/wurstclient/nochatreports/NcrModRequiredScreen.java @@ -117,20 +117,19 @@ public final class NcrModRequiredScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, - float delta) + public void render(DrawContext context, int mouseX, int mouseY, float delta) { - renderBackground(helper); + renderBackground(context); int centerX = width / 2; int reasonY = (height - 68) / 2 - reasonHeight / 2; int titleY = reasonY - textRenderer.fontHeight * 2; - helper.drawCenteredTextWithShadow(textRenderer, title, centerX, titleY, + context.drawCenteredTextWithShadow(textRenderer, title, centerX, titleY, 0xAAAAAA); - reasonFormatted.drawCenterWithShadow(helper, centerX, reasonY); + reasonFormatted.drawCenterWithShadow(context, centerX, reasonY); - super.render(helper, mouseX, mouseY, delta); + super.render(context, mouseX, mouseY, delta); } @Override diff --git a/src/main/java/net/wurstclient/options/EnterProfileNameScreen.java b/src/main/java/net/wurstclient/options/EnterProfileNameScreen.java index fb59d506..b8f8962c 100644 --- a/src/main/java/net/wurstclient/options/EnterProfileNameScreen.java +++ b/src/main/java/net/wurstclient/options/EnterProfileNameScreen.java @@ -88,15 +88,15 @@ public final class EnterProfileNameScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - renderBackground(helper); - helper.drawCenteredTextWithShadow(client.textRenderer, + renderBackground(context); + context.drawCenteredTextWithShadow(client.textRenderer, "Name your new profile", width / 2, 20, 0xFFFFFF); - valueField.render(helper, mouseX, mouseY, partialTicks); - super.render(helper, mouseX, mouseY, partialTicks); + valueField.render(context, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/net/wurstclient/options/KeybindEditorScreen.java b/src/main/java/net/wurstclient/options/KeybindEditorScreen.java index 9de18f58..fe346160 100644 --- a/src/main/java/net/wurstclient/options/KeybindEditorScreen.java +++ b/src/main/java/net/wurstclient/options/KeybindEditorScreen.java @@ -94,23 +94,23 @@ public final class KeybindEditorScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - renderBackground(helper); + renderBackground(context); - helper.drawCenteredTextWithShadow(textRenderer, + context.drawCenteredTextWithShadow(textRenderer, (oldKey != null ? "Edit" : "Add") + " Keybind", width / 2, 20, 0xffffff); - helper.drawTextWithShadow(textRenderer, + context.drawTextWithShadow(textRenderer, "Key: " + key.replace("key.keyboard.", ""), width / 2 - 100, 47, 0xa0a0a0); - helper.drawTextWithShadow(textRenderer, "Commands (separated by ';')", + context.drawTextWithShadow(textRenderer, "Commands (separated by ';')", width / 2 - 100, 87, 0xa0a0a0); - commandField.render(helper, mouseX, mouseY, partialTicks); - super.render(helper, mouseX, mouseY, partialTicks); + commandField.render(context, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/net/wurstclient/options/KeybindManagerScreen.java b/src/main/java/net/wurstclient/options/KeybindManagerScreen.java index 41aef4b3..43d5d7c4 100644 --- a/src/main/java/net/wurstclient/options/KeybindManagerScreen.java +++ b/src/main/java/net/wurstclient/options/KeybindManagerScreen.java @@ -163,18 +163,18 @@ public final class KeybindManagerScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - renderBackground(helper); - listGui.render(helper, mouseX, mouseY, partialTicks); + renderBackground(context); + listGui.render(context, mouseX, mouseY, partialTicks); - helper.drawCenteredTextWithShadow(textRenderer, "Keybind Manager", + context.drawCenteredTextWithShadow(textRenderer, "Keybind Manager", width / 2, 8, 0xffffff); - helper.drawCenteredTextWithShadow(textRenderer, + context.drawCenteredTextWithShadow(textRenderer, "Keybinds: " + listGui.getItemCount(), width / 2, 20, 0xffffff); - super.render(helper, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); } @Override @@ -222,16 +222,16 @@ public final class KeybindManagerScreen extends Screen } @Override - protected void renderItem(DrawContext helper, int index, int x, - int y, int slotHeight, int mouseX, int mouseY, float partialTicks) + protected void renderItem(DrawContext context, int index, int x, int y, + int slotHeight, int mouseX, int mouseY, float partialTicks) { Keybind keybind = WurstClient.INSTANCE.getKeybinds().getAllKeybinds().get(index); - helper.drawText(client.textRenderer, + context.drawText(client.textRenderer, "Key: " + keybind.getKey().replace("key.keyboard.", ""), x + 3, y + 3, 0xa0a0a0, false); - helper.drawText(client.textRenderer, + context.drawText(client.textRenderer, "Commands: " + keybind.getCommands(), x + 3, y + 15, 0xa0a0a0, false); } diff --git a/src/main/java/net/wurstclient/options/KeybindProfilesScreen.java b/src/main/java/net/wurstclient/options/KeybindProfilesScreen.java index 93eaecee..0946e70a 100644 --- a/src/main/java/net/wurstclient/options/KeybindProfilesScreen.java +++ b/src/main/java/net/wurstclient/options/KeybindProfilesScreen.java @@ -170,19 +170,19 @@ public final class KeybindProfilesScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - renderBackground(helper); - listGui.render(helper, mouseX, mouseY, partialTicks); + renderBackground(context); + listGui.render(context, mouseX, mouseY, partialTicks); - helper.drawCenteredTextWithShadow(client.textRenderer, + context.drawCenteredTextWithShadow(client.textRenderer, "Keybind Profiles", width / 2, 12, 0xffffff); - super.render(helper, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); if(loadButton.isSelected() && !loadButton.active) - helper.drawTooltip(textRenderer, + context.drawTooltip(textRenderer, Arrays.asList(Text.literal("You must first select a file.")), mouseX, mouseY); } @@ -236,20 +236,20 @@ public final class KeybindProfilesScreen extends Screen } @Override - protected void renderItem(DrawContext helper, int index, int x, - int y, int var4, int var5, int var6, float partialTicks) + protected void renderItem(DrawContext context, int index, int x, int y, + int var4, int var5, int var6, float partialTicks) { TextRenderer tr = mc.textRenderer; Path path = list.get(index); // tr.draw(matrixStack, "" + path.getFileName(), x + 28, y, // 0xf0f0f0); - helper.drawTextWithShadow(tr, "" + path.getFileName(), x + 28, y, + context.drawTextWithShadow(tr, "" + path.getFileName(), x + 28, y, 0xf0f0f0); // tr.draw(matrixStack, "" + // client.runDirectory.toPath().relativize(path), x + 28, y + 9, // 0xa0a0a0); - helper.drawTextWithShadow(tr, + context.drawTextWithShadow(tr, "" + client.runDirectory.toPath().relativize(path), x + 28, y + 9, 0xa0a0a0); } diff --git a/src/main/java/net/wurstclient/options/PressAKeyScreen.java b/src/main/java/net/wurstclient/options/PressAKeyScreen.java index abc05fee..da209054 100644 --- a/src/main/java/net/wurstclient/options/PressAKeyScreen.java +++ b/src/main/java/net/wurstclient/options/PressAKeyScreen.java @@ -8,6 +8,7 @@ package net.wurstclient.options; import org.lwjgl.glfw.GLFW; + import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.InputUtil; @@ -49,12 +50,12 @@ public class PressAKeyScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - renderBackground(helper); - helper.drawCenteredTextWithShadow(textRenderer, "Press a key", + renderBackground(context); + context.drawCenteredTextWithShadow(textRenderer, "Press a key", width / 2, height / 4 + 48, 16777215); - super.render(helper, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); } } diff --git a/src/main/java/net/wurstclient/options/WurstOptionsScreen.java b/src/main/java/net/wurstclient/options/WurstOptionsScreen.java index 5dfd7eb7..6a3d9bc5 100644 --- a/src/main/java/net/wurstclient/options/WurstOptionsScreen.java +++ b/src/main/java/net/wurstclient/options/WurstOptionsScreen.java @@ -146,34 +146,34 @@ public class WurstOptionsScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - renderBackground(helper); - renderTitles(helper); - super.render(helper, mouseX, mouseY, partialTicks); - renderButtonTooltip(helper, mouseX, mouseY); + renderBackground(context); + renderTitles(context); + super.render(context, mouseX, mouseY, partialTicks); + renderButtonTooltip(context, mouseX, mouseY); } - private void renderTitles(DrawContext helper) + private void renderTitles(DrawContext context) { TextRenderer tr = client.textRenderer; int middleX = width / 2; int y1 = 40; int y2 = height / 4 + 24 - 28; - helper.drawCenteredTextWithShadow(tr, "Wurst Options", middleX, y1, + context.drawCenteredTextWithShadow(tr, "Wurst Options", middleX, y1, 0xffffff); - helper.drawCenteredTextWithShadow(tr, "Settings", middleX - 104, y2, + context.drawCenteredTextWithShadow(tr, "Settings", middleX - 104, y2, 0xcccccc); - helper.drawCenteredTextWithShadow(tr, "Managers", middleX, y2, + context.drawCenteredTextWithShadow(tr, "Managers", middleX, y2, 0xcccccc); - helper.drawCenteredTextWithShadow(tr, "Links", middleX + 104, y2, + context.drawCenteredTextWithShadow(tr, "Links", middleX + 104, y2, 0xcccccc); } - private void renderButtonTooltip(DrawContext helper, int mouseX, + private void renderButtonTooltip(DrawContext context, int mouseX, int mouseY) { for(Drawable d : ((IScreen)this).getButtons()) @@ -191,7 +191,7 @@ public class WurstOptionsScreen extends Screen if(woButton.tooltip.isEmpty()) continue; - helper.drawTooltip(textRenderer, woButton.tooltip, mouseX, mouseY); + context.drawTooltip(textRenderer, woButton.tooltip, mouseX, mouseY); break; } } diff --git a/src/main/java/net/wurstclient/options/ZoomManagerScreen.java b/src/main/java/net/wurstclient/options/ZoomManagerScreen.java index 5d644838..8f16145f 100644 --- a/src/main/java/net/wurstclient/options/ZoomManagerScreen.java +++ b/src/main/java/net/wurstclient/options/ZoomManagerScreen.java @@ -94,20 +94,20 @@ public class ZoomManagerScreen extends Screen implements PressAKeyCallback } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { ZoomOtf zoom = WurstClient.INSTANCE.getOtfs().zoomOtf; SliderSetting level = zoom.getLevelSetting(); - renderBackground(helper); - helper.drawCenteredTextWithShadow(textRenderer, "Zoom Manager", + renderBackground(context); + context.drawCenteredTextWithShadow(textRenderer, "Zoom Manager", width / 2, 40, 0xffffff); - helper.drawTextWithShadow(textRenderer, + context.drawTextWithShadow(textRenderer, "Zoom Level: " + level.getValueString(), width / 2 - 75, height / 4 + 44, 0xcccccc); - super.render(helper, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java b/src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java index 813031e0..f706da3d 100644 --- a/src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java +++ b/src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java @@ -201,21 +201,21 @@ public class CleanUpScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - renderBackground(helper); - helper.drawCenteredTextWithShadow(textRenderer, "Clean Up", width / 2, + renderBackground(context); + context.drawCenteredTextWithShadow(textRenderer, "Clean Up", width / 2, 20, 16777215); - helper.drawCenteredTextWithShadow(textRenderer, + context.drawCenteredTextWithShadow(textRenderer, "Please select the servers you want to remove:", width / 2, 36, 10526880); - super.render(helper, mouseX, mouseY, partialTicks); - renderButtonTooltip(helper, mouseX, mouseY); + super.render(context, mouseX, mouseY, partialTicks); + renderButtonTooltip(context, mouseX, mouseY); } - private void renderButtonTooltip(DrawContext helper, int mouseX, + private void renderButtonTooltip(DrawContext context, int mouseX, int mouseY) { for(Drawable d : ((IScreen)this).getButtons()) @@ -233,7 +233,7 @@ public class CleanUpScreen extends Screen if(cuButton.tooltip.isEmpty()) continue; - helper.drawTooltip(textRenderer, cuButton.tooltip, mouseX, mouseY); + context.drawTooltip(textRenderer, cuButton.tooltip, mouseX, mouseY); break; } } diff --git a/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java b/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java index cadec82f..f8429ed6 100644 --- a/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java +++ b/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java @@ -12,6 +12,7 @@ import java.net.UnknownHostException; import java.util.ArrayList; import org.lwjgl.glfw.GLFW; + import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; @@ -213,41 +214,41 @@ public class ServerFinderScreen extends Screen } @Override - public void render(DrawContext helper, int mouseX, int mouseY, + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - renderBackground(helper); + renderBackground(context); - helper.drawCenteredTextWithShadow(textRenderer, "Server Finder", + context.drawCenteredTextWithShadow(textRenderer, "Server Finder", width / 2, 20, 16777215); - helper.drawCenteredTextWithShadow(textRenderer, + context.drawCenteredTextWithShadow(textRenderer, "This will search for servers with similar IPs", width / 2, 40, 10526880); - helper.drawCenteredTextWithShadow(textRenderer, + context.drawCenteredTextWithShadow(textRenderer, "to the IP you type into the field below.", width / 2, 50, 10526880); - helper.drawCenteredTextWithShadow(textRenderer, + context.drawCenteredTextWithShadow(textRenderer, "The servers it finds will be added to your server list.", width / 2, 60, 10526880); - helper.drawTextWithShadow(textRenderer, "Server address:", + context.drawTextWithShadow(textRenderer, "Server address:", width / 2 - 100, height / 4 + 24, 10526880); - ipBox.render(helper, mouseX, mouseY, partialTicks); + ipBox.render(context, mouseX, mouseY, partialTicks); - helper.drawTextWithShadow(textRenderer, "Max. threads:", + context.drawTextWithShadow(textRenderer, "Max. threads:", width / 2 - 100, height / 4 + 60, 10526880); - maxThreadsBox.render(helper, mouseX, mouseY, partialTicks); + maxThreadsBox.render(context, mouseX, mouseY, partialTicks); - helper.drawCenteredTextWithShadow(textRenderer, state.toString(), + context.drawCenteredTextWithShadow(textRenderer, state.toString(), width / 2, height / 4 + 73, 10526880); - helper.drawTextWithShadow(textRenderer, + context.drawTextWithShadow(textRenderer, "Checked: " + checked + " / 1792", width / 2 - 100, height / 4 + 84, 10526880); - helper.drawTextWithShadow(textRenderer, "Working: " + working, + context.drawTextWithShadow(textRenderer, "Working: " + working, width / 2 - 100, height / 4 + 94, 10526880); - super.render(helper, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/net/wurstclient/util/ChunkUtils.java b/src/main/java/net/wurstclient/util/ChunkUtils.java index ba5d8aae..7fed3a95 100644 --- a/src/main/java/net/wurstclient/util/ChunkUtils.java +++ b/src/main/java/net/wurstclient/util/ChunkUtils.java @@ -13,6 +13,8 @@ import java.util.stream.Stream; import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.MinecraftClient; import net.minecraft.util.math.ChunkPos; +import net.minecraft.util.math.ChunkSectionPos; +import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.WorldChunk; import net.wurstclient.WurstClient; @@ -62,4 +64,21 @@ public enum ChunkUtils return stream; } + /** + * Returns the y-coordinate of the highest non-empty section in the chunk. + * + *

+ * This is a re-implementation of + * {@link Chunk#getHighestNonEmptySectionYOffset()}, which has been + * deprecated and marked for removal in 23w17a with no apparent replacement + * provided by Mojang. + */ + public static int getHighestNonEmptySectionYOffset(Chunk chunk) + { + int i = chunk.getHighestNonEmptySection(); + if(i == -1) + return chunk.getBottomY(); + + return ChunkSectionPos.getBlockCoord(chunk.sectionIndexToCoord(i)); + } } diff --git a/src/main/java/net/wurstclient/util/ListWidget.java b/src/main/java/net/wurstclient/util/ListWidget.java index 1420112a..be6b52d5 100644 --- a/src/main/java/net/wurstclient/util/ListWidget.java +++ b/src/main/java/net/wurstclient/util/ListWidget.java @@ -94,7 +94,7 @@ public abstract class ListWidget extends AbstractParentElement protected void updateItemPosition(int index, int x, int y, float delta) {} - protected abstract void renderItem(DrawContext helper, int x, int y, + protected abstract void renderItem(DrawContext context, int x, int y, int itemHeight, int mouseX, int mouseY, int i, float f); protected void renderHeader(int x, int y, Tessellator tessellator) @@ -134,8 +134,7 @@ public abstract class ListWidget extends AbstractParentElement } @Override - public void render(DrawContext helper, int mouseX, int mouseY, - float delta) + public void render(DrawContext context, int mouseX, int mouseY, float delta) { if(visible) { @@ -168,7 +167,7 @@ public abstract class ListWidget extends AbstractParentElement if(renderHeader) renderHeader(k, l, tessellator); - renderList(helper, k, l, mouseX, mouseY, delta); + renderList(context, k, l, mouseX, mouseY, delta); RenderSystem.disableDepthTest(); renderHoleBackground(0, top, 255, 255); renderHoleBackground(bottom, height, 255, 255); @@ -374,7 +373,7 @@ public abstract class ListWidget extends AbstractParentElement return 220; } - protected void renderList(DrawContext helper, int i, int j, int k, int l, + protected void renderList(DrawContext context, int i, int j, int k, int l, float f) { int m = getItemCount(); @@ -414,7 +413,7 @@ public abstract class ListWidget extends AbstractParentElement } RenderSystem.setShaderColor(1, 1, 1, 1); - renderItem(helper, n, i, o, p, k, l, f); + renderItem(context, n, i, o, p, k, l, f); } } diff --git a/src/main/java/net/wurstclient/util/RenderUtils.java b/src/main/java/net/wurstclient/util/RenderUtils.java index dd1e2583..4ea0a1e6 100644 --- a/src/main/java/net/wurstclient/util/RenderUtils.java +++ b/src/main/java/net/wurstclient/util/RenderUtils.java @@ -864,10 +864,10 @@ public enum RenderUtils bufferBuilder.vertex(matrix, 0, 2, 1).next(); } - public static void drawItem(DrawContext helper, ItemStack stack, int x, + public static void drawItem(DrawContext context, ItemStack stack, int x, int y, boolean large) { - MatrixStack matrixStack = helper.getMatrices(); + MatrixStack matrixStack = context.getMatrices(); matrixStack.push(); matrixStack.translate(x, y, 0); @@ -880,7 +880,7 @@ public enum RenderUtils ? new ItemStack(Blocks.GRASS_BLOCK) : stack; DiffuseLighting.enableGuiDepthLighting(); - helper.drawItem(renderStack, 0, 0); + context.drawItem(renderStack, 0, 0); DiffuseLighting.disableGuiDepthLighting(); matrixStack.pop(); @@ -894,7 +894,7 @@ public enum RenderUtils GL11.glDisable(GL11.GL_DEPTH_TEST); TextRenderer tr = WurstClient.MC.textRenderer; - helper.drawText(tr, "?", 3, 2, 0xf0f0f0, false); + context.drawText(tr, "?", 3, 2, 0xf0f0f0, false); GL11.glEnable(GL11.GL_DEPTH_TEST); matrixStack.pop(); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 305d6924..0bfae0fb 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -31,7 +31,7 @@ "depends": { "fabricloader": ">=0.14.19", "fabric-api": ">=0.78.1", - "minecraft": "~1.20-alpha.23.16.a", + "minecraft": "~1.20-alpha.23.17.a", "java": ">=17" }, "suggests": { From 7168468cbf3c7c16290e25d2c6491e8bd7a5c226 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 27 Apr 2023 14:23:40 +0200 Subject: [PATCH 14/45] Update to Loom 1.2 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 59821 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 8 +- gradlew.bat | 180 ++++++++++++----------- 5 files changed, 101 insertions(+), 93 deletions(-) diff --git a/build.gradle b/build.gradle index 1c8e16ef..a009a9c9 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { } plugins { - id 'fabric-loom' version '1.1-SNAPSHOT' + id 'fabric-loom' version '1.2-SNAPSHOT' id 'maven-publish' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a4d4fb3f96a785543079b8df6723c946b..249e5832f090a2944b7473328c07c9755baa3196 100644 GIT binary patch delta 10197 zcmaKS1ymhDwk=#NxVyW%y9U<)A-Dv)xI0|j{UX8L-JRg>5ZnnKAh;%chM6~S-g^K4 z>eZ{yK4;gd>gwvXs=Id8Jk-J}R4pT911;+{Jp9@aiz6!p1Oz9z&_kGLA%J5%3Ih@0 zQ|U}%$)3u|G`jIfPzMVfcWs?jV2BO^*3+q2><~>3j+Z`^Z%=;19VWg0XndJ zwJ~;f4$;t6pBKaWn}UNO-wLCFHBd^1)^v%$P)fJk1PbK5<;Z1K&>k~MUod6d%@Bq9 z>(44uiaK&sdhwTTxFJvC$JDnl;f}*Q-^01T508(8{+!WyquuyB7R!d!J)8Ni0p!cV6$CHsLLy6}7C zYv_$eD;)@L)tLj0GkGpBoa727hs%wH$>EhfuFy{_8Q8@1HI%ZAjlpX$ob{=%g6`Ox zLzM!d^zy`VV1dT9U9(^}YvlTO9Bf8v^wMK37`4wFNFzW?HWDY(U(k6@tp(crHD)X5>8S-# zW1qgdaZa*Sh6i%60e1+hty}34dD%vKgb?QmQiZ=-j+isA4={V_*R$oGN#j|#ia@n6 zuZx4e2Xx?^lUwYFn2&Tmbx0qA3Z8;y+zKoeQu;~k~FZGy!FU_TFxYd!Ck;5QvMx9gj5fI2@BLNp~Ps@ zf@k<&Q2GS5Ia9?_D?v~$I%_CLA4x~eiKIZ>9w^c#r|vB?wXxZ(vXd*vH(Fd%Me8p( z=_0)k=iRh%8i`FYRF>E97uOFTBfajv{IOz(7CU zv0Gd84+o&ciHlVtY)wn6yhZTQQO*4Mvc#dxa>h}82mEKKy7arOqU$enb9sgh#E=Lq zU;_RVm{)30{bw+|056%jMVcZRGEBSJ+JZ@jH#~DvaDQm92^TyUq=bY*+AkEakpK>8 zB{)CkK48&nE5AzTqT;WysOG|!y}5fshxR8Ek(^H6i>|Fd&wu?c&Q@N9ZrJ=?ABHI! z`*z8D`w=~AJ!P-9M=T}f`;76$qZRllB&8#9WgbuO$P7lVqdX1=g*t=7z6!0AQ^ux_ z9rcfUv^t}o_l-ZE+TqvqFsA*~W<^78!k;~!i8(eS+(+@u8FxK+Q7;mHZ<1}|4m<}vh@p`t%|@eM_J(P% zI>M7C)Ir{l|J;$G_EGGEhbP4?6{sYzMqBv+x95N&YWFH6UcE@b}B?q)G*4<4mR@sy1#vPnLMK51tb#ED(8TA1nE zYfhK7bo1!R5WJF$5Y?zG21)6+_(_5oSX9sGIW;(O&S?Rh(nydNQYzKjjJ54aDJ-1F zrJ=np8LsN?%?Rt7f~3aAX!2E{`fh_pb?2(;HOB3W+I*~A>W%iY+v45+^e$cE10fA} zXPvw9=Bd+(;+!rl)pkYj0HGB}+3Z!Mr;zr%gz~c-hFMv8b2VRE2R$8V=_XE zq$3=|Yg05(fmwrJ)QK2ptB4no`Y8Dg_vK2QDc6-6sXRQ5k78-+cPi-fH}vpgs|Ive zE=m*XNVs?EWgiNI!5AcD*3QMW)R`EqT!f0e1%hERO&?AT7HWnSf5@#AR{OGuXG3Zb zCnVWg7h|61lGV3k+>L<#d>)InG>ETn1DbOHCfztqzQ_fBiaUt@q6VMy={Fe-w#~2- z0?*f|z$zgjI9>+JVICObBaK=pU}AEOd@q(8d?j7zQFD@=6t`|KmolTr2MfBI$;EGh zD%W0cA_d#V6Lb$us5yIG(|d>r-QleC4;%hEu5W9hyY zY#+ESY&v`8(&mC~?*|e5WEhC!YU2>m_}`K+q9)a(d$bsS<=YkyZGp}YA%TXw>@abA zS_poVPoN+?<6?DAuCNt&5SHV(hp56PJ})swwVFZFXM->F zc|0c8<$H_OV%DR|y7e+s$12@Ac8SUClPg8_O9sTUjpv%6Jsn5vsZCg>wL+db4c+{+ zsg<#wOuV4jeOq`veckdi-1`dz;gvL)bZeH|D*x=8UwRU5&8W1@l>3$)8WzET0%;1J zM3(X<7tKK&9~kWRI{&FmwY5Gg!b5f4kI_vSm)H1#>l6M+OiReDXC{kPy!`%Ecq-+3yZTk=<` zm)pE6xum5q0Qkd#iny0Q-S}@I0;mDhxf>sX)Oiv)FdsAMnpx%oe8OQ`m%Xeozdzx!C1rQR>m1c_}+J4x)K}k{G zo68;oGG&Ox7w^-m7{g4a7NJu-B|~M;oIH~~#`RyUNm##feZH;E?pf}nshmoiIY52n z%pc%lnU4Q#C=RUz)RU6}E_j4#)jh<&a%JyJj$Fufc#&COaxFHtl}zJUGNLBu3~_@1 zn9F^JO9);Duxo&i@>X(kbYga1i>6p1fca8FzQ0>((Lb-aPUbC*d~a03V$y;*RBY!R ziEJ2IF^FjrvO}0Uy{cMn%u<+P5U!UO>pm9#ZYL5i6|xSC+np7IH$GfXs&uI;y4as@ z&AzJh>(S2?3PKKgab3Z(`xbx(C#46XIvVcW8eG_DjT~}Yz_8PWZ`uf6^Xr=vkvL_` zqmvfgJL+Zc`;iq~iP?%@G7}~fal-zqxa0yNyHBJJ5M)9bI>7S_cg?Ya&p(I)C5Ef4 zZ>YAF6x|U=?ec?g*|f2g5Tw3PgxaM_bi_5Az9MO$;_Byw(2d}2%-|bg4ShdQ;)Z|M z4K|tFv)qx*kKGKoyh!DQY<{n&UmAChq@DJrQP>EY7g1JF(ih*D8wCVWyQ z5Jj^|-NVFSh5T0vd1>hUvPV6?=`90^_)t(L9)XOW7jeP45NyA2lzOn&QAPTl&d#6P zSv%36uaN(9i9WlpcH#}rmiP#=L0q(dfhdxvFVaOwM;pY;KvNQ9wMyUKs6{d}29DZQ z{H3&Sosr6)9Z+C>Q5)iHSW~gGoWGgK-0;k~&dyr-bA3O|3PCNzgC?UKS_B=^i8Ri^ zd_*_qI4B07Cayq|p4{`U_E_P=K`N_~{F|+-+`sCgcNxs`%X!$=(?l2aAW}0M=~COb zf19oe^iuAUuDEf)4tgv<=WRPpK@IjToNNC*#&Ykw!)aqWU4h#|U@(cG_=Qx+&xt~a zvCz~Ds3F71dsjNLkfM%TqdVNu=RNMOzh7?b+%hICbFlOAPphrYy>7D-e7{%o_kPFn z;T!?ilE-LcKM0P(GKMseEeW57Vs`=FF}(y@^pQl;rL3fHs8icmA+!6YJt&8 ztSF?%Un35qkv>drkks&BNTJv~xK?vD;aBkp7eIkDYqn+G0%;sT4FcwAoO+vke{8CO z0d76sgg$CannW5T#q`z~L4id)9BCKRU0A!Z-{HpXr)QJrd9@iJB+l32Ql)Z}*v(St zE)Vp=BB=DDB4Pr}B(UHNe31<@!6d{U?XDoxJ@S)9QM)2L%SA0x^~^fb=bdsBy!uh& zU?M_^kvnt%FZzm+>~bEH{2o?v&Iogs`1t-b+Ml`J!ZPS(46YQJKxWE81O$HE5w;** z|8zM%bp`M7J8)4;%DqH`wVTmM0V@D}xd%tRE3_6>ioMJxyi5Hkb>85muF81&EY!73ei zA3e<#ug||EZJ=1GLXNJ)A z791&ge#lF;GVX6IU?iw0jX^1bYaU?+x{zPlpyX6zijyn*nEdZ$fxxkl!a-~*P3bkf zPd*pzu~3GBYkR_>ET`5UM^>>zTV>5m>)f=az{d0sg6a8VzUtXy$ZS?h#Gk-CA?7)c zI%Vu9DN6XSDQn6;?n9`>l$q&>s?K)R8*OsmI+$L_m z_~E`}w694Z*`Xk3Ne=497Si~=RWRqCM?6=88smrxle#s*W znwhTRsMRmg?37GLJ-)%nDZA7r$YG849j8mJWir1bWBy& zZPneYojSbooC8U@tkO`bWx4%E5*;p#Q^1^S3lsfy7(6A{jL0`A__0vm?>xC%1y8_m z57FfWr^@YG2I1K7MGYuYd>JC}@sT2n^rkrY3w%~$J$Y~HSoOHn?zpR$ zjLj_bq@Yj8kd~DXHh30KVbz@K)0S;hPKm+S&-o%IG+@x@MEcrxW2KFh;z^4dJDZix zGRGe&lQD$p)0JVF4NRgGYuh0bYLy)BCy~sbS3^b3 zHixT<%-Vwbht|25T{3^Hk;qZ^3s!OOgljHs+EIf~C%=_>R5%vQI4mQR9qOXThMXlU zS|oSH>0PjnCakb*js2{ObN`}%HYsT6=%(xA| znpUtG_TJ08kHgm5l@G|t?4E3tG2fq?wNtIp*Vqrb{9@bo^~Rx7+J&OnayrX`LDcF~ zd@0m0ZJ#Z@=T>4kTa5e2FjI&5c(F7S{gnRPoGpu9eIqrtSvnT_tk$8T)r%YwZw!gK zj*k@cG)V&@t+mtDi37#>LhVGTfRA^p%x0d#_P|Mktz3*KOoLIqFm`~KGoDDD4OOxe z?}ag_c08u%vu=5Vx=~uoS8Q;}+R2~?Uh|m-+`-2kDo$d6T!nD*hc#dB(*R{LXV=zo z`PJP0V=O!@3l-bw+d`X6(=@fq=4O#ETa8M^fOvO4qja9o3e8ANc9$sI=A4$zUut~w z4+JryRkI{9qWxU1CCMM$@Aj=6)P+z?vqa=UCv_4XyVNoBD{Xb~Oi4cjjhm8fRD!*U z2)zaS;AI78^Wq+5mDInKiMz|z#K`2emQfNH*U;{9^{NqSMVoq?RSo43<8YpJM^+W$ zxy!A5>5Zl16Vi#?nAYywu3w_=KWnd3*QetocWt`3pK67>)ZVwnT3h zbPdD&MZkD?q=-N`MpCCwpM74L+Tr1aa)zJ)8G;(Pg51@U&5W>aNu9rA`bh{vgfE={ zdJ>aKc|2Ayw_bop+dK?Y5$q--WM*+$9&3Q9BBiwU8L<-`T6E?ZC`mT0b}%HR*LPK} z!MCd_Azd{36?Y_>yN{U1w5yrN8q`z(Vh^RnEF+;4b|2+~lfAvPT!`*{MPiDioiix8 zY*GdCwJ{S(5(HId*I%8XF=pHFz<9tAe;!D5$Z(iN#jzSql4sqX5!7Y?q4_%$lH zz8ehZuyl0K=E&gYhlfFWabnSiGty$>md|PpU1VfaC5~kskDnZX&Yu}?-h;OSav=8u z=e3Yq=mi$4A|sB-J00;1d{Sd1+!v0NtU((Nz2;PFFlC}V{@p&4wGcVhU&nI($RAS! zwXn7)?8~1J3*4+VccRSg5JS<(bBhBM&{ELMD4C_NTpvzboH!{Zr*%HP;{UqxI#g&7 zOAqPSW5Qus$8-xtTvD%h{Tw<2!XR(lU54LZG{)Cah*LZbpJkA=PMawg!O>X@&%+5XiyeIf91n2E*hl$k-Y(3iW*E}Mz-h~H~7S9I1I zR#-j`|Hk?$MqFhE4C@=n!hN*o5+M%NxRqP+aLxDdt=wS6rAu6ECK*;AB%Nyg0uyAv zO^DnbVZZo*|Ef{nsYN>cjZC$OHzR_*g%T#oF zCky9HJS;NCi=7(07tQXq?V8I&OA&kPlJ_dfSRdL2bRUt;tA3yKZRMHMXH&#W@$l%-{vQd7y@~i*^qnj^`Z{)V$6@l&!qP_y zg2oOd!Wit#)2A~w-eqw3*Mbe)U?N|q6sXw~E~&$!!@QYX4b@%;3=>)@Z#K^`8~Aki z+LYKJu~Y$;F5%_0aF9$MsbGS9Bz2~VUG@i@3Fi2q(hG^+Ia44LrfSfqtg$4{%qBDM z_9-O#3V+2~W$dW0G)R7l_R_vw(KSkC--u&%Rs^Io&*?R=`)6BN64>6>)`TxyT_(Rd zUn+aIl1mPa#Jse9B3`!T=|e!pIp$(8ZOe0ao?nS7o?oKlj zypC-fMj1DHIDrh1unUI1vp=-Fln;I9e7Jvs3wj*^_1&W|X} zZSL|S|Bb@CV*YC_-T&2!Ht3b6?)d`tHOP?rA;;t#zaXa0Sc;vGnV0BLIf8f-r{QHh z*Zp`4_ItlOR7{u(K+!p_oLDmaAkNag*l4#29F2b_A*0oz0T|#-&f*;c#<`^)(W@gm z#k9k=t%u8<+C1fNUA{Fh7~wgPrEZZ#(6aBI%6bR4RO(e1(ZocjoDek4#MTgZD>1NG zy9~yoZfWYfwe&S-(zk4o6q6o?2*~DOrJ(%5wSnEJMVOKCzHd z=Yhm+HLzoDl{P*Ybro7@sk1!Ez3`hE+&qr7Rw^2glw^M(b(NS2!F|Q!mi|l~lF94o z!QiV)Q{Z>GO5;l1y!$O)=)got;^)%@v#B!ZEVQy1(BJApHr5%Zh&W|gweD+%Ky%CO ztr45vR*y(@*Dg_Qw5v~PJtm^@Lyh*zRuT6~(K+^HWEF{;R#L$vL2!_ndBxCtUvZ(_ zauI7Qq}ERUWjr&XW9SwMbU>*@p)(cuWXCxRK&?ZoOy>2VESII53iPDP64S1pl{NsC zD;@EGPxs&}$W1;P6BB9THF%xfoLX|4?S;cu@$)9OdFst-!A7T{(LXtdNQSx!*GUSIS_lyI`da8>!y_tpJb3Zuf0O*;2y?HCfH z5QT6@nL|%l3&u4;F!~XG9E%1YwF*Fgs5V&uFsx52*iag(?6O|gYCBY3R{qhxT-Etb zq(E%V=MgQnuDGEKOGsmBj9T0-nmI%zys8NSO>gfJT4bP>tI>|ol@ zDt(&SUKrg%cz>AmqtJKEMUM;f47FEOFc%Bbmh~|*#E zDd!Tl(wa)ZZIFwe^*)4>{T+zuRykc3^-=P1aI%0Mh}*x7%SP6wD{_? zisraq`Las#y-6{`y@CU3Ta$tOl|@>4qXcB;1bb)oH9kD6 zKym@d$ zv&PZSSAV1Gwwzqrc?^_1+-ZGY+3_7~a(L+`-WdcJMo>EWZN3%z4y6JyF4NR^urk`c z?osO|J#V}k_6*9*n2?j+`F{B<%?9cdTQyVNm8D}H~T}?HOCXt%r7#2hz97Gx#X%62hyaLbU z_ZepP0<`<;eABrHrJAc!_m?kmu#7j}{empH@iUIEk^jk}^EFwO)vd7NZB=&uk6JG^ zC>xad8X$h|eCAOX&MaX<$tA1~r|hW?-0{t4PkVygTc`yh39c;&efwY(-#;$W)+4Xb z$XFsdG&;@^X`aynAMxsq)J#KZXX!sI@g~YiJdHI~r z$4mj_?S29sIa4c$z)19JmJ;Uj?>Kq=0XuH#k#};I&-6zZ_&>)j>UR0XetRO!-sjF< zd_6b1A2vfi++?>cf}s{@#BvTD|a%{9si7G}T+8ZnwuA z1k8c%lgE<-7f~H`cqgF;qZ|$>R-xNPA$25N1WI3#n%gj}4Ix}vj|e=x)B^roGQpB) zO+^#nO2 zjzJ9kHI6nI5ni&V_#5> z!?<7Qd9{|xwIf4b0bRc;zb}V4>snRg6*wl$Xz`hRDN8laL5tg&+@Dv>U^IjGQ}*=XBnXWrwTy;2nX?<1rkvOs#u(#qJ=A zBy>W`N!?%@Ay=upXFI}%LS9bjw?$h)7Dry0%d}=v0YcCSXf9nnp0tBKT1eqZ-4LU` zyiXglKRX)gtT0VbX1}w0f2ce8{$WH?BQm@$`ua%YP8G@<$n13D#*(Yd5-bHfI8!on zf5q4CPdgJLl;BqIo#>CIkX)G;rh|bzGuz1N%rr+5seP${mEg$;uQ3jC$;TsR&{IX< z;}7j3LnV+xNn^$F1;QarDf6rNYj7He+VsjJk6R@0MAkcwrsq4?(~`GKy|mgkfkd1msc2>%B!HpZ~HOzj}kl|ZF(IqB=D6ZTVcKe=I7)LlAI=!XU?J*i#9VXeKeaG zwx_l@Z(w`)5Cclw`6kQKlS<;_Knj)^Dh2pL`hQo!=GPOMR0iqEtx12ORLpN(KBOm5 zontAH5X5!9WHS_=tJfbACz@Dnkuw|^7t=l&x8yb2a~q|aqE_W&0M|tI7@ilGXqE)MONI8p67OiQGqKEQWw;LGga=ZM1;{pSw1jJK_y$vhY6 ztFrV7-xf>lbeKH1U)j3R=?w*>(Yh~NNEPVmeQ8n}0x01$-o z2Jyjn+sXhgOz>AzcZ zAbJZ@f}MBS0lLKR=IE{z;Fav%tcb+`Yi*!`HTDPqSCsFr>;yt^^&SI2mhKJ8f*%ji zz%JkZGvOn{JFn;)5jf^21AvO-9nRzsg0&CPz;OEn07`CfT@gK4abFBT$Mu?8fCcscmRkK+ zbAVJZ~#_a z{|(FFX}~8d3;DW8zuY9?r#Dt>!aD>} zlYw>D7y#eDy+PLZ&XKIY&Df0hsLDDi(Yrq8O==d30RchrUw8a=Eex>Dd?)3+k=}Q> z-b85lun-V$I}86Vg#l1S@1%=$2BQD5_waAZKQfJ${3{b2SZ#w1u+jMr{dJMvI|Og= zpQ9D={XK|ggbe04zTUd}iF{`GO1dV%zWK~?sM9OM(= zVK9&y4F^w1WFW{$qi|xQk0F`@HG8oLI5|5$j~ci9xTMT69v5KS-Yym--raU5kn2#C z<~5q^Bf0rTXVhctG2%&MG(cUGaz(gC(rcG~>qgO$W6>!#NOVQJ;pIYe-lLy(S=HgI zPh;lkL$l+FfMHItHnw_^bj8}CKM19t(C_2vSrhX2$K@-gFlH};#C?1;kk&U1L%4S~ zR^h%h+O1WE7DI$~dly?-_C7>(!E`~#REJ~Xa7lyrB$T!`&qYV5QreAa^aKr%toUJR zPWh)J3iD`(P6BI5k$oE$us#%!4$>`iH2p-88?WV0M$-K)JDibvA4 zpef%_*txN$Ei3=Lt(BBxZ&mhl|mUz-z*OD1=r9nfN zc5vOMFWpi>K=!$6f{eb?5Ru4M3o;t9xLpry|C%j~`@$f)OFB5+xo8XM8g&US@UU-sB|dAoc20y(F@=-2Ggp_`SWjEb#>IG^@j zuQK}e^>So#W2%|-)~K!+)wdU#6l>w5wnZt2pRL5Dz#~N`*UyC9tYechBTc2`@(OI# zNvcE*+zZZjU-H`QOITK^tZwOyLo)ZCLk>>Wm+flMsr5X{A<|m`Y281n?8H_2Fkz5}X?i%Rfm5s+n`J zDB&->=U+LtOIJ|jdYXjQWSQZFEs>Rm{`knop4Sq)(}O_@gk{14y51)iOcGQ5J=b#e z2Yx^6^*F^F7q_m-AGFFgx5uqyw6_4w?yKCJKDGGprWyekr;X(!4CnM5_5?KgN=3qCm03 z##6k%kIU5%g!cCL(+aK>`Wd;dZ4h$h_jb7n?nqx5&o9cUJfr%h#m4+Bh)>HodKcDcsXDXwzJ3jR(sSFqWV(OKHC*cV8;;&bH=ZI0YbW3PgIHwTjiWy z?2MXWO2u0RAEEq(zv9e%Rsz|0(OKB?_3*kkXwHxEuazIZ7=JhaNV*P~hv57q55LoebmJpfHXA@yuS{Esg+ z*C}0V-`x^=0nOa@SPUJek>td~tJ{U1T&m)~`FLp*4DF77S^{|0g%|JIqd-=5)p6a` zpJOsEkKT(FPS@t^80V!I-YJbLE@{5KmVXjEq{QbCnir%}3 zB)-J379=wrBNK6rbUL7Mh^tVmQYn-BJJP=n?P&m-7)P#OZjQoK0{5?}XqJScV6>QX zPR>G{xvU_P;q!;S9Y7*07=Z!=wxIUorMQP(m?te~6&Z0PXQ@I=EYhD*XomZ^z;`Os z4>Uh4)Cg2_##mUa>i1Dxi+R~g#!!i{?SMj%9rfaBPlWj_Yk)lCV--e^&3INB>I?lu z9YXCY5(9U`3o?w2Xa5ErMbl5+pDVpu8v+KJzI9{KFk1H?(1`_W>Cu903Hg81vEX32l{nP2vROa1Fi!Wou0+ZX7Rp`g;B$*Ni3MC-vZ`f zFTi7}c+D)!4hz6NH2e%%t_;tkA0nfkmhLtRW%){TpIqD_ev>}#mVc)<$-1GKO_oK8 zy$CF^aV#x7>F4-J;P@tqWKG0|D1+7h+{ZHU5OVjh>#aa8+V;6BQ)8L5k9t`>)>7zr zfIlv77^`Fvm<)_+^z@ac%D&hnlUAFt8!x=jdaUo{)M9Ar;Tz5Dcd_|~Hl6CaRnK3R zYn${wZe8_BZ0l0c%qbP}>($jsNDay>8+JG@F!uV4F;#zGsBP0f$f3HqEHDz_sCr^q z1;1}7KJ9&`AX2Qdav1(nNzz+GPdEk5K3;hGXe{Hq13{)c zZy%fFEEH#nlJoG{f*M^#8yXuW%!9svN8ry-Vi7AOFnN~r&D`%6d#lvMXBgZkX^vFj z;tkent^62jUr$Cc^@y31Lka6hS>F?1tE8JW$iXO*n9CQMk}D*At3U(-W1E~z>tG?> z5f`5R5LbrhRNR8kv&5d9SL7ke2a*Xr)Qp#75 z6?-p035n2<7hK;sb>t9GAwG4{9v~iEIG>}7B5zcCgZhu$M0-z8?eUO^E?g)md^XT_ z2^~-u$yak>LBy(=*GsTj6p<>b5PO&un@5hGCxpBQlOB3DpsItKZRC*oXq-r{u}Wb; z&ko>#fbnl2Z;o@KqS-d6DTeCG?m1 z&E>p}SEc*)SD&QjZbs!Csjx~0+$@ekuzV_wAalnQvX3a^n~3ui)|rDO+9HW|JPEeBGP4 z)?zcZ<8qv47`EWA*_X~H^vr(lP|f%=%cWFM;u)OFHruKT<~?>5Y8l?56>&;=WdZU# zZEK4-C8s-3zPMA^&y~e*9z)!ZJghr3N^pJa2A$??Xqx-BR*TytGYor&l8Q+^^r%Yq02xay^f#;;wO6K7G!v>wRd6531WnDI~h$PN( z+4#08uX?r&zVKsQ;?5eBX=FxsXaGyH4Gth4a&L|{8LnNCHFr1M{KjJ!BfBS_aiy-E zxtmNcXq3}WTwQ7Dq-9YS5o758sT(5b`Sg-NcH>M9OH1oW6&sZ@|GYk|cJI`vm zO<$~q!3_$&GfWetudRc*mp8)M)q7DEY-#@8w=ItkApfq3sa)*GRqofuL7)dafznKf zLuembr#8gm*lIqKH)KMxSDqbik*B(1bFt%3Vv|ypehXLCa&wc7#u!cJNlUfWs8iQ` z$66(F=1fkxwg745-8_eqV>nWGY3DjB9gE23$R5g&w|C{|xvT@7j*@aZNB199scGchI7pINb5iyqYn)O=yJJX)Ca3&Ca+{n<=1w|(|f0)h<9gs$pVSV<<9Og-V z8ki@nKwE)x)^wmHBMk?mpMT=g{S#^8W|>&rI#Ceh;9za}io0k@0JxiCqi-jHlxbt3 zjJA?RihhRvhk6%G5-D{ePh1jare*fQS<328P-DcVAxPTrw=n6k?C6EV75f}cnBRPT zMYDqqKu(ND&aOtc!QRV`vzJSVxx8i~WB#5Ml{b#eQqNnSi7l-bS-`ITW<^zyYQA(b zbj4SuRK>q9o`_v%+C=S?h>2e4!66Ij(P5{7Uz$3u6YJJC$W%EoBa{-(=tQ|y1vov%ZkXVOV z##_UVg4V^4ne#4~<-1DkJqkKqgT+E_=&4Ue&eQ-JC+gi?7G@d6= zximz{zE)WW{b@QCJ!7l&N5x=dXS?$5RBU-VvN4Uec-GHK&jPa&P2z+qDdLhIB+HU) zu0CW&uLvE^4I5xtK-$+oe|58)7m6*PO%Xt<+-XEA%jG_BEachkF3e@pn?tl!`8lOF zbi2QOuNXX)YT*MCYflILO{VZ*9GiC%R4FO20zMK?p+&aCMm2oeMK7(aW=UDzr=AO0 z$5mJ%=qRsR8rZ>_YsL+vi{3*J_9Kzq(;ZwRj+4_f0-*wbkSMPWahX#Fj_a8BnrhJ6 zo^ZZ?Vah1@&6#r=JkuaYDBdp;J3@ii+CHM&@9*er&#P}$@wI$bfrH)&c!*|nkvhf%^*Y6b%dKz%QBSIo@U z{?V^qEs4`q<8@n+u8YiB^sc@6g>TncG<|GsmC3egwE6aO=EwLr~3-2 zNr`+)`i+-83?|1Xy0^8ps&pb}YT?w1eWVnC9Ps1=KM;Rw)bH6O!7Did1NwpnqVPZc z*%Qo~qkDL>@^<^fmIBtx$WUWQiNtAB2x-LO^BB=|w~-zTnJNEdm1Ou(?8PF&U88X@ z#8rdaTd||)dG^uJw~N_-%!XNbuAyh4`>Shea=pSj0TqP+w4!`nxsmVSv02kb`DBr% zyX=e>5IJ3JYPtdbCHvKMdhXUO_*E9jc_?se7%VJF#&ZaBD;7+eFN3x+hER7!u&`Wz z7zMvBPR4y`*$a250KYjFhAKS%*XG&c;R-kS0wNY1=836wL6q02mqx;IPcH(6ThA@2 zXKQF|9H>6AW$KUF#^A%l6y5{fel77_+cR_zZ0(7=6bmNXABv}R!B-{(E^O6Y?ZS)n zs1QEmh_Fm7p}oRyT3zxUNr4UV8NGs+2b8|4shO$OGFj3D&7_e?#yDi=TTe%$2QbG5 zk<;q7aQ;p!M-Osm{vFdmXZ@!z9uWh!;*%>(vTRggufuUGP9Hols@vhx z73pn$3u2;vzRvnXuT&$Os7J@6y12*j!{ix%3B4YU1466ItmJs0NsU(4ZYRYh7wEA6q{b*Hs6@k~ zi7Yq@Ax!et0cUMTvk7P%ym){MHpcliHEI~e3HP0NV=}7;xFv#IC?a<=`>~j_sk{e> z7vg-tK*p83HZ0=QK@ zRIHo^r{D8&Ms-^WZp+6US_Quqjh$Q66W^1}=Uz&XJ8AQE9&2}P zY|FXZzZ|0IiaBd2qdt6dIjQr(ZMIOU%NG1F&fu6Po9m^?BvLhI6T0R!H2d8;U(&p2 zYA|MFscMqcO(ye~Jp?F;0>Ke+5hzVr?aBNe>GsGgr$XrpS9uajN2kNQ3o$V5rp0T( z0$6TJC;3)26SNG#XcX7l^MKTn$ga?6r4Jzfb%ZgA(Zbwit0$kY=avSnI$@Gk%+^pu zS5mHrcRS8LFPC*uVWH4DDD1pY$H8N>X?KIJZuZ2SvTqc5Nr0GHdD8TCJcd$zIhOdC zZX0ErnsozQh;t^==4zTfrZO421AL?)O)l#GSxU#|LTTg4#&yeK=^w#;q63!Nv~1(@ zs^-RNRuF&qgcr+bIzc@7$h9L;_yjdifE*$j0Q&Np=1AuHL--zdkv@}`1 zo~LlDl_YAq*z?vmr4M`GjDkl9?p|-tl(DtX76oZv25_DtZutLS9Ez!5~p?th@4 zyc_uax4W#<(#)LMkvo)yp|5tKsC2=p#6PyhpH|449T<9Zdk|%CAb5cw?fhvQtBO&7 zpQ9$24yLqPHP;$N&fe2wm%8qdctwIna<3SwGtQA3{C77s%CW%LYxtK(SBGustL0<( zu~U9r0UOkr(c{OJxZS0Ntu3+cJlF7R`7k-Bsa&q?9Ae5{{|o~?cM+T7{lB1^#vT8R z?>c9fNWey`1dKDY%F3d2O*8^qYhjlB8*7HMKE<*=(A`{>=1%s1}Pm&#_t1xy!FkPk@%SMEka2@*= zxDuM|vJJ5s+xgDls{>*o!7eOcs|xuVBPWX&+y5vEiADK%hi`#Dbd>;;Pbk2H4*-X&R?_-6ZEutSd8hC+sSjhIo z;D(j4P;2EVpEj#UF7IjM6PC+X$C5T&=nL`*!*hm9U)#O?>wqOgC>jXKN3Slk_yaQX zLf|4D8T4k|wHW`;#ZQVocNF|3izi0sOqXzi7@KlYC3CXBG`94wD;tMI1bj|8Vm zY}9`VI9!plSfhAal$M_HlaYOVNU?9Z#0<$o?lXXbX3O(l_?f)i3_~r+GcO-x#+x^X zfsZl0>Rj2iP1rsT;+b;Mr? z4Vu&O)Q5ru4j;qaSP5gA{az@XTS1NpT0d9Xhl_FkkRpcEGA0(QQ~YMh#&zwDUkNzm z6cgkdgl9W{iL6ArJ1TQHqnQ^SQ1WGu?FT|93$Ba}mPCH~!$3}0Y0g zcoG%bdTd$bmBx9Y<`Jc+=Cp4}c@EUfjiz;Rcz101p z=?#i$wo>gBE9|szaZMt-d4nUIhBnYRuBVyx+p?5#aZQgUe(!ah`J#l1$%bl5avL27 zU2~@V`3Ic&!?FhDX@Cw!R4%xtWark#p8DLT)HCZ?VJxf^yr@AD*!ERK3#L$E^*Yr? zzN&uF9Roh4rP+r`Z#7U$tzl6>k!b~HgM$C<_crP=vC>6=q{j?(I}!9>g3rJU(&){o z`R^E*9%+kEa8H_fkD9VT7(Fks&Y-RcHaUJYf-|B+eMXMaRM;{FKRiTB>1(=Iij4k1(X__|WqAd-~t#2@UQ}Z&<1Th0azdXfoll!dd)6>1miA z!&=6sDJm=e$?L&06+Q3`D-HNSkK-3$3DdZMX-6Xjn;wd#9A{~ur!2NcX>(qY_oZL0~H7dnQ9sgLe!W>~2|RSW7|hWn<({Pg*xF$%B-!rKe^_R_vc z(LO!0agxxP;FWPV({8#lEv$&&GVakGus=@!3YVG`y^AO1m{2%Np;>HNA1e{=?ra1C}H zAwT0sbwG|!am;fl?*_t^^#yLDXZ*Nx)_FqueZi0c-G~omtpHW0Cu)mEJ`Z1X8brq$ z%vK##b~o*^b&Hz!hgrD=^6P8}aW40lhzMLB5T5*v`1QH?+L~-@CDi3+C@nRf2{7UE zyDIe{@LKw`Eu=Z%6<<_=#V|yxJIKiq_N?ZJ_v0$c)N4l07ZV_mIXG}glfBSPivOhw z-~+9GdckSpMBNR9eR`Y|9_)sXS+u_OiQ%!9rE(2AFjoxN8lk16Sb~^Sq6kRoEp3yD(mm`HsYIXcag_EAB8MHc}nahxVVUTts~U9P|f;7Ul$_` zStR4v&P4q_$KXOEni$lkxy8=9w8G&47VY0oDb^+jT+>ARe3NHUg~St`$RDxY)?;_F znqTujR&chZd2qHF7y8D$4&E3+e@J~!X3&BW4BF(Ebp#TEjrd+9SU!)j;qH+ZkL@AW z?J6Mj}v0_+D zH0qlbzCkHf|EZ`6c>5ig5NAFF%|La%M-}g(7&}Vx8K)qg30YD;H!S!??{;YivzrH0 z(M%2*b_S-)yh&Aiqai)GF^c!<1Xemj|13>dZ_M#)41SrP;OEMaRJ)bCeX*ZT7W`4Y zQ|8L@NHpD@Tf(5>1U(s5iW~Zdf7$@pAL`a3X@YUv1J>q-uJ_(Dy5nYTCUHC}1(dlI zt;5>DLcHh&jbysqt?G01MhXI3!8wgf){Hv}=0N|L$t8M#L7d6WscO8Om2|NBz2Ga^ zs86y%x$H18)~akOWD7@em7)ldlWgb?_sRN>-EcYQO_}aX@+b$dR{146>{kXWP4$nN{V0_+|3{Lt|8uX_fhKh~i{(x%cj*PU$i{PO(5$uA? zQzO>a6oPj-TUk&{zq?JD2MNb6Mf~V3g$ra+PB;ujLJ2JM(a7N*b`y{MX--!fAd}5C zF$D_b8S;+Np(!cW)(hnv5b@@|EMt*RLKF*wy>ykFhEhlPN~n_Bj>LT9B^_yj>z#fx z3JuE4H&?Cc!;G@}E*3k`HK#8ag`yE3Z1)5JUlSua%qkF zkTu|<9{w9OSi$qr)WD#7EzITnch=xnR63E*d~WGvi*Co9BBE?ETHud;!Z)7&wz+l6 zuKODYG1>I1U#a%&(GNJ`AqRfg=H!BtSl+_;CEeufF-#+*2EMMz-22@>18=8PH{PHd z);mN=aR0MPF>eutLiS#-AOX>#2%+pTGEOj!j4L(m0~&xR=0+g#HNpno6@veLhJp}e zyNVC$a>4;!9&iGvU_dj&xbKt@^t6r%f^)+}eV^suRTLP52+BVs0kOLwg6n`=NUv50E7My8XQUh?y%mW62OT1pMrKI3Q(r`7vU&@93=G~A?b(^pvC-8x=bSk zZ60BQR96WB1Z@9Df(M1IQh+YrU8sEjB=Tc2;(zBn-pete*icZE|M&Uc+oHg`|1o`g zH~m+k=D$o);{Rs)b<9Zo|9_Z6L6QHLNki(N>Dw^^i1LITprZeeqIaT#+)fw)PlllU zldphHC)t!0Gf(i9zgVm>`*TbmITF zH1FZ4{wrjRCx{t^26VK_2srZuWuY*EMAsMrJYFFCH35Ky7bq8<0K|ey2wHnrFMZyr z&^yEgX{{3i@&iE5>xKZ{Ads36G3a!i50D!C4?^~cLB<<|fc1!XN(HJRM)H^21sEs%vv+Mu0h*HkLHaEffMwc0n6)JhNXY#M5w@iO@dfXY z0c6dM2a4Hd1SA*#qYj@jK}uVgAZdaBj8t6uuhUNe>)ne9vfd#C6qLV9+@Q7{MnF#0 zJ7fd-ivG_~u3bVvOzpcw1u~ZSp8-kl(sunnX>L~*K-ByWDM2E8>;Si6kn^58AZQxI xVa^It*?521mj4+UJO?7%w*+`EfEcU=@KhDx-s^WzP+ae~{CgHDE&XryzW}Nww%-5% diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2d2fd7c7..fae08049 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a58591e9..a69d9cb6 100644 --- a/gradlew +++ b/gradlew @@ -205,6 +205,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. @@ -231,4 +237,4 @@ eval "set -- $( tr '\n' ' ' )" '"$@"' -exec "$JAVACMD" "$@" \ No newline at end of file +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 477c8966..53a6b238 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,91 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega \ No newline at end of file +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From 932e6c8eedd96a949232fd0de3ab1b2459818f23 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 27 Apr 2023 18:12:27 +0200 Subject: [PATCH 15/45] Fix required Fabric API version --- src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 0bfae0fb..ab54ad55 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,7 +30,7 @@ "depends": { "fabricloader": ">=0.14.19", - "fabric-api": ">=0.78.1", + "fabric-api": ">=0.79.1", "minecraft": "~1.20-alpha.23.17.a", "java": ">=17" }, From d89187b8c22eb032b265b008f764996166d5c924 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 4 May 2023 12:25:09 +0200 Subject: [PATCH 16/45] [Wurst-Bot] Update to 23w18a --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- src/main/java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- src/main/java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index c1c9d9aa..dfbb3c8b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=23w17a -yarn_mappings=23w17a+build.4 +minecraft_version=23w18a +yarn_mappings=23w18a+build.1 loader_version=0.14.19 #Fabric api -fabric_version=0.79.1+1.20 +fabric_version=0.80.1+1.20 # Mod Properties -mod_version = v7.33-MC23w17a +mod_version = v7.33-MC23w18a maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index f4e1e151..f939002d 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.33"; - public static final String MC_VERSION = "23w17a"; + public static final String MC_VERSION = "23w18a"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 187f0eed..5297484e 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.setX(width / 2 + 2); + button.method_46421(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 28488e07..87f22486 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.setY(realmsButton.getY()); + altsButton.method_46419(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 70cd9d69..723c4d90 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -74,7 +74,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.setX(middleX - 100); + searchBar.method_46421(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } From 6a45b9becdb67c8e34f5ee98862f51a4d2d4ee48 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 4 May 2023 13:34:26 +0200 Subject: [PATCH 17/45] Update to 23w18a --- src/main/java/net/wurstclient/hacks/AutoFarmHack.java | 6 +++--- .../java/net/wurstclient/hacks/BaseFinderHack.java | 2 +- .../java/net/wurstclient/hacks/CaveFinderHack.java | 2 +- src/main/java/net/wurstclient/hacks/MobEspHack.java | 2 +- .../java/net/wurstclient/hacks/MobSpawnEspHack.java | 2 +- src/main/java/net/wurstclient/hacks/SearchHack.java | 2 +- src/main/java/net/wurstclient/hacks/TunnellerHack.java | 10 +++++----- .../wurstclient/hacks/chestesp/ChestEspRenderer.java | 4 ++-- .../wurstclient/hacks/newchunks/NewChunksRenderer.java | 2 +- .../java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- .../java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- src/main/java/net/wurstclient/treebot/Tree.java | 2 +- src/main/resources/fabric.mod.json | 4 ++-- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/java/net/wurstclient/hacks/AutoFarmHack.java b/src/main/java/net/wurstclient/hacks/AutoFarmHack.java index 01095fca..2c33ad40 100644 --- a/src/main/java/net/wurstclient/hacks/AutoFarmHack.java +++ b/src/main/java/net/wurstclient/hacks/AutoFarmHack.java @@ -529,7 +529,7 @@ public final class AutoFarmHack extends Hack if(greenBuffer != null) greenBuffer.close(); - greenBuffer = new VertexBuffer(); + greenBuffer = new VertexBuffer(VertexBuffer.class_8555.STATIC); bufferBuilder.begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION); @@ -552,7 +552,7 @@ public final class AutoFarmHack extends Hack if(cyanBuffer != null) cyanBuffer.close(); - cyanBuffer = new VertexBuffer(); + cyanBuffer = new VertexBuffer(VertexBuffer.class_8555.STATIC); bufferBuilder.begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION); @@ -573,7 +573,7 @@ public final class AutoFarmHack extends Hack if(redBuffer != null) redBuffer.close(); - redBuffer = new VertexBuffer(); + redBuffer = new VertexBuffer(VertexBuffer.class_8555.STATIC); bufferBuilder.begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION); diff --git a/src/main/java/net/wurstclient/hacks/BaseFinderHack.java b/src/main/java/net/wurstclient/hacks/BaseFinderHack.java index a724aee2..9b651b42 100644 --- a/src/main/java/net/wurstclient/hacks/BaseFinderHack.java +++ b/src/main/java/net/wurstclient/hacks/BaseFinderHack.java @@ -208,7 +208,7 @@ public final class BaseFinderHack extends Hack if(vertexBuffer != null) vertexBuffer.close(); - vertexBuffer = new VertexBuffer(); + vertexBuffer = new VertexBuffer(VertexBuffer.class_8555.STATIC); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); diff --git a/src/main/java/net/wurstclient/hacks/CaveFinderHack.java b/src/main/java/net/wurstclient/hacks/CaveFinderHack.java index 700410eb..a85eff1a 100644 --- a/src/main/java/net/wurstclient/hacks/CaveFinderHack.java +++ b/src/main/java/net/wurstclient/hacks/CaveFinderHack.java @@ -462,7 +462,7 @@ public final class CaveFinderHack extends Hack if(vertexBuffer != null) vertexBuffer.close(); - vertexBuffer = new VertexBuffer(); + vertexBuffer = new VertexBuffer(VertexBuffer.class_8555.STATIC); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); diff --git a/src/main/java/net/wurstclient/hacks/MobEspHack.java b/src/main/java/net/wurstclient/hacks/MobEspHack.java index 1a1f628b..11a3d853 100644 --- a/src/main/java/net/wurstclient/hacks/MobEspHack.java +++ b/src/main/java/net/wurstclient/hacks/MobEspHack.java @@ -75,7 +75,7 @@ public final class MobEspHack extends Hack implements UpdateListener, EVENTS.add(CameraTransformViewBobbingListener.class, this); EVENTS.add(RenderListener.class, this); - mobBox = new VertexBuffer(); + mobBox = new VertexBuffer(VertexBuffer.class_8555.STATIC); Box bb = new Box(-0.5, 0, -0.5, 0.5, 1, 0.5); RenderUtils.drawOutlinedBox(bb, mobBox); } diff --git a/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java b/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java index 658f81c2..81dbdd3b 100644 --- a/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java +++ b/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java @@ -337,7 +337,7 @@ public final class MobSpawnEspHack extends Hack if(vertexBuffer != null) vertexBuffer.close(); - vertexBuffer = new VertexBuffer(); + vertexBuffer = new VertexBuffer(VertexBuffer.class_8555.STATIC); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); diff --git a/src/main/java/net/wurstclient/hacks/SearchHack.java b/src/main/java/net/wurstclient/hacks/SearchHack.java index f6f9d27e..4702ffa6 100644 --- a/src/main/java/net/wurstclient/hacks/SearchHack.java +++ b/src/main/java/net/wurstclient/hacks/SearchHack.java @@ -429,7 +429,7 @@ public final class SearchHack extends Hack if(vertexBuffer != null) vertexBuffer.close(); - vertexBuffer = new VertexBuffer(); + vertexBuffer = new VertexBuffer(VertexBuffer.class_8555.STATIC); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); diff --git a/src/main/java/net/wurstclient/hacks/TunnellerHack.java b/src/main/java/net/wurstclient/hacks/TunnellerHack.java index dd9e41aa..0e0b53f2 100644 --- a/src/main/java/net/wurstclient/hacks/TunnellerHack.java +++ b/src/main/java/net/wurstclient/hacks/TunnellerHack.java @@ -274,7 +274,7 @@ public final class TunnellerHack extends Hack if(vertexBuffers[0] != null) vertexBuffers[0].close(); - vertexBuffers[0] = new VertexBuffer(); + vertexBuffers[0] = new VertexBuffer(VertexBuffer.class_8555.STATIC); BlockPos camPos = RenderUtils.getCameraBlockPos(); int regionX = (camPos.getX() >> 9) * 512; @@ -395,7 +395,7 @@ public final class TunnellerHack extends Hack if(vertexBuffers[1] != null) vertexBuffers[1].close(); - vertexBuffers[1] = new VertexBuffer(); + vertexBuffers[1] = new VertexBuffer(VertexBuffer.class_8555.STATIC); BlockPos camPos = RenderUtils.getCameraBlockPos(); int regionX = (camPos.getX() >> 9) * 512; @@ -509,7 +509,7 @@ public final class TunnellerHack extends Hack if(vertexBuffers[2] != null) vertexBuffers[2].close(); - vertexBuffers[2] = new VertexBuffer(); + vertexBuffers[2] = new VertexBuffer(VertexBuffer.class_8555.STATIC); BlockPos camPos = RenderUtils.getCameraBlockPos(); int regionX = (camPos.getX() >> 9) * 512; @@ -654,7 +654,7 @@ public final class TunnellerHack extends Hack if(vertexBuffers[3] != null) vertexBuffers[3].close(); - vertexBuffers[3] = new VertexBuffer(); + vertexBuffers[3] = new VertexBuffer(VertexBuffer.class_8555.STATIC); BlockPos camPos = RenderUtils.getCameraBlockPos(); int regionX = (camPos.getX() >> 9) * 512; @@ -756,7 +756,7 @@ public final class TunnellerHack extends Hack if(vertexBuffers[4] != null) vertexBuffers[4].close(); - vertexBuffers[4] = new VertexBuffer(); + vertexBuffers[4] = new VertexBuffer(VertexBuffer.class_8555.STATIC); BlockPos camPos = RenderUtils.getCameraBlockPos(); int regionX = (camPos.getX() >> 9) * 512; diff --git a/src/main/java/net/wurstclient/hacks/chestesp/ChestEspRenderer.java b/src/main/java/net/wurstclient/hacks/chestesp/ChestEspRenderer.java index 51a875f1..afedb681 100644 --- a/src/main/java/net/wurstclient/hacks/chestesp/ChestEspRenderer.java +++ b/src/main/java/net/wurstclient/hacks/chestesp/ChestEspRenderer.java @@ -112,8 +112,8 @@ public final class ChestEspRenderer public static void prepareBuffers() { closeBuffers(); - solidBox = new VertexBuffer(); - outlinedBox = new VertexBuffer(); + solidBox = new VertexBuffer(VertexBuffer.class_8555.STATIC); + outlinedBox = new VertexBuffer(VertexBuffer.class_8555.STATIC); Box box = new Box(BlockPos.ORIGIN); RenderUtils.drawSolidBox(box, solidBox); diff --git a/src/main/java/net/wurstclient/hacks/newchunks/NewChunksRenderer.java b/src/main/java/net/wurstclient/hacks/newchunks/NewChunksRenderer.java index 25fd7f44..fda2147e 100644 --- a/src/main/java/net/wurstclient/hacks/newchunks/NewChunksRenderer.java +++ b/src/main/java/net/wurstclient/hacks/newchunks/NewChunksRenderer.java @@ -41,7 +41,7 @@ public final class NewChunksRenderer public void updateBuffer(int i, BuiltBuffer buffer) { - vertexBuffers[i] = new VertexBuffer(); + vertexBuffers[i] = new VertexBuffer(VertexBuffer.class_8555.STATIC); vertexBuffers[i].bind(); vertexBuffers[i].upload(buffer); VertexBuffer.unbind(); diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 5297484e..187f0eed 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.method_46421(width / 2 + 2); + button.setX(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 87f22486..28488e07 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.method_46419(realmsButton.getY()); + altsButton.setY(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 723c4d90..70cd9d69 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -74,7 +74,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.method_46421(middleX - 100); + searchBar.setX(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } diff --git a/src/main/java/net/wurstclient/treebot/Tree.java b/src/main/java/net/wurstclient/treebot/Tree.java index d5cfe540..b455eb1f 100644 --- a/src/main/java/net/wurstclient/treebot/Tree.java +++ b/src/main/java/net/wurstclient/treebot/Tree.java @@ -39,7 +39,7 @@ public class Tree implements AutoCloseable if(vertexBuffer != null) vertexBuffer.close(); - vertexBuffer = new VertexBuffer(); + vertexBuffer = new VertexBuffer(VertexBuffer.class_8555.STATIC); int regionX = (stump.getX() >> 9) * 512; int regionZ = (stump.getZ() >> 9) * 512; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ab54ad55..17bdcddd 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,8 +30,8 @@ "depends": { "fabricloader": ">=0.14.19", - "fabric-api": ">=0.79.1", - "minecraft": "~1.20-alpha.23.17.a", + "fabric-api": ">=0.80.1", + "minecraft": "~1.20-alpha.23.18.a", "java": ">=17" }, "suggests": { From d69b0338d6fbb58a01199fa2460e9537482ce65f Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 10 May 2023 18:00:53 +0200 Subject: [PATCH 18/45] [Wurst-Bot] Update to 1.20-pre1 --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- src/main/java/net/wurstclient/hacks/AutoFarmHack.java | 6 +++--- .../java/net/wurstclient/hacks/BaseFinderHack.java | 2 +- .../java/net/wurstclient/hacks/CaveFinderHack.java | 2 +- src/main/java/net/wurstclient/hacks/MobEspHack.java | 2 +- .../java/net/wurstclient/hacks/MobSpawnEspHack.java | 2 +- src/main/java/net/wurstclient/hacks/SearchHack.java | 2 +- src/main/java/net/wurstclient/hacks/TunnellerHack.java | 10 +++++----- .../wurstclient/hacks/chestesp/ChestEspRenderer.java | 4 ++-- .../wurstclient/hacks/newchunks/NewChunksRenderer.java | 2 +- .../java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- .../java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- src/main/java/net/wurstclient/treebot/Tree.java | 2 +- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8f6dfb47..d6521137 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=23w18a -yarn_mappings=23w18a+build.1 +minecraft_version=1.20-pre1 +yarn_mappings=1.20-pre1+build.1 loader_version=0.14.19 #Fabric api -fabric_version=0.80.1+1.20 +fabric_version=0.80.2+1.20 # Mod Properties -mod_version = v7.34-MC23w18a +mod_version = v7.34-MC1.20-pre1 maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index 520e1b8f..f95a6d37 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.34"; - public static final String MC_VERSION = "23w18a"; + public static final String MC_VERSION = "1.20-pre1"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/hacks/AutoFarmHack.java b/src/main/java/net/wurstclient/hacks/AutoFarmHack.java index 497c8431..e932aff7 100644 --- a/src/main/java/net/wurstclient/hacks/AutoFarmHack.java +++ b/src/main/java/net/wurstclient/hacks/AutoFarmHack.java @@ -527,7 +527,7 @@ public final class AutoFarmHack extends Hack if(greenBuffer != null) greenBuffer.close(); - greenBuffer = new VertexBuffer(VertexBuffer.class_8555.STATIC); + greenBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC); bufferBuilder.begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION); @@ -550,7 +550,7 @@ public final class AutoFarmHack extends Hack if(cyanBuffer != null) cyanBuffer.close(); - cyanBuffer = new VertexBuffer(VertexBuffer.class_8555.STATIC); + cyanBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC); bufferBuilder.begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION); @@ -571,7 +571,7 @@ public final class AutoFarmHack extends Hack if(redBuffer != null) redBuffer.close(); - redBuffer = new VertexBuffer(VertexBuffer.class_8555.STATIC); + redBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC); bufferBuilder.begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION); diff --git a/src/main/java/net/wurstclient/hacks/BaseFinderHack.java b/src/main/java/net/wurstclient/hacks/BaseFinderHack.java index 9b651b42..fa897ff2 100644 --- a/src/main/java/net/wurstclient/hacks/BaseFinderHack.java +++ b/src/main/java/net/wurstclient/hacks/BaseFinderHack.java @@ -208,7 +208,7 @@ public final class BaseFinderHack extends Hack if(vertexBuffer != null) vertexBuffer.close(); - vertexBuffer = new VertexBuffer(VertexBuffer.class_8555.STATIC); + vertexBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); diff --git a/src/main/java/net/wurstclient/hacks/CaveFinderHack.java b/src/main/java/net/wurstclient/hacks/CaveFinderHack.java index c4617c81..43de5ca5 100644 --- a/src/main/java/net/wurstclient/hacks/CaveFinderHack.java +++ b/src/main/java/net/wurstclient/hacks/CaveFinderHack.java @@ -460,7 +460,7 @@ public final class CaveFinderHack extends Hack if(vertexBuffer != null) vertexBuffer.close(); - vertexBuffer = new VertexBuffer(VertexBuffer.class_8555.STATIC); + vertexBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); diff --git a/src/main/java/net/wurstclient/hacks/MobEspHack.java b/src/main/java/net/wurstclient/hacks/MobEspHack.java index a0098fda..e4a588ca 100644 --- a/src/main/java/net/wurstclient/hacks/MobEspHack.java +++ b/src/main/java/net/wurstclient/hacks/MobEspHack.java @@ -75,7 +75,7 @@ public final class MobEspHack extends Hack implements UpdateListener, EVENTS.add(CameraTransformViewBobbingListener.class, this); EVENTS.add(RenderListener.class, this); - mobBox = new VertexBuffer(VertexBuffer.class_8555.STATIC); + mobBox = new VertexBuffer(VertexBuffer.Usage.STATIC); Box bb = new Box(-0.5, 0, -0.5, 0.5, 1, 0.5); RenderUtils.drawOutlinedBox(bb, mobBox); } diff --git a/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java b/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java index db870003..0678ce5f 100644 --- a/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java +++ b/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java @@ -335,7 +335,7 @@ public final class MobSpawnEspHack extends Hack if(vertexBuffer != null) vertexBuffer.close(); - vertexBuffer = new VertexBuffer(VertexBuffer.class_8555.STATIC); + vertexBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); diff --git a/src/main/java/net/wurstclient/hacks/SearchHack.java b/src/main/java/net/wurstclient/hacks/SearchHack.java index 7c73cf23..37ae3ea3 100644 --- a/src/main/java/net/wurstclient/hacks/SearchHack.java +++ b/src/main/java/net/wurstclient/hacks/SearchHack.java @@ -427,7 +427,7 @@ public final class SearchHack extends Hack if(vertexBuffer != null) vertexBuffer.close(); - vertexBuffer = new VertexBuffer(VertexBuffer.class_8555.STATIC); + vertexBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC); Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder bufferBuilder = tessellator.getBuffer(); diff --git a/src/main/java/net/wurstclient/hacks/TunnellerHack.java b/src/main/java/net/wurstclient/hacks/TunnellerHack.java index 99d473c6..e1368ffa 100644 --- a/src/main/java/net/wurstclient/hacks/TunnellerHack.java +++ b/src/main/java/net/wurstclient/hacks/TunnellerHack.java @@ -272,7 +272,7 @@ public final class TunnellerHack extends Hack if(vertexBuffers[0] != null) vertexBuffers[0].close(); - vertexBuffers[0] = new VertexBuffer(VertexBuffer.class_8555.STATIC); + vertexBuffers[0] = new VertexBuffer(VertexBuffer.Usage.STATIC); BlockPos camPos = RenderUtils.getCameraBlockPos(); int regionX = (camPos.getX() >> 9) * 512; @@ -393,7 +393,7 @@ public final class TunnellerHack extends Hack if(vertexBuffers[1] != null) vertexBuffers[1].close(); - vertexBuffers[1] = new VertexBuffer(VertexBuffer.class_8555.STATIC); + vertexBuffers[1] = new VertexBuffer(VertexBuffer.Usage.STATIC); BlockPos camPos = RenderUtils.getCameraBlockPos(); int regionX = (camPos.getX() >> 9) * 512; @@ -507,7 +507,7 @@ public final class TunnellerHack extends Hack if(vertexBuffers[2] != null) vertexBuffers[2].close(); - vertexBuffers[2] = new VertexBuffer(VertexBuffer.class_8555.STATIC); + vertexBuffers[2] = new VertexBuffer(VertexBuffer.Usage.STATIC); BlockPos camPos = RenderUtils.getCameraBlockPos(); int regionX = (camPos.getX() >> 9) * 512; @@ -652,7 +652,7 @@ public final class TunnellerHack extends Hack if(vertexBuffers[3] != null) vertexBuffers[3].close(); - vertexBuffers[3] = new VertexBuffer(VertexBuffer.class_8555.STATIC); + vertexBuffers[3] = new VertexBuffer(VertexBuffer.Usage.STATIC); BlockPos camPos = RenderUtils.getCameraBlockPos(); int regionX = (camPos.getX() >> 9) * 512; @@ -754,7 +754,7 @@ public final class TunnellerHack extends Hack if(vertexBuffers[4] != null) vertexBuffers[4].close(); - vertexBuffers[4] = new VertexBuffer(VertexBuffer.class_8555.STATIC); + vertexBuffers[4] = new VertexBuffer(VertexBuffer.Usage.STATIC); BlockPos camPos = RenderUtils.getCameraBlockPos(); int regionX = (camPos.getX() >> 9) * 512; diff --git a/src/main/java/net/wurstclient/hacks/chestesp/ChestEspRenderer.java b/src/main/java/net/wurstclient/hacks/chestesp/ChestEspRenderer.java index afedb681..ac76608a 100644 --- a/src/main/java/net/wurstclient/hacks/chestesp/ChestEspRenderer.java +++ b/src/main/java/net/wurstclient/hacks/chestesp/ChestEspRenderer.java @@ -112,8 +112,8 @@ public final class ChestEspRenderer public static void prepareBuffers() { closeBuffers(); - solidBox = new VertexBuffer(VertexBuffer.class_8555.STATIC); - outlinedBox = new VertexBuffer(VertexBuffer.class_8555.STATIC); + solidBox = new VertexBuffer(VertexBuffer.Usage.STATIC); + outlinedBox = new VertexBuffer(VertexBuffer.Usage.STATIC); Box box = new Box(BlockPos.ORIGIN); RenderUtils.drawSolidBox(box, solidBox); diff --git a/src/main/java/net/wurstclient/hacks/newchunks/NewChunksRenderer.java b/src/main/java/net/wurstclient/hacks/newchunks/NewChunksRenderer.java index 16fb0ec5..04f19135 100644 --- a/src/main/java/net/wurstclient/hacks/newchunks/NewChunksRenderer.java +++ b/src/main/java/net/wurstclient/hacks/newchunks/NewChunksRenderer.java @@ -41,7 +41,7 @@ public final class NewChunksRenderer public void updateBuffer(int i, BuiltBuffer buffer) { - vertexBuffers[i] = new VertexBuffer(VertexBuffer.class_8555.STATIC); + vertexBuffers[i] = new VertexBuffer(VertexBuffer.Usage.STATIC); vertexBuffers[i].bind(); vertexBuffers[i].upload(buffer); VertexBuffer.unbind(); diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 187f0eed..5297484e 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.setX(width / 2 + 2); + button.method_46421(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 28488e07..87f22486 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.setY(realmsButton.getY()); + altsButton.method_46419(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 70cd9d69..723c4d90 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -74,7 +74,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.setX(middleX - 100); + searchBar.method_46421(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } diff --git a/src/main/java/net/wurstclient/treebot/Tree.java b/src/main/java/net/wurstclient/treebot/Tree.java index b455eb1f..740b4fec 100644 --- a/src/main/java/net/wurstclient/treebot/Tree.java +++ b/src/main/java/net/wurstclient/treebot/Tree.java @@ -39,7 +39,7 @@ public class Tree implements AutoCloseable if(vertexBuffer != null) vertexBuffer.close(); - vertexBuffer = new VertexBuffer(VertexBuffer.class_8555.STATIC); + vertexBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC); int regionX = (stump.getX() >> 9) * 512; int regionZ = (stump.getZ() >> 9) * 512; From f3b0fc2b78dd754b237a74a745fdb5350d67fd88 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 10 May 2023 18:52:42 +0200 Subject: [PATCH 19/45] Update to 1.20-pre1 --- .../mixin/ClientPlayerEntityMixin.java | 27 ++++++++++++------- .../wurstclient/mixin/StatsScreenMixin.java | 2 +- .../wurstclient/mixin/TitleScreenMixin.java | 2 +- .../navigator/NavigatorMainScreen.java | 2 +- src/main/resources/fabric.mod.json | 4 +-- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java b/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java index 005bde80..7543aa8e 100644 --- a/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java +++ b/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java @@ -83,29 +83,28 @@ public class ClientPlayerEntityMixin extends AbstractClientPlayerEntity return player.isUsingItem(); } - @Inject(at = {@At("HEAD")}, method = {"sendMovementPackets()V"}) + @Inject(at = @At("HEAD"), method = "sendMovementPackets()V") private void onSendMovementPacketsHEAD(CallbackInfo ci) { EventManager.fire(PreMotionEvent.INSTANCE); } - @Inject(at = {@At("TAIL")}, method = {"sendMovementPackets()V"}) + @Inject(at = @At("TAIL"), method = "sendMovementPackets()V") private void onSendMovementPacketsTAIL(CallbackInfo ci) { EventManager.fire(PostMotionEvent.INSTANCE); } - @Inject(at = {@At("HEAD")}, - method = { - "move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V"}) + @Inject(at = @At("HEAD"), + method = "move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V") private void onMove(MovementType type, Vec3d offset, CallbackInfo ci) { PlayerMoveEvent event = new PlayerMoveEvent(this); EventManager.fire(event); } - @Inject(at = {@At("HEAD")}, - method = {"isAutoJumpEnabled()Z"}, + @Inject(at = @At("HEAD"), + method = "isAutoJumpEnabled()Z", cancellable = true) private void onIsAutoJumpEnabled(CallbackInfoReturnable cir) { @@ -113,10 +112,14 @@ public class ClientPlayerEntityMixin extends AbstractClientPlayerEntity cir.setReturnValue(false); } + /** + * When PortalGUI is enabled, this mixin temporarily sets the current screen + * to null to prevent the updateNausea() method from closing it. + */ @Inject(at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;", opcode = Opcodes.GETFIELD, - ordinal = 0), method = {"updateNausea()V"}) + ordinal = 0), method = "updateNausea()V") private void beforeUpdateNausea(CallbackInfo ci) { if(!WurstClient.INSTANCE.getHax().portalGuiHack.isEnabled()) @@ -126,10 +129,14 @@ public class ClientPlayerEntityMixin extends AbstractClientPlayerEntity client.currentScreen = null; } + /** + * This mixin restores the current screen as soon as the updateNausea() + * method is done looking at it. + */ @Inject(at = @At(value = "FIELD", - target = "Lnet/minecraft/client/network/ClientPlayerEntity;nextNauseaStrength:F", + target = "Lnet/minecraft/client/network/ClientPlayerEntity;field_44911:F", opcode = Opcodes.GETFIELD, - ordinal = 1), method = {"updateNausea()V"}) + ordinal = 1), method = "updateNausea()V") private void afterUpdateNausea(CallbackInfo ci) { if(tempCurrentScreen == null) diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 5297484e..187f0eed 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.method_46421(width / 2 + 2); + button.setX(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 87f22486..28488e07 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.method_46419(realmsButton.getY()); + altsButton.setY(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 723c4d90..70cd9d69 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -74,7 +74,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.method_46421(middleX - 100); + searchBar.setX(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 17bdcddd..26948916 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,8 +30,8 @@ "depends": { "fabricloader": ">=0.14.19", - "fabric-api": ">=0.80.1", - "minecraft": "~1.20-alpha.23.18.a", + "fabric-api": ">=0.80.2", + "minecraft": "~1.20-beta.1", "java": ">=17" }, "suggests": { From ea850de15d038e284d83835693bd8360c3a10a99 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Tue, 16 May 2023 18:21:28 +0200 Subject: [PATCH 20/45] [Wurst-Bot] Update to 1.20-pre2 --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- src/main/java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- src/main/java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index d6521137..bad34618 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20-pre1 -yarn_mappings=1.20-pre1+build.1 +minecraft_version=1.20-pre2 +yarn_mappings=1.20-pre2+build.1 loader_version=0.14.19 #Fabric api -fabric_version=0.80.2+1.20 +fabric_version=0.81.2+1.20 # Mod Properties -mod_version = v7.34-MC1.20-pre1 +mod_version = v7.34-MC1.20-pre2 maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index f95a6d37..762d7e32 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.34"; - public static final String MC_VERSION = "1.20-pre1"; + public static final String MC_VERSION = "1.20-pre2"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 187f0eed..5297484e 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.setX(width / 2 + 2); + button.method_46421(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 28488e07..87f22486 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.setY(realmsButton.getY()); + altsButton.method_46419(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 70cd9d69..723c4d90 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -74,7 +74,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.setX(middleX - 100); + searchBar.method_46421(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } From 621eb72afa0f147e432d6d2cc40b3d97b6a9ac8b Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Tue, 16 May 2023 18:41:26 +0200 Subject: [PATCH 21/45] Update to 1.20-pre2 --- .../java/net/wurstclient/mixin/ClientPlayerEntityMixin.java | 2 +- src/main/java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- src/main/java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../java/net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- src/main/resources/fabric.mod.json | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java b/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java index 7543aa8e..0f3351b5 100644 --- a/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java +++ b/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java @@ -134,7 +134,7 @@ public class ClientPlayerEntityMixin extends AbstractClientPlayerEntity * method is done looking at it. */ @Inject(at = @At(value = "FIELD", - target = "Lnet/minecraft/client/network/ClientPlayerEntity;field_44911:F", + target = "Lnet/minecraft/client/network/ClientPlayerEntity;nauseaIntensity:F", opcode = Opcodes.GETFIELD, ordinal = 1), method = "updateNausea()V") private void afterUpdateNausea(CallbackInfo ci) diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 5297484e..187f0eed 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.method_46421(width / 2 + 2); + button.setX(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 87f22486..28488e07 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.method_46419(realmsButton.getY()); + altsButton.setY(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 723c4d90..70cd9d69 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -74,7 +74,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.method_46421(middleX - 100); + searchBar.setX(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 26948916..535036d1 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,8 +30,8 @@ "depends": { "fabricloader": ">=0.14.19", - "fabric-api": ">=0.80.2", - "minecraft": "~1.20-beta.1", + "fabric-api": ">=0.81.2", + "minecraft": "~1.20-beta.2", "java": ">=17" }, "suggests": { From 96947a11675762ac1f08df49e4c1a43fb59f0ac9 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Fri, 19 May 2023 17:14:23 +0200 Subject: [PATCH 22/45] [Wurst-Bot] Update to 1.20-pre3 --- gradle.properties | 6 +++--- src/main/java/net/wurstclient/WurstClient.java | 2 +- src/main/java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- src/main/java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../java/net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1f7d524f..0a702946 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20-pre2 -yarn_mappings=1.20-pre2+build.1 +minecraft_version=1.20-pre3 +yarn_mappings=1.20-pre3+build.1 loader_version=0.14.19 #Fabric api fabric_version=0.81.2+1.20 # Mod Properties -mod_version = v7.35-MC1.20-pre2 +mod_version = v7.35-MC1.20-pre3 maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index fbd080d4..5d491049 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.35"; - public static final String MC_VERSION = "1.20-pre2"; + public static final String MC_VERSION = "1.20-pre3"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 187f0eed..5297484e 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.setX(width / 2 + 2); + button.method_46421(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 28488e07..87f22486 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.setY(realmsButton.getY()); + altsButton.method_46419(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 70cd9d69..723c4d90 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -74,7 +74,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.setX(middleX - 100); + searchBar.method_46421(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } From ac184744ca45890eaf6ca31baf93cf49fd27da66 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Fri, 19 May 2023 17:21:06 +0200 Subject: [PATCH 23/45] Update to 1.20-pre3 --- src/main/java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- src/main/java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../java/net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 5297484e..187f0eed 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.method_46421(width / 2 + 2); + button.setX(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 87f22486..28488e07 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.method_46419(realmsButton.getY()); + altsButton.setY(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 723c4d90..70cd9d69 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -74,7 +74,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.method_46421(middleX - 100); + searchBar.setX(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } From 14cdb81a21ab8f699ee22c2fe37df4c87999be7f Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Fri, 19 May 2023 17:23:27 +0200 Subject: [PATCH 24/45] [Wurst-Bot] Update to 1.20-pre4 --- gradle.properties | 6 +++--- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0a702946..53c8cdee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20-pre3 -yarn_mappings=1.20-pre3+build.1 +minecraft_version=1.20-pre4 +yarn_mappings=1.20-pre4+build.2 loader_version=0.14.19 #Fabric api fabric_version=0.81.2+1.20 # Mod Properties -mod_version = v7.35-MC1.20-pre3 +mod_version = v7.35-MC1.20-pre4 maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index 5d491049..43d659cd 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.35"; - public static final String MC_VERSION = "1.20-pre3"; + public static final String MC_VERSION = "1.20-pre4"; private WurstAnalytics analytics; private EventManager eventManager; From 650ca14b8f8e75375eb948c0f7d73a4f4526b345 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Tue, 23 May 2023 17:23:31 +0200 Subject: [PATCH 25/45] [Wurst-Bot] Update to 1.20-pre5 --- gradle.properties | 10 +++++----- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 53c8cdee..428b14ff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20-pre4 -yarn_mappings=1.20-pre4+build.2 -loader_version=0.14.19 +minecraft_version=1.20-pre5 +yarn_mappings=1.20-pre5+build.1 +loader_version=0.14.20 #Fabric api -fabric_version=0.81.2+1.20 +fabric_version=0.81.3+1.20 # Mod Properties -mod_version = v7.35-MC1.20-pre4 +mod_version = v7.35-MC1.20-pre5 maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index 43d659cd..94d479af 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.35"; - public static final String MC_VERSION = "1.20-pre4"; + public static final String MC_VERSION = "1.20-pre5"; private WurstAnalytics analytics; private EventManager eventManager; From 4c3fc11b0d315ecd6522a07071f55bbbf4b9cff2 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 25 May 2023 19:21:57 +0200 Subject: [PATCH 26/45] [Wurst-Bot] Update to 1.20-pre6 --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- src/main/java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- src/main/java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 428b14ff..9ef5445b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20-pre5 -yarn_mappings=1.20-pre5+build.1 +minecraft_version=1.20-pre6 +yarn_mappings=1.20-pre6+build.2 loader_version=0.14.20 #Fabric api -fabric_version=0.81.3+1.20 +fabric_version=0.82.1+1.20 # Mod Properties -mod_version = v7.35-MC1.20-pre5 +mod_version = v7.35-MC1.20-pre6 maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index 94d479af..450cd537 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.35"; - public static final String MC_VERSION = "1.20-pre5"; + public static final String MC_VERSION = "1.20-pre6"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 187f0eed..5297484e 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.setX(width / 2 + 2); + button.method_46421(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 28488e07..87f22486 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.setY(realmsButton.getY()); + altsButton.method_46419(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 70cd9d69..723c4d90 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -74,7 +74,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.setX(middleX - 100); + searchBar.method_46421(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } From ad0876da2dfec5b008e501eebb5c659100ccbc3d Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 25 May 2023 19:44:04 +0200 Subject: [PATCH 27/45] Update to 1.20-pre6 --- src/main/java/net/wurstclient/mixin/StatsScreenMixin.java | 2 +- src/main/java/net/wurstclient/mixin/TitleScreenMixin.java | 2 +- .../java/net/wurstclient/navigator/NavigatorMainScreen.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 5297484e..187f0eed 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -55,7 +55,7 @@ public abstract class StatsScreenMixin extends Screen implements StatsListener .equals(I18n.translate("gui.done"))) continue; - button.method_46421(width / 2 + 2); + button.setX(width / 2 + 2); button.setWidth(150); } } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 87f22486..28488e07 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -77,7 +77,7 @@ public abstract class TitleScreenMixin extends Screen // adjust AltManager button if Realms button has been moved // happens when ModMenu is installed - altsButton.method_46419(realmsButton.getY()); + altsButton.setY(realmsButton.getY()); } /** diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 723c4d90..70cd9d69 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -74,7 +74,7 @@ public final class NavigatorMainScreen extends NavigatorScreen setFocused(searchBar); searchBar.setFocused(true); - searchBar.method_46421(middleX - 100); + searchBar.setX(middleX - 100); setContentHeight(navigatorDisplayList.size() / 3 * 20); } From 67aeb439d55cbbf196b1ad843f67c98786b74565 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Tue, 30 May 2023 11:08:49 +0200 Subject: [PATCH 28/45] [Wurst-Bot] Update to 1.20-pre7 --- gradle.properties | 8 +- .../java/net/wurstclient/WurstClient.java | 2 +- .../wurstclient/mixin/StatsScreenMixin.java | 154 +++++++------- .../wurstclient/mixin/TitleScreenMixin.java | 188 +++++++++--------- 4 files changed, 176 insertions(+), 176 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9ef5445b..7235d988 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20-pre6 -yarn_mappings=1.20-pre6+build.2 -loader_version=0.14.20 +minecraft_version=1.20-pre7 +yarn_mappings=1.20-pre7+build.2 +loader_version=0.14.21 #Fabric api fabric_version=0.82.1+1.20 # Mod Properties -mod_version = v7.35-MC1.20-pre6 +mod_version = v7.35-MC1.20-pre7 maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index 450cd537..7143a19a 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.35"; - public static final String MC_VERSION = "1.20-pre6"; + public static final String MC_VERSION = "1.20-pre7"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java index 187f0eed..31ba96df 100644 --- a/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/StatsScreenMixin.java @@ -1,77 +1,77 @@ -/* - * Copyright (c) 2014-2023 Wurst-Imperium and contributors. - * - * This source code is subject to the terms of the GNU General Public - * License, version 3. If a copy of the GPL was not distributed with this - * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt - */ -package net.wurstclient.mixin; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.StatsListener; -import net.minecraft.client.gui.screen.StatsScreen; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.gui.widget.ClickableWidget; -import net.minecraft.client.resource.language.I18n; -import net.minecraft.text.Text; -import net.wurstclient.WurstClient; -import net.wurstclient.mixinterface.IScreen; - -@Mixin(StatsScreen.class) -public abstract class StatsScreenMixin extends Screen implements StatsListener -{ - private StatsScreenMixin(WurstClient wurst, Text text_1) - { - super(text_1); - } - - @Inject(at = {@At("TAIL")}, method = {"createButtons()V"}) - private void onCreateButtons(CallbackInfo ci) - { - if(WurstClient.INSTANCE.getOtfs().disableOtf.shouldHideEnableButton()) - return; - - ButtonWidget toggleWurstButton = - ButtonWidget.builder(Text.literal(""), this::toggleWurst) - .dimensions(width / 2 - 152, height - 28, 150, 20).build(); - - updateWurstButtonText(toggleWurstButton); - addDrawableChild(toggleWurstButton); - - for(Drawable d : ((IScreen)this).getButtons()) - { - if(!(d instanceof ClickableWidget)) - continue; - - ClickableWidget button = (ClickableWidget)d; - - if(!button.getMessage().getString() - .equals(I18n.translate("gui.done"))) - continue; - - button.setX(width / 2 + 2); - button.setWidth(150); - } - } - - private void toggleWurst(ButtonWidget button) - { - WurstClient wurst = WurstClient.INSTANCE; - wurst.setEnabled(!wurst.isEnabled()); - - updateWurstButtonText(button); - } - - private void updateWurstButtonText(ButtonWidget button) - { - WurstClient wurst = WurstClient.INSTANCE; - String text = (wurst.isEnabled() ? "Disable" : "Enable") + " Wurst"; - button.setMessage(Text.literal(text)); - } -} +/* + * Copyright (c) 2014-2023 Wurst-Imperium and contributors. + * + * This source code is subject to the terms of the GNU General Public + * License, version 3. If a copy of the GPL was not distributed with this + * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt + */ +package net.wurstclient.mixin; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.StatsListener; +import net.minecraft.client.gui.screen.StatsScreen; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.gui.widget.ClickableWidget; +import net.minecraft.client.resource.language.I18n; +import net.minecraft.text.Text; +import net.wurstclient.WurstClient; +import net.wurstclient.mixinterface.IScreen; + +@Mixin(StatsScreen.class) +public abstract class StatsScreenMixin extends Screen implements StatsListener +{ + private StatsScreenMixin(WurstClient wurst, Text text_1) + { + super(text_1); + } + + @Inject(at = {@At("TAIL")}, method = {"createButtons()V"}) + private void onCreateButtons(CallbackInfo ci) + { + if(WurstClient.INSTANCE.getOtfs().disableOtf.shouldHideEnableButton()) + return; + + ButtonWidget toggleWurstButton = + ButtonWidget.builder(Text.literal(""), this::toggleWurst) + .dimensions(width / 2 - 152, height - 28, 150, 20).build(); + + updateWurstButtonText(toggleWurstButton); + addDrawableChild(toggleWurstButton); + + for(Drawable d : ((IScreen)this).getButtons()) + { + if(!(d instanceof ClickableWidget)) + continue; + + ClickableWidget button = (ClickableWidget)d; + + if(!button.getMessage().getString() + .equals(I18n.translate("gui.done"))) + continue; + + button.setX(width / 2 + 2); + button.setWidth(150); + } + } + + private void toggleWurst(ButtonWidget button) + { + WurstClient wurst = WurstClient.INSTANCE; + wurst.setEnabled(!wurst.isEnabled()); + + updateWurstButtonText(button); + } + + private void updateWurstButtonText(ButtonWidget button) + { + WurstClient wurst = WurstClient.INSTANCE; + String text = (wurst.isEnabled() ? "Disable" : "Enable") + " Wurst"; + button.setMessage(Text.literal(text)); + } +} diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 28488e07..bbe58526 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -1,94 +1,94 @@ -/* - * Copyright (c) 2014-2023 Wurst-Imperium and contributors. - * - * This source code is subject to the terms of the GNU General Public - * License, version 3. If a copy of the GPL was not distributed with this - * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt - */ -package net.wurstclient.mixin; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.TitleScreen; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.gui.widget.ClickableWidget; -import net.minecraft.client.resource.language.I18n; -import net.minecraft.text.Text; -import net.wurstclient.WurstClient; -import net.wurstclient.altmanager.screens.AltManagerScreen; -import net.wurstclient.mixinterface.IScreen; - -@Mixin(TitleScreen.class) -public abstract class TitleScreenMixin extends Screen -{ - private ClickableWidget realmsButton = null; - private ButtonWidget altsButton; - - private TitleScreenMixin(WurstClient wurst, Text text_1) - { - super(text_1); - } - - @Inject(at = {@At("RETURN")}, method = {"init()V"}) - private void onInitWidgetsNormal(CallbackInfo ci) - { - if(!WurstClient.INSTANCE.isEnabled()) - return; - - for(Drawable d : ((IScreen)this).getButtons()) - { - if(!(d instanceof ClickableWidget)) - continue; - - ClickableWidget button = (ClickableWidget)d; - if(!button.getMessage().getString() - .equals(I18n.translate("menu.online"))) - continue; - - realmsButton = button; - break; - } - - if(realmsButton == null) - throw new IllegalStateException("Couldn't find realms button!"); - - // make Realms button smaller - realmsButton.setWidth(98); - - // add AltManager button - addDrawableChild(altsButton = ButtonWidget - .builder(Text.literal("Alt Manager"), - b -> client.setScreen(new AltManagerScreen(this, - WurstClient.INSTANCE.getAltManager()))) - .dimensions(width / 2 + 2, realmsButton.getY(), 98, 20).build()); - } - - @Inject(at = {@At("RETURN")}, method = {"tick()V"}) - private void onTick(CallbackInfo ci) - { - if(realmsButton == null || altsButton == null) - return; - - // adjust AltManager button if Realms button has been moved - // happens when ModMenu is installed - altsButton.setY(realmsButton.getY()); - } - - /** - * Stops the multiplayer button being grayed out if the user's Microsoft - * account is parental-control'd or banned from online play. - */ - @Inject(at = @At("HEAD"), - method = "getMultiplayerDisabledText()Lnet/minecraft/text/Text;", - cancellable = true) - private void onGetMultiplayerDisabledText(CallbackInfoReturnable cir) - { - cir.setReturnValue(null); - } -} +/* + * Copyright (c) 2014-2023 Wurst-Imperium and contributors. + * + * This source code is subject to the terms of the GNU General Public + * License, version 3. If a copy of the GPL was not distributed with this + * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt + */ +package net.wurstclient.mixin; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.TitleScreen; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.gui.widget.ClickableWidget; +import net.minecraft.client.resource.language.I18n; +import net.minecraft.text.Text; +import net.wurstclient.WurstClient; +import net.wurstclient.altmanager.screens.AltManagerScreen; +import net.wurstclient.mixinterface.IScreen; + +@Mixin(TitleScreen.class) +public abstract class TitleScreenMixin extends Screen +{ + private ClickableWidget realmsButton = null; + private ButtonWidget altsButton; + + private TitleScreenMixin(WurstClient wurst, Text text_1) + { + super(text_1); + } + + @Inject(at = {@At("RETURN")}, method = {"init()V"}) + private void onInitWidgetsNormal(CallbackInfo ci) + { + if(!WurstClient.INSTANCE.isEnabled()) + return; + + for(Drawable d : ((IScreen)this).getButtons()) + { + if(!(d instanceof ClickableWidget)) + continue; + + ClickableWidget button = (ClickableWidget)d; + if(!button.getMessage().getString() + .equals(I18n.translate("menu.online"))) + continue; + + realmsButton = button; + break; + } + + if(realmsButton == null) + throw new IllegalStateException("Couldn't find realms button!"); + + // make Realms button smaller + realmsButton.setWidth(98); + + // add AltManager button + addDrawableChild(altsButton = ButtonWidget + .builder(Text.literal("Alt Manager"), + b -> client.setScreen(new AltManagerScreen(this, + WurstClient.INSTANCE.getAltManager()))) + .dimensions(width / 2 + 2, realmsButton.getY(), 98, 20).build()); + } + + @Inject(at = {@At("RETURN")}, method = {"tick()V"}) + private void onTick(CallbackInfo ci) + { + if(realmsButton == null || altsButton == null) + return; + + // adjust AltManager button if Realms button has been moved + // happens when ModMenu is installed + altsButton.setY(realmsButton.getY()); + } + + /** + * Stops the multiplayer button being grayed out if the user's Microsoft + * account is parental-control'd or banned from online play. + */ + @Inject(at = @At("HEAD"), + method = "getMultiplayerDisabledText()Lnet/minecraft/text/Text;", + cancellable = true) + private void onGetMultiplayerDisabledText(CallbackInfoReturnable cir) + { + cir.setReturnValue(null); + } +} From d1416ca74d82c558c1496fc3246c8598338f4d3d Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 31 May 2023 16:05:12 +0200 Subject: [PATCH 29/45] [Wurst-Bot] Update to 1.20-rc1 --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 885bb2f3..496290f7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20-pre7 -yarn_mappings=1.20-pre7+build.2 +minecraft_version=1.20-rc1 +yarn_mappings=1.20-rc1+build.1 loader_version=0.14.21 #Fabric api -fabric_version=0.82.1+1.20 +fabric_version=0.83.0+1.20 # Mod Properties -mod_version = v7.35.1-MC1.20-pre7 +mod_version = v7.35.1-MC1.20-rc1 maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index 827ae272..12b5e849 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.35.1"; - public static final String MC_VERSION = "1.20-pre7"; + public static final String MC_VERSION = "1.20-rc1"; private WurstAnalytics analytics; private EventManager eventManager; From 5bd1319c11fdcb25e83b3d6a93526e4cab3eb5be Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 7 Jun 2023 17:17:49 +0200 Subject: [PATCH 30/45] [Wurst-Bot] Update to 1.20 --- gradle.properties | 6 +++--- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 496290f7..adcb17ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20-rc1 -yarn_mappings=1.20-rc1+build.1 +minecraft_version=1.20 +yarn_mappings=1.20+build.1 loader_version=0.14.21 #Fabric api fabric_version=0.83.0+1.20 # Mod Properties -mod_version = v7.35.1-MC1.20-rc1 +mod_version = v7.35.1-MC1.20 maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index 12b5e849..d2525c8b 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.35.1"; - public static final String MC_VERSION = "1.20-rc1"; + public static final String MC_VERSION = "1.20"; private WurstAnalytics analytics; private EventManager eventManager; From d58cceea60459ad734c3d2650d5c89c64216827c Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Fri, 9 Jun 2023 22:29:23 +0200 Subject: [PATCH 31/45] Update to 1.20.1-rc1 --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index adcb17ec..3f9a96e1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20 -yarn_mappings=1.20+build.1 +minecraft_version=1.20.1-rc1 +yarn_mappings=1.20.1-rc1+build.1 loader_version=0.14.21 #Fabric api -fabric_version=0.83.0+1.20 +fabric_version=0.83.0+1.20.1 # Mod Properties -mod_version = v7.35.1-MC1.20 +mod_version = v7.35.1-MC1.20.1-rc1 maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index d2525c8b..e5378b52 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.35.1"; - public static final String MC_VERSION = "1.20"; + public static final String MC_VERSION = "1.20.1-rc1"; private WurstAnalytics analytics; private EventManager eventManager; From db1dedb2fee8f26223e40a35df2142dbd651e660 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Mon, 12 Jun 2023 16:42:41 +0200 Subject: [PATCH 32/45] [Wurst-Bot] Update to 1.20.1 --- gradle.properties | 6 +++--- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3f9a96e1..d98c334d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20.1-rc1 -yarn_mappings=1.20.1-rc1+build.1 +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.1 loader_version=0.14.21 #Fabric api fabric_version=0.83.0+1.20.1 # Mod Properties -mod_version = v7.35.1-MC1.20.1-rc1 +mod_version = v7.35.1-MC1.20.1 maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index e5378b52..014f2cb0 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -57,7 +57,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.35.1"; - public static final String MC_VERSION = "1.20.1-rc1"; + public static final String MC_VERSION = "1.20.1"; private WurstAnalytics analytics; private EventManager eventManager; From ce0265081c1f844df185d4fe6032f29fe5723ad5 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Tue, 13 Jun 2023 10:55:48 +0200 Subject: [PATCH 33/45] Remove "contents: read" permission I don't think this permission is actually necessary. --- .github/workflows/gradle.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 4286e229..bf8f6677 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -21,9 +21,6 @@ on: - 'gradle**' - 'build.gradle' -permissions: - contents: read - jobs: build: From 1cb64f04a3827c54315151e944cad15f9345e13e Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Tue, 13 Jun 2023 11:03:37 +0200 Subject: [PATCH 34/45] Allow CI to run on any branch --- .github/workflows/gradle.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index bf8f6677..a73c7a70 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -9,13 +9,11 @@ name: Java CI with Gradle on: push: - branches: [ "master" ] paths: - '**.java' - 'gradle**' - 'build.gradle' pull_request: - branches: [ "master" ] paths: - '**.java' - 'gradle**' @@ -23,9 +21,7 @@ on: jobs: build: - runs-on: ubuntu-latest - steps: - uses: actions/checkout@v3 - name: Set up JDK 17 From 50b81da8bbf0ac85935a8467b8df1c113c827bdc Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Tue, 13 Jun 2023 11:10:52 +0200 Subject: [PATCH 35/45] Add gradle wrapper validation --- .github/workflows/gradle.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index a73c7a70..62f01a7f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,10 +1,5 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. # This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle - name: Java CI with Gradle on: @@ -24,6 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - uses: gradle/wrapper-validation-action@v1 - name: Set up JDK 17 uses: actions/setup-java@v3 with: From dae1a9db39d79fc3607efc3bbcae38af342c622a Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Tue, 13 Jun 2023 11:11:55 +0200 Subject: [PATCH 36/45] Add org.gradle.parallel=true --- gradle.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle.properties b/gradle.properties index adcb17ec..ece0b6d6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,6 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and From 2749eb4874d5a65fd0c324622fc3da5f6c43f888 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Tue, 13 Jun 2023 14:01:56 +0200 Subject: [PATCH 37/45] Update jsonsyntax.yml --- .github/workflows/jsonsyntax.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/jsonsyntax.yml b/.github/workflows/jsonsyntax.yml index 1daceaff..2a5f77c7 100644 --- a/.github/workflows/jsonsyntax.yml +++ b/.github/workflows/jsonsyntax.yml @@ -2,7 +2,6 @@ name: JSON syntax on: push: - branches: [ "master" ] paths: - '**.json' pull_request: @@ -14,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: json-syntax-check + - name: Check JSON syntax uses: limitusus/json-syntax-check@v2 with: pattern: "\\.json$" From 8d0701ec13a96554d2760578694a36507fab2001 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Tue, 20 Jun 2023 16:46:57 +0200 Subject: [PATCH 38/45] Add NoChatReportsOtf to chat category so it shows up in ClickGUI --- .../net/wurstclient/other_features/NoChatReportsOtf.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/net/wurstclient/other_features/NoChatReportsOtf.java b/src/main/java/net/wurstclient/other_features/NoChatReportsOtf.java index dea62aef..c6e38a45 100644 --- a/src/main/java/net/wurstclient/other_features/NoChatReportsOtf.java +++ b/src/main/java/net/wurstclient/other_features/NoChatReportsOtf.java @@ -17,6 +17,7 @@ import net.minecraft.network.encryption.ClientPlayerSession; import net.minecraft.network.message.MessageChain; import net.minecraft.network.message.MessageSignatureData; import net.minecraft.text.Text; +import net.wurstclient.Category; import net.wurstclient.DontBlock; import net.wurstclient.SearchTags; import net.wurstclient.WurstClient; @@ -118,6 +119,12 @@ public final class NoChatReportsOtf extends OtherFeature disableSignatures.setChecked(!disableSignatures.isChecked()); } + @Override + public Category getCategory() + { + return Category.CHAT; + } + // See ChatHudMixin, ClientPlayNetworkHandlerMixin.onOnServerMetadata(), // MinecraftClientMixin.onGetProfileKeys() } From 49dc39c48e4f843df2874f96b8fc17500ef1d232 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Fri, 7 Jul 2023 11:10:38 +0200 Subject: [PATCH 39/45] Improve documentation in GameRendererMixin --- .../net/wurstclient/mixin/GameRendererMixin.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/wurstclient/mixin/GameRendererMixin.java b/src/main/java/net/wurstclient/mixin/GameRendererMixin.java index f29ddfaa..8452a05c 100644 --- a/src/main/java/net/wurstclient/mixin/GameRendererMixin.java +++ b/src/main/java/net/wurstclient/mixin/GameRendererMixin.java @@ -37,6 +37,10 @@ public abstract class GameRendererMixin { private boolean cancelNextBobView; + /** + * Fires the CameraTransformViewBobbingEvent event and records whether the + * next view-bobbing call should be cancelled. + */ @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;bobView(Lnet/minecraft/client/util/math/MatrixStack;F)V", ordinal = 0), @@ -52,6 +56,10 @@ public abstract class GameRendererMixin cancelNextBobView = true; } + /** + * Cancels the view-bobbing call if requested by the last + * CameraTransformViewBobbingEvent. + */ @Inject(at = @At("HEAD"), method = "bobView(Lnet/minecraft/client/util/math/MatrixStack;F)V", cancellable = true) @@ -65,9 +73,14 @@ public abstract class GameRendererMixin cancelNextBobView = false; } + /** + * This mixin is injected into a random method call later in the + * renderWorld() method to ensure that cancelNextBobView is always reset + * after the view-bobbing call. + */ @Inject(at = @At("HEAD"), method = "renderHand(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/Camera;F)V") - private void renderHand(MatrixStack matrices, Camera camera, + private void onRenderHand(MatrixStack matrices, Camera camera, float tickDelta, CallbackInfo ci) { cancelNextBobView = false; From d9ccc4094e414063dc8489c8d8c9aef37b0812b3 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Fri, 7 Jul 2023 11:27:32 +0200 Subject: [PATCH 40/45] Remove Redirect in ClientPlayerEntityMixin to improve mod compatibility Fixes #397 Fixes #440 Fixes #573 Fixes #605 Fixes #607 Fixes https://wurstforum.net/d/15 --- .../mixin/ClientPlayerEntityMixin.java | 41 ++++++++++++++++--- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java b/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java index 0f3351b5..ed1e2cd5 100644 --- a/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java +++ b/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java @@ -13,7 +13,6 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @@ -57,6 +56,7 @@ public class ClientPlayerEntityMixin extends AbstractClientPlayerEntity protected MinecraftClient client; private Screen tempCurrentScreen; + private boolean hideNextItemUse; public ClientPlayerEntityMixin(WurstClient wurst, ClientWorld world, GameProfile profile) @@ -72,15 +72,46 @@ public class ClientPlayerEntityMixin extends AbstractClientPlayerEntity EventManager.fire(UpdateEvent.INSTANCE); } - @Redirect(at = @At(value = "INVOKE", + /** + * This mixin runs just before the tickMovement() method calls + * isUsingItem(), so that the onIsUsingItem() mixin knows which + * call to intercept. + */ + @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isUsingItem()Z", ordinal = 0), method = "tickMovement()V") - private boolean wurstIsUsingItem(ClientPlayerEntity player) + private void onTickMovementItemUse(CallbackInfo ci) { if(WurstClient.INSTANCE.getHax().noSlowdownHack.isEnabled()) - return false; + hideNextItemUse = true; + } + + /** + * Pretends that the player is not using an item when instructed to do so by + * the onTickMovement() mixin. + */ + @Inject(at = @At("HEAD"), method = "isUsingItem()Z", cancellable = true) + private void onIsUsingItem(CallbackInfoReturnable cir) + { + if(!hideNextItemUse) + return; - return player.isUsingItem(); + cir.setReturnValue(false); + hideNextItemUse = false; + } + + /** + * This mixin is injected into a random field access later in the + * tickMovement() method to ensure that hideNextItemUse is always reset + * after the item use slowdown calculation. + */ + @Inject(at = @At(value = "FIELD", + target = "Lnet/minecraft/client/network/ClientPlayerEntity;ticksToNextAutojump:I", + opcode = Opcodes.GETFIELD, + ordinal = 0), method = "tickMovement()V") + private void afterIsUsingItem(CallbackInfo ci) + { + hideNextItemUse = false; } @Inject(at = @At("HEAD"), method = "sendMovementPackets()V") From ceebaebac10fe203e3bf1ca9a3aebc457aedf452 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Fri, 7 Jul 2023 21:58:51 +0200 Subject: [PATCH 41/45] Fix crash when files within encryption folder have incorrect permissions Now this will just disable AltManager's file IO, the same way it does when access to the ".Wurst encryption" folder itself is denied. --- .../java/net/wurstclient/altmanager/Encryption.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/wurstclient/altmanager/Encryption.java b/src/main/java/net/wurstclient/altmanager/Encryption.java index fea01194..9bd2fbbb 100644 --- a/src/main/java/net/wurstclient/altmanager/Encryption.java +++ b/src/main/java/net/wurstclient/altmanager/Encryption.java @@ -195,6 +195,7 @@ public final class Encryption } private KeyPair getRsaKeyPair(Path publicFile, Path privateFile) + throws IOException { if(Files.notExists(publicFile) || Files.notExists(privateFile)) return createRsaKeys(publicFile, privateFile); @@ -213,7 +214,7 @@ public final class Encryption } } - private SecretKey getAesKey(Path path, KeyPair pair) + private SecretKey getAesKey(Path path, KeyPair pair) throws IOException { if(Files.notExists(path)) return createAesKey(path, pair); @@ -232,6 +233,7 @@ public final class Encryption } private KeyPair createRsaKeys(Path publicFile, Path privateFile) + throws IOException { try { @@ -268,14 +270,14 @@ public final class Encryption return pair; - }catch(GeneralSecurityException | IOException e) + }catch(GeneralSecurityException e) { throw new CrashException( CrashReport.create(e, "Creating RSA keypair")); } } - private SecretKey createAesKey(Path path, KeyPair pair) + private SecretKey createAesKey(Path path, KeyPair pair) throws IOException { try { @@ -293,7 +295,7 @@ public final class Encryption return key; - }catch(GeneralSecurityException | IOException e) + }catch(GeneralSecurityException e) { throw new CrashException(CrashReport.create(e, "Creating AES key")); } From 43c6a64f011e9c44572e08119b96329cfca7d304 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Sun, 9 Jul 2023 11:49:35 +0200 Subject: [PATCH 42/45] Replace Reddit links with WurstForum --- .github/ISSUE_TEMPLATE/config.yml | 4 ++-- .../java/net/wurstclient/options/WurstOptionsScreen.java | 9 +++++---- src/main/resources/fabric.mod.json | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index e91fc221..c3c1d333 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: true contact_links: - - name: Reddit Community - url: https://www.reddit.com/r/WurstClient/ + - name: WurstForum + url: https://wurstforum.net/?utm_source=GitHub&utm_medium=Wurst7+repo about: For general discussion, support, memes, etc. - name: Contact Alexander url: https://www.wurstclient.net/contact/?utm_source=GitHub&utm_medium=Wurst7&utm_campaign=Issues&utm_content=Contact+Alexander diff --git a/src/main/java/net/wurstclient/options/WurstOptionsScreen.java b/src/main/java/net/wurstclient/options/WurstOptionsScreen.java index 6a3d9bc5..8cce4e9d 100644 --- a/src/main/java/net/wurstclient/options/WurstOptionsScreen.java +++ b/src/main/java/net/wurstclient/options/WurstOptionsScreen.java @@ -128,11 +128,12 @@ public class WurstOptionsScreen extends Screen b -> os.open( "https://wurst.wiki/?utm_source=Wurst+Client&utm_medium=Wurst+Options&utm_content=Wurst+Wiki")); - new WurstOptionsButton(54, 72, () -> "Twitter", "@Wurst_Imperium", - b -> os.open("https://www.wurstclient.net/twitter/")); + new WurstOptionsButton(54, 72, () -> "WurstForum", "WurstForum.net", + b -> os.open( + "https://wurstforum.net/?utm_source=Wurst+Client&utm_medium=Wurst+Options&utm_content=WurstForum")); - new WurstOptionsButton(54, 96, () -> "Reddit", "r/WurstClient", - b -> os.open("https://www.wurstclient.net/reddit/")); + new WurstOptionsButton(54, 96, () -> "Twitter", "@Wurst_Imperium", + b -> os.open("https://www.wurstclient.net/twitter/")); new WurstOptionsButton(54, 120, () -> "Donate", "WurstClient.net/donate", b -> os.open( diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 535036d1..456d1aaa 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -45,6 +45,7 @@ "modmenu": { "links": { "Wiki": "https://wurst.wiki/?utm_source=Wurst+Client&utm_medium=ModMenu&utm_content=Wiki", + "Forum": "https://wurstforum.net/?utm_source=Wurst+Client&utm_medium=ModMenu&utm_content=Forum", "Donate": "https://www.wurstclient.net/donate/?utm_source=Wurst+Client&utm_medium=ModMenu&utm_content=Donate" } } From ac22a81da761242539f5fabad35c7136cc86c175 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Mon, 10 Jul 2023 16:20:36 +0200 Subject: [PATCH 43/45] Make NoFall not mess with elytra flight by default --- .../net/wurstclient/hacks/NoFallHack.java | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/wurstclient/hacks/NoFallHack.java b/src/main/java/net/wurstclient/hacks/NoFallHack.java index 6521160d..304131e5 100644 --- a/src/main/java/net/wurstclient/hacks/NoFallHack.java +++ b/src/main/java/net/wurstclient/hacks/NoFallHack.java @@ -13,14 +13,33 @@ import net.wurstclient.Category; import net.wurstclient.SearchTags; import net.wurstclient.events.UpdateListener; import net.wurstclient.hack.Hack; +import net.wurstclient.settings.CheckboxSetting; @SearchTags({"no fall"}) public final class NoFallHack extends Hack implements UpdateListener { + private final CheckboxSetting allowElytra = new CheckboxSetting( + "Allow elytra", + "Also tries to prevent fall damage while you are flying with an elytra.\n\n" + + "\u00a7c\u00a7lWARNING:\u00a7r This can sometimes cause you to" + + " stop flying unexpectedly.", + false); + public NoFallHack() { super("NoFall"); setCategory(Category.MOVEMENT); + addSetting(allowElytra); + } + + @Override + public String getRenderName() + { + if(MC.player != null && MC.player.isFallFlying() + && !allowElytra.isChecked()) + return getName() + " (paused)"; + + return getName(); } @Override @@ -39,13 +58,22 @@ public final class NoFallHack extends Hack implements UpdateListener public void onUpdate() { ClientPlayerEntity player = MC.player; - if(player.fallDistance <= (player.isFallFlying() ? 1 : 2)) + boolean fallFlying = player.isFallFlying(); + + // pause when flying with elytra, unless allowed + if(fallFlying && !allowElytra.isChecked()) return; - if(player.isFallFlying() && player.isSneaking() + // ignore small falls that can't cause damage + if(player.fallDistance <= (fallFlying ? 1 : 2)) + return; + + // attempt to fix elytra weirdness, if allowed + if(fallFlying && player.isSneaking() && !isFallingFastEnoughToCauseDamage(player)) return; + // send packet to stop fall damage player.networkHandler.sendPacket(new OnGroundOnly(true)); } From c81f36b6ef8e2a773e2d21b0d75fd13d1b2bda0e Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Mon, 10 Jul 2023 16:47:55 +0200 Subject: [PATCH 44/45] Change version to 7.35.2 --- gradle.properties | 2 +- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5e734f76..198dc8be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ loader_version=0.14.21 fabric_version=0.83.0+1.20.1 # Mod Properties -mod_version = v7.35.1-MC1.20.1 +mod_version = v7.35.2-MC1.20.1 maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index 014f2cb0..68ea4553 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -56,7 +56,7 @@ public enum WurstClient public static MinecraftClient MC; public static IMinecraftClient IMC; - public static final String VERSION = "7.35.1"; + public static final String VERSION = "7.35.2"; public static final String MC_VERSION = "1.20.1"; private WurstAnalytics analytics; From c8f245358d6b53b3ba0f66c6238fb14327517df9 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 12 Jul 2023 16:55:27 +0200 Subject: [PATCH 45/45] Update Fabric stuff --- build.gradle | 2 +- gradle.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index a009a9c9..532612de 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { } plugins { - id 'fabric-loom' version '1.2-SNAPSHOT' + id 'fabric-loom' version '1.3-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 198dc8be..266fd8a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,11 +6,11 @@ org.gradle.parallel=true # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api minecraft_version=1.20.1 -yarn_mappings=1.20.1+build.1 +yarn_mappings=1.20.1+build.9 loader_version=0.14.21 #Fabric api -fabric_version=0.83.0+1.20.1 +fabric_version=0.85.0+1.20.1 # Mod Properties mod_version = v7.35.2-MC1.20.1