From 81a092f8c18b1ca59eea1fce107077d836a088f2 Mon Sep 17 00:00:00 2001
From: sndmax <max.kvy@gmail.com>
Date: Tue, 11 Jul 2023 16:54:00 +0300
Subject: [PATCH] Propagate ba47d3a817d6e044b22a6d29d507c90e21e86a87 commit
 commit to 1.19.1

---
 src/main/java/eu/pb4/sgui/api/GuiHelpers.java |   8 +-
 .../elements/AnimatedGuiElementBuilder.java   |  13 +--
 .../sgui/api/elements/GuiElementBuilder.java  |  14 +--
 .../java/eu/pb4/sgui/api/gui/BookGui.java     |   2 +-
 .../eu/pb4/sgui/api/gui/GuiInterface.java     |  19 ++-
 .../java/eu/pb4/sgui/api/gui/SignGui.java     |   2 +-
 .../api/gui/layered/BackendSimpleGui.java     |   5 -
 .../eu/pb4/sgui/impl/PlayerExtensions.java    |   2 +-
 .../eu/pb4/sgui/mixin/ScreenHandlerMixin.java |   2 +-
 .../mixin/ServerPlayNetworkHandlerMixin.java  | 109 ++++++++++--------
 .../sgui/mixin/ServerPlayerEntityMixin.java   |  18 +--
 .../java/eu/pb4/sgui/testmod/SGuiTest.java    |  13 ++-
 12 files changed, 118 insertions(+), 89 deletions(-)

diff --git a/src/main/java/eu/pb4/sgui/api/GuiHelpers.java b/src/main/java/eu/pb4/sgui/api/GuiHelpers.java
index 72240b4..d9dd3e7 100644
--- a/src/main/java/eu/pb4/sgui/api/GuiHelpers.java
+++ b/src/main/java/eu/pb4/sgui/api/GuiHelpers.java
@@ -8,17 +8,23 @@
 import net.minecraft.network.packet.s2c.play.ScreenHandlerSlotUpdateS2CPacket;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Style;
+import net.minecraft.text.TextColor;
+import net.minecraft.util.Formatting;
 
 import javax.annotation.Nullable;
+import java.util.function.UnaryOperator;
 
 public final class GuiHelpers {
+    public static final UnaryOperator<Style> STYLE_CLEARER = style -> style.withItalic(style.isItalic()).withColor(style.getColor() != null ? style.getColor() : TextColor.fromFormatting(Formatting.WHITE));
+
     @Nullable
     public static GuiInterface getCurrentGui(ServerPlayerEntity player) {
         return player.currentScreenHandler instanceof VirtualScreenHandlerInterface v ? v.getGui() : null;
     }
 
     public static void ignoreNextGuiClosing(ServerPlayerEntity player) {
-        ((PlayerExtensions) player).sgui_ignoreNextClose();
+        ((PlayerExtensions) player).sgui$ignoreNextClose();
     }
 
     public static void sendSlotUpdate(ServerPlayerEntity player, int syncId, int slot, ItemStack stack, int revision) {
diff --git a/src/main/java/eu/pb4/sgui/api/elements/AnimatedGuiElementBuilder.java b/src/main/java/eu/pb4/sgui/api/elements/AnimatedGuiElementBuilder.java
index 32c51a9..a9dc079 100644
--- a/src/main/java/eu/pb4/sgui/api/elements/AnimatedGuiElementBuilder.java
+++ b/src/main/java/eu/pb4/sgui/api/elements/AnimatedGuiElementBuilder.java
@@ -1,6 +1,7 @@
 package eu.pb4.sgui.api.elements;
 
 import com.mojang.authlib.GameProfile;
+import eu.pb4.sgui.api.GuiHelpers;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.item.Item;
@@ -11,7 +12,6 @@
 import net.minecraft.nbt.NbtList;
 import net.minecraft.nbt.NbtString;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Util;
 import org.jetbrains.annotations.Nullable;
@@ -332,10 +332,9 @@ public ItemStack asStack() {
         }
 
         if (this.name != null) {
-            if (this.name instanceof MutableText) {
-                ((MutableText) this.name).styled(style -> style.withItalic(style.isItalic()));
-            }
-            itemStack.setCustomName(this.name);
+            var name = this.name.copy().styled(GuiHelpers.STYLE_CLEARER);
+
+            itemStack.setCustomName(name);
         }
 
         if (this.item.isDamageable() && this.damage != -1) {
@@ -350,9 +349,7 @@ public ItemStack asStack() {
             NbtCompound display = itemStack.getOrCreateSubNbt("display");
             NbtList loreItems = new NbtList();
             for (Text l : this.lore) {
-                if (l instanceof MutableText) {
-                    ((MutableText) l).styled(style -> style.withItalic(style.isItalic()));
-                }
+                l = l.copy().styled(GuiHelpers.STYLE_CLEARER);
                 loreItems.add(NbtString.of(Text.Serializer.toJson(l)));
             }
             display.put("Lore", loreItems);
diff --git a/src/main/java/eu/pb4/sgui/api/elements/GuiElementBuilder.java b/src/main/java/eu/pb4/sgui/api/elements/GuiElementBuilder.java
index d5e7c81..16f886e 100644
--- a/src/main/java/eu/pb4/sgui/api/elements/GuiElementBuilder.java
+++ b/src/main/java/eu/pb4/sgui/api/elements/GuiElementBuilder.java
@@ -1,6 +1,7 @@
 package eu.pb4.sgui.api.elements;
 
 import com.mojang.authlib.GameProfile;
+import eu.pb4.sgui.api.GuiHelpers;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.item.Item;
@@ -76,7 +77,7 @@ public static GuiElementBuilder from(ItemStack stack) {
         NbtCompound tag = stack.getOrCreateNbt().copy();
 
         if (stack.hasCustomName()) {
-            builder.setName((MutableText) stack.getName());
+            builder.setName(stack.getName());
             tag.getCompound("display").remove("Name");
         }
 
@@ -349,10 +350,9 @@ public ItemStack asStack() {
         }
 
         if (this.name != null) {
-            if (this.name instanceof MutableText) {
-                ((MutableText) this.name).styled(style -> style.withItalic(style.isItalic()));
-            }
-            itemStack.setCustomName(this.name);
+            MutableText name = this.name.copy().styled(GuiHelpers.STYLE_CLEARER);
+
+            itemStack.setCustomName(name);
         }
 
         if (this.item.isDamageable() && this.damage != -1) {
@@ -367,9 +367,7 @@ public ItemStack asStack() {
             NbtCompound display = itemStack.getOrCreateSubNbt("display");
             NbtList loreItems = new NbtList();
             for (Text l : this.lore) {
-                if (l instanceof MutableText) {
-                    ((MutableText) l).styled(style -> style.withItalic(style.isItalic()));
-                }
+                l = l.copy().styled(GuiHelpers.STYLE_CLEARER);
                 loreItems.add(NbtString.of(Text.Serializer.toJson(l)));
             }
             display.put("Lore", loreItems);
diff --git a/src/main/java/eu/pb4/sgui/api/gui/BookGui.java b/src/main/java/eu/pb4/sgui/api/gui/BookGui.java
index cc288ef..38e88d9 100644
--- a/src/main/java/eu/pb4/sgui/api/gui/BookGui.java
+++ b/src/main/java/eu/pb4/sgui/api/gui/BookGui.java
@@ -5,9 +5,9 @@
 import eu.pb4.sgui.virtual.SguiScreenHandlerFactory;
 import eu.pb4.sgui.virtual.book.BookScreenHandler;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tag.ItemTags;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.tag.ItemTags;
 import net.minecraft.text.Text;
 
 import java.util.OptionalInt;
diff --git a/src/main/java/eu/pb4/sgui/api/gui/GuiInterface.java b/src/main/java/eu/pb4/sgui/api/gui/GuiInterface.java
index 4f056bd..65739e2 100644
--- a/src/main/java/eu/pb4/sgui/api/gui/GuiInterface.java
+++ b/src/main/java/eu/pb4/sgui/api/gui/GuiInterface.java
@@ -86,15 +86,10 @@ default void close() {
         this.close(false);
     }
 
-    @Deprecated
-    default void onUpdate(boolean firstUpdate) {
-    }
-
     /**
      * Executes when the screen is opened
      */
     default void onOpen() {
-        this.onUpdate(true);
     }
 
     /**
@@ -109,6 +104,14 @@ default void onClose() {
     default void onTick() {
     }
 
+    default boolean canPlayerClose() {
+        return true;
+    }
+
+    default void handleException(Throwable throwable) {
+        throwable.printStackTrace();
+    }
+
     /**
      * Send additional properties to the GUI.
      *
@@ -126,6 +129,12 @@ default void sendProperty(ScreenProperty property, int value) {
         }
     }
 
+    default void sendRawProperty(int id, int value) {
+        if (this.isOpen()) {
+            this.getPlayer().networkHandler.sendPacket(new ScreenHandlerPropertyUpdateS2CPacket(this.getSyncId(), id, value));
+        }
+    }
+
     default boolean resetMousePosition() {
         return false;
     }
diff --git a/src/main/java/eu/pb4/sgui/api/gui/SignGui.java b/src/main/java/eu/pb4/sgui/api/gui/SignGui.java
index 47e78b8..60c72ef 100644
--- a/src/main/java/eu/pb4/sgui/api/gui/SignGui.java
+++ b/src/main/java/eu/pb4/sgui/api/gui/SignGui.java
@@ -9,9 +9,9 @@
 import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.CloseScreenS2CPacket;
 import net.minecraft.network.packet.s2c.play.SignEditorOpenS2CPacket;
+import net.minecraft.tag.BlockTags;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.tag.BlockTags;
 import net.minecraft.text.Text;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/eu/pb4/sgui/api/gui/layered/BackendSimpleGui.java b/src/main/java/eu/pb4/sgui/api/gui/layered/BackendSimpleGui.java
index 0298679..d202a1e 100644
--- a/src/main/java/eu/pb4/sgui/api/gui/layered/BackendSimpleGui.java
+++ b/src/main/java/eu/pb4/sgui/api/gui/layered/BackendSimpleGui.java
@@ -34,11 +34,6 @@ public void onTick() {
         this.gui.onTick();
     }
 
-    @Override
-    public void onUpdate(boolean firstUpdate) {
-        this.gui.onUpdate(firstUpdate);
-    }
-
     @Override
     public void onOpen() {
         this.gui.onOpen();
diff --git a/src/main/java/eu/pb4/sgui/impl/PlayerExtensions.java b/src/main/java/eu/pb4/sgui/impl/PlayerExtensions.java
index 6d3606c..391c3a7 100644
--- a/src/main/java/eu/pb4/sgui/impl/PlayerExtensions.java
+++ b/src/main/java/eu/pb4/sgui/impl/PlayerExtensions.java
@@ -1,5 +1,5 @@
 package eu.pb4.sgui.impl;
 
 public interface PlayerExtensions {
-    void sgui_ignoreNextClose();
+    void sgui$ignoreNextClose();
 }
diff --git a/src/main/java/eu/pb4/sgui/mixin/ScreenHandlerMixin.java b/src/main/java/eu/pb4/sgui/mixin/ScreenHandlerMixin.java
index e9410e8..fd86a45 100644
--- a/src/main/java/eu/pb4/sgui/mixin/ScreenHandlerMixin.java
+++ b/src/main/java/eu/pb4/sgui/mixin/ScreenHandlerMixin.java
@@ -13,7 +13,7 @@
 public class ScreenHandlerMixin {
 
     @Inject(method = "canInsertItemIntoSlot", at = @At("HEAD"), cancellable = true)
-    private static void blockIfVirtual(Slot slot, ItemStack stack, boolean allowOverflow, CallbackInfoReturnable<Boolean> cir) {
+    private static void sgui$blockIfVirtual(Slot slot, ItemStack stack, boolean allowOverflow, CallbackInfoReturnable<Boolean> cir) {
         if (slot.inventory instanceof VirtualInventory) {
             cir.setReturnValue(false);
         }
diff --git a/src/main/java/eu/pb4/sgui/mixin/ServerPlayNetworkHandlerMixin.java b/src/main/java/eu/pb4/sgui/mixin/ServerPlayNetworkHandlerMixin.java
index cc40413..aac9ab2 100644
--- a/src/main/java/eu/pb4/sgui/mixin/ServerPlayNetworkHandlerMixin.java
+++ b/src/main/java/eu/pb4/sgui/mixin/ServerPlayNetworkHandlerMixin.java
@@ -4,26 +4,22 @@
 import eu.pb4.sgui.api.GuiHelpers;
 import eu.pb4.sgui.api.gui.AnvilInputGui;
 import eu.pb4.sgui.api.gui.HotbarGui;
-import eu.pb4.sgui.api.gui.SimpleGui;
 import eu.pb4.sgui.api.gui.SignGui;
+import eu.pb4.sgui.api.gui.SimpleGui;
+import eu.pb4.sgui.virtual.FakeScreenHandler;
 import eu.pb4.sgui.virtual.VirtualScreenHandlerInterface;
 import eu.pb4.sgui.virtual.book.BookScreenHandler;
 import eu.pb4.sgui.virtual.hotbar.HotbarScreenHandler;
 import eu.pb4.sgui.virtual.inventory.VirtualScreenHandler;
 import eu.pb4.sgui.virtual.merchant.VirtualMerchantScreenHandler;
-import eu.pb4.sgui.virtual.FakeScreenHandler;
 import io.netty.buffer.Unpooled;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.Packet;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.network.packet.c2s.play.*;
-import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket;
-import net.minecraft.network.packet.s2c.play.PlayerActionResponseS2CPacket;
-import net.minecraft.network.packet.s2c.play.ScreenHandlerSlotUpdateS2CPacket;
-import net.minecraft.network.packet.s2c.play.UpdateSelectedSlotS2CPacket;
+import net.minecraft.network.packet.s2c.play.*;
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.server.filter.FilteredMessage;
-import net.minecraft.server.filter.TextStream;
 import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
@@ -41,7 +37,7 @@
 public abstract class ServerPlayNetworkHandlerMixin {
 
     @Unique
-    private ScreenHandler sgui_previousScreen = null;
+    private ScreenHandler sgui$previousScreen = null;
 
     @Shadow
     public ServerPlayerEntity player;
@@ -50,7 +46,7 @@ public abstract class ServerPlayNetworkHandlerMixin {
     public abstract void sendPacket(Packet<?> packet);
 
     @Inject(method = "onClickSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;updateLastActionTime()V", shift = At.Shift.AFTER), cancellable = true)
-    private void sgui_handleGuiClicks(ClickSlotC2SPacket packet, CallbackInfo ci) {
+    private void sgui$handleGuiClicks(ClickSlotC2SPacket packet, CallbackInfo ci) {
         if (this.player.currentScreenHandler instanceof VirtualScreenHandler handler) {
             try {
                 var gui = handler.getGui();
@@ -84,8 +80,8 @@ private void sgui_handleGuiClicks(ClickSlotC2SPacket packet, CallbackInfo ci) {
                     }
                 }
 
-            } catch (Exception e) {
-                e.printStackTrace();
+            } catch (Throwable e) {
+                handler.getGui().handleException(e);
                 ci.cancel();
             }
 
@@ -96,8 +92,8 @@ private void sgui_handleGuiClicks(ClickSlotC2SPacket packet, CallbackInfo ci) {
     }
 
     @Inject(method = "onClickSlot", at = @At("TAIL"))
-    private void sgui_resyncGui(ClickSlotC2SPacket packet, CallbackInfo ci) {
-        if (this.player.currentScreenHandler instanceof VirtualScreenHandler) {
+    private void sgui$resyncGui(ClickSlotC2SPacket packet, CallbackInfo ci) {
+        if (this.player.currentScreenHandler instanceof VirtualScreenHandler handler) {
             try {
                 int slot = packet.getSlot();
                 int button = packet.getButton();
@@ -107,61 +103,74 @@ private void sgui_resyncGui(ClickSlotC2SPacket packet, CallbackInfo ci) {
                     GuiHelpers.sendPlayerScreenHandler(this.player);
                 }
 
-            } catch (Exception e) {
-                e.printStackTrace();
+            } catch (Throwable e) {
+                handler.getGui().handleException(e);
             }
         }
     }
 
-    @Inject(method = "onCloseHandledScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;closeScreenHandler()V", shift = At.Shift.BEFORE))
-    private void sgui_storeScreenHandler(CloseHandledScreenC2SPacket packet, CallbackInfo info) {
-        if (this.player.currentScreenHandler instanceof VirtualScreenHandlerInterface) {
-            this.sgui_previousScreen = this.player.currentScreenHandler;
+    @Inject(method = "onCloseHandledScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/NetworkThreadUtils;forceMainThread(Lnet/minecraft/network/Packet;Lnet/minecraft/network/listener/PacketListener;Lnet/minecraft/server/world/ServerWorld;)V", shift = At.Shift.AFTER), cancellable = true)
+    private void sgui$storeScreenHandler(CloseHandledScreenC2SPacket packet, CallbackInfo info) {
+        if (this.player.currentScreenHandler instanceof VirtualScreenHandlerInterface handler) {
+            if (handler.getGui().canPlayerClose()) {
+                this.sgui$previousScreen = this.player.currentScreenHandler;
+            } else {
+                var screenHandler = this.player.currentScreenHandler;
+                if (screenHandler.getType() != null) {
+                    try {
+                        this.sendPacket(new OpenScreenS2CPacket(screenHandler.syncId, screenHandler.getType(), handler.getGui().getTitle()));
+                        screenHandler.syncState();
+                    } catch (Throwable e) {
+
+                    }
+                }
+                info.cancel();
+            }
+
         }
     }
 
     @Inject(method = "onCloseHandledScreen", at = @At("TAIL"))
-    private void sgui_executeClosing(CloseHandledScreenC2SPacket packet, CallbackInfo info) {
+    private void sgui$executeClosing(CloseHandledScreenC2SPacket packet, CallbackInfo info) {
         try {
-            if (this.sgui_previousScreen != null) {
-                if (this.sgui_previousScreen instanceof VirtualScreenHandlerInterface screenHandler) {
+            if (this.sgui$previousScreen != null) {
+                if (this.sgui$previousScreen instanceof VirtualScreenHandlerInterface screenHandler) {
                     screenHandler.getGui().close(true);
                 }
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
-        this.sgui_previousScreen = null;
+        this.sgui$previousScreen = null;
     }
 
 
     @Inject(method = "onRenameItem", at = @At("TAIL"))
-    private void sgui_catchRenamingWithCustomGui(RenameItemC2SPacket packet, CallbackInfo ci) {
-        if (this.player.currentScreenHandler instanceof VirtualScreenHandler) {
+    private void sgui$catchRenamingWithCustomGui(RenameItemC2SPacket packet, CallbackInfo ci) {
+        if (this.player.currentScreenHandler instanceof VirtualScreenHandler handler) {
             try {
-                VirtualScreenHandler handler = (VirtualScreenHandler) this.player.currentScreenHandler;
                 if (handler.getGui() instanceof AnvilInputGui) {
                     ((AnvilInputGui) handler.getGui()).input(packet.getName());
                 }
-            } catch (Exception e) {
-                e.printStackTrace();
+            } catch (Throwable e) {
+                handler.getGui().handleException(e);
             }
         }
     }
 
     @Inject(method = "onCraftRequest", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;updateLastActionTime()V", shift = At.Shift.BEFORE), cancellable = true)
-    private void sgui_catchRecipeRequests(CraftRequestC2SPacket packet, CallbackInfo ci) {
+    private void sgui$catchRecipeRequests(CraftRequestC2SPacket packet, CallbackInfo ci) {
         if (this.player.currentScreenHandler instanceof VirtualScreenHandler handler && handler.getGui() instanceof SimpleGui gui) {
             try {
                 gui.onCraftRequest(packet.getRecipe(), packet.shouldCraftAll());
-            } catch (Exception e) {
-                e.printStackTrace();
+            } catch (Throwable e) {
+                handler.getGui().handleException(e);
             }
         }
     }
 
     @Inject(method = "onSignUpdate", at = @At("HEAD"), cancellable = true)
-    private void sgui_catchSignUpdate(UpdateSignC2SPacket packet, List<FilteredMessage> signText, CallbackInfo ci) {
+    private void sgui$catchSignUpdate(UpdateSignC2SPacket packet, List<FilteredMessage> signText, CallbackInfo ci) {
         try {
             if (this.player.currentScreenHandler instanceof FakeScreenHandler fake && fake.getGui() instanceof SignGui gui) {
                 for (int i = 0; i < packet.getText().length; i++) {
@@ -170,13 +179,17 @@ private void sgui_catchSignUpdate(UpdateSignC2SPacket packet, List<FilteredMessa
                 gui.close(true);
                 ci.cancel();
             }
-        } catch (Exception e) {
-            e.printStackTrace();
+        } catch (Throwable e) {
+            if (this.player.currentScreenHandler instanceof VirtualScreenHandlerInterface handler ) {
+                handler.getGui().handleException(e);
+            } else {
+                e.printStackTrace();
+            }
         }
     }
 
     @Inject(method = "onSelectMerchantTrade", at = @At(value = "INVOKE", shift = At.Shift.AFTER, target = "Lnet/minecraft/network/NetworkThreadUtils;forceMainThread(Lnet/minecraft/network/Packet;Lnet/minecraft/network/listener/PacketListener;Lnet/minecraft/server/world/ServerWorld;)V"), cancellable = true)
-    private void sgui_catchMerchantTradeSelect(SelectMerchantTradeC2SPacket packet, CallbackInfo ci) {
+    private void sgui$catchMerchantTradeSelect(SelectMerchantTradeC2SPacket packet, CallbackInfo ci) {
         if (this.player.currentScreenHandler instanceof VirtualMerchantScreenHandler merchantScreenHandler) {
             int id = packet.getTradeId();
             merchantScreenHandler.selectNewTrade(id);
@@ -185,7 +198,7 @@ private void sgui_catchMerchantTradeSelect(SelectMerchantTradeC2SPacket packet,
     }
 
     @Inject(method = "onUpdateSelectedSlot", at = @At(value = "INVOKE", shift = At.Shift.AFTER, target = "Lnet/minecraft/network/NetworkThreadUtils;forceMainThread(Lnet/minecraft/network/Packet;Lnet/minecraft/network/listener/PacketListener;Lnet/minecraft/server/world/ServerWorld;)V"), cancellable = true)
-    private void sgui_catchUpdateSelectedSlot(UpdateSelectedSlotC2SPacket packet, CallbackInfo ci) {
+    private void sgui$catchUpdateSelectedSlot(UpdateSelectedSlotC2SPacket packet, CallbackInfo ci) {
         if (this.player.currentScreenHandler instanceof HotbarScreenHandler handler) {
             if (!handler.getGui().onSelectedSlotChange(packet.getSelectedSlot())) {
                 this.sendPacket(new UpdateSelectedSlotS2CPacket(handler.getGui().getSelectedSlot()));
@@ -195,14 +208,14 @@ private void sgui_catchUpdateSelectedSlot(UpdateSelectedSlotC2SPacket packet, Ca
     }
 
     @Inject(method = "onCreativeInventoryAction", at = @At(value = "INVOKE", shift = At.Shift.AFTER, target = "Lnet/minecraft/network/NetworkThreadUtils;forceMainThread(Lnet/minecraft/network/Packet;Lnet/minecraft/network/listener/PacketListener;Lnet/minecraft/server/world/ServerWorld;)V"), cancellable = true)
-    private void sgui_cancelCreativeAction(CreativeInventoryActionC2SPacket packet, CallbackInfo ci) {
+    private void sgui$cancelCreativeAction(CreativeInventoryActionC2SPacket packet, CallbackInfo ci) {
         if (this.player.currentScreenHandler instanceof VirtualScreenHandlerInterface) {
             ci.cancel();
         }
     }
 
     @Inject(method = "onHandSwing", at = @At(value = "INVOKE", shift = At.Shift.AFTER, target = "Lnet/minecraft/network/NetworkThreadUtils;forceMainThread(Lnet/minecraft/network/Packet;Lnet/minecraft/network/listener/PacketListener;Lnet/minecraft/server/world/ServerWorld;)V"), cancellable = true)
-    private void sgui_clickHandSwing(HandSwingC2SPacket packet, CallbackInfo ci) {
+    private void sgui$clickHandSwing(HandSwingC2SPacket packet, CallbackInfo ci) {
         if (this.player.currentScreenHandler instanceof HotbarScreenHandler screenHandler) {
             var gui = screenHandler.getGui();
             if (!gui.onHandSwing()) {
@@ -212,7 +225,7 @@ private void sgui_clickHandSwing(HandSwingC2SPacket packet, CallbackInfo ci) {
     }
 
     @Inject(method = "onPlayerInteractItem", at = @At(value = "INVOKE", shift = At.Shift.AFTER, target = "Lnet/minecraft/network/NetworkThreadUtils;forceMainThread(Lnet/minecraft/network/Packet;Lnet/minecraft/network/listener/PacketListener;Lnet/minecraft/server/world/ServerWorld;)V"), cancellable = true)
-    private void sgui_clickWithItem(PlayerInteractItemC2SPacket packet, CallbackInfo ci) {
+    private void sgui$clickWithItem(PlayerInteractItemC2SPacket packet, CallbackInfo ci) {
         if (this.player.currentScreenHandler instanceof HotbarScreenHandler screenHandler) {
             var gui = screenHandler.getGui();
             if (screenHandler.slotsOld != null) {
@@ -225,7 +238,7 @@ private void sgui_clickWithItem(PlayerInteractItemC2SPacket packet, CallbackInfo
     }
 
     @Inject(method = "onPlayerInteractBlock", at = @At(value = "INVOKE", shift = At.Shift.AFTER, target = "Lnet/minecraft/network/NetworkThreadUtils;forceMainThread(Lnet/minecraft/network/Packet;Lnet/minecraft/network/listener/PacketListener;Lnet/minecraft/server/world/ServerWorld;)V"), cancellable = true)
-    private void sgui_clickOnBlock(PlayerInteractBlockC2SPacket packet, CallbackInfo ci) {
+    private void sgui$clickOnBlock(PlayerInteractBlockC2SPacket packet, CallbackInfo ci) {
         if (this.player.currentScreenHandler instanceof HotbarScreenHandler screenHandler) {
             var gui = screenHandler.getGui();
 
@@ -247,7 +260,7 @@ private void sgui_clickOnBlock(PlayerInteractBlockC2SPacket packet, CallbackInfo
     }
 
     @Inject(method = "onPlayerAction", at = @At(value = "INVOKE", shift = At.Shift.AFTER, target = "Lnet/minecraft/network/NetworkThreadUtils;forceMainThread(Lnet/minecraft/network/Packet;Lnet/minecraft/network/listener/PacketListener;Lnet/minecraft/server/world/ServerWorld;)V"), cancellable = true)
-    private void sgui_onPlayerAction(PlayerActionC2SPacket packet, CallbackInfo ci) {
+    private void sgui$onPlayerAction(PlayerActionC2SPacket packet, CallbackInfo ci) {
         if (this.player.currentScreenHandler instanceof HotbarScreenHandler screenHandler) {
             var gui = screenHandler.getGui();
 
@@ -267,7 +280,7 @@ private void sgui_onPlayerAction(PlayerActionC2SPacket packet, CallbackInfo ci)
     }
 
     @Inject(method = "onPlayerInteractEntity", at = @At(value = "INVOKE", shift = At.Shift.AFTER, target = "Lnet/minecraft/network/NetworkThreadUtils;forceMainThread(Lnet/minecraft/network/Packet;Lnet/minecraft/network/listener/PacketListener;Lnet/minecraft/server/world/ServerWorld;)V"), cancellable = true)
-    private void sgui_clickOnEntity(PlayerInteractEntityC2SPacket packet, CallbackInfo ci) {
+    private void sgui$clickOnEntity(PlayerInteractEntityC2SPacket packet, CallbackInfo ci) {
         if (this.player.currentScreenHandler instanceof HotbarScreenHandler screenHandler) {
             var gui = screenHandler.getGui();
             var buf = new PacketByteBuf(Unpooled.buffer());
@@ -300,27 +313,27 @@ private void sgui_clickOnEntity(PlayerInteractEntityC2SPacket packet, CallbackIn
     }
 
     @Inject(method = "method_44900", at = @At("HEAD"), cancellable = true)
-    private void sgui_onMessage(ChatMessageC2SPacket chatMessageC2SPacket, CallbackInfo ci) {
+    private void sgui$onMessage(ChatMessageC2SPacket chatMessageC2SPacket, CallbackInfo ci) {
         if (this.player.currentScreenHandler instanceof BookScreenHandler handler) {
             try {
                 if (handler.getGui().onCommand(chatMessageC2SPacket.chatMessage())) {
                     ci.cancel();
                 }
-            } catch (Exception e) {
-                e.printStackTrace();
+            } catch (Throwable e) {
+                handler.getGui().handleException(e);
             }
         }
     }
 
     @Inject(method = "method_44356", at = @At("HEAD"), cancellable = true)
-    private void sgui_onCommand(CommandExecutionC2SPacket packet, CallbackInfo ci) {
+    private void sgui$onCommand(CommandExecutionC2SPacket packet, CallbackInfo ci) {
         if (this.player.currentScreenHandler instanceof BookScreenHandler handler) {
             try {
                 if (handler.getGui().onCommand("/" + packet.command())) {
                     ci.cancel();
                 }
-            } catch (Exception e) {
-                e.printStackTrace();
+            } catch (Throwable e) {
+                handler.getGui().handleException(e);
             }
         }
     }
diff --git a/src/main/java/eu/pb4/sgui/mixin/ServerPlayerEntityMixin.java b/src/main/java/eu/pb4/sgui/mixin/ServerPlayerEntityMixin.java
index a1849d2..7b2b8c8 100644
--- a/src/main/java/eu/pb4/sgui/mixin/ServerPlayerEntityMixin.java
+++ b/src/main/java/eu/pb4/sgui/mixin/ServerPlayerEntityMixin.java
@@ -27,37 +27,37 @@ public abstract class ServerPlayerEntityMixin extends PlayerEntity implements Pl
     @Shadow public abstract void closeScreenHandler();
 
     @Unique
-    private boolean sgui_ignoreNext = false;
+    private boolean sgui$ignoreNext = false;
 
     public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile gameProfile, @Nullable PlayerPublicKey publicKey) {
         super(world, pos, yaw, gameProfile, publicKey);
     }
 
     @Inject(method = "openHandledScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;closeHandledScreen()V", shift = At.Shift.BEFORE), cancellable = true)
-    private void sgui_dontForceCloseFor(NamedScreenHandlerFactory factory, CallbackInfoReturnable<OptionalInt> cir) {
+    private void sgui$dontForceCloseFor(NamedScreenHandlerFactory factory, CallbackInfoReturnable<OptionalInt> cir) {
         if (factory instanceof SguiScreenHandlerFactory<?> sguiScreenHandlerFactory && !sguiScreenHandlerFactory.gui().resetMousePosition()) {
-            this.sgui_ignoreNext = true;
+            this.sgui$ignoreNext = true;
         }
     }
 
     @Inject(method = "closeHandledScreen", at = @At("HEAD"), cancellable = true)
-    private void sgui_ignoreClosing(CallbackInfo ci) {
-        if (this.sgui_ignoreNext) {
-            this.sgui_ignoreNext = false;
+    private void sgui$ignoreClosing(CallbackInfo ci) {
+        if (this.sgui$ignoreNext) {
+            this.sgui$ignoreNext = false;
             this.closeScreenHandler();
             ci.cancel();
         }
     }
 
     @Inject(method = "onDeath", at = @At("TAIL"))
-    private void sgui_onDeath(DamageSource source, CallbackInfo ci) {
+    private void sgui$onDeath(DamageSource source, CallbackInfo ci) {
         if (this.currentScreenHandler instanceof VirtualScreenHandlerInterface handler) {
             handler.getGui().close(true);
         }
     }
 
     @Override
-    public void sgui_ignoreNextClose() {
-        this.sgui_ignoreNext = true;
+    public void sgui$ignoreNextClose() {
+        this.sgui$ignoreNext = true;
     }
 }
diff --git a/src/testmod/java/eu/pb4/sgui/testmod/SGuiTest.java b/src/testmod/java/eu/pb4/sgui/testmod/SGuiTest.java
index bbddd2a..030c4d3 100644
--- a/src/testmod/java/eu/pb4/sgui/testmod/SGuiTest.java
+++ b/src/testmod/java/eu/pb4/sgui/testmod/SGuiTest.java
@@ -56,6 +56,11 @@ public void onTick() {
                     this.setSlot(0, new GuiElementBuilder(Items.ARROW).setCount((int) (player.world.getTime() % 127)));
                     super.onTick();
                 }
+
+                @Override
+                public boolean canPlayerClose() {
+                    return false;
+                }
             };
 
             gui.setTitle(Text.literal("Nice"));
@@ -215,6 +220,7 @@ public void onTick() {
 
                 @Override
                 public boolean onCommand(String command) {
+                    System.out.println(command);
                     bookBuilder.addPage(Text.of(command));
                     this.book = bookBuilder.asStack();
 
@@ -467,6 +473,11 @@ public void onClose() {
                     player.sendMessage(Text.literal("CLOSE!"), false);
                 }
 
+                @Override
+                public boolean canPlayerClose() {
+                    return false;
+                }
+
                 @Override
                 public boolean onClick(int index, ClickType type, SlotActionType action, GuiElementInterface element) {
                     player.sendMessage(Text.literal("CLICK!"), false);
@@ -543,7 +554,7 @@ public boolean onSelectedSlotChange(int slot) {
                     .setItem(Items.BARRIER)
                     .glow()
                     .setName(Text.literal("Bye")
-                            .setStyle(Style.EMPTY.withItalic(false).withBold(true)))
+                            .setStyle(Style.EMPTY.withItalic(false).withBold(true).withFormatting(Formatting.RED)))
                     .addLoreLine(Text.literal("Some lore"))
                     .addLoreLine(Text.literal("More lore").formatted(Formatting.RED))
                     .setCount(3)