From b316dde8ba586cdd786555babec5c99a5ee6987a Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 28 Jul 2022 19:45:57 +0800 Subject: [PATCH] Update to 1.19.1 (#302) * Update to 1.19.1 * Make it compile * Update to 1.19.1 * Set 1.19.1 as the publishing version --- .../core/item/ArchitecturyRecordItem.java | 4 +- .../event/events/client/ClientChatEvent.java | 37 ++----- .../event/events/common/ChatEvent.java | 54 ++++----- .../common/CommandRegistrationEvent.java | 6 +- .../architectury/impl/ChatProcessorImpl.java | 60 ---------- .../main/resources/architectury.accessWidener | 2 +- fabric/build.gradle | 2 +- .../event/fabric/EventHandlerImpl.java | 23 +++- .../impl/fabric/ChatComponentImpl.java | 29 ++--- .../impl/fabric/EventChatDecorator.java | 86 --------------- .../mixin/fabric/MixinCommands.java | 10 +- .../mixin/fabric/MixinMinecraftServer.java | 55 ---------- .../MixinServerGamePacketListenerImpl.java | 62 ----------- .../fabric/client/MixinChatListener_1.java | 69 ++++++++++++ .../fabric/client/MixinChatListener_2.java | 69 ++++++++++++ .../mixin/fabric/client/MixinGui.java | 103 ------------------ .../mixin/fabric/client/MixinLocalPlayer.java | 33 +----- .../mixin/fabric/client/MixinMinecraft.java | 2 +- .../main/resources/architectury.mixins.json | 5 +- forge/build.gradle | 2 +- .../event/forge/EventHandlerImplClient.java | 18 +-- .../event/forge/EventHandlerImplCommon.java | 30 ++--- forge/src/main/resources/META-INF/mods.toml | 6 +- gradle.properties | 12 +- .../architectury/test/events/DebugEvents.java | 27 +++-- 25 files changed, 260 insertions(+), 546 deletions(-) delete mode 100644 common/src/main/java/dev/architectury/impl/ChatProcessorImpl.java delete mode 100644 fabric/src/main/java/dev/architectury/impl/fabric/EventChatDecorator.java delete mode 100644 fabric/src/main/java/dev/architectury/mixin/fabric/MixinMinecraftServer.java delete mode 100644 fabric/src/main/java/dev/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java create mode 100644 fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinChatListener_1.java create mode 100644 fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinChatListener_2.java delete mode 100644 fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGui.java diff --git a/common/src/main/java/dev/architectury/core/item/ArchitecturyRecordItem.java b/common/src/main/java/dev/architectury/core/item/ArchitecturyRecordItem.java index 314494d6..cdb7840a 100644 --- a/common/src/main/java/dev/architectury/core/item/ArchitecturyRecordItem.java +++ b/common/src/main/java/dev/architectury/core/item/ArchitecturyRecordItem.java @@ -26,8 +26,8 @@ import net.minecraft.world.item.RecordItem; public class ArchitecturyRecordItem extends RecordItem { private final RegistrySupplier sound; - public ArchitecturyRecordItem(int analogOutput, RegistrySupplier sound, Properties properties) { - super(analogOutput, sound.orElse(null), properties); + public ArchitecturyRecordItem(int analogOutput, RegistrySupplier sound, Properties properties, int lengthInSeconds) { + super(analogOutput, sound.orElse(null), properties, lengthInSeconds); this.sound = sound; if (!sound.isPresent()) { diff --git a/common/src/main/java/dev/architectury/event/events/client/ClientChatEvent.java b/common/src/main/java/dev/architectury/event/events/client/ClientChatEvent.java index 146e079f..30e47402 100644 --- a/common/src/main/java/dev/architectury/event/events/client/ClientChatEvent.java +++ b/common/src/main/java/dev/architectury/event/events/client/ClientChatEvent.java @@ -25,49 +25,33 @@ import dev.architectury.event.EventFactory; import dev.architectury.event.EventResult; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.chat.ClientChatPreview; -import net.minecraft.client.multiplayer.ServerData; -import net.minecraft.network.chat.ChatSender; import net.minecraft.network.chat.ChatType; import net.minecraft.network.chat.Component; import org.jetbrains.annotations.Nullable; -import java.util.function.Function; - @Environment(EnvType.CLIENT) public interface ClientChatEvent { /** - * @see Process#process(ChatProcessor) + * @see Send#send(String, Component) */ - Event PROCESS = EventFactory.createEventResult(); + Event SEND = EventFactory.createEventResult(); /** - * @see Received#process(ChatType, Component, ChatSender) + * @see Received#process(ChatType.Bound, Component) */ Event RECEIVED = EventFactory.createCompoundEventResult(); @Environment(EnvType.CLIENT) - interface Process { + interface Send { /** - * Event to modify the chat message a clients sends. + * Event to cancel clients sending the chat message. * Equivalent to Forge's {@code ClientChatEvent} event. * - * @param processor The chat message the client wants to send. + * @param message The chat message. + * @param component The chat component that was decorated, can be {@code null}. * @return A {@link EventResult} determining the outcome of the event, - * if an outcome is set, the sent message is overridden. + * if an outcome is set, the message and component will be ignored. */ - EventResult process(ChatProcessor processor); - } - - interface ChatProcessor { - String getMessage(); - - @Nullable - Component getComponent(); - - void setMessage(String message); - - void setComponent(@Nullable Component component); + EventResult send(String message, @Nullable Component component); } @Environment(EnvType.CLIENT) @@ -79,10 +63,9 @@ public interface ClientChatEvent { * * @param type Where was the message emitted from. * @param message The chat message. - * @param sender The packet sender. Can be {@code null}, but probably is the sending player UUID or null for system messages. * @return A {@link CompoundEventResult} determining the outcome of the event, * if an outcome is set, the received message is overridden. */ - CompoundEventResult process(ChatType type, Component message, @Nullable ChatSender sender); + CompoundEventResult process(ChatType.Bound type, Component message); } } diff --git a/common/src/main/java/dev/architectury/event/events/common/ChatEvent.java b/common/src/main/java/dev/architectury/event/events/common/ChatEvent.java index 43918ca8..356b650e 100644 --- a/common/src/main/java/dev/architectury/event/events/common/ChatEvent.java +++ b/common/src/main/java/dev/architectury/event/events/common/ChatEvent.java @@ -19,7 +19,6 @@ package dev.architectury.event.events.common; -import dev.architectury.event.CompoundEventResult; import dev.architectury.event.Event; import dev.architectury.event.EventFactory; import dev.architectury.event.EventResult; @@ -27,15 +26,30 @@ import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import org.jetbrains.annotations.Nullable; -import java.util.function.Function; - public interface ChatEvent { /** - * @see Server#process(ServerPlayer, ChatComponent) + * @see Decorate#decorate(ServerPlayer, ChatComponent) */ - Event SERVER = EventFactory.createEventResult(); + Event DECORATE = EventFactory.createLoop(); + /** + * @see Received#received(ServerPlayer, Component) + */ + Event RECEIVED = EventFactory.createEventResult(); - interface Server { + @FunctionalInterface + interface Decorate { + /** + * Invoked when the server receives a message from a client. + * Equivalent to Forge's {@code ServerChatEvent} event. + * + * @param player The player who has sent the message, or null. + * @param component The message as component. + */ + void decorate(@Nullable ServerPlayer player, ChatComponent component); + } + + @FunctionalInterface + interface Received { /** * Invoked when the server receives a message from a client. * Equivalent to Forge's {@code ServerChatEvent} event. @@ -45,34 +59,12 @@ public interface ChatEvent { * @return A {@link EventResult} determining the outcome of the event, * the execution of the vanilla message may be cancelled by the result. */ - EventResult process(@Nullable ServerPlayer player, ChatComponent component); + EventResult received(@Nullable ServerPlayer player, Component component); } interface ChatComponent { - Component getRaw(); + Component get(); - @Nullable - Component getFiltered(); - - void setRaw(Component raw); - - void setFiltered(@Nullable Component filtered); - - default void modifyRaw(Function function) { - setRaw(function.apply(getRaw())); - } - - default void modifyFiltered(Function function) { - Component filtered = getFiltered(); - - if (filtered != null) { - setFiltered(function.apply(filtered)); - } - } - - default void modifyBoth(Function function) { - modifyRaw(function); - modifyFiltered(function); - } + void set(Component component); } } diff --git a/common/src/main/java/dev/architectury/event/events/common/CommandRegistrationEvent.java b/common/src/main/java/dev/architectury/event/events/common/CommandRegistrationEvent.java index bd76feec..5b70a415 100644 --- a/common/src/main/java/dev/architectury/event/events/common/CommandRegistrationEvent.java +++ b/common/src/main/java/dev/architectury/event/events/common/CommandRegistrationEvent.java @@ -22,12 +22,13 @@ package dev.architectury.event.events.common; import com.mojang.brigadier.CommandDispatcher; import dev.architectury.event.Event; import dev.architectury.event.EventFactory; +import net.minecraft.commands.CommandBuildContext; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; public interface CommandRegistrationEvent { /** - * @see CommandRegistrationEvent#register(CommandDispatcher, Commands.CommandSelection) + * @see CommandRegistrationEvent#register(CommandDispatcher, CommandBuildContext, Commands.CommandSelection) */ Event EVENT = EventFactory.createLoop(); @@ -36,7 +37,8 @@ public interface CommandRegistrationEvent { * Equivalent to Forge's {@code RegisterCommandsEvent} and Fabric's {@code CommandRegistrationCallback}. * * @param dispatcher The command dispatcher to register commands to. + * @param registry The command registry for building arguments. * @param selection The selection where the command can be executed. */ - void register(CommandDispatcher dispatcher, Commands.CommandSelection selection); + void register(CommandDispatcher dispatcher, CommandBuildContext registry, Commands.CommandSelection selection); } diff --git a/common/src/main/java/dev/architectury/impl/ChatProcessorImpl.java b/common/src/main/java/dev/architectury/impl/ChatProcessorImpl.java deleted file mode 100644 index afb495a3..00000000 --- a/common/src/main/java/dev/architectury/impl/ChatProcessorImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package dev.architectury.impl; - -import dev.architectury.event.events.client.ClientChatEvent; -import net.minecraft.network.chat.Component; -import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.Nullable; - -import java.util.Objects; - -@ApiStatus.Internal -public class ChatProcessorImpl implements ClientChatEvent.ChatProcessor { - private String message; - @Nullable - private Component component; - - public ChatProcessorImpl(String message, @Nullable Component component) { - this.message = message; - this.component = component; - } - - @Override - public String getMessage() { - return message; - } - - @Override - @Nullable - public Component getComponent() { - return component; - } - - @Override - public void setMessage(String message) { - this.message = Objects.requireNonNull(message); - } - - @Override - public void setComponent(@Nullable Component component) { - this.component = component; - } -} diff --git a/common/src/main/resources/architectury.accessWidener b/common/src/main/resources/architectury.accessWidener index 6d8c8a60..52efcae5 100644 --- a/common/src/main/resources/architectury.accessWidener +++ b/common/src/main/resources/architectury.accessWidener @@ -146,7 +146,7 @@ transitive-accessible method net/minecraft/world/item/AxeItem (Lnet/minec transitive-accessible method net/minecraft/world/item/DiggerItem (FFLnet/minecraft/world/item/Tier;Lnet/minecraft/tags/TagKey;Lnet/minecraft/world/item/Item$Properties;)V transitive-accessible method net/minecraft/world/item/HoeItem (Lnet/minecraft/world/item/Tier;IFLnet/minecraft/world/item/Item$Properties;)V transitive-accessible method net/minecraft/world/item/PickaxeItem (Lnet/minecraft/world/item/Tier;IFLnet/minecraft/world/item/Item$Properties;)V -transitive-accessible method net/minecraft/world/item/RecordItem (ILnet/minecraft/sounds/SoundEvent;Lnet/minecraft/world/item/Item$Properties;)V +transitive-accessible method net/minecraft/world/item/RecordItem (ILnet/minecraft/sounds/SoundEvent;Lnet/minecraft/world/item/Item$Properties;I)V # Constructors of non-abstract block classes transitive-accessible method net/minecraft/world/level/block/AirBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V diff --git a/fabric/build.gradle b/fabric/build.gradle index 12ee0bf8..aa399f5e 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -113,7 +113,7 @@ unifiedPublishing { displayName = "[Fabric $rootProject.supported_version] v$project.version" releaseType = "$rootProject.artifact_type" changelog = releaseChangelog() - gameVersions = ["1.19"] + gameVersions = ["1.19.1"] gameLoaders = ["fabric", "quilt"] mainPublication renameJarForPublication relations { diff --git a/fabric/src/main/java/dev/architectury/event/fabric/EventHandlerImpl.java b/fabric/src/main/java/dev/architectury/event/fabric/EventHandlerImpl.java index 5a47869b..389d32e3 100644 --- a/fabric/src/main/java/dev/architectury/event/fabric/EventHandlerImpl.java +++ b/fabric/src/main/java/dev/architectury/event/fabric/EventHandlerImpl.java @@ -23,11 +23,8 @@ import dev.architectury.event.events.client.ClientGuiEvent; import dev.architectury.event.events.client.ClientLifecycleEvent; import dev.architectury.event.events.client.ClientTickEvent; import dev.architectury.event.events.client.ClientTooltipEvent; -import dev.architectury.event.events.common.CommandRegistrationEvent; -import dev.architectury.event.events.common.InteractionEvent; -import dev.architectury.event.events.common.LifecycleEvent; -import dev.architectury.event.events.common.LootEvent; -import dev.architectury.event.events.common.TickEvent; +import dev.architectury.event.events.common.*; +import dev.architectury.impl.fabric.ChatComponentImpl; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents; @@ -42,6 +39,11 @@ import net.fabricmc.fabric.api.event.player.AttackBlockCallback; import net.fabricmc.fabric.api.event.player.UseBlockCallback; import net.fabricmc.fabric.api.event.player.UseItemCallback; import net.fabricmc.fabric.api.loot.v2.LootTableEvents; +import net.fabricmc.fabric.api.message.v1.ServerMessageDecoratorEvent; +import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; +import net.minecraft.network.chat.PlayerChatMessage; + +import java.util.concurrent.CompletableFuture; public class EventHandlerImpl { @Environment(EnvType.CLIENT) @@ -72,13 +74,22 @@ public class EventHandlerImpl { ServerWorldEvents.LOAD.register((server, world) -> LifecycleEvent.SERVER_LEVEL_LOAD.invoker().act(world)); ServerWorldEvents.UNLOAD.register((server, world) -> LifecycleEvent.SERVER_LEVEL_UNLOAD.invoker().act(world)); - CommandRegistrationCallback.EVENT.register((dispatcher, registry, selection) -> CommandRegistrationEvent.EVENT.invoker().register(dispatcher, selection)); + CommandRegistrationCallback.EVENT.register((dispatcher, registry, selection) -> CommandRegistrationEvent.EVENT.invoker().register(dispatcher, registry, selection)); UseItemCallback.EVENT.register((player, world, hand) -> InteractionEvent.RIGHT_CLICK_ITEM.invoker().click(player, hand).asMinecraft()); UseBlockCallback.EVENT.register((player, world, hand, hitResult) -> InteractionEvent.RIGHT_CLICK_BLOCK.invoker().click(player, hand, hitResult.getBlockPos(), hitResult.getDirection()).asMinecraft()); AttackBlockCallback.EVENT.register((player, world, hand, pos, face) -> InteractionEvent.LEFT_CLICK_BLOCK.invoker().click(player, hand, pos, face).asMinecraft()); LootTableEvents.MODIFY.register((resourceManager, lootManager, id, tableBuilder, source) -> LootEvent.MODIFY_LOOT_TABLE.invoker().modifyLootTable(lootManager, id, new LootTableModificationContextImpl(tableBuilder), source.isBuiltin())); + + ServerMessageDecoratorEvent.EVENT.register(ServerMessageDecoratorEvent.CONTENT_PHASE, (player, component) -> { + ChatEvent.ChatComponent chatComponent = new ChatComponentImpl(component); + ChatEvent.DECORATE.invoker().decorate(player, chatComponent); + return CompletableFuture.completedFuture(chatComponent.get()); + }); + ServerMessageEvents.ALLOW_CHAT_MESSAGE.register((message, sender, params) -> { + return !ChatEvent.RECEIVED.invoker().received(sender, message.serverContent()).isFalse(); + }); } @Environment(EnvType.SERVER) diff --git a/fabric/src/main/java/dev/architectury/impl/fabric/ChatComponentImpl.java b/fabric/src/main/java/dev/architectury/impl/fabric/ChatComponentImpl.java index ad0a9ce4..da2a5a6c 100644 --- a/fabric/src/main/java/dev/architectury/impl/fabric/ChatComponentImpl.java +++ b/fabric/src/main/java/dev/architectury/impl/fabric/ChatComponentImpl.java @@ -26,33 +26,18 @@ import org.jetbrains.annotations.Nullable; @ApiStatus.Internal public class ChatComponentImpl implements ChatEvent.ChatComponent { - private Component raw; - @Nullable - private Component filtered; + private Component component; - public ChatComponentImpl(Component raw, @Nullable Component filtered) { - this.raw = raw; - this.filtered = filtered; + public ChatComponentImpl(Component component) { + this.component = component; } @Override - public Component getRaw() { - return raw; + public Component get() { + return component; } - @Override - @Nullable - public Component getFiltered() { - return filtered; - } - - @Override - public void setRaw(Component raw) { - this.raw = raw; - } - - @Override - public void setFiltered(@Nullable Component filtered) { - this.filtered = filtered; + public void set(Component component) { + this.component = component; } } diff --git a/fabric/src/main/java/dev/architectury/impl/fabric/EventChatDecorator.java b/fabric/src/main/java/dev/architectury/impl/fabric/EventChatDecorator.java deleted file mode 100644 index 00ae7d10..00000000 --- a/fabric/src/main/java/dev/architectury/impl/fabric/EventChatDecorator.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package dev.architectury.impl.fabric; - -import dev.architectury.event.events.common.ChatEvent; -import net.minecraft.network.chat.ChatDecorator; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MessageSignature; -import net.minecraft.network.chat.PlayerChatMessage; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.FilteredText; -import org.jetbrains.annotations.Nullable; - -import java.util.concurrent.CompletableFuture; - -public class EventChatDecorator implements ChatDecorator { - public static final Component CANCELLING_COMPONENT = Component.literal("THIS SHOULDN'T BE DISPLAYED, ARCHITECTURY SPECIFIC STRING DO NOT IMITATE THIS"); - private final ChatDecorator parent; - private final ChatProcessor processor; - - public EventChatDecorator(ChatDecorator parent, ChatProcessor processor) { - this.parent = parent; - this.processor = processor; - } - - @Override - public CompletableFuture decorate(@Nullable ServerPlayer player, Component component) { - return parent.decorate(player, component).thenApply(c -> { - return processor.process(player, FilteredText.fullyFiltered(c)).raw(); - }).exceptionally(throwable -> { - throwable.printStackTrace(); - return component; - }); - } - - @Override - public CompletableFuture> decorateFiltered(@Nullable ServerPlayer player, FilteredText message) { - return parent.decorateFiltered(player, message).thenApply(newMessage -> { - FilteredText newContent = processor.process(player, newMessage); - if (!newContent.equals(newMessage)) { - return newContent; - } - return newMessage; - }).exceptionally(throwable -> { - throwable.printStackTrace(); - return message; - }); - } - - @Override - public CompletableFuture> decorateChat(@Nullable ServerPlayer player, FilteredText component, MessageSignature signature, boolean signedPreview) { - return parent.decorateChat(player, component, signature, signedPreview).thenApply(message -> { - FilteredText newComponent = processor.process(player, message.map(PlayerChatMessage::signedContent)); - FilteredText newMessage = PlayerChatMessage.filteredSigned(component, newComponent, signature, signedPreview); - if (!newMessage.equals(message)) { - return newMessage; - } - return message; - }).exceptionally(throwable -> { - throwable.printStackTrace(); - return PlayerChatMessage.filteredSigned(component, component, signature, signedPreview); - }); - } - - @FunctionalInterface - public interface ChatProcessor { - FilteredText process(@Nullable ServerPlayer player, FilteredText text); - } -} diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/MixinCommands.java b/fabric/src/main/java/dev/architectury/mixin/fabric/MixinCommands.java index 5703dabb..42c8d3be 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/MixinCommands.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/MixinCommands.java @@ -21,7 +21,7 @@ package dev.architectury.mixin.fabric; import com.google.common.base.Throwables; import com.mojang.brigadier.CommandDispatcher; -import com.mojang.brigadier.StringReader; +import com.mojang.brigadier.ParseResults; import com.mojang.brigadier.exceptions.CommandSyntaxException; import dev.architectury.event.events.common.CommandPerformEvent; import net.minecraft.commands.CommandSourceStack; @@ -33,11 +33,9 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(Commands.class) public class MixinCommands { @Redirect(method = "performCommand", - at = @At(value = "INVOKE", target = "Lcom/mojang/brigadier/CommandDispatcher;execute(Lcom/mojang/brigadier/StringReader;Ljava/lang/Object;)I", remap = false)) - private int performCommand(CommandDispatcher dispatcher, StringReader input, Object source) throws CommandSyntaxException { - var stack = (CommandSourceStack) source; - var parse = dispatcher.parse(input, stack); - var event = new CommandPerformEvent(parse, null); + at = @At(value = "INVOKE", target = "Lcom/mojang/brigadier/CommandDispatcher;execute(Lcom/mojang/brigadier/ParseResults;)I", remap = false)) + private int performCommand(CommandDispatcher dispatcher, ParseResults results) throws CommandSyntaxException { + var event = new CommandPerformEvent(results, null); if (CommandPerformEvent.EVENT.invoker().act(event).isPresent()) { if (event.getThrowable() != null) { Throwables.throwIfUnchecked(event.getThrowable()); diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/MixinMinecraftServer.java b/fabric/src/main/java/dev/architectury/mixin/fabric/MixinMinecraftServer.java deleted file mode 100644 index d7d18093..00000000 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/MixinMinecraftServer.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package dev.architectury.mixin.fabric; - -import dev.architectury.event.CompoundEventResult; -import dev.architectury.event.EventResult; -import dev.architectury.event.events.common.ChatEvent; -import dev.architectury.impl.fabric.ChatComponentImpl; -import dev.architectury.impl.fabric.EventChatDecorator; -import net.minecraft.network.chat.ChatDecorator; -import net.minecraft.network.chat.Component; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.network.FilteredText; -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; - -@Mixin(MinecraftServer.class) -public class MixinMinecraftServer { - @Inject(method = "getChatDecorator", at = @At("RETURN"), cancellable = true) - private void getChatDecorator(CallbackInfoReturnable cir) { - ChatDecorator parent = cir.getReturnValue(); - cir.setReturnValue(new EventChatDecorator(parent, (player, component) -> { - ChatEvent.ChatComponent chatComponent = new ChatComponentImpl(component.raw(), component.filtered()); - EventResult result = ChatEvent.SERVER.invoker().process(player, chatComponent); - if (result.isPresent()) { - if (result.isFalse()) { - return FilteredText.fullyFiltered(EventChatDecorator.CANCELLING_COMPONENT); - } else { - return new FilteredText<>(chatComponent.getRaw(), chatComponent.getFiltered()); - } - } - - return component; - })); - } -} diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java b/fabric/src/main/java/dev/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java deleted file mode 100644 index 2dcf63ad..00000000 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package dev.architectury.mixin.fabric; - -import dev.architectury.impl.fabric.EventChatDecorator; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MessageSignature; -import net.minecraft.network.chat.PlayerChatMessage; -import net.minecraft.network.protocol.game.ServerboundChatPacket; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.FilteredText; -import net.minecraft.server.network.ServerGamePacketListenerImpl; -import net.minecraft.server.network.TextFilter; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; - -@Mixin(ServerGamePacketListenerImpl.class) -public abstract class MixinServerGamePacketListenerImpl { - @Shadow - public ServerPlayer player; - - @Shadow - @Final - private MinecraftServer server; - - @Shadow - protected abstract void detectRateSpam(); - - @Inject(method = "broadcastChatMessage", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/network/chat/PlayerChatMessage;verify(Lnet/minecraft/server/level/ServerPlayer;)Z"), - cancellable = true) - private void handleChat(FilteredText filteredText, CallbackInfo ci) { - PlayerChatMessage chatMessage = filteredText.raw(); - if (chatMessage.serverContent().equals(EventChatDecorator.CANCELLING_COMPONENT)) { - ci.cancel(); - } - } -} diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinChatListener_1.java b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinChatListener_1.java new file mode 100644 index 00000000..23344a3e --- /dev/null +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinChatListener_1.java @@ -0,0 +1,69 @@ +/* + * This file is part of architectury. + * Copyright (C) 2020, 2021, 2022 architectury + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package dev.architectury.mixin.fabric.client; + +import dev.architectury.event.events.client.ClientChatEvent; +import net.minecraft.network.chat.ChatType; +import net.minecraft.network.chat.Component; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.ModifyArgs; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.spongepowered.asm.mixin.injection.invoke.arg.Args; + +import java.util.Objects; + +@Mixin(targets = "net.minecraft.client.multiplayer.chat.ChatListener$1") +public class MixinChatListener_1 { + @Shadow + @Final + Component val$decoratedMessage; + @Unique + private ThreadLocal cancelNext = new ThreadLocal<>(); + + @ModifyArgs(method = "accept", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/chat/ChatListener;processPlayerChatMessage(Lnet/minecraft/network/chat/ChatType$Bound;Lnet/minecraft/network/chat/PlayerChatMessage;Lnet/minecraft/network/chat/Component;Lnet/minecraft/client/multiplayer/PlayerInfo;ZLjava/time/Instant;)Z")) + private void modifyMessage(Args args) { + cancelNext.remove(); + ChatType.Bound boundChatType = args.get(0); + Component message = args.get(2); + var process = ClientChatEvent.RECEIVED.invoker().process(boundChatType, message); + if (process.isPresent()) { + if (process.isFalse()) { + cancelNext.set(message); + } else if (process.object() != null) { + args.set(2, process.object()); + } + } + } + + @Inject(method = "accept", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/chat/ChatListener;processPlayerChatMessage(Lnet/minecraft/network/chat/ChatType$Bound;Lnet/minecraft/network/chat/PlayerChatMessage;Lnet/minecraft/network/chat/Component;Lnet/minecraft/client/multiplayer/PlayerInfo;ZLjava/time/Instant;)Z"), + cancellable = true) + private void handleChatPre(CallbackInfoReturnable cir) { + if (Objects.equals(cancelNext.get(), this.val$decoratedMessage)) { + cir.setReturnValue(false); + } + + cancelNext.remove(); + } +} diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinChatListener_2.java b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinChatListener_2.java new file mode 100644 index 00000000..6050157c --- /dev/null +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinChatListener_2.java @@ -0,0 +1,69 @@ +/* + * This file is part of architectury. + * Copyright (C) 2020, 2021, 2022 architectury + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package dev.architectury.mixin.fabric.client; + +import dev.architectury.event.events.client.ClientChatEvent; +import net.minecraft.network.chat.ChatType; +import net.minecraft.network.chat.Component; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.ModifyArgs; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.spongepowered.asm.mixin.injection.invoke.arg.Args; + +import java.util.Objects; + +@Mixin(targets = "net.minecraft.client.multiplayer.chat.ChatListener$2") +public class MixinChatListener_2 { + @Shadow + @Final + Component val$decoratedMessage; + @Unique + private ThreadLocal cancelNext = new ThreadLocal<>(); + + @ModifyArgs(method = "accept", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/chat/ChatListener;processNonPlayerChatMessage(Lnet/minecraft/network/chat/ChatType$Bound;Lnet/minecraft/network/chat/PlayerChatMessage;Lnet/minecraft/network/chat/Component;)Z")) + private void modifyMessage(Args args) { + cancelNext.remove(); + ChatType.Bound boundChatType = args.get(0); + Component message = args.get(2); + var process = ClientChatEvent.RECEIVED.invoker().process(boundChatType, message); + if (process.isPresent()) { + if (process.isFalse()) { + cancelNext.set(message); + } else if (process.object() != null) { + args.set(2, process.object()); + } + } + } + + @Inject(method = "accept", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/chat/ChatListener;processNonPlayerChatMessage(Lnet/minecraft/network/chat/ChatType$Bound;Lnet/minecraft/network/chat/PlayerChatMessage;Lnet/minecraft/network/chat/Component;)Z"), + cancellable = true) + private void handleChatPre(CallbackInfoReturnable cir) { + if (Objects.equals(cancelNext.get(), this.val$decoratedMessage)) { + cir.setReturnValue(false); + } + + cancelNext.remove(); + } +} diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGui.java b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGui.java deleted file mode 100644 index 10f9ffe8..00000000 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGui.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * This file is part of architectury. - * Copyright (C) 2020, 2021, 2022 architectury - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package dev.architectury.mixin.fabric.client; - -import dev.architectury.event.events.client.ClientChatEvent; -import dev.architectury.impl.fabric.EventChatDecorator; -import net.minecraft.client.gui.Gui; -import net.minecraft.network.chat.ChatSender; -import net.minecraft.network.chat.ChatType; -import net.minecraft.network.chat.Component; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.ModifyVariable; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(Gui.class) -public abstract class MixinGui { - @Unique - private ChatType chatType; - @Unique - private ChatSender chatSender; - - @Inject(method = "handlePlayerChat", at = @At(value = "HEAD")) - private void handleChatPre(ChatType chatType, Component component, ChatSender chatSender, CallbackInfo ci) { - this.chatType = chatType; - this.chatSender = chatSender; - } - - @ModifyVariable(method = "handlePlayerChat", at = @At("HEAD"), argsOnly = true, ordinal = 0) - private Component modifyMessage(Component message) { - if (chatType == null) { - chatType = null; - chatSender = null; - return message; - } - var process = ClientChatEvent.RECEIVED.invoker().process(chatType, message, chatSender); - if (process.isPresent()) { - if (process.isFalse()) - return EventChatDecorator.CANCELLING_COMPONENT; - if (process.object() != null) - return process.object(); - } - return message; - } - - @Inject(method = "handlePlayerChat", at = @At(value = "INVOKE", - target = "Lnet/minecraft/client/Minecraft;isBlocked(Ljava/util/UUID;)Z", ordinal = 0), - cancellable = true) - private void handleChat(ChatType chatType, Component component, ChatSender chatSender, CallbackInfo ci) { - if (EventChatDecorator.CANCELLING_COMPONENT.equals(component)) { - ci.cancel(); - } - } - - @Inject(method = "handleSystemChat", at = @At(value = "HEAD")) - private void handleSystemChatPre(ChatType chatType, Component component, CallbackInfo ci) { - this.chatType = chatType; - } - - @ModifyVariable(method = "handleSystemChat", at = @At("HEAD"), argsOnly = true, ordinal = 0) - private Component modifySystemMessage(Component message) { - if (chatType == null) { - chatType = null; - return message; - } - var process = ClientChatEvent.RECEIVED.invoker().process(chatType, message, null); - if (process.isPresent()) { - if (process.isFalse()) - return EventChatDecorator.CANCELLING_COMPONENT; - if (process.object() != null) - return process.object(); - } - return message; - } - - @Inject(method = "handleSystemChat", at = @At(value = "INVOKE", - target = "Lnet/minecraft/client/Options;hideMatchedNames()Lnet/minecraft/client/OptionInstance;"), - cancellable = true) - private void handleChat(ChatType chatType, Component component, CallbackInfo ci) { - if (EventChatDecorator.CANCELLING_COMPONENT.equals(component)) { - ci.cancel(); - } - } -} diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinLocalPlayer.java b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinLocalPlayer.java index 49eb9c18..6e16ccd4 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinLocalPlayer.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinLocalPlayer.java @@ -20,53 +20,30 @@ package dev.architectury.mixin.fabric.client; import com.mojang.authlib.GameProfile; -import dev.architectury.event.CompoundEventResult; import dev.architectury.event.EventResult; import dev.architectury.event.events.client.ClientChatEvent; -import dev.architectury.impl.ChatProcessorImpl; -import dev.architectury.impl.fabric.EventChatDecorator; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.player.AbstractClientPlayer; import net.minecraft.client.player.LocalPlayer; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MessageSigner; import net.minecraft.world.entity.player.ProfilePublicKey; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import java.util.Objects; - @Mixin(LocalPlayer.class) public abstract class MixinLocalPlayer extends AbstractClientPlayer { public MixinLocalPlayer(ClientLevel clientLevel, GameProfile gameProfile, @Nullable ProfilePublicKey profilePublicKey) { super(clientLevel, gameProfile, profilePublicKey); } - @Shadow - protected abstract void sendChat(MessageSigner messageSigner, String string, @Nullable Component component); - - @Inject(method = "chat(Ljava/lang/String;Lnet/minecraft/network/chat/Component;)V", at = @At(value = "HEAD"), cancellable = true) - private void chat(String message, Component component, CallbackInfo ci) { - ChatProcessorImpl processor = new ChatProcessorImpl(message, component); - EventResult process = ClientChatEvent.PROCESS.invoker().process(processor); - if (process.isPresent()) { - if (process.isFalse()) - ci.cancel(); - else { - String processorMessage = processor.getMessage(); - Component processorComponent = processor.getComponent(); - - if (!Objects.equals(processorMessage, message) || !Objects.equals(processorComponent, component)) { - MessageSigner messageSigner = MessageSigner.create(this.getUUID()); - this.sendChat(messageSigner, processorMessage, processorComponent); - ci.cancel(); - } - } + @Inject(method = "sendChat(Ljava/lang/String;Lnet/minecraft/network/chat/Component;)V", at = @At(value = "HEAD"), cancellable = true) + private void chat(String string, Component component, CallbackInfo ci) { + EventResult process = ClientChatEvent.SEND.invoker().send(string, component); + if (process.isFalse()) { + ci.cancel(); } } } diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinMinecraft.java b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinMinecraft.java index 8c99560a..e98283ec 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinMinecraft.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinMinecraft.java @@ -58,7 +58,7 @@ public abstract class MixinMinecraft { private ThreadLocal setScreenCancelled = new ThreadLocal<>(); @Inject(method = "clearLevel(Lnet/minecraft/client/gui/screens/Screen;)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/chat/NarratorChatListener;clear()V")) + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/GameNarrator;clear()V")) private void handleLogin(Screen screen, CallbackInfo ci) { ClientPlayerEvent.CLIENT_PLAYER_QUIT.invoker().quit(player); } diff --git a/fabric/src/main/resources/architectury.mixins.json b/fabric/src/main/resources/architectury.mixins.json index aecc7fad..52aa0a6a 100644 --- a/fabric/src/main/resources/architectury.mixins.json +++ b/fabric/src/main/resources/architectury.mixins.json @@ -7,12 +7,13 @@ "client": [ "client.ClientPlayerAttackInvoker", "client.MixinAbstractContainerScreen", + "client.MixinChatListener_1", + "client.MixinChatListener_2", "client.MixinClientLevel", "client.MixinClientPacketListener", "client.MixinDebugScreenOverlay", "client.MixinEffectInstance", "client.MixinGameRenderer", - "client.MixinGui", "client.MixinIntegratedServer", "client.MixinKeyboardHandler", "client.MixinLocalPlayer", @@ -44,7 +45,6 @@ "MixinInventory", "MixinItemEntity", "MixinLivingEntity", - "MixinMinecraftServer", "MixinNaturalSpawner", "MixinOcelot", "MixinPatrolSpawner", @@ -54,7 +54,6 @@ "MixinPlayerAdvancements", "MixinPlayerList", "MixinResultSlot", - "MixinServerGamePacketListenerImpl", "MixinServerLevel", "MixinServerPlayer", "MixinServerPlayerGameMode", diff --git a/forge/build.gradle b/forge/build.gradle index e136f934..0cf6144f 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -126,7 +126,7 @@ unifiedPublishing { displayName = "[Forge $rootProject.supported_version] v$project.version" releaseType = "$rootProject.artifact_type" changelog = releaseChangelog() - gameVersions = ["1.19"] + gameVersions = ["1.19.1"] gameLoaders = ["forge"] mainPublication renameJarForPublication diff --git a/forge/src/main/java/dev/architectury/event/forge/EventHandlerImplClient.java b/forge/src/main/java/dev/architectury/event/forge/EventHandlerImplClient.java index f97cce92..bbad9f99 100644 --- a/forge/src/main/java/dev/architectury/event/forge/EventHandlerImplClient.java +++ b/forge/src/main/java/dev/architectury/event/forge/EventHandlerImplClient.java @@ -25,7 +25,6 @@ import dev.architectury.event.EventResult; import dev.architectury.event.events.client.ClientChatEvent; import dev.architectury.event.events.client.*; import dev.architectury.event.events.common.InteractionEvent; -import dev.architectury.impl.ChatProcessorImpl; import dev.architectury.impl.ScreenAccessImpl; import dev.architectury.impl.TooltipEventColorContextImpl; import dev.architectury.impl.TooltipEventPositionContextImpl; @@ -100,24 +99,15 @@ public class EventHandlerImplClient { @SubscribeEvent(priority = EventPriority.HIGH) public static void event(net.minecraftforge.client.event.ClientChatEvent event) { - ChatProcessorImpl processor = new ChatProcessorImpl(event.getMessage(), null); - EventResult process = ClientChatEvent.PROCESS.invoker().process(processor); - if (process.isPresent()) { - if (process.isFalse()) - event.setCanceled(true); - else { - event.setMessage(processor.getMessage()); - - if (process.isTrue()) { - event.setCanceled(true); - } - } + EventResult process = ClientChatEvent.SEND.invoker().send(event.getMessage(), null); + if (process.isFalse()) { + event.setCanceled(true); } } @SubscribeEvent(priority = EventPriority.HIGH) public static void event(ClientChatReceivedEvent event) { - CompoundEventResult process = ClientChatEvent.RECEIVED.invoker().process(event.getType(), event.getMessage(), event.getChatSender()); + CompoundEventResult process = ClientChatEvent.RECEIVED.invoker().process(event.getBoundChatType(), event.getMessage()); if (process.isPresent()) { if (process.isFalse()) event.setCanceled(true); diff --git a/forge/src/main/java/dev/architectury/event/forge/EventHandlerImplCommon.java b/forge/src/main/java/dev/architectury/event/forge/EventHandlerImplCommon.java index 3d0b8f83..3f49a256 100644 --- a/forge/src/main/java/dev/architectury/event/forge/EventHandlerImplCommon.java +++ b/forge/src/main/java/dev/architectury/event/forge/EventHandlerImplCommon.java @@ -102,7 +102,7 @@ public class EventHandlerImplCommon { @SubscribeEvent(priority = EventPriority.HIGH) public static void event(RegisterCommandsEvent event) { - CommandRegistrationEvent.EVENT.invoker().register(event.getDispatcher(), event.getCommandSelection()); + CommandRegistrationEvent.EVENT.invoker().register(event.getDispatcher(), event.getBuildContext(), event.getCommandSelection()); } @SubscribeEvent(priority = EventPriority.HIGH) @@ -140,30 +140,24 @@ public class EventHandlerImplCommon { } @SubscribeEvent(priority = EventPriority.HIGH) - public static void event(ServerChatEvent event) { + public static void event(ServerChatEvent.Preview event) { class ChatComponentImpl implements ChatEvent.ChatComponent { @Override - public Component getRaw() { - return Component.literal(event.getMessage()); + public Component get() { + return event.getMessage(); } @Override - public Component getFiltered() { - return event.getComponent(); - } - - @Override - public void setRaw(Component raw) { - // NO-OP - } - - @Override - public void setFiltered(Component filtered) { - event.setComponent(filtered); + public void set(Component component) { + event.setMessage(component); } } - - EventResult process = ChatEvent.SERVER.invoker().process(event.getPlayer(), new ChatComponentImpl()); + ChatEvent.DECORATE.invoker().decorate(event.getPlayer(), new ChatComponentImpl()); + } + + @SubscribeEvent(priority = EventPriority.HIGH) + public static void event(ServerChatEvent.Submitted event) { + EventResult process = ChatEvent.RECEIVED.invoker().received(event.getPlayer(), event.getMessage()); if (process.isFalse()) event.setCanceled(true); } diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 40c6f70b..34cb57b6 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[41,)" +loaderVersion = "[42,)" issueTrackerURL = "https://github.com/shedaniel/architectury/issues" license = "GNU LGPLv3" @@ -17,13 +17,13 @@ license = "LGPL-3" [[dependencies.architectury]] modId = "minecraft" mandatory = true -versionRange = "[1.19,)" +versionRange = "[1.19.1,)" ordering = "NONE" side = "BOTH" [[dependencies.architectury]] modId = "forge" mandatory = true -versionRange = "[41.0.94,)" +versionRange = "[42.0.0,)" ordering = "NONE" side = "BOTH" diff --git a/gradle.properties b/gradle.properties index 773db286..2acea1cb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,21 +3,21 @@ org.gradle.daemon=false platforms=fabric,forge -minecraft_version=1.19 -supported_version=1.19 +minecraft_version=1.19.1 +supported_version=1.19.1 artifact_type=release archives_base_name=architectury archives_base_name_snapshot=architectury-snapshot -base_version=5.10 +base_version=6.0 maven_group=dev.architectury -fabric_loader_version=0.14.6 -fabric_api_version=0.55.1+1.19 +fabric_loader_version=0.14.8 +fabric_api_version=0.58.5+1.19.1 mod_menu_version=3.1.0 -forge_version=41.0.94 +forge_version=42.0.0 curseforge_id=419699 modrinth_id=lhGA9TYQ diff --git a/testmod-common/src/main/java/dev/architectury/test/events/DebugEvents.java b/testmod-common/src/main/java/dev/architectury/test/events/DebugEvents.java index edc171c4..f78e20dd 100644 --- a/testmod-common/src/main/java/dev/architectury/test/events/DebugEvents.java +++ b/testmod-common/src/main/java/dev/architectury/test/events/DebugEvents.java @@ -61,19 +61,21 @@ public class DebugEvents { TestMod.SINK.accept(Optional.ofNullable(placer).map(Entity::getScoreboardName).orElse("null") + " places block at " + toShortString(pos) + logSide(world)); return EventResult.pass(); }); - ChatEvent.SERVER.register((player, message) -> { - TestMod.SINK.accept("Server chat received: " + message.getRaw()); - if (message.getRaw().getString().contains("shit")) { + ChatEvent.DECORATE.register((player, component) -> { + component.set(component.get().copy().withStyle(ChatFormatting.AQUA).append(" + new text")); + }); + ChatEvent.RECEIVED.register((player, message) -> { + TestMod.SINK.accept("Server chat received: " + message); + if (message.getString().contains("shit")) { return EventResult.interruptFalse(); } - message.modifyBoth(component -> component.copy().withStyle(ChatFormatting.AQUA)); return EventResult.interruptTrue(); }); CommandPerformEvent.EVENT.register(event -> { TestMod.SINK.accept("Server command performed: " + event.getResults().getReader().getString()); return EventResult.pass(); }); - CommandRegistrationEvent.EVENT.register((dispatcher, selection) -> { + CommandRegistrationEvent.EVENT.register((dispatcher, registry, selection) -> { TestMod.SINK.accept("Server commands registers"); }); EntityEvent.LIVING_DEATH.register((entity, source) -> { @@ -253,12 +255,21 @@ public class DebugEvents { e.printStackTrace(); } }); - ClientChatEvent.PROCESS.register((message) -> { - TestMod.SINK.accept("Client chat sent: " + message.getMessage()); + ClientChatEvent.SEND.register((message, component) -> { + TestMod.SINK.accept("Client chat sent: " + message); + if (message.contains("error")) { + return EventResult.interruptFalse(); + } return EventResult.pass(); }); - ClientChatEvent.RECEIVED.register((type, message, sender) -> { + ClientChatEvent.RECEIVED.register((type, message) -> { TestMod.SINK.accept("Client chat received: " + message.getString()); + if (message.getString().contains("terraria")) { + return CompoundEventResult.interruptTrue(message.copy().append(" + terraria is a great game!")); + } + if (message.getString().contains("potato")) { + return CompoundEventResult.interruptFalse(Component.empty()); + } return CompoundEventResult.pass(); }); ClientLifecycleEvent.CLIENT_LEVEL_LOAD.register(world -> {