[WIP][core] Port to 1.21.11

lonefelidae16 · lonefelidae16 · commit ce1210ea7d2a · 2025-12-10T10:48:29.000+09:00
* update dependencies
  - yarn mappings 1.21.11+build.1
  - fabric api 0.139.4+1.21.11
  - fabric loader 0.18.2
  - fabric loom 1.14
  - Gradle 9.2.1
  - SoundCategories

* new sounds
  - Nautilus armor
  - Netherite horse armor
diff --git a/build.gradle b/build.gradle
@@ -9,12 +9,8 @@ plugins {
 
 var targetJavaLang = Integer.parseInt(project.java_lang_version)
 
-tasks.named('runClient').with {
-    if (isPresent()) {
-        configure {
-            dependsOn(build)
-        }
-    }
+tasks.named('runClient').configure {
+    dependsOn(build)
 }
 
 var verStr = (project.findProperty('verStr') ?: versionDetails().gitHash[0..7]).toString()
diff --git a/gradle.properties b/gradle.properties
@@ -5,12 +5,12 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-minecraft_version=1.21.10
+minecraft_version=1.21.11
 yarn_mappings=+build.1
-loader_version=0.17.3
-loom_version=1.11-SNAPSHOT
+loader_version=0.18.2
+loom_version=1.14-SNAPSHOT
 #Fabric api
-fabric_api_version=0.135.0+1.21.10
+fabric_api_version=0.139.4+1.21.11
 # Java
 java_lang_version=17
 # Mod Properties
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
@@ -16,7 +16,7 @@ pluginManagement {
 // SoundCategories modules
 include 'sound-categories', 'sound-categories:shared'
 // 1.21 family
-include 'sound-categories:versioned:sc1.21.9', 'sound-categories:versioned:sc1.21'
+include 'sound-categories:versioned:sc1.21.11', 'sound-categories:versioned:sc1.21.9', 'sound-categories:versioned:sc1.21'
 // 1.20 family
 include 'sound-categories:versioned:sc1.20.5', 'sound-categories:versioned:sc1.20.3', 'sound-categories:versioned:sc1.20.2', 'sound-categories:versioned:sc1.20'
 // 1.19 family
diff --git a/sound-categories b/sound-categories
@@ -1 +1 @@
-Subproject commit b159b93b1615aac424964e8d1371a903f43f62c3
+Subproject commit de300b1886ef1dd024c7ab57560029aea3ed08b6
diff --git a/src/main/resources/assets/extrasounds/sounds.json b/src/main/resources/assets/extrasounds/sounds.json
@@ -1103,6 +1103,16 @@
       }
     ]
   },
+  "item.pickup.minecraft.netherite_horse_armor": {
+    "replace": true,
+    "sounds": [
+      {
+        "name": "extrasounds:item.category.gear.netherite",
+        "pitch": 0.8,
+        "type": "event"
+      }
+    ]
+  },
   "item.pickup.minecraft.diamond_horse_armor": {
     "replace": true,
     "sounds": [
@@ -2101,5 +2111,55 @@
         "type": "event"
       }
     ]
+  },
+  "item.pickup.minecraft.netherite_nautilus_armor": {
+    "replace": true,
+    "sounds": [
+      {
+        "name": "extrasounds:item.category.gear.netherite",
+        "pitch": 0.8,
+        "type": "event"
+      }
+    ]
+  },
+  "item.pickup.minecraft.diamond_nautilus_armor": {
+    "replace": true,
+    "sounds": [
+      {
+        "name": "extrasounds:item.category.gear.diamond",
+        "pitch": 0.8,
+        "type": "event"
+      }
+    ]
+  },
+  "item.pickup.minecraft.golden_nautilus_armor": {
+    "replace": true,
+    "sounds": [
+      {
+        "name": "extrasounds:item.category.gear.golden",
+        "pitch": 0.8,
+        "type": "event"
+      }
+    ]
+  },
+  "item.pickup.minecraft.iron_nautilus_armor": {
+    "replace": true,
+    "sounds": [
+      {
+        "name": "extrasounds:item.category.gear.iron",
+        "pitch": 0.8,
+        "type": "event"
+      }
+    ]
+  },
+  "item.pickup.minecraft.copper_nautilus_armor": {
+    "replace": true,
+    "sounds": [
+      {
+        "name": "extrasounds:item.category.gear.copper",
+        "pitch": 0.8,
+        "type": "event"
+      }
+    ]
   }
 }
diff --git a/versioned/es1.18.2/src/main/java/dev/stashy/extrasounds/mc1_18_2/mixin/inventory/CreativeInventoryScreenMixin.java b/versioned/es1.18.2/src/main/java/dev/stashy/extrasounds/mc1_18_2/mixin/inventory/CreativeInventoryScreenMixin.java
@@ -54,7 +54,7 @@ protected boolean isCreativeInventorySlot(Slot slot) {
 
         @Override
         protected Slot getDeleteItemSlot() {
-            return deleteItemSlot;
+            return CreativeInventoryScreenMixin.this.deleteItemSlot;
         }
     };
 
diff --git a/versioned/es1.18/src/main/java/dev/stashy/extrasounds/mc1_18/mixin/inventory/CreativeInventoryScreenMixin.java b/versioned/es1.18/src/main/java/dev/stashy/extrasounds/mc1_18/mixin/inventory/CreativeInventoryScreenMixin.java
@@ -54,7 +54,7 @@ protected boolean isCreativeInventorySlot(Slot slot) {
 
         @Override
         protected Slot getDeleteItemSlot() {
-            return deleteItemSlot;
+            return CreativeInventoryScreenMixin.this.deleteItemSlot;
         }
     };
 
diff --git a/versioned/es1.19.1/src/main/java/dev/stashy/extrasounds/mc1_19_1/mixin/inventory/CreativeInventoryScreenMixin.java b/versioned/es1.19.1/src/main/java/dev/stashy/extrasounds/mc1_19_1/mixin/inventory/CreativeInventoryScreenMixin.java
@@ -54,7 +54,7 @@ protected boolean isCreativeInventorySlot(Slot slot) {
 
         @Override
         protected Slot getDeleteItemSlot() {
-            return deleteItemSlot;
+            return CreativeInventoryScreenMixin.this.deleteItemSlot;
         }
     };
 
diff --git a/versioned/es1.19.3/src/main/java/dev/stashy/extrasounds/mc1_19_3/mixin/inventory/CreativeInventoryScreenMixin.java b/versioned/es1.19.3/src/main/java/dev/stashy/extrasounds/mc1_19_3/mixin/inventory/CreativeInventoryScreenMixin.java
@@ -53,7 +53,7 @@ protected boolean isCreativeInventorySlot(Slot slot) {
 
         @Override
         protected Slot getDeleteItemSlot() {
-            return deleteItemSlot;
+            return CreativeInventoryScreenMixin.this.deleteItemSlot;
         }
     };
 
diff --git a/versioned/es1.19.4/src/main/java/dev/stashy/extrasounds/mc1_19_4/mixin/inventory/CreativeInventoryScreenMixin.java b/versioned/es1.19.4/src/main/java/dev/stashy/extrasounds/mc1_19_4/mixin/inventory/CreativeInventoryScreenMixin.java
@@ -53,7 +53,7 @@ protected boolean isCreativeInventorySlot(Slot slot) {
 
         @Override
         protected Slot getDeleteItemSlot() {
-            return deleteItemSlot;
+            return CreativeInventoryScreenMixin.this.deleteItemSlot;
         }
     };
 
diff --git a/versioned/es1.19/src/main/java/dev/stashy/extrasounds/mc1_19/mixin/inventory/CreativeInventoryScreenMixin.java b/versioned/es1.19/src/main/java/dev/stashy/extrasounds/mc1_19/mixin/inventory/CreativeInventoryScreenMixin.java
@@ -54,7 +54,7 @@ protected boolean isCreativeInventorySlot(Slot slot) {
 
         @Override
         protected Slot getDeleteItemSlot() {
-            return deleteItemSlot;
+            return CreativeInventoryScreenMixin.this.deleteItemSlot;
         }
     };
 
diff --git a/versioned/es1.20.2/src/main/java/dev/stashy/extrasounds/mc1_20_2/mixin/inventory/CreativeInventoryScreenMixin.java b/versioned/es1.20.2/src/main/java/dev/stashy/extrasounds/mc1_20_2/mixin/inventory/CreativeInventoryScreenMixin.java
@@ -53,7 +53,7 @@ protected boolean isCreativeInventorySlot(Slot slot) {
 
         @Override
         protected Slot getDeleteItemSlot() {
-            return deleteItemSlot;
+            return CreativeInventoryScreenMixin.this.deleteItemSlot;
         }
     };
 
diff --git a/versioned/es1.20.5/src/main/java/dev/stashy/extrasounds/mc1_20_5/mixin/inventory/CreativeInventoryScreenMixin.java b/versioned/es1.20.5/src/main/java/dev/stashy/extrasounds/mc1_20_5/mixin/inventory/CreativeInventoryScreenMixin.java
@@ -53,7 +53,7 @@ protected boolean isCreativeInventorySlot(Slot slot) {
 
         @Override
         protected Slot getDeleteItemSlot() {
-            return deleteItemSlot;
+            return CreativeInventoryScreenMixin.this.deleteItemSlot;
         }
     };
 
diff --git a/versioned/es1.20/src/main/java/dev/stashy/extrasounds/mc1_20/mixin/inventory/CreativeInventoryScreenMixin.java b/versioned/es1.20/src/main/java/dev/stashy/extrasounds/mc1_20/mixin/inventory/CreativeInventoryScreenMixin.java
@@ -53,7 +53,7 @@ protected boolean isCreativeInventorySlot(Slot slot) {
 
         @Override
         protected Slot getDeleteItemSlot() {
-            return deleteItemSlot;
+            return CreativeInventoryScreenMixin.this.deleteItemSlot;
         }
     };
 
diff --git a/versioned/es1.21.2/src/main/java/dev/stashy/extrasounds/mc1_21_2/mixin/inventory/CreativeInventoryScreenMixin.java b/versioned/es1.21.2/src/main/java/dev/stashy/extrasounds/mc1_21_2/mixin/inventory/CreativeInventoryScreenMixin.java
@@ -53,7 +53,7 @@ protected boolean isCreativeInventorySlot(Slot slot) {
 
         @Override
         protected Slot getDeleteItemSlot() {
-            return deleteItemSlot;
+            return CreativeInventoryScreenMixin.this.deleteItemSlot;
         }
     };
 
diff --git a/versioned/es1.21.4/src/main/java/dev/stashy/extrasounds/mc1_21_4/mixin/inventory/CreativeInventoryScreenMixin.java b/versioned/es1.21.4/src/main/java/dev/stashy/extrasounds/mc1_21_4/mixin/inventory/CreativeInventoryScreenMixin.java
@@ -53,7 +53,7 @@ protected boolean isCreativeInventorySlot(Slot slot) {
 
         @Override
         protected Slot getDeleteItemSlot() {
-            return deleteItemSlot;
+            return CreativeInventoryScreenMixin.this.deleteItemSlot;
         }
     };
 
diff --git a/versioned/es1.21.5/src/main/java/dev/stashy/extrasounds/mc1_21_5/mixin/inventory/CreativeInventoryScreenMixin.java b/versioned/es1.21.5/src/main/java/dev/stashy/extrasounds/mc1_21_5/mixin/inventory/CreativeInventoryScreenMixin.java
@@ -53,7 +53,7 @@ protected boolean isCreativeInventorySlot(Slot slot) {
 
         @Override
         protected Slot getDeleteItemSlot() {
-            return deleteItemSlot;
+            return CreativeInventoryScreenMixin.this.deleteItemSlot;
         }
     };
 
diff --git a/versioned/es1.21.6/src/main/java/dev/stashy/extrasounds/mc1_21_6/mixin/inventory/CreativeInventoryScreenMixin.java b/versioned/es1.21.6/src/main/java/dev/stashy/extrasounds/mc1_21_6/mixin/inventory/CreativeInventoryScreenMixin.java
@@ -53,7 +53,7 @@ protected boolean isCreativeInventorySlot(Slot slot) {
 
         @Override
         protected Slot getDeleteItemSlot() {
-            return deleteItemSlot;
+            return CreativeInventoryScreenMixin.this.deleteItemSlot;
         }
     };
 
diff --git a/versioned/es1.21.9/gradle.properties b/versioned/es1.21.9/gradle.properties
@@ -1,4 +1,4 @@
-minecraft_version=1.21.10
+minecraft_version=1.21.11
 yarn_mappings=+build.1
 
 rei_version=21.9.812
diff --git a/versioned/es1.21.9/src/main/java/dev/stashy/extrasounds/mc1_21_9/VersionedMixinPlugin.java b/versioned/es1.21.9/src/main/java/dev/stashy/extrasounds/mc1_21_9/VersionedMixinPlugin.java
@@ -10,6 +10,6 @@ protected String earlierVersion() {
 
     @Override
     protected String laterVersion() {
-        return "1.21.10";
+        return "1.21.11";
     }
 }
diff --git a/versioned/es1.21.9/src/main/java/dev/stashy/extrasounds/mc1_21_9/mixin/inventory/CreativeInventoryScreenMixin.java b/versioned/es1.21.9/src/main/java/dev/stashy/extrasounds/mc1_21_9/mixin/inventory/CreativeInventoryScreenMixin.java
@@ -100,7 +100,11 @@ public CreativeInventoryScreenMixin(CreativeInventoryScreen.CreativeScreenHandle
         this.screenScrollHandler.onScroll(this.getScreenHandler().getRow(this.scrollPosition));
     }
 
-    @Inject(method = "resize", at = @At(value = "INVOKE", target = METHOD_SIGN_SCROLL_ITEMS))
+    @Inject(method = {
+            "method_25410(Lnet/minecraft/class_310;II)V",  // void resize(MinecraftClient, int, int)
+            "resize(II)V"
+//            "method_25410(II)V"    // void resize(int, int)
+    }, at = @At(value = "INVOKE", target = METHOD_SIGN_SCROLL_ITEMS), require = 1)
     private void extrasounds$creativeScreenScrollOnResize(CallbackInfo ci) {
         this.screenScrollHandler.onScroll(this.getScreenHandler().getRow(this.scrollPosition));
     }
diff --git a/versioned/es1.21/src/main/java/dev/stashy/extrasounds/mc1_21/mixin/inventory/CreativeInventoryScreenMixin.java b/versioned/es1.21/src/main/java/dev/stashy/extrasounds/mc1_21/mixin/inventory/CreativeInventoryScreenMixin.java
@@ -53,7 +53,7 @@ protected boolean isCreativeInventorySlot(Slot slot) {
 
         @Override
         protected Slot getDeleteItemSlot() {
-            return deleteItemSlot;
+            return CreativeInventoryScreenMixin.this.deleteItemSlot;
         }
     };
 
diff --git a/versioned/version-diff.sh b/versioned/version-diff.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+terminal_width=$(tput cols)
+
+usage() {
+    echo Usage: "${0##/}" leftDir rightDir
+    echo Shows difference between each dir
+    exit 0
+}
+
+error_exit() {
+    echo "$@" >&2
+    exit 1
+}
+
+get_files() {
+    local left="$1" right="$2" current="$3" f trimmed
+    for f in "${left%%/}/${current%%/}/"*; do
+        trimmed="${f/"$left/"//}"
+        if [ -d "$f" ]; then
+            get_files "$left" "$right" "${trimmed%%/}/"
+        else
+            echo "${trimmed#/}"
+        fi
+    done
+}
+
+print_diff() {
+    local left="$1" right="$2" relative="$3"
+    if [ ! -f "$left/$relative" ]; then
+        printf "\n"
+        echo "+++ File added: ${right%%/}/$relative"
+        printf "\n\n"
+    elif [ ! -f "$right/$relative" ]; then
+        printf "\n"
+        echo "--- File removed: ${left%%/}/$relative"
+        printf "\n\n"
+    else
+        result=$(diff -I '^package' "$left/$relative" "$right/$relative")
+        if [ -n "$result" ]; then
+            printf "### %s\n%s\n" "$relative" "$result"
+            printf "%*s\n\n" "$terminal_width" "" | tr " " "="
+        fi
+    fi
+}
+
+array_exists() {
+    printf '%s\n' "$1" | grep -qx "$2"
+    return $?
+}
+
+[ -n "$1" ] && [ -n "$2" ] || usage
+
+if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
+    usage
+fi
+
+[ -d "$1" ] || error_exit "cannot stat dir: $1"
+[ -d "$2" ] || error_exit "cannot stat dir: $2"
+
+printf "%s <|> %s\n\n" "$1" "$2"
+
+file_list=()
+
+while IFS= read -r line; do
+  if ! array_exists "${file_list[@]}" "$line"; then
+    file_list+=("$line")
+  fi
+done < <(get_files "${1}" "${2}" "")
+
+while IFS= read -r line; do
+  if ! array_exists "${file_list[@]}" "$line"; then
+    file_list+=("$line")
+  fi
+done < <(get_files "${2}" "${1}" "")
+
+for relative in "${file_list[@]}"; do
+    print_diff "$1" "$2" "$relative"
+done

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ protected boolean isCreativeInventorySlot(Slot slot) {`
`54`	`54`
`55`	`55`	`@Override`
`56`	`56`	`protected Slot getDeleteItemSlot() {`
`57`		`- return deleteItemSlot;`
	`57`	`+ return CreativeInventoryScreenMixin.this.deleteItemSlot;`
`58`	`58`	`}`
`59`	`59`	`};`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ protected boolean isCreativeInventorySlot(Slot slot) {`
`53`	`53`
`54`	`54`	`@Override`
`55`	`55`	`protected Slot getDeleteItemSlot() {`
`56`		`- return deleteItemSlot;`
	`56`	`+ return CreativeInventoryScreenMixin.this.deleteItemSlot;`
`57`	`57`	`}`
`58`	`58`	`};`
`59`	`59`