Add option to disable dialog handling in 1.21.6->1.21.5 (#1116)

Author: FlorianMichael

common/src/main/java/com/viaversion/viabackwards/ViaBackwardsConfig.java

@@ -44,6 +44,7 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
  private boolean mapCustomModelData;
  private boolean mapDisplayEntities;
  private boolean suppressEmulationWarnings;
+ private boolean dialogsViaChests;
  private DialogStyleConfig dialogStyleConfig;
 
  public ViaBackwardsConfig(File configFile, Logger logger) {
@@ -70,6 +71,7 @@ private void loadFields() {
  mapCustomModelData = getBoolean("map-custom-model-data", true);
  mapDisplayEntities = getBoolean("map-display-entities", true);
  suppressEmulationWarnings = getBoolean("suppress-emulation-warnings", false);
+ dialogsViaChests = getBoolean("dialogs-via-chests", true);
  dialogStyleConfig = loadDialogStyleConfig(getSection("dialog-style"));
  }
 
@@ -160,6 +162,11 @@ public boolean suppressEmulationWarnings() {
  return suppressEmulationWarnings;
  }
 
+ @Override
+ public boolean dialogsViaChests() {
+ return dialogsViaChests;
+ }
+
  @Override
  public DialogStyleConfig dialogStyleConfig() {
  return dialogStyleConfig;

common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsConfig.java

@@ -113,6 +113,13 @@ public interface ViaBackwardsConfig extends Config {
  */
  boolean suppressEmulationWarnings();
 
+ /**
+ * If enabled, dialogs will be shown via chest inventories for 1.21.5 clients on 1.21.6+ servers.
+ *
+ * @return true if enabled
+ */
+ boolean dialogsViaChests();
+
  /**
  * Returns the dialog style configuration.
  *

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/Protocol1_21_6To1_21_5.java

@@ -19,6 +19,7 @@
 
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.Tag;
+import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
@@ -149,10 +150,15 @@ public void handleArgument(final PacketWrapper wrapper, final String argumentTyp
  final short difficulty = wrapper.read(Types.UNSIGNED_BYTE);
  wrapper.write(Types.VAR_INT, (int) difficulty);
  });
+ registerServerbound(ServerboundPackets1_21_5.CHAT_COMMAND, this::handleClickEvents);
+ registerServerbound(ServerboundPackets1_21_5.CHAT_COMMAND_SIGNED, this::handleClickEvents);
 
  // Are you sure you want to see this? This is your last chance to turn back.
  registerClientbound(ClientboundPackets1_21_6.SHOW_DIALOG, null, wrapper -> {
  wrapper.cancel();
+ if (!ViaBackwards.getConfig().dialogsViaChests()) {
+ return;
+ }
 
  final RegistryAndTags registryAndTags = wrapper.user().get(RegistryAndTags.class);
  final ServerLinks serverLinks = wrapper.user().get(ServerLinks.class);
@@ -169,6 +175,9 @@ public void handleArgument(final PacketWrapper wrapper, final String argumentTyp
  });
  registerClientbound(ClientboundConfigurationPackets1_21_6.SHOW_DIALOG, null, wrapper -> {
  wrapper.cancel();
+ if (!ViaBackwards.getConfig().dialogsViaChests()) {
+ return;
+ }
 
  final RegistryAndTags registryAndTags = wrapper.user().get(RegistryAndTags.class);
  final ServerLinks serverLinks = wrapper.user().get(ServerLinks.class);
@@ -183,9 +192,6 @@ public void handleArgument(final PacketWrapper wrapper, final String argumentTyp
  registerClientbound(ClientboundPackets1_21_6.SERVER_LINKS, this::storeServerLinks);
  registerClientbound(ClientboundConfigurationPackets1_21_6.SERVER_LINKS, this::storeServerLinks);
 
- registerServerbound(ServerboundPackets1_21_5.CHAT_COMMAND, this::handleClickEvents);
- registerServerbound(ServerboundPackets1_21_5.CHAT_COMMAND_SIGNED, this::handleClickEvents);
-
  // The ones below are specific to the chest dialog view provider
  registerServerbound(ServerboundPackets1_21_5.CONTAINER_CLOSE, wrapper -> {
  final ChestDialogStorage storage = wrapper.user().get(ChestDialogStorage.class);
@@ -290,6 +296,10 @@ private void updateTags(final PacketWrapper wrapper) {
 
  private void clearDialog(final PacketWrapper wrapper) {
  wrapper.cancel();
+ if (!ViaBackwards.getConfig().dialogsViaChests()) {
+ return;
+ }
+
  final DialogViewProvider provider = Via.getManager().getProviders().get(DialogViewProvider.class);
  provider.closeDialog(wrapper.user());
  }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/storage/ClickEvents.java

@@ -19,6 +19,7 @@
 
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.Protocol1_21_6To1_21_5;
 import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.data.Dialog;
 import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.provider.DialogViewProvider;
@@ -59,6 +60,10 @@ public boolean handleChatCommand(final UserConnection connection, final String c
  public static void handleClickEvent(final UserConnection connection, final CompoundTag clickEvent) {
  final String action = Key.stripMinecraftNamespace(clickEvent.getString("action"));
  if ("show_dialog".equals(action)) {
+ if (!ViaBackwards.getConfig().dialogsViaChests()) {
+ return;
+ }
+
  final RegistryAndTags registryAndTags = connection.get(RegistryAndTags.class);
  final ServerLinks serverLinks = connection.get(ServerLinks.class);
 

common/src/main/resources/assets/viabackwards/config.yml

@@ -45,6 +45,9 @@ map-display-entities: true
 # Suppresses warnings of missing emulations for certain features that are not supported (e.g. world height in 1.17+).
 suppress-emulation-warnings: false
 #
+# If enabled, dialogs will be shown via chest inventories for 1.21.5 clients on 1.21.6+ servers.
+dialogs-via-chests: true
+#
 # Dialog styling. You can also use translation keys here.
 dialog-style:
  page-navigation-title: "&9&lPage navigation"