Compatibility patch for realmsfix

Author: JunePrimavera

Diff for: gradle.properties

@@ -5,14 +5,14 @@ org.gradle.jvmargs=-Xmx1G
 	# check these on https://modmuss50.me/fabric.html
 
 minecraft_version=1.21
-yarn_mappings=1.21+build.1
+yarn_mappings=1.21-rc1+build.1
 loader_version=0.15.11
 
 #Fabric api
-fabric_version=0.100.1+1.21
+fabric_version=0.100.7+1.21
 
 # Mod Properties
-mod_version = 4.0.3
+mod_version = 4.0.4
 maven_group = xyz.sillyjune
 archives_base_name = Notebook
 

Diff for: src/main/java/xyz/sillyjune/notebook/Notebook.java

@@ -91,5 +91,5 @@ public static ButtonTextures getBookIcon() {
     public static NotebookConfig CONFIG;
     public static final Identifier BOOK_TEXTURE = Identifier.of("textures/gui/book.png");
     public static String BOOK_FOLDER = "Notebook";
-    public static boolean GAY = true;
+    public static boolean GAY = true; // I might be straight but gay people are pretty cool
 }

Diff for: src/main/java/xyz/sillyjune/notebook/NotebookScreen.java

@@ -205,9 +205,9 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         super.render(context, mouseX, mouseY, delta);
         if (GAY) { context.drawText(this.textRenderer, Text.translatable("notebook.gay"), 5, this.height - 22, Colors.WHITE, true); }
         if (CONFIG.debug()) {
-            context.drawText(this.textRenderer, Text.of("Notebook v4.0.3 - " + Text.translatable("devwarning.info").getString()), 5, this.height - 10, Colors.WHITE, true);
+            context.drawText(this.textRenderer, Text.of("Notebook v4.0.4 - " + Text.translatable("devwarning.info").getString()), 5, this.height - 10, Colors.WHITE, true);
         } else {
-            context.drawText(this.textRenderer, Text.of("Notebook v4.0.3"), 5, this.height - 10, Colors.WHITE, true);
+            context.drawText(this.textRenderer, Text.of("Notebook v4.0.4"), 5, this.height - 10, Colors.WHITE, true);
         }
     }
     public void renderBackground(DrawContext context, int mouseX, int mouseY, float delta) {

Diff for: src/main/java/xyz/sillyjune/notebook/mixin/GameMenuScreenButton.java

@@ -11,8 +11,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import static xyz.sillyjune.notebook.Notebook.MAIN_BUTTON_ICON;
-import static xyz.sillyjune.notebook.Notebook.getBookIcon;
+import static xyz.sillyjune.notebook.Notebook.*;
 
 @Mixin(GameMenuScreen.class)
 public abstract class GameMenuScreenButton extends Screen {
@@ -21,7 +20,15 @@ protected GameMenuScreenButton(Text title) {
     }
     @Inject(at = @At("RETURN"), method="initWidgets")
     private void addCustomButton(CallbackInfo ci) {
-        ButtonTextures icon = getBookIcon();
-        this.addDrawableChild(new TexturedButtonWidget(this.width / 2 + 104, this.height / 4 + 96 + -16, 20, 20, icon, (button) -> this.client.setScreen(new NotebookScreen())));
+        TexturedButtonWidget b = new TexturedButtonWidget(
+                this.width / 2 + 104,
+                this.height / 4 + 96 + -16,
+                20,
+                20,
+                getBookIcon(),
+                (button) -> this.client.setScreen(new NotebookScreen())
+        );
+        b.setMessage(Text.translatable("key.notebook.open"));
+        this.addDrawableChild(b);
     }
 }

Diff for: src/main/java/xyz/sillyjune/notebook/mixin/TitleScreenButton.java

@@ -1,6 +1,10 @@
 package xyz.sillyjune.notebook.mixin;
 
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.Drawable;
 import net.minecraft.client.gui.screen.ButtonTextures;
+import net.minecraft.client.gui.screen.option.OptionsScreen;
+import net.minecraft.client.gui.widget.ButtonWidget;
 import xyz.sillyjune.notebook.NotebookScreen;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -23,10 +27,18 @@ public abstract class TitleScreenButton extends Screen {
     protected TitleScreenButton(Text title) {
         super(title);
     }
-    @Inject(at = @At("RETURN"), method="initWidgetsNormal")
+    @Inject(at = @At("TAIL"), method="initWidgetsNormal")
     private void addCustomButton(int y, int spacingY, CallbackInfo ci) {
-        ButtonTextures icon = getBookIcon();
-        this.addDrawableChild(new TexturedButtonWidget((this.width / 2 + 104), y + spacingY + CONFIG.button_offset(), 20, 20, icon, (button) -> this.client.setScreen(new NotebookScreen())));
+        TexturedButtonWidget b = new TexturedButtonWidget(
+                (this.width / 2 + 104),
+                y + spacingY + CONFIG.button_offset(),
+                20,
+                20,
+                getBookIcon(),
+                (button) -> this.client.setScreen(new NotebookScreen())
+        );
+        b.setMessage(Text.translatable("key.notebook.open"));
+        this.addDrawableChild(b);
     }
 }
 

Diff for: src/main/resources/notebook.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "xyz.sillyjune.notebook.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [],
   "client": [
     "TitleScreenButton",