update to 26.1.1

Author: arnokeesman

build.gradle

@@ -1,11 +1,15 @@
 plugins {
-    id 'fabric-loom' version "${loom_version}"
+    id 'net.fabricmc.fabric-loom' version "${loom_version}"
     id 'maven-publish'
 }
 
 version = "${project.mod_version}+mc${project.supported_minecraft_version}"
 group = project.maven_group
 
+base {
+    archivesName = project.archives_base_name
+}
+
 repositories {
     // Add repositories to retrieve artifacts from in here.
     // You should only use this when depending on other mods because
@@ -16,17 +20,28 @@ repositories {
     maven { url 'https://maven.nucleoid.xyz' } // playerdataapi
 }
 
+loom {
+    splitEnvironmentSourceSets()
+
+    mods {
+        "magnet-command" {
+            sourceSet sourceSets.main
+//            sourceSet sourceSets.client
+        }
+    }
+
+}
+
 dependencies {
     // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings loom.officialMojangMappings()
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    implementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     // Fabric API. This is technically optional, but you probably want it anyway.
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 
-    include(modImplementation('me.lucko:fabric-permissions-api:0.6.1'))
-    modImplementation include("eu.pb4:player-data-api:${project.player_data_api}")
+    include(implementation('me.lucko:fabric-permissions-api:0.7.0'))
+    implementation include("eu.pb4:player-data-api:${project.player_data_api}")
 }
 
 processResources {
@@ -38,40 +53,29 @@ processResources {
     }
 }
 
-def targetJavaVersion = 17
-tasks.withType(JavaCompile).configureEach {
-    // ensure that the encoding is set to UTF-8, no matter what the system default is
-    // this fixes some edge cases with special characters not displaying correctly
-    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-    // If Javadoc is generated, this must be specified in that task too.
-    it.options.encoding = "UTF-8"
-    if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
-        it.options.release = targetJavaVersion
-    }
-}
-
 java {
-    def javaVersion = JavaVersion.toVersion(targetJavaVersion)
-    if (JavaVersion.current() < javaVersion) {
-        toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
-    }
-    archivesBaseName = project.archives_base_name
     // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
     // if it is present.
     // If you remove this line, sources will not be generated.
     withSourcesJar()
+
+    sourceCompatibility = JavaVersion.VERSION_25
+    targetCompatibility = JavaVersion.VERSION_25
 }
 
 jar {
+    inputs.property "archivesName", project.base.archivesName
+
     from("LICENSE") {
-        rename { "${it}_${project.archivesBaseName}" }
+        rename { "${it}_${inputs.properties.archivesName}"}
     }
 }
 
 // configure the maven publication
 publishing {
     publications {
-        mavenJava(MavenPublication) {
+        create("mavenJava", MavenPublication) {
+            artifactId = project.archives_base_name
             from components.java
         }
     }

gradle.properties

@@ -3,18 +3,18 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.21.11
-loader_version=0.18.2
-loom_version=1.13-SNAPSHOT
+minecraft_version=26.1.1
+loader_version=0.18.6
+loom_version=1.15-SNAPSHOT
 
 # Mod Properties
 mod_version=0.3.0
 maven_group=dev.keesmand
 archives_base_name=magnet-command
-supported_minecraft_version=1.21.11
+supported_minecraft_version=26.1.1
 
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.139.4+1.21.11
+fabric_api_version=0.145.3+26.1.1
 # check this on https://maven.nucleoid.xyz/eu/pb4/player-data-api/
-player_data_api=0.9.0+1.21.9
+player_data_api=0.10.0+26.1

gradle/wrapper/gradle-wrapper.properties

@@ -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.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/dev/keesmand/magnetcommand/mixin/BlockMixin.java

@@ -5,6 +5,7 @@
 import dev.keesmand.magnetcommand.enums.DropMode;
 import dev.keesmand.magnetcommand.enums.MagnetMode;
 import dev.keesmand.magnetcommand.util.MagnetModeData;
+import net.minecraft.world.item.ItemInstance;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -13,6 +14,7 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.core.BlockPos;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -27,19 +29,19 @@
 public class BlockMixin {
     @Redirect(
             method = "dropResources(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/item/ItemStack;)V",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/Block;getDrops(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/item/ItemStack;)Ljava/util/List;")
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/Block;getDrops(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/item/ItemInstance;)Ljava/util/List;")
     )
-    private static List<ItemStack> onDropStacks(BlockState state, ServerLevel world, BlockPos pos, BlockEntity blockEntity, Entity entity, ItemStack tool) {
-        List<ItemStack> droppedStacks = getDrops(state, world, pos, blockEntity, entity, tool);
+    private static List<ItemStack> onDropStacks(BlockState state, ServerLevel level, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity breaker, ItemInstance tool) {
+        List<ItemStack> droppedStacks = getDrops(state, level, pos, blockEntity, breaker, tool);
 
         MagnetCommandConfig config = MagnetCommandMod.CONFIG;
         if (config == null) return droppedStacks;
 
-        if (entity instanceof ServerPlayer player) {
+        if (breaker instanceof ServerPlayer player) {
             MagnetMode mode = MagnetModeData.getMagnetMode(player);
             if (mode != MagnetMode.OnBreak) return droppedStacks;
 
-            droppedStacks.forEach(dropStack -> InjectStack(world,
+            droppedStacks.forEach(dropStack -> InjectStack(level,
                     config.dropLocation == DropMode.Block ? pos : player.blockPosition(),
                     player, dropStack));
 

src/main/java/dev/keesmand/magnetcommand/mixin/ContainersMixin.java

@@ -20,7 +20,7 @@
 @Mixin(Containers.class)
 public class ContainersMixin {
     @Inject(method = "dropContents(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/Container;)V", at = @At("HEAD"), cancellable = true)
-    private static void inject(Level world, BlockPos pos, Container inventory, CallbackInfo ci) {
+    private static void inject(Level level, BlockPos pos, Container container, CallbackInfo ci) {
         MagnetCommandConfig config = MagnetCommandMod.CONFIG;
         if (config == null || !config.includeContainerItems) return;
 
@@ -29,10 +29,10 @@ private static void inject(Level world, BlockPos pos, Container inventory, Callb
 
         if (MagnetModeData.getMagnetMode(player) != MagnetMode.OnBreak) return;
 
-        for (int i = 0; i < inventory.getContainerSize(); ++i) {
-            InjectStack(world,
+        for (int i = 0; i < container.getContainerSize(); ++i) {
+            InjectStack(level,
                     config.dropLocation == DropMode.Block ? pos : player.blockPosition(),
-                    player, inventory.getItem(i));
+                    player, container.getItem(i));
         }
 
         ci.cancel();

src/main/java/dev/keesmand/magnetcommand/mixin/PlayerListMixin.java

@@ -1,25 +1,23 @@
 package dev.keesmand.magnetcommand.mixin;
 
+import com.llamalad7.mixinextras.sugar.Local;
 import dev.keesmand.magnetcommand.enums.MagnetMode;
 import dev.keesmand.magnetcommand.util.MagnetModeData;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.server.players.PlayerList;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.portal.TeleportTransition;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 @Mixin(PlayerList.class)
 public class PlayerListMixin {
     @Inject(
             method = "respawn",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;restoreFrom(Lnet/minecraft/server/level/ServerPlayer;Z)V"),
-            locals = LocalCapture.CAPTURE_FAILHARD)
-    void handlePlayerRespawn(ServerPlayer oldPlayer, boolean alive, Entity.RemovalReason removalReason, CallbackInfoReturnable<ServerPlayer> cir, TeleportTransition teleportTarget, ServerLevel serverWorld, ServerPlayer newPlayer) {
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;restoreFrom(Lnet/minecraft/server/level/ServerPlayer;Z)V")
+    )
+    void handlePlayerRespawn(ServerPlayer oldPlayer, boolean alive, Entity.RemovalReason removalReason, CallbackInfoReturnable<ServerPlayer> cir, @Local(name = "player") ServerPlayer newPlayer) {
         MagnetMode mode = MagnetModeData.getMagnetMode(oldPlayer);
         MagnetModeData.setMagnetMode(newPlayer, mode);
     }

src/main/java/dev/keesmand/magnetcommand/mixin/ServerLevelMixin.java

@@ -12,7 +12,7 @@
 @Mixin(ServerLevel.class)
 public class ServerLevelMixin {
     @Inject(method = "tick", at = @At("HEAD"))
-    void clearBreakingAuthors(BooleanSupplier shouldKeepTicking, CallbackInfo ci) {
+    void clearBreakingAuthors(BooleanSupplier haveTime, CallbackInfo ci) {
         MagnetCommandMod.BLOCKS_BROKEN_BY.clear();
     }
 }

src/main/java/dev/keesmand/magnetcommand/mixin/ServerPlayerGameModeMixin.java

@@ -10,7 +10,6 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 @Mixin(ServerPlayerGameMode.class)
 public class ServerPlayerGameModeMixin {
@@ -20,8 +19,8 @@ public class ServerPlayerGameModeMixin {
 
     @Inject(
             method = "destroyBlock",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/Block;playerWillDestroy(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/world/level/block/state/BlockState;"),
-            locals = LocalCapture.CAPTURE_FAILHARD)
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/Block;playerWillDestroy(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/world/level/block/state/BlockState;")
+    )
     void storeBreakingAuthor(BlockPos pos, CallbackInfoReturnable<Boolean> cir) {
         MagnetCommandMod.BLOCKS_BROKEN_BY.put(pos, player);
     }

src/main/java/dev/keesmand/magnetcommand/mixin/ServerPlayerMixin.java

@@ -23,7 +23,6 @@
 
 @Mixin(ServerPlayer.class)
 public abstract class ServerPlayerMixin {
-    @SuppressWarnings("UnreachableCode")
     @Inject(method = "tick", at = @At("HEAD"))
     private void magnetRangeMode(CallbackInfo callbackInfo) {
         // well this sure is a nice trick, thanks u/tom_the_geek

src/main/resources/fabric.mod.json

@@ -21,7 +21,7 @@
   ],
   "depends": {
     "fabricloader": ">=0.14.21",
-    "fabric": "*",
-    "minecraft": ">=1.21.11"
+    "fabric-api": "*",
+    "minecraft": ">=26.1"
   }
 }