Fix warnings in GUI

This commit is contained in:
drcrazy 2020-10-24 10:29:05 +03:00
parent ca24d58f86
commit ebc45ff9f8
10 changed files with 20 additions and 48 deletions

View file

@ -24,7 +24,6 @@
package techreborn.client.gui; package techreborn.client.gui;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
@ -74,16 +73,16 @@ public class GuiAESU extends GuiBase<BuiltScreenHandler> {
final Layer layer = Layer.FOREGROUND; final Layer layer = Layer.FOREGROUND;
if (!hideGuiElements()) { if (!hideGuiElements()) {
RenderSystem.pushMatrix(); matrixStack.push();
RenderSystem.scaled(0.6, 0.6, 1); matrixStack.scale(0.6f, 0.6f, 1.0f);
Text text = new LiteralText(PowerSystem.getLocalizedPowerNoSuffix((int) blockEntity.getEnergy())) Text text = new LiteralText(PowerSystem.getLocalizedPowerNoSuffix(blockEntity.getEnergy()))
.append("/") .append("/")
.append(PowerSystem.getLocalizedPowerNoSuffix((int) blockEntity.getMaxStoredPower())) .append(PowerSystem.getLocalizedPowerNoSuffix(blockEntity.getMaxStoredPower()))
.append(" ") .append(" ")
.append(PowerSystem.getDisplayPower().abbreviation); .append(PowerSystem.getDisplayPower().abbreviation);
drawCentredText(matrixStack, text, 35, 0, 58, layer); 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); builder.drawMultiEnergyBar(matrixStack, this, 81, 28, (int) blockEntity.getEnergy(), (int) blockEntity.getMaxStoredPower(), mouseX, mouseY, 0, layer);

View file

@ -58,17 +58,14 @@ public class GuiBatbox extends GuiBase<BuiltScreenHandler> {
final Layer layer = Layer.FOREGROUND; final Layer layer = Layer.FOREGROUND;
if (!hideGuiElements()) { if (!hideGuiElements()) {
RenderSystem.pushMatrix(); matrixStack.push();
RenderSystem.scaled(0.6, 0.6, 5); matrixStack.scale(0.6f, 0.6f, 1.0f);
Text text = new LiteralText(PowerSystem.getLocalizedPowerNoSuffix(blockEntity.getEnergy())) Text text = new LiteralText(PowerSystem.getLocalizedPowerNoSuffix(blockEntity.getEnergy()))
.append("/") .append("/")
.append(PowerSystem.getLocalizedPowerNoSuffix(blockEntity.getMaxStoredPower())) .append(PowerSystem.getLocalizedPower(blockEntity.getMaxStoredPower()));
.append(" ")
.append(PowerSystem.getDisplayPower().abbreviation);
drawCentredText(matrixStack, text, 35, 0, 58, layer); drawCentredText(matrixStack, text, 35, 0, 58, layer);
matrixStack.pop();
RenderSystem.popMatrix();
} }
builder.drawMultiEnergyBar(matrixStack, this, 81, 28, (int) blockEntity.getEnergy(), (int) blockEntity.getMaxStoredPower(), mouseX, mouseY, 0, layer); builder.drawMultiEnergyBar(matrixStack, this, 81, 28, (int) blockEntity.getEnergy(), (int) blockEntity.getMaxStoredPower(), mouseX, mouseY, 0, layer);

View file

@ -24,7 +24,6 @@
package techreborn.client.gui; package techreborn.client.gui;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.GuiBase;

View file

@ -24,7 +24,6 @@
package techreborn.client.gui; package techreborn.client.gui;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.GuiBase;
@ -45,8 +44,6 @@ public class GuiDistillationTower extends GuiBase<BuiltScreenHandler> {
@Override @Override
protected void drawBackground(MatrixStack matrixStack, final float f, final int mouseX, final int mouseY) { protected void drawBackground(MatrixStack matrixStack, final float f, final int mouseX, final int mouseY) {
super.drawBackground(matrixStack, f, mouseX, mouseY); super.drawBackground(matrixStack, f, mouseX, mouseY);
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
final GuiBase.Layer layer = Layer.BACKGROUND; final GuiBase.Layer layer = Layer.BACKGROUND;
// Battery slot // Battery slot
drawSlot(matrixStack, 8, 72, layer); drawSlot(matrixStack, 8, 72, layer);
@ -74,7 +71,6 @@ public class GuiDistillationTower extends GuiBase<BuiltScreenHandler> {
builder.drawHologramButton(matrixStack, this, 76, 56, mouseX, mouseY, layer); 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); 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) { public void onClick(GuiButtonExtended button, Double x, Double y) {

View file

@ -24,7 +24,6 @@
package techreborn.client.gui; package techreborn.client.gui;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.text.LiteralText; import net.minecraft.text.LiteralText;
@ -58,8 +57,8 @@ public class GuiIDSU extends GuiBase<BuiltScreenHandler> {
super.drawForeground(matrixStack, mouseX, mouseY); super.drawForeground(matrixStack, mouseX, mouseY);
final Layer layer = Layer.FOREGROUND; final Layer layer = Layer.FOREGROUND;
RenderSystem.pushMatrix(); matrixStack.push();
RenderSystem.scaled(0.6, 0.6, 1); matrixStack.scale(0.6f, 0.6f, 1.0f);
Text text = new LiteralText(PowerSystem.getLocalizedPowerNoSuffix(idsu.getEnergy())) Text text = new LiteralText(PowerSystem.getLocalizedPowerNoSuffix(idsu.getEnergy()))
.append("/") .append("/")
@ -68,7 +67,7 @@ public class GuiIDSU extends GuiBase<BuiltScreenHandler> {
.append(PowerSystem.getDisplayPower().abbreviation); .append(PowerSystem.getDisplayPower().abbreviation);
drawCentredText(matrixStack, text, 35, 0, 58, layer); 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); builder.drawMultiEnergyBar(matrixStack, this, 81, 28, (int) idsu.getEnergy(), (int) idsu.getMaxStoredPower(), mouseX, mouseY, 0, layer);
} }

View file

@ -24,7 +24,6 @@
package techreborn.client.gui; package techreborn.client.gui;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.GuiBase;
@ -45,8 +44,6 @@ public class GuiImplosionCompressor extends GuiBase<BuiltScreenHandler> {
@Override @Override
protected void drawBackground(MatrixStack matrixStack, final float f, final int mouseX, final int mouseY) { protected void drawBackground(MatrixStack matrixStack, final float f, final int mouseX, final int mouseY) {
super.drawBackground(matrixStack, f, mouseX, mouseY); super.drawBackground(matrixStack, f, mouseX, mouseY);
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
final GuiBase.Layer layer = Layer.BACKGROUND; final GuiBase.Layer layer = Layer.BACKGROUND;
drawSlot(matrixStack, 8, 72, layer); drawSlot(matrixStack, 8, 72, layer);
@ -77,7 +74,6 @@ public class GuiImplosionCompressor extends GuiBase<BuiltScreenHandler> {
builder.drawHologramButton(matrixStack, this, 76, 56, mouseX, mouseY, layer); 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); 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) { public void onClick(GuiButtonExtended button, Double mouseX, Double mouseY) {

View file

@ -24,7 +24,6 @@
package techreborn.client.gui; package techreborn.client.gui;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.text.LiteralText; import net.minecraft.text.LiteralText;
@ -58,17 +57,15 @@ public class GuiMFE extends GuiBase<BuiltScreenHandler> {
final Layer layer = Layer.FOREGROUND; final Layer layer = Layer.FOREGROUND;
if (!hideGuiElements()) { if (!hideGuiElements()) {
RenderSystem.pushMatrix(); matrixStack.push();
RenderSystem.scaled(0.6, 0.6, 1); matrixStack.scale(0.6f, 0.6f, 1.0f);
drawCentredText(matrixStack, new LiteralText(PowerSystem.getLocalizedPowerNoSuffix(mfe.getEnergy())) drawCentredText(matrixStack, new LiteralText(PowerSystem.getLocalizedPowerNoSuffix(mfe.getEnergy()))
.append("/") .append("/")
.append(PowerSystem.getLocalizedPowerNoSuffix(mfe.getMaxStoredPower())) .append(PowerSystem.getLocalizedPower(mfe.getMaxStoredPower()))
.append(" ")
.append(PowerSystem.getDisplayPower().abbreviation)
, 35, 0, 58, layer); , 35, 0, 58, layer);
RenderSystem.popMatrix(); matrixStack.pop();
} }
builder.drawMultiEnergyBar(matrixStack, this, 81, 28, (int) mfe.getEnergy(), (int) mfe.getMaxStoredPower(), mouseX, mouseY, 0, layer); builder.drawMultiEnergyBar(matrixStack, this, 81, 28, (int) mfe.getEnergy(), (int) mfe.getMaxStoredPower(), mouseX, mouseY, 0, layer);

View file

@ -57,10 +57,10 @@ public class GuiMFSU extends GuiBase<BuiltScreenHandler> {
super.drawForeground(matrixStack, mouseX, mouseY); super.drawForeground(matrixStack, mouseX, mouseY);
final Layer layer = Layer.FOREGROUND; final Layer layer = Layer.FOREGROUND;
RenderSystem.pushMatrix(); matrixStack.push();
RenderSystem.scaled(0.6, 0.6, 1); matrixStack.scale(0.6f, 0.6f, 1.0f);
drawCentredText(matrixStack, new LiteralText(PowerSystem.getLocalizedPowerNoSuffix(mfsu.getEnergy()) + "/" + PowerSystem.getLocalizedPowerNoSuffix(mfsu.getMaxStoredPower()) + " " + PowerSystem.getDisplayPower().abbreviation), 35, 0, 58, layer); drawCentredText(matrixStack, new LiteralText(PowerSystem.getLocalizedPowerNoSuffix(mfsu.getEnergy()) + "/" + PowerSystem.getLocalizedPower(mfsu.getMaxStoredPower())), 35, 0, 58, layer);
RenderSystem.popMatrix(); matrixStack.pop();
builder.drawMultiEnergyBar(matrixStack, this, 81, 28, (int) mfsu.getEnergy(), (int) mfsu.getMaxStoredPower(), mouseX, mouseY, 0, layer); builder.drawMultiEnergyBar(matrixStack, this, 81, 28, (int) mfsu.getEnergy(), (int) mfsu.getMaxStoredPower(), mouseX, mouseY, 0, layer);
} }

View file

@ -39,11 +39,6 @@ import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity;
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
public class GuiPlasmaGenerator extends GuiBase<BuiltScreenHandler> { public class GuiPlasmaGenerator extends GuiBase<BuiltScreenHandler> {
/**
* @param player
* @param blockEntity
* @param container
*/
PlasmaGeneratorBlockEntity blockEntity; PlasmaGeneratorBlockEntity blockEntity;
public GuiPlasmaGenerator(int syncID, final PlayerEntity player, final PlasmaGeneratorBlockEntity blockEntity) { public GuiPlasmaGenerator(int syncID, final PlayerEntity player, final PlasmaGeneratorBlockEntity blockEntity) {

View file

@ -41,12 +41,6 @@ public class GuiSolar extends GuiBase<BuiltScreenHandler> {
this.blockEntity = panel; 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 @Override
protected void drawForeground(MatrixStack matrixStack, int mouseX, int mouseY) { protected void drawForeground(MatrixStack matrixStack, int mouseX, int mouseY) {
super.drawForeground(matrixStack, mouseX, mouseY); super.drawForeground(matrixStack, mouseX, mouseY);