From 1c0fa82a4313ef49f3a5038bf79c729bfe701a2a Mon Sep 17 00:00:00 2001 From: Fabboz Date: Sun, 6 Oct 2024 15:38:00 +0200 Subject: [PATCH 1/5] LP Hud fix --- .../client/renderer/RenderHelper.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java index ab36d637a..072fe8267 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java @@ -114,18 +114,20 @@ private static void renderLPHUD(Minecraft mc, int lpAmount, int maxAmount) { ResourceLocation test2 = new ResourceLocation("alchemicalwizardry", "textures/gui/container1.png"); GL11.glColor4f(1, 0, 0, 1.0F); - mc.getTextureManager().bindTexture(test2); + GL11.glEnable(3042); + mc.renderEngine.bindTexture(test2); GL11.glScalef(1f / 8f, 1f / 8f, 1f / 8f); - + GL11.glPushMatrix(); drawTexturedModalRect(x, y + amount, 0, amount, 256, 256 - amount); - + GL11.glPopMatrix(); ResourceLocation test = new ResourceLocation("alchemicalwizardry", "textures/gui/lpVial.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.getTextureManager().bindTexture(test); - + mc.renderEngine.bindTexture(test); + GL11.glPushMatrix(); drawTexturedModalRect(x, y, 0, 0, 256, 256); - + GL11.glPopMatrix(); + GL11.glDisable(3042); GL11.glPopMatrix(); } From 7b7ec392b88db2dd35c69f9b48b2686dc651e2b4 Mon Sep 17 00:00:00 2001 From: Fabboz Date: Sun, 6 Oct 2024 23:15:25 +0200 Subject: [PATCH 2/5] fix lpHud 2 --- .../client/renderer/RenderHelper.java | 52 +++++++++---------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java index 072fe8267..8fe3ef0a6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java @@ -102,34 +102,30 @@ public static boolean onTickInGame(Minecraft mc) { return true; } - private static void renderLPHUD(Minecraft mc, int lpAmount, int maxAmount) { - GL11.glPushMatrix(); - int xSize = 32; - int ySize = 32; - - int amount = Math.max((int) (256 * ((double) (maxAmount - lpAmount) / maxAmount)), 0); - - int x = (lpBarX - xSize / 2) * 8; - int y = (lpBarY - ySize / 2) * 8; - - ResourceLocation test2 = new ResourceLocation("alchemicalwizardry", "textures/gui/container1.png"); - GL11.glColor4f(1, 0, 0, 1.0F); - GL11.glEnable(3042); - mc.renderEngine.bindTexture(test2); - - GL11.glScalef(1f / 8f, 1f / 8f, 1f / 8f); - GL11.glPushMatrix(); - drawTexturedModalRect(x, y + amount, 0, amount, 256, 256 - amount); - GL11.glPopMatrix(); - ResourceLocation test = new ResourceLocation("alchemicalwizardry", "textures/gui/lpVial.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(test); - GL11.glPushMatrix(); - drawTexturedModalRect(x, y, 0, 0, 256, 256); - GL11.glPopMatrix(); - GL11.glDisable(3042); - GL11.glPopMatrix(); - } +private static void renderLPHUD(Minecraft mc, int lpAmount, int maxAmount) { + GL11.glPushMatrix(); + int xSize = 32; + int ySize = 32; + int amount = Math.max((int) (256 * ((double) (maxAmount - lpAmount) / maxAmount)), 0); + int x = (lpBarX - xSize / 2) * 8; + int y = (lpBarY - ySize / 2) * 8; + ResourceLocation test2 = new ResourceLocation("alchemicalwizardry", "textures/gui/container1.png"); + GL11.glColor4f(1, 0, 0, 1.0F); + GL11.glEnable(GL11.GL_BLEND); + mc.renderEngine.bindTexture(test2); + GL11.glScalef(1f / 8f, 1f / 8f, 1f / 8f); + GL11.glPushMatrix(); + drawTexturedModalRect(x, y + amount, 0, amount, 256, 256 - amount); + GL11.glPopMatrix(); + ResourceLocation test = new ResourceLocation("alchemicalwizardry", "textures/gui/lpVial.png"); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.bindTexture(test); + GL11.glPushMatrix(); + drawTexturedModalRect(x, y, 0, 0, 256, 256); + GL11.glPopMatrix(); + GL11.glDisable(GL11.GL_BLEND); + GL11.glPopMatrix(); +} private static void renderHPHUD(Minecraft mc, float hpAmount, float maxAmount) { GL11.glPushMatrix(); From 406eca8c18d68e8e846f982cd035873591b46ca7 Mon Sep 17 00:00:00 2001 From: Fabboz Date: Sat, 19 Oct 2024 13:33:59 +0200 Subject: [PATCH 3/5] Add files via upload --- .../client/renderer/RenderHelper.java | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java index 8fe3ef0a6..eaebf4201 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java @@ -102,30 +102,30 @@ public static boolean onTickInGame(Minecraft mc) { return true; } -private static void renderLPHUD(Minecraft mc, int lpAmount, int maxAmount) { - GL11.glPushMatrix(); - int xSize = 32; - int ySize = 32; - int amount = Math.max((int) (256 * ((double) (maxAmount - lpAmount) / maxAmount)), 0); - int x = (lpBarX - xSize / 2) * 8; - int y = (lpBarY - ySize / 2) * 8; - ResourceLocation test2 = new ResourceLocation("alchemicalwizardry", "textures/gui/container1.png"); - GL11.glColor4f(1, 0, 0, 1.0F); - GL11.glEnable(GL11.GL_BLEND); - mc.renderEngine.bindTexture(test2); - GL11.glScalef(1f / 8f, 1f / 8f, 1f / 8f); - GL11.glPushMatrix(); - drawTexturedModalRect(x, y + amount, 0, amount, 256, 256 - amount); - GL11.glPopMatrix(); - ResourceLocation test = new ResourceLocation("alchemicalwizardry", "textures/gui/lpVial.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(test); - GL11.glPushMatrix(); - drawTexturedModalRect(x, y, 0, 0, 256, 256); - GL11.glPopMatrix(); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); -} + private static void renderLPHUD(Minecraft mc, int lpAmount, int maxAmount) { + GL11.glPushMatrix(); + int xSize = 32; + int ySize = 32; + int amount = Math.max((int) (256 * ((double) (maxAmount - lpAmount) / maxAmount)), 0); + int x = (lpBarX - xSize / 2) * 8; + int y = (lpBarY - ySize / 2) * 8; + ResourceLocation test2 = new ResourceLocation("alchemicalwizardry", "textures/gui/container1.png"); + GL11.glColor4f(1, 0, 0, 1.0F); + GL11.glEnable(GL11.GL_BLEND); + mc.renderEngine.bindTexture(test2); + GL11.glScalef(1f / 8f, 1f / 8f, 1f / 8f); + GL11.glPushMatrix(); + drawTexturedModalRect(x, y + amount, 0, amount, 256, 256 - amount); + GL11.glPopMatrix(); + ResourceLocation test = new ResourceLocation("alchemicalwizardry", "textures/gui/lpVial.png"); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.bindTexture(test); + GL11.glPushMatrix(); + drawTexturedModalRect(x, y, 0, 0, 256, 256); + GL11.glPopMatrix(); + GL11.glDisable(GL11.GL_BLEND); + GL11.glPopMatrix(); + } private static void renderHPHUD(Minecraft mc, float hpAmount, float maxAmount) { GL11.glPushMatrix(); From 14b048461e27c3efae7062ae8e1b0b20818f8c99 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 20 Oct 2024 11:35:27 +0200 Subject: [PATCH 4/5] sa --- .../client/renderer/RenderHelper.java | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java index eaebf4201..bad4d2f20 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RenderHelper.java @@ -102,30 +102,30 @@ public static boolean onTickInGame(Minecraft mc) { return true; } - private static void renderLPHUD(Minecraft mc, int lpAmount, int maxAmount) { - GL11.glPushMatrix(); - int xSize = 32; - int ySize = 32; - int amount = Math.max((int) (256 * ((double) (maxAmount - lpAmount) / maxAmount)), 0); - int x = (lpBarX - xSize / 2) * 8; - int y = (lpBarY - ySize / 2) * 8; - ResourceLocation test2 = new ResourceLocation("alchemicalwizardry", "textures/gui/container1.png"); - GL11.glColor4f(1, 0, 0, 1.0F); - GL11.glEnable(GL11.GL_BLEND); - mc.renderEngine.bindTexture(test2); - GL11.glScalef(1f / 8f, 1f / 8f, 1f / 8f); - GL11.glPushMatrix(); - drawTexturedModalRect(x, y + amount, 0, amount, 256, 256 - amount); - GL11.glPopMatrix(); - ResourceLocation test = new ResourceLocation("alchemicalwizardry", "textures/gui/lpVial.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(test); - GL11.glPushMatrix(); - drawTexturedModalRect(x, y, 0, 0, 256, 256); - GL11.glPopMatrix(); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); - } + private static void renderLPHUD(Minecraft mc, int lpAmount, int maxAmount) { + GL11.glPushMatrix(); + int xSize = 32; + int ySize = 32; + int amount = Math.max((int) (256 * ((double) (maxAmount - lpAmount) / maxAmount)), 0); + int x = (lpBarX - xSize / 2) * 8; + int y = (lpBarY - ySize / 2) * 8; + ResourceLocation test2 = new ResourceLocation("alchemicalwizardry", "textures/gui/container1.png"); + GL11.glColor4f(1, 0, 0, 1.0F); + GL11.glEnable(GL11.GL_BLEND); + mc.renderEngine.bindTexture(test2); + GL11.glScalef(1f / 8f, 1f / 8f, 1f / 8f); + GL11.glPushMatrix(); + drawTexturedModalRect(x, y + amount, 0, amount, 256, 256 - amount); + GL11.glPopMatrix(); + ResourceLocation test = new ResourceLocation("alchemicalwizardry", "textures/gui/lpVial.png"); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.bindTexture(test); + GL11.glPushMatrix(); + drawTexturedModalRect(x, y, 0, 0, 256, 256); + GL11.glPopMatrix(); + GL11.glDisable(GL11.GL_BLEND); + GL11.glPopMatrix(); + } private static void renderHPHUD(Minecraft mc, float hpAmount, float maxAmount) { GL11.glPushMatrix(); From 7ad0d2f9525a7025b8d9a98e9ee53966fafae0b7 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 20 Oct 2024 11:35:36 +0200 Subject: [PATCH 5/5] update deps --- dependencies.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index a17b2d582..ebc10c2dc 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -24,12 +24,12 @@ dependencies { api("com.github.GTNewHorizons:waila:1.8.1:dev") - api("com.github.GTNewHorizons:NotEnoughItems:2.6.34-GTNH:dev") + api("com.github.GTNewHorizons:NotEnoughItems:2.6.42-GTNH:dev") - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.68:dev") {transitive = false } + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.44:dev") {transitive = false } compileOnly("com.github.GTNewHorizons:Botania:1.11.5-GTNH:api") {transitive = false } - compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.10:api") {transitive = false } + compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.16:api") {transitive = false } compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.5.0:dev") {transitive = false } compileOnly("com.github.GTNewHorizons:Chisel:2.15.2-GTNH:api") {transitive = false }