fix guis

MeiNanziiii · Dec 6, 2024 · 68d4340 · 68d4340
1 parent 4d63a78
commit 68d4340
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/src/main/java/ua/mei/mgui/api/font/GUITextureManager.java b/src/main/java/ua/mei/mgui/api/font/GUITextureManager.java
@@ -6,7 +6,7 @@
 
 public class GUITextureManager {
     public static MutableText requestGui(String path, FontResourceManager manager) {
-        BitmapGlyph glyph = manager.requestGlyph(path, 256, 0);
+        BitmapGlyph glyph = manager.requestGlyph(path, 256, 13);
         return glyph.formatter().space(-8, -glyph.glyphWidth + 7).value;
     }
 }
diff --git a/src/main/java/ua/mei/mgui/impl/MGuiImpl.java b/src/main/java/ua/mei/mgui/impl/MGuiImpl.java
@@ -8,7 +8,6 @@
 @ApiStatus.Internal
 public class MGuiImpl implements ModInitializer {
     public static final String MOD_ID = "mgui";
-    public static final boolean GUI_ENABLED = false;
 
     @Override
     public void onInitialize() {

diff --git a/src/main/java/ua/mei/mgui/mixin/ServerPlayerEntityMixin.java b/src/main/java/ua/mei/mgui/mixin/ServerPlayerEntityMixin.java
@@ -9,18 +9,13 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
-import ua.mei.mgui.impl.MGuiImpl;
 import ua.mei.mgui.impl.VanillaTextures;
 
 @Mixin(ServerPlayerEntity.class)
 public abstract class ServerPlayerEntityMixin {
     @ModifyArg(method = "openHandledScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayNetworkHandler;sendPacket(Lnet/minecraft/network/packet/Packet;)V"))
     private Packet<ClientPlayPacketListener> mgui$replaceName(Packet<ClientPlayPacketListener> par1) {
         OpenScreenS2CPacket packet = (OpenScreenS2CPacket) par1;
-        if (MGuiImpl.GUI_ENABLED) {
-            return new OpenScreenS2CPacket(packet.getSyncId(), packet.getScreenHandlerType(), Text.empty().append(VanillaTextures.fromScreenHandler(packet.getScreenHandlerType()).formatted(Formatting.WHITE)).append(packet.getName()));
-        } else {
-            return par1;
-        }
+        return new OpenScreenS2CPacket(packet.getSyncId(), packet.getScreenHandlerType(), Text.empty().append(VanillaTextures.fromScreenHandler(packet.getScreenHandlerType()).formatted(Formatting.WHITE)).append(packet.getName()));
     }
 }
diff --git a/src/main/resources/mgui.mixins.json b/src/main/resources/mgui.mixins.json
@@ -4,6 +4,7 @@
     "package": "ua.mei.mgui.mixin",
     "compatibilityLevel": "JAVA_21",
     "mixins": [
+        "ServerPlayerEntityMixin"
     ],
     "injectors": {
         "defaultRequire": 1