From b6497cee4e7b12299ba08560896b5d5cfdeab02d Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Fri, 24 Feb 2023 18:14:21 -0500 Subject: [PATCH] Show branding on F3 --- .../embeddedt/modernfix/ModernFixClient.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/org/embeddedt/modernfix/ModernFixClient.java b/src/main/java/org/embeddedt/modernfix/ModernFixClient.java index 2ed3b0c3..90779e01 100644 --- a/src/main/java/org/embeddedt/modernfix/ModernFixClient.java +++ b/src/main/java/org/embeddedt/modernfix/ModernFixClient.java @@ -4,15 +4,19 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.ConnectScreen; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraftforge.client.event.GuiOpenEvent; +import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.ModContainer; +import net.minecraftforge.fml.ModList; import org.embeddedt.modernfix.core.ModernFixMixinPlugin; import org.embeddedt.modernfix.load.LoadEvents; import org.embeddedt.modernfix.screen.DeferredLevelLoadingScreen; import java.lang.management.ManagementFactory; +import java.util.Optional; public class ModernFixClient { public static long worldLoadStartTime; @@ -20,10 +24,17 @@ public class ModernFixClient { public static float gameStartTimeSeconds = -1; + private String brandingString = null; + public ModernFixClient() { if(ModernFixMixinPlugin.instance.isOptionEnabled("perf.faster_singleplayer_load.ClientEvents")) { MinecraftForge.EVENT_BUS.register(new LoadEvents()); } + if(ModernFixMixinPlugin.instance.isOptionEnabled("feature.branding.F3Screen")) { + Optional mfContainer = ModList.get().getModContainerById("modernfix"); + if(mfContainer.isPresent()) + brandingString = "ModernFix " + mfContainer.get().getModInfo().getVersion().toString(); + } } public void resetWorldLoadStateMachine() { @@ -52,4 +63,12 @@ public class ModernFixClient { ModernFix.worldLoadSemaphore.countDown(); } } + + @SubscribeEvent(priority = EventPriority.HIGHEST) + public void onRenderOverlay(RenderGameOverlayEvent.Text event) { + if(brandingString != null && Minecraft.getInstance().options.renderDebug) { + event.getLeft().add(""); + event.getLeft().add(brandingString); + } + } }