From 6d3c4fa508df489ee653cbb704726b0493362e17 Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 22 Jul 2022 18:25:43 +0200 Subject: [PATCH] 1.19.1-rc2 --- gradle.properties | 2 +- src/main/java/carpet/helpers/TickSpeed.java | 2 +- .../carpet/mixins/Commands_customCommandsMixin.java | 5 +++-- ...erverGamePacketListenerImpl_scarpetEventsMixin.java | 10 +++++----- src/main/java/carpet/network/ServerNetworkHandler.java | 2 +- src/main/java/carpet/script/api/Auxiliary.java | 2 +- .../java/carpet/script/utils/SnoopyCommandSource.java | 7 ++++--- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index f4f7e7cc..2bed46fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=1.19.1-pre4 + minecraft_version=1.19.1-rc2 loader_version=0.14.8 fabric_version=0.56.0+1.19 diff --git a/src/main/java/carpet/helpers/TickSpeed.java b/src/main/java/carpet/helpers/TickSpeed.java index 338b85dc..879535d3 100644 --- a/src/main/java/carpet/helpers/TickSpeed.java +++ b/src/main/java/carpet/helpers/TickSpeed.java @@ -149,7 +149,7 @@ public class TickSpeed Commands icommandmanager = tick_warp_sender.getServer().getCommands(); try { - icommandmanager.performCommand(tick_warp_sender, tick_warp_callback); + icommandmanager.performPrefixedCommand(tick_warp_sender, tick_warp_callback); } catch (Throwable var23) { diff --git a/src/main/java/carpet/mixins/Commands_customCommandsMixin.java b/src/main/java/carpet/mixins/Commands_customCommandsMixin.java index d525bc99..cac7058b 100644 --- a/src/main/java/carpet/mixins/Commands_customCommandsMixin.java +++ b/src/main/java/carpet/mixins/Commands_customCommandsMixin.java @@ -3,6 +3,7 @@ package carpet.mixins; import carpet.CarpetServer; import carpet.CarpetSettings; import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.ParseResults; import net.minecraft.commands.CommandBuildContext; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; @@ -31,14 +32,14 @@ public abstract class Commands_customCommandsMixin } @Inject(method = "performCommand", at = @At("HEAD")) - private void onExecuteBegin(CommandSourceStack serverCommandSource_1, String string_1, CallbackInfoReturnable cir) + private void onExecuteBegin(ParseResults parseResults, String string, CallbackInfoReturnable cir) { if (!CarpetSettings.fillUpdates) CarpetSettings.impendingFillSkipUpdates.set(true); } @Inject(method = "performCommand", at = @At("RETURN")) - private void onExecuteEnd(CommandSourceStack serverCommandSource_1, String string_1, CallbackInfoReturnable cir) + private void onExecuteEnd(ParseResults parseResults, String string, CallbackInfoReturnable cir) { CarpetSettings.impendingFillSkipUpdates.set(false); } diff --git a/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_scarpetEventsMixin.java b/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_scarpetEventsMixin.java index 610e0ee5..ee342120 100644 --- a/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_scarpetEventsMixin.java +++ b/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_scarpetEventsMixin.java @@ -1,7 +1,7 @@ package carpet.mixins; +import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.game.ServerboundChatPacket; -import net.minecraft.server.network.FilteredText; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -282,13 +282,13 @@ public class ServerGamePacketListenerImpl_scarpetEventsMixin } } - @Inject(method = "handleChat(Lnet/minecraft/network/protocol/game/ServerboundChatPacket;Lnet/minecraft/server/network/FilteredText;)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/game/ServerboundChatPacket;signedPreview()Z") + @Inject(method = "handleChat(Lnet/minecraft/network/protocol/game/ServerboundChatPacket;)V", + at = @At(value = "HEAD") ) - private void onChatMessage(ServerboundChatPacket serverboundChatPacket, FilteredText filteredText, CallbackInfo ci) { + private void onChatMessage(ServerboundChatPacket serverboundChatPacket, CallbackInfo ci) { if (PLAYER_MESSAGE.isNeeded()) { - PLAYER_MESSAGE.onPlayerMessage(player, filteredText.raw()); + PLAYER_MESSAGE.onPlayerMessage(player, serverboundChatPacket.message()); } } } diff --git a/src/main/java/carpet/network/ServerNetworkHandler.java b/src/main/java/carpet/network/ServerNetworkHandler.java index f78d8b82..f8713a6d 100644 --- a/src/main/java/carpet/network/ServerNetworkHandler.java +++ b/src/main/java/carpet/network/ServerNetworkHandler.java @@ -99,7 +99,7 @@ public class ServerNetworkHandler } else { - resultCode = player.getServer().getCommands().performCommand( + resultCode = player.getServer().getCommands().performPrefixedCommand( new SnoopyCommandSource(player, error, output), command ); } diff --git a/src/main/java/carpet/script/api/Auxiliary.java b/src/main/java/carpet/script/api/Auxiliary.java index aef8e55a..665b0b72 100644 --- a/src/main/java/carpet/script/api/Auxiliary.java +++ b/src/main/java/carpet/script/api/Auxiliary.java @@ -607,7 +607,7 @@ public class Auxiliary { { Component[] error = {null}; List output = new ArrayList<>(); - Value retval = new NumericValue(s.getServer().getCommands().performCommand( + Value retval = new NumericValue(s.getServer().getCommands().performPrefixedCommand( new SnoopyCommandSource(s, error, output), lv.get(0).getString()) ); diff --git a/src/main/java/carpet/script/utils/SnoopyCommandSource.java b/src/main/java/carpet/script/utils/SnoopyCommandSource.java index 2d3ace36..685c60c0 100644 --- a/src/main/java/carpet/script/utils/SnoopyCommandSource.java +++ b/src/main/java/carpet/script/utils/SnoopyCommandSource.java @@ -11,6 +11,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.Mth; +import net.minecraft.util.TaskChainer; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.dimension.DimensionType; import net.minecraft.world.phys.Vec2; @@ -43,7 +44,7 @@ public class SnoopyCommandSource extends CommandSourceStack { super(CommandSource.NULL, original.getPosition(), original.getRotation(), original.getLevel(), CarpetSettings.runPermissionLevel, original.getTextName(), original.getDisplayName(), original.getServer(), original.getEntity(), false, - (ctx, succ, res) -> { }, EntityAnchorArgument.Anchor.FEET, CommandSigningContext.anonymous()); + (ctx, succ, res) -> { }, EntityAnchorArgument.Anchor.FEET, CommandSigningContext.ANONYMOUS, TaskChainer.IMMEDIATE); this.output = CommandSource.NULL; this.position = original.getPosition(); this.world = original.getLevel(); @@ -78,7 +79,7 @@ public class SnoopyCommandSource extends CommandSourceStack this.rotation = player.getRotationVector(); // not a client call really this.error = error; this.chatOutput = output; - this.signingContext = CommandSigningContext.anonymous(); + this.signingContext = CommandSigningContext.ANONYMOUS; } private SnoopyCommandSource(CommandSource output, Vec3 pos, Vec2 rot, ServerLevel world, int level, String simpleName, Component name, MinecraftServer server, @Nullable Entity entity, ResultConsumer consumer, EntityAnchorArgument.Anchor entityAnchor, CommandSigningContext context, @@ -86,7 +87,7 @@ public class SnoopyCommandSource extends CommandSourceStack ) { super(output, pos, rot, world, level, simpleName, name, server, entity, false, - consumer, entityAnchor, context); + consumer, entityAnchor, context, TaskChainer.IMMEDIATE); this.output = output; this.position = pos; this.rotation = rot;