Skip to content

Commit c30aa2a

Browse files
PotatoPresidentPotatoPresident
committed
Update to 26.2
1 parent 02df2e3 commit c30aa2a

48 files changed

Lines changed: 476 additions & 467 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎blockbot-api/src/main/java/io/github/quiltservertools/blockbotapi/BlockBotApi.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class BlockBotApi implements ModInitializer {
2323
public void onInitialize() {
2424
ServerMessageEvents.CHAT_MESSAGE.register((message, sender, typeKey) -> ChatMessageEvent.EVENT.invoker().message(
2525
new PlayerMessageSender(sender, MessageSender.MessageType.REGULAR),
26-
message.getContent()
26+
message.decoratedContent()
2727
));
2828
}
2929

‎blockbot-api/src/main/java/io/github/quiltservertools/blockbotapi/Bot.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import io.github.quiltservertools.blockbotapi.sender.MessageSender;
44
import net.fabricmc.fabric.api.networking.v1.PacketSender;
5-
import net.minecraft.advancement.Advancement;
5+
import net.minecraft.advancements.Advancement;
66
import net.minecraft.server.MinecraftServer;
7-
import net.minecraft.server.network.ServerPlayNetworkHandler;
8-
import net.minecraft.server.network.ServerPlayerEntity;
9-
import net.minecraft.text.Text;
7+
import net.minecraft.server.network.ServerGamePacketListenerImpl;
8+
import net.minecraft.server.level.ServerPlayer;
9+
import net.minecraft.network.chat.Component;
1010

1111
public interface Bot {
12-
void onChatMessage(MessageSender sender, Text message);
13-
void onPlayerJoinMessage(ServerPlayerEntity player);
14-
void onPlayerLeaveMessage(ServerPlayerEntity player);
15-
void onPlayerDeath(ServerPlayerEntity player, Text message);
16-
void onAdvancementGrant(ServerPlayerEntity player, Advancement advancement);
12+
void onChatMessage(MessageSender sender, Component message);
13+
void onPlayerJoinMessage(ServerPlayer player);
14+
void onPlayerLeaveMessage(ServerPlayer player);
15+
void onPlayerDeath(ServerPlayer player, Component message);
16+
void onAdvancementGrant(ServerPlayer player, Advancement advancement);
1717
void onServerStart(MinecraftServer server);
1818
void onServerStop(MinecraftServer server);
1919
void onServerTick(MinecraftServer server);

‎blockbot-api/src/main/java/io/github/quiltservertools/blockbotapi/event/ChatMessageEvent.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import io.github.quiltservertools.blockbotapi.sender.MessageSender;
44
import net.fabricmc.fabric.api.event.Event;
55
import net.fabricmc.fabric.api.event.EventFactory;
6-
import net.minecraft.text.Text;
6+
import net.minecraft.network.chat.Component;
77

88
public interface ChatMessageEvent {
99
Event<ChatMessageEvent> EVENT = EventFactory.createArrayBacked(ChatMessageEvent.class, (listeners) -> (sender, message) -> {
@@ -12,5 +12,5 @@ public interface ChatMessageEvent {
1212
}
1313
});
1414

15-
void message(MessageSender sender, Text message);
15+
void message(MessageSender sender, Component message);
1616
}

‎blockbot-api/src/main/java/io/github/quiltservertools/blockbotapi/event/PlayerAdvancementGrantEvent.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import net.fabricmc.fabric.api.event.Event;
44
import net.fabricmc.fabric.api.event.EventFactory;
5-
import net.minecraft.advancement.Advancement;
6-
import net.minecraft.server.network.ServerPlayerEntity;
5+
import net.minecraft.advancements.Advancement;
6+
import net.minecraft.server.level.ServerPlayer;
77

88
public interface PlayerAdvancementGrantEvent {
99
Event<PlayerAdvancementGrantEvent> EVENT = EventFactory.createArrayBacked(PlayerAdvancementGrantEvent.class, (listeners) -> (player, advancement) -> {
@@ -12,5 +12,5 @@ public interface PlayerAdvancementGrantEvent {
1212
}
1313
});
1414

15-
void onAdvancementGrant(ServerPlayerEntity player, Advancement advancement);
15+
void onAdvancementGrant(ServerPlayer player, Advancement advancement);
1616
}

‎blockbot-api/src/main/java/io/github/quiltservertools/blockbotapi/event/PlayerDeathEvent.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import net.fabricmc.fabric.api.event.Event;
44
import net.fabricmc.fabric.api.event.EventFactory;
5-
import net.minecraft.server.network.ServerPlayerEntity;
6-
import net.minecraft.text.Text;
5+
import net.minecraft.server.level.ServerPlayer;
6+
import net.minecraft.network.chat.Component;
77

88
public interface PlayerDeathEvent {
99
Event<PlayerDeathEvent> EVENT = EventFactory.createArrayBacked(PlayerDeathEvent.class, (listeners) -> (player, message) -> {
@@ -12,5 +12,5 @@ public interface PlayerDeathEvent {
1212
}
1313
});
1414

15-
void death(ServerPlayerEntity player, Text message);
15+
void death(ServerPlayer player, Component message);
1616
}

‎blockbot-api/src/main/java/io/github/quiltservertools/blockbotapi/event/PlayerJoinMessageEvent.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import net.fabricmc.fabric.api.event.Event;
44
import net.fabricmc.fabric.api.event.EventFactory;
5-
import net.minecraft.server.network.ServerPlayerEntity;
5+
import net.minecraft.server.level.ServerPlayer;
66

77
public interface PlayerJoinMessageEvent {
88
Event<PlayerJoinMessageEvent> EVENT = EventFactory.createArrayBacked(PlayerJoinMessageEvent.class, (listeners) -> (player) -> {
@@ -11,5 +11,5 @@ public interface PlayerJoinMessageEvent {
1111
}
1212
});
1313

14-
void onPlayerJoinMessage(ServerPlayerEntity player);
14+
void onPlayerJoinMessage(ServerPlayer player);
1515
}

‎blockbot-api/src/main/java/io/github/quiltservertools/blockbotapi/event/PlayerLeaveMessageEvent.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import net.fabricmc.fabric.api.event.Event;
44
import net.fabricmc.fabric.api.event.EventFactory;
5-
import net.minecraft.server.network.ServerPlayerEntity;
5+
import net.minecraft.server.level.ServerPlayer;
66

77
public interface PlayerLeaveMessageEvent {
88
Event<PlayerLeaveMessageEvent> EVENT = EventFactory.createArrayBacked(PlayerLeaveMessageEvent.class, (listeners) -> (player) -> {
@@ -11,5 +11,5 @@ public interface PlayerLeaveMessageEvent {
1111
}
1212
});
1313

14-
void onPlayerLeaveMessage(ServerPlayerEntity player);
14+
void onPlayerLeaveMessage(ServerPlayer player);
1515
}

‎blockbot-api/src/main/java/io/github/quiltservertools/blockbotapi/event/RelayMessageEvent.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
import io.github.quiltservertools.blockbotapi.sender.RelayMessageSender;
44
import net.fabricmc.fabric.api.event.Event;
55
import net.fabricmc.fabric.api.event.EventFactory;
6-
import net.minecraft.util.ActionResult;
6+
import net.minecraft.world.InteractionResult;
77

88
public interface RelayMessageEvent {
99
Event<RelayMessageEvent> EVENT = EventFactory.createArrayBacked(RelayMessageEvent.class, (listeners) -> (sender, channel, message) -> {
1010
for (RelayMessageEvent listener : listeners) {
11-
ActionResult result = listener.message(sender, channel, message);
11+
InteractionResult result = listener.message(sender, channel, message);
1212

13-
if (result != ActionResult.PASS) {
13+
if (result != InteractionResult.PASS) {
1414
return result;
1515
}
1616
}
1717

18-
return ActionResult.PASS;
18+
return InteractionResult.PASS;
1919
});
2020

21-
ActionResult message(RelayMessageSender sender, String channel, String message);
21+
InteractionResult message(RelayMessageSender sender, String channel, String message);
2222
}

blockbot-api/src/main/java/io/github/quiltservertools/blockbotapi/mixin/MeCommandMixin.java renamed to blockbot-api/src/main/java/io/github/quiltservertools/blockbotapi/mixin/EmoteCommandsMixin.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
import com.mojang.brigadier.context.CommandContext;
44
import io.github.quiltservertools.blockbotapi.event.ChatMessageEvent;
55
import io.github.quiltservertools.blockbotapi.sender.MessageSender;
6-
import net.minecraft.network.message.SignedMessage;
7-
import net.minecraft.server.command.MeCommand;
8-
import net.minecraft.server.command.ServerCommandSource;
6+
import net.minecraft.network.chat.PlayerChatMessage;
7+
import net.minecraft.server.commands.EmoteCommands;
8+
import net.minecraft.commands.CommandSourceStack;
99
import org.spongepowered.asm.mixin.Mixin;
1010
import org.spongepowered.asm.mixin.injection.At;
1111
import org.spongepowered.asm.mixin.injection.Inject;
1212
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1313

14-
@Mixin(MeCommand.class)
15-
public abstract class MeCommandMixin {
14+
@Mixin(EmoteCommands.class)
15+
public abstract class EmoteCommandsMixin {
1616
@Inject(
17-
method = "method_43645",
18-
at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;broadcast(Lnet/minecraft/network/message/SignedMessage;Lnet/minecraft/server/command/ServerCommandSource;Lnet/minecraft/network/message/MessageType$Parameters;)V")
17+
method = "lambda$register$1",
18+
at = @At(value = "INVOKE", target = "Lnet/minecraft/server/players/PlayerList;broadcastChatMessage(Lnet/minecraft/network/chat/PlayerChatMessage;Lnet/minecraft/commands/CommandSourceStack;Lnet/minecraft/network/chat/ChatType$Bound;)V")
1919
)
20-
private static void relayPlayerMeToDiscord(CommandContext<ServerCommandSource> ctx, SignedMessage message, CallbackInfo ci) {
20+
private static void relayPlayerMeToDiscord(CommandContext<CommandSourceStack> ctx, PlayerChatMessage message, CallbackInfo ci) {
2121
MessageSender sender = MessageSender.of(ctx.getSource(), MessageSender.MessageType.EMOTE);
2222
ChatMessageEvent.EVENT.invoker().message(
2323
sender,
24-
message.getContent()
24+
message.decoratedContent()
2525
);
2626
}
2727

‎blockbot-api/src/main/java/io/github/quiltservertools/blockbotapi/mixin/MixinPlayerAdvancementTracker.java‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)