From c291ca33f3e8f19f7f595b9af3c471805a5a5d09 Mon Sep 17 00:00:00 2001 From: Aether Date: Wed, 16 Oct 2024 19:21:53 -0400 Subject: [PATCH] add dev build warning --- src/game/java/net/minecraft/client/gui/GuiIngame.java | 8 ++++++++ src/game/java/net/minecraft/client/gui/GuiScreen.java | 7 +++++++ .../net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java | 7 ++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/game/java/net/minecraft/client/gui/GuiIngame.java b/src/game/java/net/minecraft/client/gui/GuiIngame.java index 9f7f8bd..2c4cfa9 100644 --- a/src/game/java/net/minecraft/client/gui/GuiIngame.java +++ b/src/game/java/net/minecraft/client/gui/GuiIngame.java @@ -8,6 +8,7 @@ import java.util.Collection; import net.lax1dude.eaglercraft.v1_8.Display; import net.lax1dude.eaglercraft.v1_8.EagRuntime; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; +import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion; import net.lax1dude.eaglercraft.v1_8.PointerInputAbstraction; import net.lax1dude.eaglercraft.v1_8.Touch; import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite; @@ -160,6 +161,13 @@ public class GuiIngame extends Gui { GlStateManager.enableDepth(); GlStateManager.disableLighting(); + if (EaglercraftVersion.isDevBuild) { + drawRect(0, 0, i, 10, 0xAAFFFF00); + int w = mc.fontRendererObj.getStringWidth("EaglercraftL Dev Build // EaglercraftL Dev Build // EaglercraftL Dev Build"); + int x = (i - w) / 2; + mc.fontRendererObj.drawString("EaglercraftL Dev Build // EaglercraftL Dev Build // EaglercraftL Dev Build", x, 1, 0xFF000000); + } + ItemStack itemstack = this.mc.thePlayer.inventory.armorItemInSlot(3); if (this.mc.gameSettings.thirdPersonView == 0 && itemstack != null && itemstack.getItem() == Item.getItemFromBlock(Blocks.pumpkin)) { diff --git a/src/game/java/net/minecraft/client/gui/GuiScreen.java b/src/game/java/net/minecraft/client/gui/GuiScreen.java index d14df85..622c280 100644 --- a/src/game/java/net/minecraft/client/gui/GuiScreen.java +++ b/src/game/java/net/minecraft/client/gui/GuiScreen.java @@ -19,6 +19,7 @@ import com.google.common.collect.Sets; import net.lax1dude.eaglercraft.v1_8.EagRuntime; import net.lax1dude.eaglercraft.v1_8.EaglerXBungeeVersion; +import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion; import net.lax1dude.eaglercraft.v1_8.Keyboard; import net.lax1dude.eaglercraft.v1_8.Mouse; import net.lax1dude.eaglercraft.v1_8.PauseMenuCustomizeState; @@ -119,6 +120,12 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback { * mouseY, renderPartialTicks */ public void drawScreen(int i, int j, float var3) { + if (EaglercraftVersion.isDevBuild) { + drawRect(0, 0, this.width, 10, 0xAAFFFF00); + int w = fontRendererObj.getStringWidth("EaglercraftL Dev Build // EaglercraftL Dev Build // EaglercraftL Dev Build"); + int x = (this.width - w) / 2; + fontRendererObj.drawString("EaglercraftL Dev Build // EaglercraftL Dev Build // EaglercraftL Dev Build", x, 1, 0xFF000000); + } for (int k = 0, l = this.buttonList.size(); k < l; ++k) { ((GuiButton) this.buttonList.get(k)).drawButton(this.mc, i, j); } diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java index 19c5cd9..dd98aff 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java @@ -10,9 +10,11 @@ public class EaglercraftVersion { /// Customize these to fit your fork: public static final String projectForkName = "Eaglercraft Lambda"; - public static final String projectForkVersion = "1.0.0"; + public static final String projectForkVersion = "1.1.0 dev"; public static final String projectForkVendor = "HoosierTransfer"; + public static final boolean isDevBuild = true; + public static final String projectForkURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; ////////////////////////////////////////////////////////////////////// @@ -20,7 +22,7 @@ public class EaglercraftVersion { public static final String projectOriginName = "EaglercraftX"; public static final String projectOriginAuthor = "lax1dude"; public static final String projectOriginRevision = "1.9"; - public static final String projectOriginVersion = "1.0.0"; + public static final String projectOriginVersion = "u39"; public static final String projectOriginURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; // rest in peace @@ -74,5 +76,4 @@ public class EaglercraftVersion { public static final boolean forceDemoMode = false; public static final String localStorageNamespace = "_eaglercraftX"; - }