[ALPHA] Port to 26.1-alpha.7

* dependency updates
  - Minecraft 26.1-snapshot-7
  - Java 25
  - fabric api 0.143.4+26.1
  - fabric loader 0.18.4
  - Gradle 9.3.0
  - SoundCategories
  - fabric-loom -> net.fabricmc.fabric-loom 1.15

* mappings migration
  - yarn -> official

Author: lonefelidae16

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [ 21 ]
+        java: [ 25 ]
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     steps:

build.gradle

@@ -2,7 +2,7 @@ import com.google.gson.JsonParser
 import com.google.gson.JsonPrimitive
 
 plugins {
-    id "fabric-loom"
+    id 'net.fabricmc.fabric-loom'
     id "maven-publish"
     id 'com.palantir.git-version'
 }
@@ -99,46 +99,28 @@ allprojects {
 }
 
 var devLibsPaths = '**/build/devlibs/*-dev.jar'
+var libsPaths = '**/build/libs/*.jar'
 var sourcesPaths = '**/*-sources.jar'
 
 dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings "net.fabricmc:yarn:${project.minecraft_version}${project.yarn_mappings}:v2"
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+    implementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 
     implementation include("me.lonefelidae16:groominglib:${project.groom_version}")
 
     // <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.6'))
-    compileOnly include(project(path: 'versioned:es1.21.5'))
-    compileOnly include(project(path: 'versioned:es1.21.4'))
-    compileOnly include(project(path: 'versioned:es1.21.2'))
-    compileOnly include(project(path: 'versioned:es1.21'))
-    // 1.20 family
-    compileOnly include(project(path: 'versioned:es1.20.5'))
-    compileOnly include(project(path: 'versioned:es1.20.2'))
-    compileOnly include(project(path: 'versioned:es1.20'))
-    // 1.19 family
-    compileOnly include(project(path: 'versioned:es1.19.4'))
-    compileOnly include(project(path: 'versioned:es1.19.3'))
-    compileOnly include(project(path: 'versioned:es1.19.1'))
-    compileOnly include(project(path: 'versioned:es1.19'))
-    // 1.18 family
-    compileOnly include(project(path: 'versioned:es1.18.2'))
-    compileOnly include(project(path: 'versioned:es1.18'))
+    compileOnly include(project(path: 'versioned:es26.1'))
     // </editor-fold>
 
     // Sound Categories modules
     compileOnly include(project(path: 'sound-categories'))
 
     // DevLaunch
-    runtimeOnly fileTree(dir: 'logics', exclude: [sourcesPaths], include: [devLibsPaths])
-    runtimeOnly fileTree(dir: 'versioned', exclude: [sourcesPaths], include: [devLibsPaths])
-    runtimeOnly fileTree(dir: 'sound-categories', exclude: [sourcesPaths], include: [devLibsPaths])
+    runtimeOnly fileTree(dir: 'logics', exclude: [sourcesPaths], include: [devLibsPaths, libsPaths])
+    runtimeOnly fileTree(dir: 'versioned', exclude: [sourcesPaths], include: [devLibsPaths, libsPaths])
+    runtimeOnly fileTree(dir: 'sound-categories', exclude: [sourcesPaths], include: [devLibsPaths, libsPaths])
 }
 
 jar {
@@ -151,12 +133,6 @@ publishing {
     publications {
         mavenJava(MavenPublication) {
             from components.java
-            artifact(remapJar) {
-                builtBy remapJar
-            }
-            artifact(sourcesJar) {
-                builtBy remapSourcesJar
-            }
         }
     }
 

gradle.properties

@@ -5,14 +5,13 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-minecraft_version=1.21.11
-yarn_mappings=+build.4
+minecraft_version=26.1-snapshot-7
 loader_version=0.18.4
-loom_version=1.14-SNAPSHOT
+loom_version=1.15-SNAPSHOT
 #Fabric api
-fabric_api_version=0.141.1+1.21.11
+fabric_api_version=0.143.4+26.1
 # Java
-java_lang_version=17
+java_lang_version=25
 # Mod Properties
 mod_version=3.0.0
 maven_group=dev.stashy
@@ -27,4 +26,4 @@ mod_page=https://github.com/lonefelidae16/extra-sounds/blob/dev/README.md
 mod_sources=https://github.com/lonefelidae16/extra-sounds
 mod_issues=https://github.com/lonefelidae16/extra-sounds/issues
 mod_license=CC0-1.0
-mod_support_lowest_mc=1.18
+mod_support_lowest_mc=26.1-alpha.1

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom'
+    id 'net.fabricmc.fabric-loom'
 }
 
 var extraSounds = project.parent
@@ -12,17 +12,12 @@ base {
 
 dependencies {
     minecraft "com.mojang:minecraft:${extraSounds.minecraft_version}"
-    mappings "net.fabricmc:yarn:${extraSounds.minecraft_version}${extraSounds.yarn_mappings}:v2"
-    modImplementation "net.fabricmc:fabric-loader:${extraSounds.loader_version}"
+    implementation "net.fabricmc:fabric-loader:${extraSounds.loader_version}"
 
     implementation "me.lonefelidae16:groominglib:${extraSounds.groom_version}"
 
-    compileOnly project(path: ':sound-categories:shared')
+    compileOnly project(path: ':sound-categories')
 
     // Integrations
-    modCompileOnly "maven.modrinth:midnightcontrols:${extraSounds.mn_ctrls_version}"
-}
-
-loom {
-    accessWidenerPath = file("src/main/resources/extrasounds.accesswidener")
-}
+    compileOnly "maven.modrinth:midnightcontrols:${extraSounds.mn_ctrls_version}"
+}

logics/build.gradle

@@ -6,7 +6,7 @@
 import dev.stashy.extrasounds.sounds.SoundType;
 import dev.stashy.extrasounds.sounds.Sounds;
 import me.lonefelidae16.groominglib.api.PrefixableMessageFactory;
-import net.minecraft.util.Identifier;
+import net.minecraft.resources.Identifier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -46,7 +46,7 @@ public static Identifier getClickId(Identifier id, SoundType type) {
                         )
                 );
             }
-            return Objects.requireNonNull(MAIN.generateIdentifier(ExtraSounds.MODID, "%s.%s.%s".formatted(prefix, namespace, path)));
+            return Identifier.fromNamespaceAndPath(ExtraSounds.MODID, "%s.%s.%s".formatted(prefix, namespace, path));
         } catch (Exception ex) {
             ExtraSounds.LOGGER.error("Failed to create Click Id.", ex);
         }
@@ -66,6 +66,6 @@ public static Identifier generateIdentifier(String path) {
     }
 
     public static Identifier generateIdentifier(String namespace, String path) {
-        return MAIN.generateIdentifier(namespace, path);
+        return Identifier.fromNamespaceAndPath(namespace, path);
     }
 }

logics/src/main/java/dev/stashy/extrasounds/logics/ExtraSounds.java

@@ -1,37 +1,48 @@
 package dev.stashy.extrasounds.logics;
 
 import dev.stashy.soundcategories.CategoryLoader;
-import net.minecraft.sound.SoundCategory;
+import net.minecraft.sounds.SoundSource;
 
 public final class Mixers implements CategoryLoader {
     @Register(master = true, defaultLevel = 0.33f, preview = ExtraSounds.MODID + ":item.pickup_all")
-    public static SoundCategory MASTER;
+    public static SoundSource MASTER;
+
     @Register(preview = ExtraSounds.MODID + ":item.pickup_all")
-    public static SoundCategory INVENTORY;
+    public static SoundSource INVENTORY;
+
     @Register(preview = ExtraSounds.MODID + ":hotbar_scroll")
-    public static SoundCategory HOTBAR;
+    public static SoundSource HOTBAR;
+
     @Register(preview = ExtraSounds.MODID + ":chat.message")
-    public static SoundCategory CHAT;
+    public static SoundSource CHAT;
+
     @Register(preview = ExtraSounds.MODID + ":chat.mention")
-    public static SoundCategory CHAT_MENTION;
+    public static SoundSource CHAT_MENTION;
+
     @Register(toggle = true, preview = ExtraSounds.MODID + ":keyboard.screenshot")
-    public static SoundCategory SCREENSHOT;
+    public static SoundSource SCREENSHOT;
+
     @Register(preview = {
             ExtraSounds.MODID + ":effect.add.positive",
             ExtraSounds.MODID + ":effect.add.negative"
     })
-    public static SoundCategory EFFECTS;
+    public static SoundSource EFFECTS;
+
     @Register(preview = ExtraSounds.MODID + ":keyboard.type")
-    public static SoundCategory TYPING;
+    public static SoundSource TYPING;
+
     @Register(preview = ExtraSounds.MODID + ":action.bow")
-    public static SoundCategory ITEM_INTR;
+    public static SoundSource ITEM_INTR;
+
     @Register(preview = {
             ExtraSounds.MODID + ":action.redstone_component.on",
             ExtraSounds.MODID + ":action.redstone_component.off"
     })
-    public static SoundCategory BLOCK_INTR;
+    public static SoundSource BLOCK_INTR;
+
     @Register(defaultLevel = 0.f, preview = ExtraSounds.MODID + ":entity.poof")
-    public static SoundCategory ENTITY;
+    public static SoundSource ENTITY;
+
     @Register(toggle = true, preview = ExtraSounds.MODID + ":item.drop")
-    public static SoundCategory ITEM_DROP;
+    public static SoundSource ITEM_DROP;
 }