fix: forge mixins

build.gradle

@@ -61,7 +61,9 @@ dependencies {
     })
 
     modImplementation(include("dev.architectury:architectury-${loader}:${property("deps.arch_api")}"))
-    modImplementation "dev.imb11:mru:${property("deps.mru")}+${mcVersion}+${loader}"
+    modImplementation ("dev.imb11:mru:${property("deps.mru")}+${mcVersion}+${loader}", {
+        transitive = false
+    })
 
     modCompileOnly "dev.emi:emi-${loader}:${property("compile.emi")}"
     modCompileOnly "maven.modrinth:inventorio:${property("compile.inventorio")}"
@@ -75,7 +77,9 @@ dependencies {
         modLocalRuntime modCompileOnly("com.terraformersmc:modmenu:${property("runtime.modmenu")}")
         include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.5.0-beta.2")))
     } else {
-        modImplementation(include("dev.isxander:yet-another-config-lib:${property("deps.yacl")}-${loader}"))
+        modImplementation(include("dev.isxander:yet-another-config-lib:${property("deps.yacl")}-${loader}"), {
+            transitive = false
+        })
 
         "forgeRuntimeLibrary"(implementation include("com.twelvemonkeys.imageio:imageio-core:3.10.0"))
         "forgeRuntimeLibrary"(implementation include("com.twelvemonkeys.imageio:imageio-webp:3.10.0"))
@@ -138,9 +142,10 @@ loom {
     if (loader == "forge") {
         forge {
             convertAccessWideners = true
-            mixinConfig "mru.mixins.json"
+            mixinConfig "sounds.mixins.json"
         }
     }
+    accessWidenerPath = getRootProject().file("src/main/resources/sounds.accesswidener")
 }
 
 java {
@@ -192,6 +197,25 @@ processResources {
             exclude("META-INF/neoforge.mods.toml")
         }
     }
+
+    // expand ${pack_format} in pack.mcmeta
+
+
+    int packFormat;
+    switch (mcVersion) {
+        case "1.20.1":
+            packFormat = 15;
+            break;
+        case "1.21":
+            packFormat = 34;
+            break;
+        default:
+            throw new IllegalArgumentException("Unsupported Minecraft version: " + mcVersion);
+    }
+
+    filesMatching("pack.mcmeta") {
+        expand("pack_format": packFormat)
+    }
 }
 
 jar {

src/main/java/dev/imb11/sounds/gui/DynamicGridWidget.java

@@ -137,7 +137,7 @@ public void calculateLayout() {
             /*? >=1.21 {*/
             child.widget().setHeight(thisCellHeight - padding * 2);
             /*?} else {*/
-            /*((dev.imb11.sounds.mixin.accessors.ClickableWidgetAccessor) child.widget()).setHeight_1_20_1(thisCellHeight - padding * 2);
+            /*child.widget().height = (thisCellHeight - padding * 2);
             *//*?}*/
 
 

src/main/java/dev/imb11/sounds/gui/ImageButtonWidget.java

@@ -1,6 +1,5 @@
 package dev.imb11.sounds.gui;
 
-import dev.imb11.sounds.mixin.accessors.AnimatedDynamicTextureImageAccessor;
 import dev.isxander.yacl3.gui.image.ImageRendererManager;
 import dev.isxander.yacl3.gui.image.impl.AnimatedDynamicTextureImage;
 import net.minecraft.client.MinecraftClient;
@@ -13,6 +12,7 @@
 import net.minecraft.util.math.ColorHelper;
 import net.minecraft.util.math.MathHelper;
 
+import java.lang.reflect.Field;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
@@ -65,16 +65,30 @@ protected void renderWidget(DrawContext context, int mouseX, int mouseY, float d
                 var contentImage = image.get();
                 if (contentImage != null) {
 
-                    // Scale the image so that the image height is the same as the button height.
-                    float neededWidth = ((AnimatedDynamicTextureImageAccessor) contentImage).getFrameWidth() * ((float) this.height / ((AnimatedDynamicTextureImageAccessor) contentImage).getFrameHeight());
-
-                    // Scale the image to fit within the width and height of the button.
-                    context.getMatrices().push();
-                    // gl bilinear scaling.
-                    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-                    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-                    contentImage.render(context, getX(), getY(), (int) Math.max(neededWidth, this.width), delta);
-                    context.getMatrices().pop();
+                    // Using reflection, get value of contentImage.frameWidth and frameHeight
+                    try {
+                        Field frameWidthField = contentImage.getClass().getDeclaredField("frameWidth");
+                        frameWidthField.setAccessible(true);
+                        int frameWidth = frameWidthField.getInt(contentImage);
+
+                        Field frameHeightField = contentImage.getClass().getDeclaredField("frameHeight");
+                        frameHeightField.setAccessible(true);
+                        int frameHeight = frameHeightField.getInt(contentImage);
+
+                        // Use frameWidth and frameHeight as needed
+                        // Scale the image so that the image height is the same as the button height.
+                        float neededWidth = frameWidth * ((float) this.height / frameHeight);
+
+                        // Scale the image to fit within the width and height of the button.
+                        context.getMatrices().push();
+                        // gl bilinear scaling.
+                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+                        contentImage.render(context, getX(), getY(), (int) Math.max(neededWidth, this.width), delta);
+                        context.getMatrices().pop();
+                    } catch (NoSuchFieldException | IllegalAccessException e) {
+                        e.printStackTrace();
+                    }
                 }
             } catch (InterruptedException | ExecutionException ignored) {
             }

src/main/java/dev/imb11/sounds/loaders/forge/SoundsForge.java

@@ -1,15 +1,19 @@
 //? if forge {
 /*package dev.imb11.sounds.loaders.forge;
 
+import dev.architectury.platform.forge.EventBuses;
 import dev.imb11.sounds.SoundsClient;
 import dev.imb11.sounds.gui.SoundsConfigScreen;
 import net.minecraftforge.client.ConfigScreenHandler;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
 @Mod("sounds")
 public class SoundsForge {
     public SoundsForge() {
+        EventBuses.registerModEventBus("sounds", FMLJavaModLoadingContext.get().getModEventBus());
+
         SoundsClient.init();
 
         ModLoadingContext.get().registerExtensionPoint(

src/main/java/dev/imb11/sounds/mixin/BlockSoundMixin.java

@@ -16,6 +16,7 @@
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Debug;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -27,6 +28,7 @@
 @Mixin(AbstractBlock.class)
 /*?} else {*/
 /*@Mixin(Block.class)
+@Debug(export = true)
 *//*?}*/
 public abstract class BlockSoundMixin implements BlockAccessor {
     @Unique
@@ -57,6 +59,7 @@ public abstract class BlockSoundMixin implements BlockAccessor {
     @Inject(method = "getSoundGroup", at = @At("HEAD"), cancellable = true)
     public void $manageCustomSounds(BlockState state, CallbackInfoReturnable<BlockSoundGroup> cir) {
 //        if(MinecraftClient.getInstance().world == null) return;
+        SoundsClient.LOGGER.info("Getting sound group for " + state.getBlock().getTranslationKey());
         try {
             if(!hasFetched) {
                 sounds$prepareTagPair(Registries.BLOCK.getId(state.getBlock()));

src/main/resources/fabric.mod.json

@@ -13,6 +13,7 @@
   },
   "license": "ARR",
   "icon": "assets/sounds/icon.png",
+  "accessWidener": "sounds.accesswidener",
   "environment": "client",
   "entrypoints": {
     "client": [

src/main/resources/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+    "pack": {
+        "description": "Library mod providing compatability utilities and other stuff.",
+        "pack_format": ${pack_format}
+    }
+}

src/main/resources/sounds.accesswidener

@@ -0,0 +1,2 @@
+accessWidener   v2  named
+accessible field net/minecraft/client/gui/widget/ClickableWidget height I

src/main/resources/sounds.mixins.json

@@ -10,8 +10,6 @@
         "BlockSoundMixin",
         "SoundsOptionsScreenMixin",
         "TitleScreenWidget",
-        "accessors.AnimatedDynamicTextureImageAccessor",
-        "accessors.ClickableWidgetAccessor",
         "accessors.BlockAccessor",
         "compat.EmiSoundEffects",
         "compat.InventiveInventoryCompatMixin",