[ALPHA] Port to 25w33a

* update dependencies
  - yarn mappings 25w33a+build.8
  - fabric api 0.131.3+1.21.9
  - fabric loader 0.17.2
  - SoundCategories
  - Gradle 9.0.0

* new sounds
  - `item.category.gear.copper`
  - Copper items, tools, armor

* new module
  - `:versioned:es1.21.9`

* into versioned module
  - `logics.mixin.action.entity.LivingEntityMixin`

Author: lonefelidae16

build.gradle

@@ -102,7 +102,7 @@ dependencies {
     // <editor-fold desc="Extra Sounds modules">
     compileOnly include(project(path: 'logics'))
     // 1.21 family
-//    compileOnly include(project(path: 'versioned:es1.21.9'))
+    compileOnly include(project(path: 'versioned:es1.21.9'))
     compileOnly include(project(path: 'versioned:es1.21.6'))
     compileOnly include(project(path: 'versioned:es1.21.5'))
     compileOnly include(project(path: 'versioned:es1.21.4'))

gradle.properties

@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-minecraft_version=1.21.8
-yarn_mappings=+build.1
-loader_version=0.16.14
+minecraft_version=25w33a
+yarn_mappings=+build.8
+loader_version=0.17.2
 loom_version=1.11-SNAPSHOT
 #Fabric api
-fabric_api_version=0.129.0+1.21.8
+fabric_api_version=0.131.3+1.21.9
 # Java
 java_lang_version=17
 # Mod Properties

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -2,6 +2,7 @@
 
 import dev.stashy.extrasounds.logics.ExtraSounds;
 import dev.stashy.extrasounds.logics.impl.state.ActionResultState;
+import dev.stashy.extrasounds.logics.mixin.access.FlowerPotBlockInvoker;
 import dev.stashy.extrasounds.sounds.Sounds;
 import net.minecraft.block.*;
 import net.minecraft.block.entity.BlockEntity;
@@ -100,7 +101,7 @@ public final void onUse(ClientPlayerEntity player, BlockPos blockPos, ActionResu
                 (this.block instanceof FlowerPotBlock potBlock) &&
                 actionResult == ActionResultState.SUCCESS
         ) {
-            if (!potBlock.isEmpty()) {
+            if (!((FlowerPotBlockInvoker) potBlock).invokeIsEmpty()) {
                 // Take from pot
                 ExtraSounds.MANAGER.blockInteract(potBlock.getContent().asItem(), blockPos);
             } else {

gradlew

@@ -0,0 +1,11 @@
+package dev.stashy.extrasounds.logics.mixin.access;
+
+import net.minecraft.block.FlowerPotBlock;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(FlowerPotBlock.class)
+public interface FlowerPotBlockInvoker {
+    @Invoker("isEmpty")
+    boolean invokeIsEmpty();
+}

logics/src/main/java/dev/stashy/extrasounds/logics/impl/AbstractInteractionHandler.java

@@ -49,5 +49,6 @@ private Gear() {
         public static final VersionedSoundEventWrapper TURTLE = ExtraSounds.createEvent("item.category.gear.turtle");
         public static final VersionedSoundEventWrapper ARMADILLO = ExtraSounds.createEvent("item.category.gear.armadillo");
         public static final VersionedSoundEventWrapper WOOD = ExtraSounds.createEvent("item.category.gear.wood");
+        public static final VersionedSoundEventWrapper COPPER = ExtraSounds.createEvent("item.category.gear.copper");
     }
 }

logics/src/main/java/dev/stashy/extrasounds/logics/mixin/access/FlowerPotBlockInvoker.java

@@ -1,3 +1,2 @@
 accessWidener	v2	named
-accessible method net/minecraft/block/FlowerPotBlock isEmpty ()Z
 accessible class net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen$LockableSlot

logics/src/main/java/dev/stashy/extrasounds/sounds/Categories.java

@@ -4,7 +4,8 @@
   "package": "dev.stashy.extrasounds.logics.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "action.entity.LivingEntityMixin",
+    "access.FlowerPotBlockInvoker",
+
     "hotbar.MinecraftClientMixin",
     "inventory.ClientPlayerInteractionManagerMixin",
     "inventory.HandledScreenMixin",