From f5597a9626db5760de0c0dc352076d92d6825a09 Mon Sep 17 00:00:00 2001 From: samo_lego <34912839+samolego@users.noreply.github.com> Date: Wed, 10 Jun 2020 22:38:42 +0200 Subject: [PATCH] 1-16-pre2 --- build.gradle | 2 +- .../java/org/samo_lego/simpleauth/commands/AuthCommand.java | 2 +- .../simpleauth/mixin/MixinServerPlayNetworkHandler.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 03f0376..881cab1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.2.7-SNAPSHOT' + id 'fabric-loom' version '0.4-SNAPSHOT' id 'maven-publish' } diff --git a/src/main/java/org/samo_lego/simpleauth/commands/AuthCommand.java b/src/main/java/org/samo_lego/simpleauth/commands/AuthCommand.java index f8b8fe4..265025d 100644 --- a/src/main/java/org/samo_lego/simpleauth/commands/AuthCommand.java +++ b/src/main/java/org/samo_lego/simpleauth/commands/AuthCommand.java @@ -55,7 +55,7 @@ public class AuthCommand { .then(argument("position", BlockPosArgumentType.blockPos()) .executes(ctx -> setSpawn( ctx.getSource(), - DimensionArgumentType.getDimensionArgument(ctx, "dimension").getValue(), + DimensionArgumentType.getDimensionArgument(ctx, "dimension").getRegistryKey().getValue(), BlockPosArgumentType.getLoadedBlockPos(ctx, "position").getX(), // +1 to not spawn player in ground BlockPosArgumentType.getLoadedBlockPos(ctx, "position").getY() + 1, diff --git a/src/main/java/org/samo_lego/simpleauth/mixin/MixinServerPlayNetworkHandler.java b/src/main/java/org/samo_lego/simpleauth/mixin/MixinServerPlayNetworkHandler.java index 8ecb405..3ae87e7 100644 --- a/src/main/java/org/samo_lego/simpleauth/mixin/MixinServerPlayNetworkHandler.java +++ b/src/main/java/org/samo_lego/simpleauth/mixin/MixinServerPlayNetworkHandler.java @@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket.Action.SWAP_HELD_ITEMS; +import static net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket.Action.SWAP_ITEM_WITH_OFFHAND; @Mixin(ServerPlayNetworkHandler.class) public abstract class MixinServerPlayNetworkHandler { @@ -50,7 +50,7 @@ public abstract class MixinServerPlayNetworkHandler { cancellable = true ) private void onPlayerAction(PlayerActionC2SPacket packet, CallbackInfo ci) { - if(packet.getAction() == SWAP_HELD_ITEMS) { + if(packet.getAction() == SWAP_ITEM_WITH_OFFHAND) { ActionResult result = TakeItemCallback.EVENT.invoker().onTakeItem(this.player); if (result == ActionResult.FAIL) { ci.cancel();