From 193dc94f803624a490ee9a9b34cd47cf83c29f49 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 18 Jun 2021 12:14:08 +0300 Subject: [PATCH] Fix GUI for TR Manual --- .../java/techreborn/client/gui/GuiManual.java | 33 ++++++++++--------- .../java/techreborn/items/ManualItem.java | 11 +++---- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/main/java/techreborn/client/gui/GuiManual.java b/src/main/java/techreborn/client/gui/GuiManual.java index 3386f532d..f38cecf5f 100644 --- a/src/main/java/techreborn/client/gui/GuiManual.java +++ b/src/main/java/techreborn/client/gui/GuiManual.java @@ -24,10 +24,10 @@ package techreborn.client.gui; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.screen.ConfirmChatLinkScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; @@ -36,44 +36,42 @@ import net.minecraft.util.Util; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.common.network.NetworkManager; import techreborn.config.TechRebornConfig; -import techreborn.items.ManualItem; import techreborn.packets.ServerboundPackets; public class GuiManual extends Screen { - ManualItem manual; - PlayerEntity player; - - private static final Identifier texture = new Identifier("techreborn", "textures/gui/manual.png"); + private static final Identifier MANUAL_TEXTURE = new Identifier("techreborn", "textures/gui/manual.png"); int guiWidth = 207; int guiHeight = 195; private static final Text text1 = new TranslatableText("techreborn.manual.wiki"); private static final Text text2 = new TranslatableText("techreborn.manual.discord"); private static final Text text3 = new TranslatableText("techreborn.manual.refund"); - public GuiManual(PlayerEntity player) { + public GuiManual() { super(new LiteralText("gui.manual")); - this.player = player; } @Override public void init() { int y = (height / 2) - guiHeight / 2; - y += 40; - addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 10, 60, 20, new TranslatableText("techreborn.manual.wikibtn"), var1 -> client.openScreen(new ConfirmChatLinkScreen(t -> { + if (client == null) { return; } + + addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 40, 60, 20, new TranslatableText("techreborn.manual.wikibtn"), var1 -> client.openScreen(new ConfirmChatLinkScreen(t -> { if (t) { Util.getOperatingSystem().open("http://wiki.techreborn.ovh"); } this.client.openScreen(this); }, "http://wiki.techreborn.ovh", false)))); - addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 60, 60, 20, new TranslatableText("techreborn.manual.discordbtn"), var1 -> client.openScreen(new ConfirmChatLinkScreen(t -> { + + addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 90, 60, 20, new TranslatableText("techreborn.manual.discordbtn"), var1 -> client.openScreen(new ConfirmChatLinkScreen(t -> { if (t) { Util.getOperatingSystem().open("https://discord.gg/teamreborn"); } this.client.openScreen(this); }, "https://discord.gg/teamreborn", false)))); + if (TechRebornConfig.allowManualRefund) { - addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 110, 60, 20, new TranslatableText("techreborn.manual.refundbtn"), var1 -> { + addSelectableChild(new GuiButtonExtended((width / 2 - 30), y + 140, 60, 20, new TranslatableText("techreborn.manual.refundbtn"), var1 -> { NetworkManager.sendToServer(ServerboundPackets.createRefundPacket()); this.client.openScreen(null); })); @@ -83,15 +81,18 @@ public class GuiManual extends Screen { @Override public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { renderBackground(matrixStack); - client.getTextureManager().bindTexture(GuiManual.texture); + RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.setShaderTexture(0, MANUAL_TEXTURE); int centerX = (width / 2) - guiWidth / 2; int centerY = (height / 2) - guiHeight / 2; drawTexture(matrixStack, centerX, centerY, 0, 0, guiWidth, guiHeight); - textRenderer.draw(matrixStack, text1, ((width / 2) - textRenderer.getWidth(text1) / 2), centerY + 40, 4210752); - textRenderer.draw(matrixStack, text2, ((width / 2) - textRenderer.getWidth(text2) / 2), centerY + 90, 4210752); + + textRenderer.draw(matrixStack, text1, (float) ((width / 2) - textRenderer.getWidth(text1) / 2), centerY + 40, 4210752); + textRenderer.draw(matrixStack, text2, (float) ((width / 2) - textRenderer.getWidth(text2) / 2), centerY + 90, 4210752); if (TechRebornConfig.allowManualRefund) { - textRenderer.draw(matrixStack, text3, ((width / 2) - textRenderer.getWidth(text3) / 2), centerY + 140, 4210752); + textRenderer.draw(matrixStack, text3, (float) ((width / 2) - textRenderer.getWidth(text3) / 2), centerY + 140, 4210752); } + super.render(matrixStack, mouseX, mouseY, partialTicks); } } diff --git a/src/main/java/techreborn/items/ManualItem.java b/src/main/java/techreborn/items/ManualItem.java index 2fcfe1656..7b2a73f81 100644 --- a/src/main/java/techreborn/items/ManualItem.java +++ b/src/main/java/techreborn/items/ManualItem.java @@ -44,16 +44,13 @@ public class ManualItem extends Item { } @Override - public TypedActionResult use(final World world, final PlayerEntity player, - final Hand hand) { - if (world.isClient) { - openGui(player); - } + public TypedActionResult use(final World world, final PlayerEntity player, final Hand hand) { + if (world.isClient) { openGui(); } return new TypedActionResult<>(ActionResult.SUCCESS, player.getStackInHand(hand)); } @Environment(EnvType.CLIENT) - private void openGui(PlayerEntity playerEntity) { - MinecraftClient.getInstance().openScreen(new GuiManual(playerEntity)); + private void openGui() { + MinecraftClient.getInstance().openScreen(new GuiManual()); } }