it's beautiful (port 26.1)

Author: isXander

.bugs

@@ -5,7 +5,6 @@
 patched 577 client basic
 patched 4490 client basic
 patched 12062 client basic
-patched 22882 client basic
 patched 35361 client basic
 patched 46737 client basic
 patched 46766 client basic
@@ -47,7 +46,6 @@ patched 280220 client basic
 patched 298225 client basic
 patched 298558 client basic
 
-patched 2025 server basic
 patched 7569 server basic
 patched 8187 server gameplay
 patched 30391 server basic
@@ -63,7 +61,6 @@ patched 119754 server basic
 patched 121706 server basic
 patched 121903 server basic
 patched 123450 server basic
-patched 123605 server basic
 patched 129909 server basic
 patched 132878 server basic
 patched 134110 server basic
@@ -79,15 +76,13 @@ patched 177381 server basic
 patched 179072 server basic
 patched 183990 server basic
 patched 187100 server basic
-patched 199467 server basic
 patched 200418 server basic
 patched 201374 server basic
 patched 202637 server basic
 patched 206705 server basic
 patched 206922 server basic
 patched 214147 server basic
 patched 215530 server basic
-patched 219981 server basic
 patched 221257 server basic
 patched 223153 server basic
 patched 224729 server basic
@@ -141,6 +136,7 @@ previous 135971 24w33a
 previous 12829 24w44a
 previous 55347 24w44a
 previous 111516 24w44a
+previous 263865 25w04a
 previous 112730 25w21a
 previous 183776 25w31a
 previous 46503 25w33a
@@ -152,3 +148,5 @@ previous 267469 1.21.9
 previous 201723 1.21.9
 previous 22882 25w41a
 previous 199467 25w45a
+previous 219981 26.1-snapshot-1
+previous 123605 26.1-snapshot-6

build.gradle.kts

@@ -16,12 +16,8 @@ plugins {
 val debugifyVersion = "1.0"
 
 modstitch {
-    minecraftVersion = "1.21.11"
-    modLoaderVersion = "0.18.4"
-
-    parchment {
-        mappingsVersion = "2025.12.20"
-    }
+    minecraftVersion = property("minecraftVersion")!!.toString()
+    modLoaderVersion = "0.18.6"
 
     metadata {
         modVersion = minecraftVersion.map { "$it+$debugifyVersion" }
@@ -45,8 +41,6 @@ modstitch {
 
     loom {
         configureLoom {
-            mixin.useLegacyMixinAp = false
-
             splitEnvironmentSourceSets()
 
             val gametest by sourceSets.registering {
@@ -56,7 +50,6 @@ modstitch {
                 runtimeClasspath += sourceSets["client"].runtimeClasspath
             }
 
-            //createProxyConfigurations(sourceSets["client"])
             createProxyConfigurations(gametest.get())
 
             mods.register("debugify") {
@@ -89,13 +82,7 @@ repositories {
         forRepository { maven("https://maven.terraformersmc.com/releases") }
         filter { includeGroup("com.terraformersmc") }
     }
-    exclusiveContent {
-        forRepository { maven("https://maven.isxander.dev/releases") }
-        filter {
-            includeGroup("dev.isxander")
-            includeGroup("org.quiltmc.parsers")
-        }
-    }
+    maven("https://maven.isxander.dev/releases")
 }
 
 val fabricApiVersion: String by project
@@ -104,15 +91,13 @@ val mixinExtrasVersion: String by project
 val modMenuVersion: String by project
 
 dependencies {
-    modImplementation(fabricApi.module("fabric-resource-loader-v0", fabricApiVersion))
-    modImplementation("net.fabricmc.fabric-api:fabric-api:$fabricApiVersion")
+    implementation("net.fabricmc.fabric-api:fabric-api:$fabricApiVersion")
 
-    "modClientImplementation"("dev.isxander:yet-another-config-lib:$yaclVersion")
-    "modClientImplementation"("com.terraformersmc:modmenu:$modMenuVersion")
+    "clientImplementation"("dev.isxander:yet-another-config-lib:$yaclVersion")
+    "clientImplementation"("com.terraformersmc:modmenu:$modMenuVersion")
 
     "gametestImplementation"(sourceSets.main.get().output)
     "gametestImplementation"(sourceSets["client"].output)
-    "modGametestImplementation"(fabricApi.module("fabric-gametest-api-v1", fabricApiVersion))
 
     nmcpAggregation(project)
 }
@@ -129,7 +114,7 @@ tasks.javadoc {
 publishMods {
     displayName = modstitch.metadata.modVersion.map { "Debugify $it" }
     version = modstitch.metadata.modVersion
-    file = tasks.remapJar.get().archiveFile
+    //file = tasks.remapJar.get().archiveFile
     type = STABLE
     modLoaders.add("fabric")
 

gradle.properties

@@ -2,14 +2,15 @@ org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 org.gradle.parallel.threads=4
 
-modstitch.platform=fabric-loom-remap
+modstitch.platform=fabric-loom
 
 pub.modrinthId=QwxR6Gcd
 pub.curseforgeId=596224
 pub.curseforgeSlug=debugify
 githubProject=isXander/Debugify
 
 # Libraries
-fabricApiVersion=0.139.4+1.21.11
-yaclVersion=3.8.1+1.21.11-fabric
-modMenuVersion=17.0.0-alpha.1
+minecraftVersion=26.1.2
+fabricApiVersion=0.145.4+26.1.2
+yaclVersion=3.9.2+26.1-fabric
+modMenuVersion=18.0.0-alpha.8

scripts/check_bug_fixes.py

@@ -1,4 +1,3 @@
-import re
 import requests
 import sys
 import os
@@ -22,47 +21,49 @@ def version_idx(version):
 minecraft_version_idx = version_idx(minecraft_version)
 print(f'Minecraft Version: {minecraft_version}')
 
-with open('../PATCHED.md', 'r') as f:
-    patched_lines = f.readlines()
+with open('../.bugs', 'r') as f:
+    bugs_lines = f.readlines()
 
 bugs = []
-start_unpatched = False
-pattern = re.compile('\\|.+\\| \\[(MC-\\d+)]')
+for line in bugs_lines:
+    parts = line.split()
+    if len(parts) >= 3 and parts[0] == 'patched':
+        bugs.append((f'MC-{parts[1]}', parts[2]))
 
-for line in patched_lines:
-    if line.startswith('## '):
-        if start_unpatched:
-            break
-        start_unpatched = line == '## Unpatched in vanilla\n'
-
-    if not start_unpatched:
+resolved_count = 0
+duplicate_count = 0
+for bug, side in bugs:
+    try:
+        response = requests.get(f'https://mojira.dev/api/v1/issues/{bug}')
+    except Exception as e:
+        print(f'Failed to fetch {bug}: {e}')
         continue
 
-    match = re.search(pattern, line)
-    if match is None:
+    if not response.ok:
+        print(f'Failed to fetch {bug}: HTTP {response.status_code} {response.text.strip()}')
         continue
-    bugs.append(match.group(1))
 
-resolved_count = 0
-duplicate_count = 0
-for bug in bugs:
-    response = requests.get(f'https://bugs.mojang.com/rest/api/2/issue/{bug}')
-    json_response = response.json()
+    try:
+        json_response = response.json()
+    except Exception as e:
+        text = response.text.strip()
+        if '\n' not in text and len(text) < 100:
+            print(f'\033[35m{bug} ({side}): {text}\033[0m')
+        else:
+            print(f'Failed to parse response for {bug} ({side}): {e}\n{text}')
+        continue
 
-    fields = json_response['fields']
-    resolution_id = int(fields['resolution']['id']) if fields['resolution'] is not None else -1
+    resolution = json_response['resolution']
+    fix_versions = [v.replace(' Pre-release ', '-pre').replace(' Release Candidate ', '-rc').replace(' Snapshot ', '-snapshot-').replace('Minecraft ', '')
+                    for v in (json_response.get('fix_versions') or [])]
 
     message_color = ''
-    match resolution_id:
-        case 1 | 5:  # resolved
+    match resolution:
+        case 'Fixed' | "Won't Fix" | 'Works As Intended':
             resolved_count += 1
-            bug_status = "Resolved"
+            bug_status = resolution
             message_color = '\033[91m'
 
-            fix_versions = []
-            for v in fields['fixVersions'] or []:
-                fix_versions.append(v['name'].replace(' Pre-release ', '-pre').replace(' Release Candidate ', '-rc'))
-
             if len(fix_versions) > 0:
                 bug_status += f' in {", ".join(fix_versions)}'
 
@@ -71,32 +72,17 @@ def version_idx(version):
                 message_color = '\033[33m'
                 resolved_count -= 1
 
-        case 3:  # duplicate
+        case 'Duplicate':
             duplicate_count += 1
             bug_status = "Duplicate"
             message_color = '\033[33m'
 
-            duplicates = None
-            duplicate_fixed = False
-            issue_links = fields['issuelinks']
-            for issue in issue_links:
-                if int(issue['type']['id']) == 10102:
-                    duplicates = issue['outwardIssue']['key']
-                    duplicate_fixed = int(issue['outwardIssue']['fields']['status']['id']) == 1 | 5
-                    break
-
-            if duplicates is not None:
-                bug_status += f' of {duplicates}'
-                if duplicate_fixed:
-                    bug_status += f' which is resolved'
-                    message_color = '\033[91m'
-                    resolved_count += 1
-
         case _:
             bug_status = 'OK!'
 
-    message = f"{message_color}{bug}: {bug_status}\033[0m"
-    print(message, file=sys.stderr if resolution_id == 1 else sys.stdout)
+    is_resolved = resolution in ('Fixed', "Won't Fix", 'Works As Intended')
+    message = f"{message_color}{bug} ({side}): {bug_status}\033[0m"
+    print(message, file=sys.stderr if is_resolved else sys.stdout)
 
 if resolved_count == 0 and duplicate_count == 0:
     print('\nNothing to report!')

src/client/java/dev/isxander/debugify/client/gui/NoYACLScreen.java

@@ -2,98 +2,26 @@
 
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.ChatFormatting;
-import net.minecraft.client.gui.ActiveTextCollector;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.AlertScreen;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.Style;
-import net.minecraft.util.FormattedCharSequence;
-import net.minecraft.util.Mth;
 
 import java.net.URI;
-import java.util.List;
-import org.jspecify.annotations.Nullable;
-
-public class NoYACLScreen extends Screen {
-    private final Screen parent;
-
-    private final FormattedCharSequence title;
-    private List<FormattedCharSequence> wrappedText;
-    private final Component unwrappedText;
 
+public class NoYACLScreen extends AlertScreen {
     public NoYACLScreen(Screen parent) {
-        super(Component.translatable("debugify.no_yacl.title"));
-        this.parent = parent;
-        this.title = Component.translatable("debugify.no_yacl.title").withStyle(ChatFormatting.BOLD).getVisualOrderText();
-        this.unwrappedText = Component.translatable("debugify.no_yacl.description",
-                Component.literal("YetAnotherConfigLib").withStyle(style -> style
-                        .withClickEvent(new ClickEvent.OpenUrl(URI.create("https://curseforge.com/minecraft/mc-mods/yacl")))
-                        .applyFormats(ChatFormatting.BLUE, ChatFormatting.UNDERLINE)),
-                Component.literal(".minecraft/config/debugify.json").withStyle(style -> style
-                        .withClickEvent(new ClickEvent.OpenFile(FabricLoader.getInstance().getConfigDir()))
-                        .applyFormats(ChatFormatting.BLUE, ChatFormatting.UNDERLINE)));
-    }
-
-    @Override
-    protected void init() {
-        this.wrappedText = this.font.split(unwrappedText, width - 50);
-        this.addRenderableWidget(
-                Button.builder(CommonComponents.GUI_BACK, button -> minecraft.setScreen(parent))
-                        .pos(
-                                (this.width - 150) / 2,
-                                Mth.clamp(90 + this.wrappedText.size() * 9 + 12, this.height / 6 + 96, this.height - 24)
-                        )
-                        .size(150, 20)
-                        .build()
+        super(
+                () -> Minecraft.getInstance().setScreen(parent),
+                Component.translatable("debugify.no_yacl.title").withStyle(ChatFormatting.BOLD),
+                Component.translatable("debugify.no_yacl.description",
+                        Component.literal("YetAnotherConfigLib").withStyle(style -> style
+                                .withClickEvent(new ClickEvent.OpenUrl(URI.create("https://curseforge.com/minecraft/mc-mods/yacl")))
+                                .applyFormats(ChatFormatting.BLUE, ChatFormatting.UNDERLINE)),
+                        Component.literal(".minecraft/config/debugify.json").withStyle(style -> style
+                                .withClickEvent(new ClickEvent.OpenFile(FabricLoader.getInstance().getConfigDir()))
+                                .applyFormats(ChatFormatting.BLUE, ChatFormatting.UNDERLINE)))
         );
     }
-
-    @Override
-    public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
-        super.render(graphics, mouseX, mouseY, delta);
-
-        graphics.drawCenteredString(this.font, title, this.width / 2, 70, -1);
-        int y = 90;
-        for (FormattedCharSequence line : wrappedText) {
-            graphics.drawCenteredString(this.font, line, this.width / 2, y, -1);
-            y += this.font.lineHeight;
-        }
-    }
-
-    @Override
-    public boolean mouseClicked(MouseButtonEvent mouseButtonEvent, boolean bl) {
-        if (super.mouseClicked(mouseButtonEvent, bl)) {
-            return true;
-        }
-
-        Style style = this.getStyle((int) mouseButtonEvent.x(), (int) mouseButtonEvent.y());
-        return this.handleClickEvent(style.getClickEvent());
-    }
-
-    protected Style getStyle(int mouseX, int mouseY) {
-        int y = mouseY - 90;
-        int line = y / this.font.lineHeight;
-
-        if (y < 0 || y > y + this.wrappedText.size() * this.font.lineHeight) return null;
-        if (line < 0 || line >= this.wrappedText.size()) return null;
-
-        FormattedCharSequence text = this.wrappedText.get(line);
-        int x = mouseX - (this.width / 2 - this.font.width(text) / 2);
-
-        ActiveTextCollector.ClickableStyleFinder clickableStyleFinder = new ActiveTextCollector.ClickableStyleFinder(this.font, mouseX, mouseY);
-        return clickableStyleFinder.result();
-    }
-
-    protected boolean handleClickEvent(@Nullable ClickEvent clickEvent) {
-        if (clickEvent == null) {
-            return false;
-        }
-
-        defaultHandleGameClickEvent(clickEvent, this.minecraft, this);
-        return true;
-    }
 }