WIP: Improve Instrument and MusicVenueTool overlays.

AeronicaMC · Mar 6, 2024 · 415e416 · 415e416
1 parent 39edf5b
commit 415e416
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 17 deletions.
diff --git a/src/main/java/aeronicamc/mods/mxtune/events/ClientEvents.java b/src/main/java/aeronicamc/mods/mxtune/events/ClientEvents.java
@@ -21,14 +21,14 @@ private ClientEvents() { /* NOOP */ }
     public static void event(ClientPlayerNetworkEvent.LoggedInEvent event)
     {
         GroupClient.clear();
-        RenderHelper.getOverlayItem().clear();
+        RenderHelper.getOverlayItemGui().clear();
         PacketDispatcher.sendToServer(new SyncRequestMessage());
     }
 
     @SubscribeEvent
     public static void event(ClientPlayerNetworkEvent.LoggedOutEvent event)
     {
-        RenderHelper.getOverlayItem().clear();
+        RenderHelper.getOverlayItemGui().clear();
         InfoRenderer.getInstance().clearInfoRendererInstances();
     }
 
@@ -37,7 +37,7 @@ public static void event(ClientPlayerNetworkEvent.RespawnEvent event)
     {
         GroupClient.clear();
         ClientAudio.stopAll();
-        RenderHelper.getOverlayItem().clear();
+        RenderHelper.getOverlayItemGui().clear();
         PacketDispatcher.sendToServer(new SyncRequestMessage());
     }
 }
diff --git a/src/main/java/aeronicamc/mods/mxtune/gui/TestScreen.java b/src/main/java/aeronicamc/mods/mxtune/gui/TestScreen.java
@@ -98,7 +98,7 @@ public void onButtonOpen()
         m.setItem(0, Objects.requireNonNull(getMinecraft().player).inventory.getSelected());
         m.setChanged();
         ModItems.MULTI_INST.get().setPatch(itemStack, RandomUtils.nextInt(0, SoundFontProxyManager.getProxies().size()));
-        RenderHelper.getOverlayItem().addOverlay(new OverlayInst(itemStack));
+        RenderHelper.getOverlayItemGui().addOverlay(new OverlayInst(itemStack));
     }
 
     public void onButtonFile()

diff --git a/src/main/java/aeronicamc/mods/mxtune/render/IOverlayItem.java b/src/main/java/aeronicamc/mods/mxtune/render/IOverlayItem.java
@@ -3,6 +3,7 @@
 import com.mojang.blaze3d.matrix.MatrixStack;
 import net.minecraft.client.audio.SimpleSound;
 import net.minecraft.client.audio.SoundHandler;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundEvent;
 import net.minecraft.util.SoundEvents;
@@ -17,6 +18,8 @@ default Object getToken() {
       return NO_TOKEN;
    }
 
+   ItemStack getItemStack();
+
    default int baseWidth() {
       return 160;
    }

diff --git a/src/main/java/aeronicamc/mods/mxtune/render/MXOverlay.java b/src/main/java/aeronicamc/mods/mxtune/render/MXOverlay.java
@@ -30,6 +30,11 @@ public Visibility render(MatrixStack pPoseStack, OverlayItemGui pOverlayComponen
         return delta - this.lastChanged >= 5000L ? IOverlayItem.Visibility.HIDE : IOverlayItem.Visibility.SHOW;
     }
 
+    @Override
+    public ItemStack getItemStack() {
+        return itemStack;
+    }
+
     @Override
     public int totalHeight() {
         return this.baseWidth();

diff --git a/src/main/java/aeronicamc/mods/mxtune/render/OverlayInst.java b/src/main/java/aeronicamc/mods/mxtune/render/OverlayInst.java
@@ -13,7 +13,6 @@ public class OverlayInst implements IOverlayItem {
     private final ItemStack itemStack;
     private long lastChanged;
     private boolean changed;
-    private ItemStack sheetMusic;
     private ITextComponent titleText;
     private ITextComponent extraText;
     private int totalWidth;
@@ -24,12 +23,17 @@ private OverlayInst() {
 
     public OverlayInst(ItemStack itemStack) {
         this.itemStack = itemStack;
-        this.sheetMusic = SheetMusicHelper.getIMusicFromIInstrument(itemStack);
+        ItemStack sheetMusic = SheetMusicHelper.getIMusicFromIInstrument(itemStack);
         this.titleText = SheetMusicHelper.getFormattedMusicTitle(sheetMusic);
         this.extraText = SheetMusicHelper.getFormattedExtraText(sheetMusic);
         this.totalWidth = Math.max(Math.max(mc.font.width(titleText), mc.font.width(extraText)) + 40, this.baseWidth());
     }
 
+    @Override
+    public ItemStack getItemStack() {
+        return itemStack;
+    }
+
     @Override
     public int totalHeight() {
         return this.baseHeight();

diff --git a/src/main/java/aeronicamc/mods/mxtune/render/OverlayItemGui.java b/src/main/java/aeronicamc/mods/mxtune/render/OverlayItemGui.java
@@ -16,7 +16,7 @@
 
 public class OverlayItemGui extends AbstractGui {
    private final Minecraft minecraft;
-   private final OverlayInstance<?>[] visible = new OverlayInstance[1];
+   private final OverlayInstance<?>[] visible = new OverlayInstance[4];
    private final Deque<IOverlayItem> queued = Queues.newArrayDeque();
 
    public OverlayItemGui(Minecraft pMinecraft) {
@@ -35,7 +35,6 @@ public void render(MatrixStack pPoseStack) {
                this.visible[i] = new OverlayInstance<>(this.queued.removeFirst());
             }
          }
-
       }
    }
 

diff --git a/src/main/java/aeronicamc/mods/mxtune/render/OverlayVenueTool.java b/src/main/java/aeronicamc/mods/mxtune/render/OverlayVenueTool.java
@@ -0,0 +1,32 @@
+package aeronicamc.mods.mxtune.render;
+
+import com.mojang.blaze3d.matrix.MatrixStack;
+import net.minecraft.item.ItemStack;
+
+public class OverlayVenueTool implements IOverlayItem {
+    private final ItemStack itemStack;
+
+    public OverlayVenueTool(ItemStack itemStack) {
+        this.itemStack = itemStack;
+    }
+
+    @Override
+    public Visibility render(MatrixStack pPoseStack, OverlayItemGui pOverlayComponent, long delta) {
+        return null;
+    }
+
+    @Override
+    public ItemStack getItemStack() {
+        return null;
+    }
+
+    @Override
+    public int totalHeight() {
+        return this.baseHeight();
+    }
+
+    @Override
+    public int totalWidth() {
+        return 0;
+    }
+}
diff --git a/src/main/java/aeronicamc/mods/mxtune/render/RenderEvents.java b/src/main/java/aeronicamc/mods/mxtune/render/RenderEvents.java
@@ -32,7 +32,6 @@
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.DrawHighlightEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -138,16 +137,10 @@ public static void event(RenderGameOverlayEvent.Post event)
         final ItemStack itemStack = getPlayer().inventory.getSelected();
         InstrumentOverlayRenderer.render(itemStack, event);
         MusicVenueToolOverlayRenderer.render(getPlayer(), itemStack, event);
+        RenderHelper.getOverlayItemGui().render(event.getMatrixStack());
         ActiveAudioOverlay.render(event);
     }
 
-    @SubscribeEvent
-    public static void event(TickEvent.RenderTickEvent event) {
-        if (TickEvent.Phase.END.equals(event.phase)) {
-            RenderHelper.getOverlayItem().render(new MatrixStack());
-        }
-    }
-
     static void renderGroupStatusPlacard(MatrixStack pMatrixStack, IRenderTypeBuffer.Impl pBuffer, ActiveRenderInfo pActiveRenderInfo, float pPartialTicks, ClippingHelper pClippingHelper)
     {
         if (GroupClient.hasGroups())

diff --git a/src/main/java/aeronicamc/mods/mxtune/render/RenderHelper.java b/src/main/java/aeronicamc/mods/mxtune/render/RenderHelper.java
@@ -36,7 +36,7 @@ public static void init() {
         overlayItem = new OverlayItemGui(mc);
     }
 
-    public static OverlayItemGui getOverlayItem() {
+    public static OverlayItemGui getOverlayItemGui() {
         return overlayItem;
     }