Update to Minecraft 1.21.11

Author: AmberIsFrozen

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       - name: Validate gradle wrapper
         uses: gradle/actions/wrapper-validation@v5
       - name: Setup JDK 21

README.md

@@ -15,7 +15,7 @@ This mod achieves it's goal by removing all button except the Quit Game button,
 Don't worry! Whether you are indecisive or you crave for more games, there's something for you as well!  
 If you can re-arrange the letter in the splash text to start with "start", "menu", "play" and "poison", you *get to be in the game*, how incredible.
 
-https://github.com/Kenny-Hui/QuitGame/assets/28094366/92e1460f-4441-40c6-9e28-e102b2b938d2
+https://github.com/AmberIsFrozen/QuitGame/assets/28094366/92e1460f-4441-40c6-9e28-e102b2b938d2
 
 For gamers, that is 65% more game per game! (Don't get the right letter? Better luck next time!)
 

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.13-SNAPSHOT'
+	id 'fabric-loom' version "$loom_version"
 	id 'maven-publish'
 }
 
@@ -16,13 +16,18 @@ repositories {
 	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
 	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
 	// for more information about repositories.
+
+    maven { url 'https://repo.sleeping.town/' }
 }
 
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings loom.officialMojangMappings()
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+    implementation 'folk.sisby:kaleido-config:0.3.3+1.3.2'
+    include 'folk.sisby:kaleido-config:0.3.3+1.3.2'
 }
 
 processResources {

gradle.properties

@@ -4,10 +4,11 @@ org.gradle.parallel=true
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.21.10
-	loader_version=0.18.1
+	minecraft_version=1.21.11
+	loader_version=0.18.3
+    loom_version=1.14-SNAPSHOT
 
 # Mod Properties
-	mod_version = 1.0.4
+	mod_version = 1.1.0
 	maven_group = com.lx862
 	archives_base_name = quitgame

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/lx862/quitgame/QuitGame.java

@@ -1,24 +1,20 @@
 package com.lx862.quitgame;
 
-import com.lx862.quitgame.config.Config;
+import com.lx862.quitgame.config.QuitGameConfig;
 import net.fabricmc.api.ModInitializer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class QuitGame implements ModInitializer {
-    public static final Logger LOGGER = LogManager.getLogger("QuitGame");
+    public static final String MOD_ID = "quitgame";
+    public static final Logger LOGGER = LogManager.getLogger(MOD_ID);
     public static double scale = 1.8;
-    public static float rotAngle = 20.0F;
-    public static List<String> keywords = new ArrayList<>();
     public static boolean unlocked = false;
     public static float unlockedAlpha = 0;
 
     @Override
     public void onInitialize() {
-        Config.load();
+        QuitGameConfig.init();
         LOGGER.info("[QuitGame] QuitGame loaded");
     }
 }

src/main/java/com/lx862/quitgame/ReorderableSplashText.java

@@ -1,17 +1,24 @@
 package com.lx862.quitgame;
 
+import net.minecraft.client.gui.Font;
+import net.minecraft.network.chat.Component;
+
 import java.util.LinkedList;
 import java.util.stream.Collectors;
 
 public class ReorderableSplashText {
-    public String text;
+    public static final float SPLASH_TILT_ANGLE = 20.0F;
+    private final Component text;
     public LinkedList<SplashTextCharacter> chars;
-    public ReorderableSplashText(String text) {
+
+    public ReorderableSplashText(Font font, Component text) {
         this.text = text;
         chars = new LinkedList<>();
-        for(int i = 0; i < text.length(); i++) {
-            chars.add(new SplashTextCharacter(text.charAt(i)));
-        }
+
+        text.getVisualOrderText().accept((i, style, j) -> {
+            chars.add(new SplashTextCharacter(font, String.valueOf((char)j), style));
+            return true;
+        });
     }
 
     public void reorder(SplashTextCharacter object, int idx) {
@@ -34,7 +41,11 @@ public void reorder(SplashTextCharacter object, int idx) {
     }
 
     public boolean startsWith(String str) {
-        String formedStr = chars.stream().map(e -> String.valueOf(e.getChar())).collect(Collectors.joining());
+        String formedStr = chars.stream().map(e -> e.getChar()).collect(Collectors.joining());
         return formedStr.trim().toLowerCase().startsWith(str.toLowerCase());
     }
+
+    public Component asComponent() {
+        return this.text;
+    }
 }

src/main/java/com/lx862/quitgame/SplashTextCharacter.java

@@ -1,27 +1,29 @@
 package com.lx862.quitgame;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.util.ARGB;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.Style;
 import org.joml.Vector2f;
 
 public class SplashTextCharacter {
-    private final char character;
+    private final String character;
+    private final Style style;
     private Vector2f startPos;
     private Vector2f targetPos;
     private Vector2f renderedPos;
     private boolean dragging;
     public double width;
 
-    public SplashTextCharacter(char character) {
+    public SplashTextCharacter(Font font, String character, Style style) {
         this.character = character;
+        this.style = style;
         this.targetPos = new Vector2f(0, 0);
         this.renderedPos = new Vector2f(0, 0);
-        this.width = Minecraft.getInstance().font.width(String.valueOf(character));
+        this.width = font.width(Component.literal(character).withStyle(style));
     }
 
-    public char getChar() {
+    public String getChar() {
         return character;
     }
 
@@ -58,8 +60,8 @@ public void render(GuiGraphics guiGraphics, double deltaTime, float alpha, Font
 
         guiGraphics.pose().pushMatrix();
         guiGraphics.pose().translate(renderedPos.x, renderedPos.y);
-        guiGraphics.pose().rotate((float)(-QuitGame.rotAngle * Math.PI) / 180f);
-        guiGraphics.drawString(font, String.valueOf(character), 0, 0, ARGB.color(alpha, 16776960));
+        guiGraphics.pose().rotate((float)(-ReorderableSplashText.SPLASH_TILT_ANGLE * Math.PI) / 180f);
+        guiGraphics.drawString(font, getComponent(), 0, 0, 0xFFFFFFFF /*ARGB.color(alpha, 16776960)*/);
         guiGraphics.pose().popMatrix();
     }
 
@@ -69,7 +71,11 @@ public void renderBoundary(GuiGraphics guiGraphics, double deltaTime, Font font)
         double endX = ((width + 0.5) * QuitGame.scale);
         double endY = ((8 + 2) * QuitGame.scale);
 
-        guiGraphics.submitOutline((int)startX, (int)startY, (int)endX, (int)endY, 0xFFFFFFFF);
+        guiGraphics.renderOutline((int)startX, (int)startY, (int)endX, (int)endY, 0xFFFFFFFF);
+    }
+
+    public Component getComponent() {
+        return Component.literal(character).withStyle(style);
     }
 
     public void dragged() {

src/main/java/com/lx862/quitgame/config/Config.java

@@ -0,0 +1,25 @@
+package com.lx862.quitgame.config;
+
+import com.lx862.quitgame.QuitGame;
+import folk.sisby.kaleido.api.WrappedConfig;
+import folk.sisby.kaleido.lib.quiltconfig.api.annotations.Comment;
+import folk.sisby.kaleido.lib.quiltconfig.api.values.ValueList;
+import net.fabricmc.loader.api.FabricLoader;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public class QuitGameConfig extends WrappedConfig {
+    public static final Path configDir = FabricLoader.getInstance().getConfigDir();
+    public static final QuitGameConfig INSTANCE = createToml(configDir, "", QuitGame.MOD_ID, QuitGameConfig.class);
+
+    @Comment("Whether to directly unlock the game, the splash will still be reorderable after that.")
+    public boolean alwaysUnlock = false;
+
+    @Comment("A list of keywords the rearranged splash have to start with in order to unlock the game")
+    public List<String> keywords = ValueList.create("", "init", "start", "menu", "play", "poison");
+
+    // Static initialization
+    public static void init() {
+    }
+}