Update to 1.21.3

README.md

@@ -1,9 +1,9 @@
-BetterThanMending 2.2.0
+BetterThanMending 2.2.1
 =========
 [![ CurseForge](http://cf.way2muchnoise.eu/264738.svg)](https://minecraft.curseforge.com/projects/better-than-mending) [![Modrinth Downloads](https://img.shields.io/modrinth/dt/better-than-mending?color=00AF5C&label=downloads&style=flat-square&logo=modrinth)](https://modrinth.com/mod/better-than-mending) [![Build status](https://github.com/legobmw99/BetterThanMending/actions/workflows/build.yml/badge.svg)](https://github.com/legobmw99/BetterThanMending/actions)
 
 A simple mod to improve Mending, allowing you to repair items by shift-right clicking and draining experience
 
-This mod is currently updated for `Minecraft 1.21.1`.
+This mod is currently updated for `Minecraft 1.21.3`.
 
 Please verify and report any issues!

build.gradle

@@ -1,8 +1,8 @@
 plugins {
     // see https://fabricmc.net/develop/ for new versions
-    id 'fabric-loom' version '1.7-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.8-SNAPSHOT' apply false
     // see https://projects.neoforged.net/neoforged/moddevgradle for new versions
-    id 'net.neoforged.moddev' version '0.1.110' apply false
+    id 'net.neoforged.moddev' version '2.0.49-beta' apply false
     // build a single jar with multiple loaders supported
     id "io.github.pacifistmc.forgix" version "1.2.9"
 }

common/build.gradle

@@ -1,15 +1,26 @@
 plugins {
     id 'multiloader-common'
-    id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT'
+    id 'net.neoforged.moddev'
 }
 
-minecraft {
-    version(minecraft_version)
+neoForge {
+    neoFormVersion = neo_form_version
+    // Automatically enable AccessTransformers if the file exists
+    def at = file('src/main/resources/META-INF/accesstransformer.cfg')
+    if (at.exists()) {
+        accessTransformers.from(at.absolutePath)
+    }
+    parchment {
+        minecraftVersion = parchment_minecraft
+        mappingsVersion = parchment_version
+    }
 }
 
 dependencies {
-    compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5'
-    implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
+    compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
+    // fabric and neoforge both bundle mixinextras, so it is safe to use it in common
+    compileOnly group: 'io.github.llamalad7', name: 'mixinextras-common', version: '0.3.5'
+    annotationProcessor group: 'io.github.llamalad7', name: 'mixinextras-common', version: '0.3.5'
 }
 
 configurations {

fabric/build.gradle

@@ -19,13 +19,13 @@ loom {
             client()
             setConfigName('Fabric Client')
             ideConfigGenerated(true)
-            runDir('runs/client')
+            runDir('../runs/client')
         }
         server {
             server()
             setConfigName('Fabric Server')
             ideConfigGenerated(true)
-            runDir('runs/server')
+            runDir('../runs/server')
         }
     }
 }

fabric/src/main/java/com/legobmw99/BetterThanMending/BetterThanMending.java

@@ -5,7 +5,7 @@
 import net.fabricmc.fabric.api.event.player.UseItemCallback;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.InteractionResultHolder;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.item.ItemStack;
 
 public class BetterThanMending implements ModInitializer {
@@ -18,9 +18,9 @@ public void onInitialize() {
                 if (player instanceof ServerPlayer splayer) {
                     Common.doMend(splayer, stack, 1.0f);
                 }
-                return InteractionResultHolder.success(stack);
+                return InteractionResult.SUCCESS;
             }
-            return InteractionResultHolder.pass(stack);
+            return InteractionResult.PASS;
         });
     }
 }

gradle.properties

@@ -1,34 +1,37 @@
 # Important Notes:
 # Every field you add must be added to the root build.gradle expandProps map.
 # Project
-version=2.2.0
+version=2.2.1
 group=com.legobmw99.BetterThanMending
 java_version=21
 # Common
-minecraft_version=1.21.1
+minecraft_version=1.21.3
 mod_name=BetterThanMending
 mod_author=Legobmw99
 mod_id=betterthanmending
 license=GPL-3.0
 credits=
 description=A mod to improve the mending behavior in vanilla Minecraft.
-minecraft_version_range=[1.21.1,)
+minecraft_version_range=[1.21.3,)
 # Fabric
 # https://fabricmc.net/develop/
-fabric_version=0.102.1+1.21.1
-fabric_loader_version=0.16.2
+fabric_version=0.110.0+1.21.3
+fabric_loader_version=0.16.9
 # Forge
 # https://files.minecraftforge.net/net/minecraftforge/forge/
-forge_version=52.0.9
-forge_loader_version_range=[51,)
-forge_version_range=[51,)
+forge_version=53.0.25
+forge_loader_version_range=[53,)
+forge_version_range=[53,)
 # NeoForge
 # https://projects.neoforged.net/neoforged/neoforge
-neoforge_version=21.1.26
+neoforge_version=21.3.57
 neoforge_loader_version_range=[4,)
+# This is the version of minecraft that the 'common' project uses, you can find a list of all versions here
+# https://projects.neoforged.net/neoforged/neoform
+neo_form_version=1.21.3-20241023.131943
 # The version of ParchmentMC that is used, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
 parchment_minecraft=1.21
-parchment_version=2024.07.28
+parchment_version=2024.11.10
 
 # Gradle
 org.gradle.jvmargs=-Xmx3G

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

neoforge/build.gradle

@@ -35,9 +35,9 @@ neoForge {
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 // IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior.
-idea {
-    module {
-        downloadSources = true
-        downloadJavadoc = true
-    }
-}
+//idea {
+//    module {
+//        downloadSources = true
+//        downloadJavadoc = true
+//    }
+//}