[NeoForge/Fabric] Update to 1.21.5 (#833)

Author: Rakambda

datapack/pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack" : {
-    "pack_format" : 61,
+    "pack_format" : 71,
     "description" : {
       "text" : "Add FallingTree enchantments"
     }

forge/src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[54,)"
+loaderVersion = "[55,)"
 issueTrackerURL = "https://github.com/${repoUser}/${repoName}/issues"
 license = "LGPL-3.0"
 
@@ -15,7 +15,7 @@ authors = "Rakambda"
 [[dependencies.fallingtree]]
 modId = "forge"
 mandatory = true
-versionRange = "[54,)"
+versionRange = "[55,)"
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.fallingtree]]
@@ -27,6 +27,6 @@ side = "BOTH"
 [[dependencies.fallingtree]]
 modId = "cloth-config"
 mandatory = false
-versionRange = "[17.0.0,)"
+versionRange = "[18.0.0,)"
 ordering = "NONE"
 side = "CLIENT"

forge/src/main/resources/pack.mcmeta

@@ -3,6 +3,6 @@
         "description": {
           "text": "FallingTree"
         },
-        "pack_format": 42
+        "pack_format": 55
     }
 }

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.daemon=false
 modId=fallingtree
 modName=FallingTree
 includeFabric=true
-includeForge=true
+includeForge=false
 includeNeoForge=true
 # Repository
 repoUser=Rakambda

gradle/libs.versions.toml

@@ -7,17 +7,17 @@ gson-version = "2.11.0"
 log4j2-version = "2.24.1"
 
 # Minecraft / Loaders
-minecraftVersion = "1.21.4"
-fabric-loader-version = "0.16.9"
-fabric-api-version = "0.111.0+1.21.4"
+minecraftVersion = "1.21.5"
+fabric-loader-version = "0.16.10"
+fabric-api-version = "0.119.5+1.21.5"
 forge-version = "1.21.4-54.0.6"
-neoforge-version = "21.4.9-beta"
+neoforge-version = "21.5.2-beta"
 
 # Mod dependencies
-modmenu-version = "13.0.3"
+modmenu-version = "14.0.0-rc.2"
 clothConfigVersion = "17.0.144"
 
-fabric-loom-version = "1.9+"
+fabric-loom-version = "1.10+"
 forge-plugin-version = "[6.0.24,6.2)"
 neoforge-plugin-version = "7.0.171"
 curse-version = "1.4.0"

neoforge/src/main/java/fr/rakambda/fallingtree/neoforge/common/wrapper/ItemStackWrapper.java

@@ -13,7 +13,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
-import net.neoforged.neoforge.common.ItemAbilities;
+import net.minecraft.world.level.block.Blocks;
 import org.jetbrains.annotations.NotNull;
 import java.util.Optional;
 
@@ -78,6 +78,6 @@ public Optional<BreakMode> getBreakModeFromEnchant(){
 
 	@Override
 	public boolean canPerformAxeAction(){
-		return raw.canPerformAction(ItemAbilities.AXE_DIG);
+		return raw.isCorrectToolForDrops(Blocks.OAK_LOG.defaultBlockState());
 	}
 }

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -17,7 +17,7 @@ file="META-INF/neoforge.accesstransformer.cfg"
 [[dependencies.fallingtree]]
 modId="neoforge"
 type="required"
-versionRange="[21.4,)"
+versionRange="[21.5,)"
 ordering="NONE"
 side="BOTH"
 [[dependencies.fallingtree]]
@@ -29,6 +29,6 @@ side="BOTH"
 [[dependencies.fallingtree]]
 modId = "cloth-config"
 type="optional"
-versionRange = "[17.0.0,)"
+versionRange = "[18.0.0,)"
 ordering = "NONE"
 side = "CLIENT"