Merge branch 'fabric/26.2' into merge/26.2

Author: coredex-source

gradle.properties

@@ -7,16 +7,16 @@ mod_id=modernfix
 version=5.27.17-build.1
 
 # Minecraft/Fabric
-minecraft_version=26.1.2
-loader_version=0.18.6
-loom_version=1.16-SNAPSHOT
+minecraft_version=26.2
+loader_version=0.19.3
+loom_version=1.17-SNAPSHOT
 
 # Fabric API
-fabric_api_version=0.145.4+26.1.2
+fabric_api_version=0.152.1+26.2
 
 # Dependencies
-mixinextras_version=0.4.1
-modmenu_version=18.0.0-alpha.5
+mixinextras_version=0.5.4
+modmenu_version=20.0.0-beta.2
 
 # For mod sites
 supported_minecraft_versions=~26.1-

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/org/embeddedt/modernfix/screen/OptionList.java

@@ -13,6 +13,7 @@
 import net.minecraft.client.gui.narration.NarratableEntry;
 import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.client.resources.language.I18n;
+import net.minecraft.locale.Language;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.HoverEvent;
 import net.minecraft.network.chat.MutableComponent;
@@ -41,7 +42,7 @@ public class OptionList extends ContainerObjectSelectionList<OptionList.Entry> {
     private static MutableComponent getOptionComponent(Option option) {
         String friendlyKey = "modernfix.option.name." + option.getName();
         MutableComponent baseComponent = Component.literal(option.getSelfName());
-        if(I18n.exists(friendlyKey))
+        if(Language.getInstance().has(friendlyKey))
             return Component.translatable(friendlyKey).withStyle(style -> style.withHoverEvent(new HoverEvent.ShowText(baseComponent)));
         else
             return baseComponent;
@@ -168,7 +169,7 @@ public OptionEntry(String optionName, Option option) {
             }).pos(75, 0).size(20, 20).build();
             String helpKey = "modernfix.option." + optionName;
             String helpText = I18n.get(helpKey);
-            if(!I18n.exists(helpKey) || helpText == null || helpText.isBlank() || helpText.equals(helpKey)) {
+            if(!Language.getInstance().has(helpKey) || helpText == null || helpText.isBlank() || helpText.equals(helpKey)) {
                 this.helpButton.active = false;
                 if(ModernFixPlatformHooks.INSTANCE.isDevEnv() && OPTIONS_MISSING_HELP.add(optionName))
                     ModernFix.LOGGER.warn("Missing help for {}", optionName);

src/main/java/org/embeddedt/modernfix/util/DummyServerConfiguration.java

@@ -87,6 +87,11 @@ public boolean isAllowCommands() {
         return false;
     }
 
+    @Override
+    public void setAllowCommands(boolean allowCommands) {
+
+    }
+
     @Override
     public Difficulty getDifficulty() {
         return null;

src/main/resources/fabric.mod.json

@@ -8,18 +8,18 @@
     "embeddedt"
   ],
   "contact": {
-    "sources": "https://github.com/embeddedt/ModernFix",
-    "homepage": "https://modrinth.com/mod/modernfix",
-    "issues": "https://github.com/embeddedt/ModernFix/issues"
+    "sources": "https://github.com/coredex-source/ModernFix---mVUS",
+    "homepage": "https://modrinth.com/mod/modernfix-mvus",
+    "issues": "https://github.com/coredex-source/ModernFix---mVUS/issues"
   },
   "license": "LGPL-3.0",
   "icon": "icon.png",
   "custom": {
     "modmenu": {
       "links": {
-        "modmenu.kofi": "https://ko-fi.com/embeddedt",
-        "modmenu.github_releases": "https://github.com/embeddedt/ModernFix/releases",
-        "modmenu.curseforge": "https://www.curseforge.com/minecraft/mc-mods/modernfix"
+        "modmenu.kofi": "https://ko-fi.com/coredex",
+        "modmenu.github_releases": "https://github.com/coredex-source/ModernFix---mVUS/releases",
+        "modmenu.curseforge": "https://www.curseforge.com/minecraft/mc-mods/modernfix-mvus"
       }
     }
   },