From ebc45ff9f8a875cd0aeb40d3db87ddb0b69ee6f6 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Sat, 24 Oct 2020 10:29:05 +0300 Subject: [PATCH] Fix warnings in GUI --- src/main/java/techreborn/client/gui/GuiAESU.java | 11 +++++------ src/main/java/techreborn/client/gui/GuiBatbox.java | 11 ++++------- .../java/techreborn/client/gui/GuiBlastFurnace.java | 1 - .../techreborn/client/gui/GuiDistillationTower.java | 4 ---- src/main/java/techreborn/client/gui/GuiIDSU.java | 7 +++---- .../techreborn/client/gui/GuiImplosionCompressor.java | 4 ---- src/main/java/techreborn/client/gui/GuiMFE.java | 11 ++++------- src/main/java/techreborn/client/gui/GuiMFSU.java | 8 ++++---- .../techreborn/client/gui/GuiPlasmaGenerator.java | 5 ----- src/main/java/techreborn/client/gui/GuiSolar.java | 6 ------ 10 files changed, 20 insertions(+), 48 deletions(-) diff --git a/src/main/java/techreborn/client/gui/GuiAESU.java b/src/main/java/techreborn/client/gui/GuiAESU.java index 6704a53ce..e818a1d50 100644 --- a/src/main/java/techreborn/client/gui/GuiAESU.java +++ b/src/main/java/techreborn/client/gui/GuiAESU.java @@ -24,7 +24,6 @@ package techreborn.client.gui; -import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; @@ -74,16 +73,16 @@ public class GuiAESU extends GuiBase { final Layer layer = Layer.FOREGROUND; if (!hideGuiElements()) { - RenderSystem.pushMatrix(); - RenderSystem.scaled(0.6, 0.6, 1); - Text text = new LiteralText(PowerSystem.getLocalizedPowerNoSuffix((int) blockEntity.getEnergy())) + matrixStack.push(); + matrixStack.scale(0.6f, 0.6f, 1.0f); + Text text = new LiteralText(PowerSystem.getLocalizedPowerNoSuffix(blockEntity.getEnergy())) .append("/") - .append(PowerSystem.getLocalizedPowerNoSuffix((int) blockEntity.getMaxStoredPower())) + .append(PowerSystem.getLocalizedPowerNoSuffix(blockEntity.getMaxStoredPower())) .append(" ") .append(PowerSystem.getDisplayPower().abbreviation); drawCentredText(matrixStack, text, 35, 0, 58, layer); - RenderSystem.popMatrix(); + matrixStack.pop(); } builder.drawMultiEnergyBar(matrixStack, this, 81, 28, (int) blockEntity.getEnergy(), (int) blockEntity.getMaxStoredPower(), mouseX, mouseY, 0, layer); diff --git a/src/main/java/techreborn/client/gui/GuiBatbox.java b/src/main/java/techreborn/client/gui/GuiBatbox.java index e1a1004e0..dead84a07 100644 --- a/src/main/java/techreborn/client/gui/GuiBatbox.java +++ b/src/main/java/techreborn/client/gui/GuiBatbox.java @@ -58,17 +58,14 @@ public class GuiBatbox extends GuiBase { final Layer layer = Layer.FOREGROUND; if (!hideGuiElements()) { - RenderSystem.pushMatrix(); - RenderSystem.scaled(0.6, 0.6, 5); + matrixStack.push(); + matrixStack.scale(0.6f, 0.6f, 1.0f); Text text = new LiteralText(PowerSystem.getLocalizedPowerNoSuffix(blockEntity.getEnergy())) .append("/") - .append(PowerSystem.getLocalizedPowerNoSuffix(blockEntity.getMaxStoredPower())) - .append(" ") - .append(PowerSystem.getDisplayPower().abbreviation); + .append(PowerSystem.getLocalizedPower(blockEntity.getMaxStoredPower())); drawCentredText(matrixStack, text, 35, 0, 58, layer); - - RenderSystem.popMatrix(); + matrixStack.pop(); } builder.drawMultiEnergyBar(matrixStack, this, 81, 28, (int) blockEntity.getEnergy(), (int) blockEntity.getMaxStoredPower(), mouseX, mouseY, 0, layer); diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index 77be76b13..710f2fdc3 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -24,7 +24,6 @@ package techreborn.client.gui; -import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import reborncore.client.gui.builder.GuiBase; diff --git a/src/main/java/techreborn/client/gui/GuiDistillationTower.java b/src/main/java/techreborn/client/gui/GuiDistillationTower.java index e7a42cfb3..d200d717b 100644 --- a/src/main/java/techreborn/client/gui/GuiDistillationTower.java +++ b/src/main/java/techreborn/client/gui/GuiDistillationTower.java @@ -24,7 +24,6 @@ package techreborn.client.gui; -import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import reborncore.client.gui.builder.GuiBase; @@ -45,8 +44,6 @@ public class GuiDistillationTower extends GuiBase { @Override protected void drawBackground(MatrixStack matrixStack, final float f, final int mouseX, final int mouseY) { super.drawBackground(matrixStack, f, mouseX, mouseY); - - RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); final GuiBase.Layer layer = Layer.BACKGROUND; // Battery slot drawSlot(matrixStack, 8, 72, layer); @@ -74,7 +71,6 @@ public class GuiDistillationTower extends GuiBase { builder.drawHologramButton(matrixStack, this, 76, 56, mouseX, mouseY, layer); } builder.drawMultiEnergyBar(matrixStack, this, 9, 19, (int) blockEntity.getEnergy(), (int) blockEntity.getMaxStoredPower(), mouseX, mouseY, 0, layer); - } public void onClick(GuiButtonExtended button, Double x, Double y) { diff --git a/src/main/java/techreborn/client/gui/GuiIDSU.java b/src/main/java/techreborn/client/gui/GuiIDSU.java index 44a1bf871..10ac6e742 100644 --- a/src/main/java/techreborn/client/gui/GuiIDSU.java +++ b/src/main/java/techreborn/client/gui/GuiIDSU.java @@ -24,7 +24,6 @@ package techreborn.client.gui; -import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.LiteralText; @@ -58,8 +57,8 @@ public class GuiIDSU extends GuiBase { super.drawForeground(matrixStack, mouseX, mouseY); final Layer layer = Layer.FOREGROUND; - RenderSystem.pushMatrix(); - RenderSystem.scaled(0.6, 0.6, 1); + matrixStack.push(); + matrixStack.scale(0.6f, 0.6f, 1.0f); Text text = new LiteralText(PowerSystem.getLocalizedPowerNoSuffix(idsu.getEnergy())) .append("/") @@ -68,7 +67,7 @@ public class GuiIDSU extends GuiBase { .append(PowerSystem.getDisplayPower().abbreviation); drawCentredText(matrixStack, text, 35, 0, 58, layer); - RenderSystem.popMatrix(); + matrixStack.pop(); builder.drawMultiEnergyBar(matrixStack, this, 81, 28, (int) idsu.getEnergy(), (int) idsu.getMaxStoredPower(), mouseX, mouseY, 0, layer); } diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index cc7902abc..8109467a6 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -24,7 +24,6 @@ package techreborn.client.gui; -import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import reborncore.client.gui.builder.GuiBase; @@ -45,8 +44,6 @@ public class GuiImplosionCompressor extends GuiBase { @Override protected void drawBackground(MatrixStack matrixStack, final float f, final int mouseX, final int mouseY) { super.drawBackground(matrixStack, f, mouseX, mouseY); - - RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); final GuiBase.Layer layer = Layer.BACKGROUND; drawSlot(matrixStack, 8, 72, layer); @@ -77,7 +74,6 @@ public class GuiImplosionCompressor extends GuiBase { builder.drawHologramButton(matrixStack, this, 76, 56, mouseX, mouseY, layer); } builder.drawMultiEnergyBar(matrixStack, this, 9, 19, (int) blockEntity.getEnergy(), (int) blockEntity.getMaxStoredPower(), mouseX, mouseY, 0, layer); - } public void onClick(GuiButtonExtended button, Double mouseX, Double mouseY) { diff --git a/src/main/java/techreborn/client/gui/GuiMFE.java b/src/main/java/techreborn/client/gui/GuiMFE.java index 207521dd3..44c5759b6 100644 --- a/src/main/java/techreborn/client/gui/GuiMFE.java +++ b/src/main/java/techreborn/client/gui/GuiMFE.java @@ -24,7 +24,6 @@ package techreborn.client.gui; -import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.LiteralText; @@ -58,17 +57,15 @@ public class GuiMFE extends GuiBase { final Layer layer = Layer.FOREGROUND; if (!hideGuiElements()) { - RenderSystem.pushMatrix(); - RenderSystem.scaled(0.6, 0.6, 1); + matrixStack.push(); + matrixStack.scale(0.6f, 0.6f, 1.0f); drawCentredText(matrixStack, new LiteralText(PowerSystem.getLocalizedPowerNoSuffix(mfe.getEnergy())) .append("/") - .append(PowerSystem.getLocalizedPowerNoSuffix(mfe.getMaxStoredPower())) - .append(" ") - .append(PowerSystem.getDisplayPower().abbreviation) + .append(PowerSystem.getLocalizedPower(mfe.getMaxStoredPower())) , 35, 0, 58, layer); - RenderSystem.popMatrix(); + matrixStack.pop(); } builder.drawMultiEnergyBar(matrixStack, this, 81, 28, (int) mfe.getEnergy(), (int) mfe.getMaxStoredPower(), mouseX, mouseY, 0, layer); diff --git a/src/main/java/techreborn/client/gui/GuiMFSU.java b/src/main/java/techreborn/client/gui/GuiMFSU.java index 695aa4a67..9b19bd404 100644 --- a/src/main/java/techreborn/client/gui/GuiMFSU.java +++ b/src/main/java/techreborn/client/gui/GuiMFSU.java @@ -57,10 +57,10 @@ public class GuiMFSU extends GuiBase { super.drawForeground(matrixStack, mouseX, mouseY); final Layer layer = Layer.FOREGROUND; - RenderSystem.pushMatrix(); - RenderSystem.scaled(0.6, 0.6, 1); - drawCentredText(matrixStack, new LiteralText(PowerSystem.getLocalizedPowerNoSuffix(mfsu.getEnergy()) + "/" + PowerSystem.getLocalizedPowerNoSuffix(mfsu.getMaxStoredPower()) + " " + PowerSystem.getDisplayPower().abbreviation), 35, 0, 58, layer); - RenderSystem.popMatrix(); + matrixStack.push(); + matrixStack.scale(0.6f, 0.6f, 1.0f); + drawCentredText(matrixStack, new LiteralText(PowerSystem.getLocalizedPowerNoSuffix(mfsu.getEnergy()) + "/" + PowerSystem.getLocalizedPower(mfsu.getMaxStoredPower())), 35, 0, 58, layer); + matrixStack.pop(); builder.drawMultiEnergyBar(matrixStack, this, 81, 28, (int) mfsu.getEnergy(), (int) mfsu.getMaxStoredPower(), mouseX, mouseY, 0, layer); } diff --git a/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java b/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java index 0d6176661..84eefdcaa 100644 --- a/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java @@ -39,11 +39,6 @@ import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity; @Environment(EnvType.CLIENT) public class GuiPlasmaGenerator extends GuiBase { - /** - * @param player - * @param blockEntity - * @param container - */ PlasmaGeneratorBlockEntity blockEntity; public GuiPlasmaGenerator(int syncID, final PlayerEntity player, final PlasmaGeneratorBlockEntity blockEntity) { diff --git a/src/main/java/techreborn/client/gui/GuiSolar.java b/src/main/java/techreborn/client/gui/GuiSolar.java index 745159c94..f8f9f27ed 100644 --- a/src/main/java/techreborn/client/gui/GuiSolar.java +++ b/src/main/java/techreborn/client/gui/GuiSolar.java @@ -41,12 +41,6 @@ public class GuiSolar extends GuiBase { this.blockEntity = panel; } - @Override - protected void drawBackground(MatrixStack matrixStack, float lastFrameDuration, int mouseX, int mouseY) { - super.drawBackground(matrixStack, lastFrameDuration, mouseX, mouseY); - final GuiBase.Layer layer = GuiBase.Layer.BACKGROUND; - } - @Override protected void drawForeground(MatrixStack matrixStack, int mouseX, int mouseY) { super.drawForeground(matrixStack, mouseX, mouseY);