Fix F3+ESC fix.

IMB11 · Dec 5, 2024 · a132663 · a132663
1 parent e838f54
commit a132663
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/settings.gradle b/settings.gradle
@@ -18,6 +18,6 @@ plugins {
 stonecutter {
     create(rootProject) {
         versions '1.21.3', '1.21', '1.20.1'
-        vcsVersion = '1.21'
+        vcsVersion = '1.21.3'
     }
 }
diff --git a/src/main/java/com/mineblock11/skinshuffle/client/gui/GeneratedScreens.java b/src/main/java/com/mineblock11/skinshuffle/client/gui/GeneratedScreens.java
@@ -46,7 +46,12 @@ public static ArrayList<ClickableWidget> createCarouselWidgets(Screen screen) {
         int x = screen.width / 2 + 104 + 25;
 
         if(screen instanceof GameMenuScreen gameMenuScreen) {
-            if(!gameMenuScreen.shouldShowMenu()) return new ArrayList<>();
+            //? <1.21 {
+            /*if(!gameMenuScreen.showMenu)
+            *///?} else {
+            if(!gameMenuScreen.shouldShowMenu())
+            //?}
+                return new ArrayList<>();
 
             if(!SkinShuffleConfig.get().displayInPauseMenu) return widgets;
             y = ((GameMenuScreenAccessor) gameMenuScreen).getExitButton().getY();

diff --git a/src/main/resources/aw/1.20.1.accesswidener b/src/main/resources/aw/1.20.1.accesswidener
@@ -12,4 +12,6 @@ accessible field net/minecraft/server/world/ThreadedAnvilChunkStorage$EntityTrac
 accessible field net/minecraft/server/world/ThreadedAnvilChunkStorage$EntityTracker listeners Ljava/util/Set;
 accessible method net/minecraft/client/gui/widget/ClickableWidget drawScrollableText (Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;IIIII)V
 accessible method net/minecraft/client/gui/widget/CyclingButtonWidget <init> (IIIILnet/minecraft/text/Text;Lnet/minecraft/text/Text;ILjava/lang/Object;Lnet/minecraft/client/gui/widget/CyclingButtonWidget$Values;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/client/gui/widget/CyclingButtonWidget$UpdateCallback;Lnet/minecraft/client/option/SimpleOption$TooltipFactory;Z)V
-accessible field net/minecraft/client/render/entity/model/PlayerEntityModel cloak Lnet/minecraft/client/model/ModelPart;
+accessible field net/minecraft/client/render/entity/model/PlayerEntityModel cloak Lnet/minecraft/client/model/ModelPart;
+
+accessible field net/minecraft/client/gui/screen/GameMenuScreen showMenu Z