[Patch] More patches.

Author: coredex-source

common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/branding/DebugScreenEntriesInvoker.java

@@ -0,0 +1,18 @@
+package org.embeddedt.modernfix.common.mixin.feature.branding;
+
+import net.minecraft.client.gui.components.debug.DebugScreenEntries;
+import net.minecraft.client.gui.components.debug.DebugScreenEntry;
+import net.minecraft.resources.ResourceLocation;
+import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+
+@ClientOnlyMixin
+@Mixin(DebugScreenEntries.class)
+public interface DebugScreenEntriesInvoker {
+    @Invoker("register")
+    static ResourceLocation mfix$register(ResourceLocation name, DebugScreenEntry entry) {
+        throw new RuntimeException("Invoker mixin didn't work?");
+    };
+}

common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/branding/DebugScreenEntriesMixin.java

@@ -0,0 +1,27 @@
+package org.embeddedt.modernfix.common.mixin.feature.branding;
+
+import net.minecraft.client.gui.components.debug.DebugScreenEntries;
+import net.minecraft.client.gui.components.debug.DebugScreenEntryStatus;
+import net.minecraft.resources.ResourceLocation;
+import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
+import org.embeddedt.modernfix.screen.ModernFixDebugScreen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@ClientOnlyMixin
+@Mixin(DebugScreenEntries.class)
+public class DebugScreenEntriesMixin {
+    @ModifyVariable(method = "<clinit>", at = @At(value = "STORE"), ordinal = 0)
+    private static Map<ResourceLocation, DebugScreenEntryStatus> insertIntoDefaultProfile(Map<ResourceLocation, DebugScreenEntryStatus> map) {
+        // Map is immutable, so we need to build a new one with the added entry
+        var stream = map.entrySet().stream();
+        var new_map = Map.of(ModernFixDebugScreen.MODERNFIX_ENTRY, DebugScreenEntryStatus.IN_F3).entrySet().stream();
+
+        return Stream.concat(stream, new_map).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+    }
+}

common/src/main/java/org/embeddedt/modernfix/screen/ModernFixDebugScreen.java

@@ -0,0 +1,31 @@
+package org.embeddedt.modernfix.screen;
+
+import net.minecraft.client.gui.components.debug.DebugScreenDisplayer;
+import net.minecraft.client.gui.components.debug.DebugScreenEntry;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.chunk.LevelChunk;
+import org.embeddedt.modernfix.ModernFix;
+import org.embeddedt.modernfix.ModernFixClient;
+import org.embeddedt.modernfix.common.mixin.feature.branding.DebugScreenEntriesInvoker;
+import org.jetbrains.annotations.Nullable;
+
+public class ModernFixDebugScreen {
+    public static final ResourceLocation MODERNFIX_GROUP = ResourceLocation.fromNamespaceAndPath(ModernFix.MODID, "modernfix_info");
+    public static ResourceLocation MODERNFIX_ENTRY = DebugScreenEntriesInvoker.mfix$register(
+            MODERNFIX_GROUP,
+            new ModernFixDebugEntry()
+    );
+
+    static class ModernFixDebugEntry implements DebugScreenEntry {
+        @Override
+        public void display(DebugScreenDisplayer displayer, @Nullable Level level, @Nullable LevelChunk clientChunk, @Nullable LevelChunk serverChunk) {
+            displayer.addToGroup(MODERNFIX_GROUP, ModernFixClient.INSTANCE.brandingString);
+        }
+
+        @Override
+        public boolean isAllowed(boolean reducedDebugInfo) {
+            return true;
+        }
+    }
+}

fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/feature/branding/GuiMixin.java

@@ -7,7 +7,7 @@ mixinextras_version=0.4.1
 mod_id=modernfix
 minecraft_version=1.21.10
 enabled_platforms=neoforge,fabric
-forge_version=21.10.38-beta
+forge_version=21.10.55-beta
 parchment_version=2025.10.12
 parchment_mc_version=1.21.10
 refined_storage_version=4392788
@@ -27,7 +27,7 @@ continuity_version=3.0.0-beta.4+1.20.2
 modmenu_version=15.0.0
 diagonal_fences_version=4558828
 
-spark_version=6225208
+spark_version=7094485
 
 use_fabric_api_at_runtime=true
 

gradle.properties

@@ -24,9 +24,6 @@
 import org.embeddedt.modernfix.ModernFixClient;
 import org.embeddedt.modernfix.screen.ModernFixConfigScreen;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class ModernFixClientForge {
     private static ModernFixClient commonMod;
     public static KeyMapping.Category MODERNFIX_KEYS = KeyMapping.Category.register(ResourceLocation.fromNamespaceAndPath(ModernFix.MODID, "key.modernfix"));
@@ -60,8 +57,6 @@ public void onConfigKey(ClientTickEvent.Pre event) {
         }
     }
 
-    private static final List<String> brandingList = new ArrayList<>();
-
     @SubscribeEvent
     public void onDisconnect(LevelEvent.Unload event) {
         if(event.getLevel().isClientSide()) {