Prep HideVanillaHidMod

Author: S-N00B-1

src/main/java/net/kyrptonaught/lemclienthelper/hud/genericHud/GenericHudMod.java

@@ -6,6 +6,7 @@
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.loader.api.FabricLoader;
+import net.kyrptonaught.lemclienthelper.hud.genericHud.HideVanillaHUD;
 import net.kyrptonaught.lemclienthelper.hud.genericHud.packets.BannerPacket;
 import net.kyrptonaught.lemclienthelper.hud.genericHud.packets.PlayerBarPacket;
 
@@ -65,7 +66,13 @@ public static void onInitialize() {
                 accessor.getStaticDefinitions().add(UIDefinition.createBeforeInit((a) -> {
                     if ((Boolean)LegacyMixinOptions.legacyGui.get()) {
                         a.getElements().put(FactoryGuiElement.EXPERIENCE_BAR.name() + ".isVisible", () -> {
-                            return !SHOULD_RENDER_PLAYERBAR;
+                            return HideVanillaHUD.visibe.getValue(HideVanillaHUD.HUD_ELEMENT.EXPERIENCE) && HideVanillaHUD.visibe.getValue(HideVanillaHUD.HUD_ELEMENT.STATS) && HideVanillaHUD.visibe.getValue(HideVanillaHUD.HUD_ELEMENT.ALL);
+                        });
+                        a.getElements().put(FactoryGuiElement.PLAYER_HEALTH.name() + ".isVisible", () -> {
+                            return HideVanillaHUD.visibe.getValue(HideVanillaHUD.HEARTS.HOTBAR) && HideVanillaHUD.visibe.getValue(HideVanillaHUD.HUD_ELEMENT.STATS) && HideVanillaHUD.visibe.getValue(HideVanillaHUD.HUD_ELEMENT.ALL);
+                        });
+                        a.getElements().put(FactoryGuiElement.HOTBAR.name() + ".isVisible", () -> {
+                            return HideVanillaHUD.visibe.getValue(HideVanillaHUD.HUD_ELEMENT.HOTBAR) && HideVanillaHUD.visibe.getValue(HideVanillaHUD.HUD_ELEMENT.ALL);
                         });
                     }
                 }));
@@ -77,7 +84,10 @@ public static void onInitialize() {
         ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> SHOULD_RENDER_PLAYERBAR = false);
 
         PayloadTypeRegistry.playS2C().register(PlayerBarPacket.PACKET_ID, PlayerBarPacket.codec);
-        ClientPlayNetworking.registerGlobalReceiver(PlayerBarPacket.PACKET_ID, ((payload, context) -> SHOULD_RENDER_PLAYERBAR = payload.enabled()));
+        ClientPlayNetworking.registerGlobalReceiver(PlayerBarPacket.PACKET_ID, ((payload, context) -> { 
+                SHOULD_RENDER_PLAYERBAR = payload.enabled();
+                HideVanillaHUD.visibe.put(HideVanillaHUD.HUD_ELEMENT.EXPERIENCE, !payload.enabled());
+        }));
 
         PayloadTypeRegistry.playS2C().register(BannerPacket.PACKET_ID, BannerPacket.codec);
         ClientPlayNetworking.registerGlobalReceiver(BannerPacket.PACKET_ID, ((payload, context) -> {

src/main/java/net/kyrptonaught/lemclienthelper/hud/genericHud/HideVanillaHUD.java

@@ -0,0 +1,31 @@
+package net.kyrptonaught.lemclienthelper.hud.glideHud;
+
+import java.util.HashMap;
+
+import net.kyrptonaught.lemclienthelper.ServerInfo.ServerInfoData;
+import net.kyrptonaught.lemclienthelper.hud.HudMod;
+import net.minecraft.client.DeltaTracker;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.Mth;
+
+public class HideVanillaHUD {
+    public static final enum HUD_ELEMENT {
+        ALL,
+        EXPERIENCE,
+        HEARTS,
+        HOTBAR,
+        HUNGER,
+        STATS
+    }
+
+    public static HashMap<HUD_ELEMENT, Boolean> visible;
+
+    init {
+        visible.clear();
+        HUD_ELEMENT.forEach(element -> 
+            visibe.putIfAbsent(element, true)
+        );
+    }
+}

src/main/java/net/kyrptonaught/lemclienthelper/hud/genericHud/packets/HideVanillaHUDPacket.java

@@ -0,0 +1,33 @@
+package net.kyrptonaught.lemclienthelper.hud.genericHud.packets;
+
+import net.kyrptonaught.lemclienthelper.hud.genericHud.HideVanillaHUD;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.codec.ByteBufCodecs;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.network.chat.ComponentSerialization;
+
+import java.util.Optional;
+
+/**
+ * HideVanillaHUDPacket sends banner to client
+ *
+ * @param element an enumerator, HOTBAR, HEARTS, HUNGER, STATS (Hearts & Hunger), ALL (Hearts, Hunger, & Hotbar).
+ * @param visibe boolean, Is the element visible, false for hidden, true for shown.
+ */
+public record HideVanillaHUDPacket(HideVanillaHUD.HUD_ELEMENT element, boolean visible) implements CustomPacketPayload {
+    public static final Type<HideVanillaHUDPacket> PACKET_ID = new Type<>(ResourceLocation.fromNamespaceAndPath("hud", "hidevanilla"));
+    public static final StreamCodec<RegistryFriendlyByteBuf, HideVanillaHUDPacket> codec = StreamCodec.composite(
+            ByteBufCodecs.idMapper(i -> HideVanillaHUD.HUD_ELEMENT.values()[i], HideVanillaHUD.HUD_ELEMENT::ordinal), HideVanillaHUDPacket::element,
+            ByteBufCodecs.BOOL, HideVanillaHUDPacket::visible,
+            HideVanillaHUDPacket::new
+    );
+
+    @Override
+    public Type<? extends CustomPacketPayload> type() {
+        return PACKET_ID;
+    }
+
+}

src/main/java/net/kyrptonaught/lemclienthelper/mixin/hud/genericHud/HideVanillaHUDMixin.java

@@ -0,0 +1,20 @@
+package net.kyrptonaught.lemclienthelper.mixin.hud.genericHud;
+
+import net.kyrptonaught.lemclienthelper.hud.genericHud.GenericHudMod;
+import net.kyrptonaught.lemclienthelper.hud.genericHud.HideVanillaHUD;
+import net.kyrptonaught.lemclienthelper.hud.genericHud.PlayerBarRenderer;
+import net.minecraft.client.DeltaTracker;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiGraphics;
+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.CallbackInfo;
+
+@Mixin(Gui.class)
+public class HideVanillaHUDMixin {
+    @Inject(method = "renderExperienceBar", at=@At("HEAD"), cancellable = true)
+    void disableExperienceBar(GuiGraphics guiGraphics, int i, CallbackInfo ci) {
+        if (!HideVanillaHUD.visibe.getValue(HideVanillaHUD.HUD_ELEMENT.EXPERIENCE) || !HideVanillaHUD.visibe.getValue(HideVanillaHUD.HUD_ELEMENT.ALL)) {ci.cancel();}
+    }
+}

src/main/java/net/kyrptonaught/lemclienthelper/mixin/hud/genericHud/PlayerBarMixin.java

@@ -16,9 +16,4 @@ public class PlayerBarMixin {
     void renderPlayerBar(GuiGraphics guiGraphics, DeltaTracker deltaTracker, CallbackInfo ci){
         PlayerBarRenderer.renderPlayerBar(guiGraphics,deltaTracker);
     }
-
-    @Inject(method = "renderExperienceBar", at=@At("HEAD"), cancellable = true)
-    void disableExperienceBar(GuiGraphics guiGraphics, int i, CallbackInfo ci) {
-        if (GenericHudMod.SHOULD_RENDER_PLAYERBAR) {ci.cancel();}
-    }
 }