remove modfusioner, fix ftbq mixin, rework mixinplugin

Author: TexBlock

.github/workflows/build.yml

@@ -29,31 +29,14 @@ jobs:
           chmod +x gradlew
           ./gradlew build
 
-      - name: Merge Fabric & Neoforge JARs
-        run: |
-          chmod +x gradlew
-          ./gradlew fusejars
-
       - name: Upload fabric artifacts
         uses: actions/upload-artifact@v4
         with:
           name: fabric-artifacts
           path: ${{ github.workspace }}/fabric/build/libs
 
-      - name: Upload forge artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: forge-artifacts
-          path: ${{ github.workspace }}/forge/build/libs
-
       - name: Upload neoforge artifacts
         uses: actions/upload-artifact@v4
         with:
           name: neoforge-artifacts
           path: ${{ github.workspace }}/neoforge/build/libs
-
-      - name: Upload merged artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: merged
-          path: ${{ github.workspace }}/build/merged/*

build.gradle

@@ -1,8 +1,7 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.11-SNAPSHOT" apply false
     id "com.gradleup.shadow" version "9.+" apply false
-    id "com.hypherionmc.modutils.modfusioner" version "1.+"
 }
 
 architectury {
@@ -35,29 +34,12 @@ allprojects {
         options.release = 21
     }
 
-    java {
-        withSourcesJar()
-    }
-}
-
-fusioner {
-    packageGroup = rootProject.maven_group
-    mergedJarName = "${rootProject.archives_base_name}.jar"
-    outputDirectory = "build/merged"
-    jarVersion = rootProject.version
-
-    fabric {
-        projectName = "fabric"
-        inputTaskName = "remapJar"
-    }
-
-    forge {
-        projectName = "forge"
-        inputTaskName = "remapJar"
+    repositories {
+        maven { url 'https://maven.fallenbreath.me/releases' }
+        maven { url "https://maven.ftb.dev/releases" }
     }
 
-    neoforge {
-        projectName = "neoforge"
-        inputTaskName = "remapJar"
+    java {
+        withSourcesJar()
     }
 }

common/build.gradle

@@ -2,13 +2,11 @@ architectury {
     common(rootProject.enabled_platforms.split(","))
 }
 
-repositories {
-    maven { url "https://maven.ftb.dev/releases" }
-}
-
 dependencies {
     // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
     // Do NOT use other classes from fabric loader
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modImplementation "dev.ftb.mods:ftb-quests:${rootProject.ftb_quests_version}"
+
+    modImplementation "me.fallenbreath:conditional-mixin-common:${rootProject.conditional_mixin_version}"
 }

…tor/mixin/ftbquests/FTBQMixinPlugin.java …turelocaleredirector/TLRMixinPlugin.javacommon/src/main/java/com/wulian/texturelocaleredirector/mixin/ftbquests/FTBQMixinPlugin.java renamed to common/src/main/java/com/wulian/texturelocaleredirector/TLRMixinPlugin.java common/src/main/java/com/wulian/texturelocaleredirector/mixin/ftbquests/FTBQMixinPlugin.java renamed to common/src/main/java/com/wulian/texturelocaleredirector/TLRMixinPlugin.java

@@ -1,13 +1,13 @@
-package com.wulian.texturelocaleredirector.mixin.ftbquests;
+package com.wulian.texturelocaleredirector;
 
+import me.fallenbreath.conditionalmixin.api.mixin.RestrictiveMixinConfigPlugin;
 import org.objectweb.asm.tree.ClassNode;
-import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
 
 import java.util.List;
 import java.util.Set;
 
-public class FTBQMixinPlugin implements IMixinConfigPlugin {
+public class TLRMixinPlugin extends RestrictiveMixinConfigPlugin {
     @Override
     public void onLoad(String mixinPackage) {
     }
@@ -19,10 +19,6 @@ public String getRefMapperConfig() {
 
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        if (mixinClassName.endsWith("ChapterImageMixin")) {
-            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-            return classLoader.getResource("dev/ftb/mods/ftbquests/quest/ChapterImage.class") != null;
-        }
         return true;
     }
 

common/src/main/java/com/wulian/texturelocaleredirector/mixin/ftbquests/ChapterImageMixin.java

@@ -4,10 +4,13 @@
 import com.wulian.texturelocaleredirector.TextureLocaleRedirector;
 import dev.ftb.mods.ftblibrary.icon.Icon;
 import dev.ftb.mods.ftbquests.quest.ChapterImage;
+import me.fallenbreath.conditionalmixin.api.annotation.Condition;
+import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
+@Restriction(require = @Condition("ftbquests"))
 @Mixin(value = ChapterImage.class, remap = false)
 public abstract class ChapterImageMixin {
 
@@ -18,21 +21,31 @@ public abstract class ChapterImageMixin {
     )
     private Icon injectLocalizedImage(Icon image) {
         String currentLang = LangTextureCache.getCurrentLanguage();
-        if ("en_us".equals(currentLang)) {
+
+        if ("en_us".equals(currentLang) || image == null) {
             return image;
         }
 
-        String path = image.toString();
-        if (path.startsWith("textures/")) {
-            String localizedPath = "textures/" + currentLang + "/" + path.substring(9);
+        String originalPath = image.toString();
+        String texturePrefix = "textures/";
+        String textureInsert = currentLang + "/";
+
+        if (originalPath.contains(texturePrefix + currentLang)) {
+            TextureLocaleRedirector.LOGGER.warn("{} already exists in {} path.", currentLang, originalPath);
+            TextureLocaleRedirector.LOGGER.info("ChapterImage icon {}", originalPath);
+            return image;
+        } else {
+            int index = originalPath.indexOf(texturePrefix) + texturePrefix.length();
+            String localizedPath = originalPath.substring(0, index) + textureInsert + originalPath.substring(index);
+
             Icon localizedIcon = Icon.getIcon(localizedPath);
 
             if (!localizedIcon.isEmpty()) {
-                TextureLocaleRedirector.LOGGER.info("Redirected ChapterImage icon {} -> {}", path, localizedPath);
+                TextureLocaleRedirector.LOGGER.info("Redirected ChapterImage icon {} -> {}", originalPath, localizedPath);
                 return localizedIcon;
+            } else {
+                return Icon.getIcon(originalPath.substring(0, index) + originalPath.substring(index));
             }
         }
-
-        return image;
     }
 }

common/src/main/resources/texturelocaleredirector.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "com.wulian.texturelocaleredirector.mixin",
-  "plugin": "com.wulian.texturelocaleredirector.mixin.ftbquests.FTBQMixinPlugin",
+  "plugin": "com.wulian.texturelocaleredirector.TLRMixinPlugin",
   "compatibilityLevel": "JAVA_21",
   "minVersion": "0.8",
   "injectors": {

fabric/build.gradle

@@ -19,15 +19,13 @@ configurations {
     }
 }
 
-repositories {
-    maven { url "https://maven.ftb.dev/releases" }
-}
-
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
     modApi "dev.ftb.mods:ftb-quests-fabric:${rootProject.ftb_quests_version}"
 
+    modImplementation(include("me.fallenbreath:conditional-mixin-fabric:${rootProject.conditional_mixin_version}"))
+
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowBundle(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
 }