From 1c23f6d83b6708cecd19ada9dd4444afc530ad13 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 19 May 2023 18:12:43 +0200 Subject: Make it compile --- .../common/gui/AdaptiveWarningScreen.java | 15 +++-- .../common/gui/AdvancedImageButton.java | 7 +- .../nochatreports/common/gui/AdvancedTooltip.java | 75 ++++++++-------------- .../common/gui/EncryptionConfigScreen.java | 24 +++---- .../nochatreports/common/gui/InvisibleButton.java | 3 +- .../mixins/client/MixinGuiMessageTagIcon.java | 7 +- .../mixins/client/MixinOnlineServerEntry.java | 7 +- .../server/MixinServerGamePacketListenerImpl.java | 2 +- 8 files changed, 58 insertions(+), 82 deletions(-) diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java index 931645c..4fba0bf 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java @@ -4,6 +4,7 @@ import org.jetbrains.annotations.Nullable; import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Checkbox; import net.minecraft.client.gui.components.MultiLineLabel; import net.minecraft.client.gui.screens.Screen; @@ -52,16 +53,16 @@ public abstract class AdaptiveWarningScreen extends Screen { protected abstract void initButtons(int y); @Override - public void render(PoseStack poseStack, int i, int j, float f) { - this.renderBackground(poseStack); - this.renderTitle(poseStack); + public void render(GuiGraphics graphics, int i, int j, float f) { + this.renderBackground(graphics); + this.renderTitle(graphics); int k = this.width / 2 - this.message.getWidth() / 2; - this.message.renderLeftAligned(poseStack, k, this.hugeGUI() ? 35 : 70, this.getLineHeight(), 0xFFFFFF); - super.render(poseStack, i, j, f); + this.message.renderLeftAligned(graphics, k, this.hugeGUI() ? 35 : 70, this.getLineHeight(), 0xFFFFFF); + super.render(graphics, i, j, f); } - private void renderTitle(PoseStack poseStack) { - drawString(poseStack, this.font, this.title, 25, this.hugeGUI() ? 15 : 30, 0xFFFFFF); + private void renderTitle(GuiGraphics graphics) { + graphics.drawString(this.font, this.title, 25, this.hugeGUI() ? 15 : 30, 0xFFFFFF); } private boolean hugeGUI() { diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java index 13ad030..f470b6a 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java @@ -4,6 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipPositioner; @@ -30,12 +31,12 @@ public class AdvancedImageButton extends ImageButton { } @Override - public void renderWidget(PoseStack poseStack, int mouseX, int mouseY, float delta) { - super.renderWidget(poseStack, mouseX, mouseY, delta); + public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) { + super.renderWidget(graphics, mouseX, mouseY, delta); if (this.isHovered) if (this.tooltip instanceof AdvancedTooltip tooltip && tooltip.hasCustomRender()) { - tooltip.doCustomRender(this.parent, poseStack, mouseX, mouseY, this.createTooltipPositioner()); + tooltip.doCustomRender(this.parent, graphics, mouseX, mouseY, this.createTooltipPositioner()); } } diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java index 8286b19..7b5c289 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java @@ -19,7 +19,7 @@ import com.mojang.blaze3d.vertex.VertexFormat; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiComponent; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Tooltip; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; @@ -80,83 +80,58 @@ public class AdvancedTooltip extends Tooltip { return this.renderWithoutGap; } - public void doCustomRender(Screen screen, PoseStack poseStack, int x, int y, ClientTooltipPositioner positioner) { + public static List splitTooltip(Minecraft minecraft, Component component, int maxWidth) { + return minecraft.font.split(component, maxWidth); + } + + public void doCustomRender(Screen screen, GuiGraphics graphics, int x, int y, ClientTooltipPositioner positioner) { if (this.renderWithoutGap) { - this.renderTooltipNoGap(screen, poseStack, splitTooltip(screen.minecraft, this.getMessage(), this.maxWidth), x, y, positioner); + this.renderTooltipNoGap(screen, graphics, splitTooltip(screen.minecraft, this.getMessage(), this.maxWidth), x, y, positioner); } else throw new UnsupportedOperationException("This tooltip doesn't support custom render!"); } - public static List splitTooltip(Minecraft minecraft, Component component, int maxWidth) { - return minecraft.font.split(component, maxWidth); - } - - protected void renderTooltipNoGap(Screen screen, PoseStack poseStack, List list, int x, int y, ClientTooltipPositioner positioner) { + protected void renderTooltipNoGap(Screen screen, GuiGraphics poseStack, List list, int x, int y, ClientTooltipPositioner positioner) { this.renderTooltipInternalNoGap(screen, poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), x, y, positioner); } - protected void renderTooltipInternalNoGap(Screen screen, PoseStack poseStack, List list, int i2, int j2, ClientTooltipPositioner clientTooltipPositioner) { + // Originates from GuiGraphics + protected void renderTooltipInternalNoGap(Screen screen, GuiGraphics graphics, List list, int i, int j, ClientTooltipPositioner clientTooltipPositioner) { ClientTooltipComponent clientTooltipComponent2; int t; if (list.isEmpty()) return; - int k2 = 0; - int l2 = list.size() == 1 ? -2 : /*0*/ -2; + int k = 0; + int l = list.size() == 1 ? -2 : /*0*/ -2; for (ClientTooltipComponent clientTooltipComponent : list) { - int m2 = clientTooltipComponent.getWidth(screen.font); - if (m2 > k2) { - k2 = m2; + int m = clientTooltipComponent.getWidth(screen.font); + if (m > k) { + k = m; } - l2 += clientTooltipComponent.getHeight(); + l += clientTooltipComponent.getHeight(); } - int n2 = k2; - int o2 = l2; - Vector2ic vector2ic = clientTooltipPositioner.positionTooltip(screen, i2, j2, n2, o2); + int n = k; + int o = l; + Vector2ic vector2ic = clientTooltipPositioner.positionTooltip(graphics.guiWidth(), graphics.guiHeight(), i, j, n, o); int p = vector2ic.x(); int q = vector2ic.y(); - poseStack.pushPose(); + graphics.pose().pushPose(); int r = 400; - Tesselator tesselator = Tesselator.getInstance(); - BufferBuilder bufferBuilder2 = tesselator.getBuilder(); - RenderSystem.setShader(GameRenderer::getPositionColorShader); - bufferBuilder2.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); - Matrix4f matrix4f2 = poseStack.last().pose(); - TooltipRenderUtil.renderTooltipBackground((matrix4f, bufferBuilder, i, j, k, l, m, n, o) -> fillGradient(matrix4f, bufferBuilder, i, j, k, l, m, n, o), matrix4f2, bufferBuilder2, p, q, n2, o2, 400); - RenderSystem.enableDepthTest(); - RenderSystem.enableBlend(); - RenderSystem.defaultBlendFunc(); - BufferUploader.drawWithShader(bufferBuilder2.end()); - MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder()); - poseStack.translate(0.0f, 0.0f, 400.0f); + graphics.drawManaged(() -> TooltipRenderUtil.renderTooltipBackground(graphics, p, q, n, o, 400)); + graphics.pose().translate(0.0f, 0.0f, 400.0f); int s = q; for (t = 0; t < list.size(); ++t) { clientTooltipComponent2 = list.get(t); - clientTooltipComponent2.renderText(screen.font, p, s, matrix4f2, bufferSource); + clientTooltipComponent2.renderText(screen.font, p, s, graphics.pose().last().pose(), graphics.bufferSource()); s += clientTooltipComponent2.getHeight() + /*(t == 0 ? 2 : 0)*/ 0; } - bufferSource.endBatch(); - poseStack.popPose(); s = q; for (t = 0; t < list.size(); ++t) { clientTooltipComponent2 = list.get(t); - clientTooltipComponent2.renderImage(screen.font, p, s, poseStack, screen.itemRenderer); + clientTooltipComponent2.renderImage(screen.font, p, s, graphics); s += clientTooltipComponent2.getHeight() + /*(t == 0 ? 2 : 0)*/ 0; } - } - - protected static void fillGradient(Matrix4f matrix4f, BufferBuilder bufferBuilder, int i, int j, int k, int l, int m, int n, int o) { - float f = (n >> 24 & 0xFF) / 255.0f; - float g = (n >> 16 & 0xFF) / 255.0f; - float h = (n >> 8 & 0xFF) / 255.0f; - float p = (n & 0xFF) / 255.0f; - float q = (o >> 24 & 0xFF) / 255.0f; - float r = (o >> 16 & 0xFF) / 255.0f; - float s = (o >> 8 & 0xFF) / 255.0f; - float t = (o & 0xFF) / 255.0f; - bufferBuilder.vertex(matrix4f, k, j, m).color(g, h, p, f).endVertex(); - bufferBuilder.vertex(matrix4f, i, j, m).color(g, h, p, f).endVertex(); - bufferBuilder.vertex(matrix4f, i, l, m).color(r, s, t, q).endVertex(); - bufferBuilder.vertex(matrix4f, k, l, m).color(r, s, t, q).endVertex(); + graphics.pose().popPose(); } } diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java index c0cdb47..5e3e68a 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java @@ -11,6 +11,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.Checkbox; import net.minecraft.client.gui.components.CycleButton; @@ -155,7 +156,7 @@ public class EncryptionConfigScreen extends Screen { } @Override - public void render(PoseStack poseStack, int i, int j, float f) { + public void render(GuiGraphics graphics, int i, int j, float f) { if (!this.passField.isActive()) { if (this.passField.isFocused()) { this.passField.setFocused(false); @@ -163,37 +164,36 @@ public class EncryptionConfigScreen extends Screen { this.passField.setEditable(false); } - this.renderBackground(poseStack); - Screen.drawCenteredString(poseStack, this.font, HEADER, this.width / 2, this.hugeGUI() ? 8 : 16, 0xFFFFFF); + this.renderBackground(graphics); + graphics.drawCenteredString(this.font, HEADER, this.width / 2, this.hugeGUI() ? 8 : 16, 0xFFFFFF); - this.keyDesc.renderLeftAligned(poseStack, this.keyField.getX() - 20, (this.hugeGUI() ? 25 : FIELDS_Y_START), this.getLineHeight(), 0xFFFFFF); + this.keyDesc.renderLeftAligned(graphics, this.keyField.getX() - 20, (this.hugeGUI() ? 25 : FIELDS_Y_START), this.getLineHeight(), 0xFFFFFF); - this.keyField.render(poseStack, i, j, f); + this.keyField.render(graphics, i, j, f); - this.passDesc.renderLeftAligned(poseStack, this.passField.getX() - 20, this.keyField.getY() + this.keyField.getHeight() + (this.hugeGUI() ? 12 : 28), + this.passDesc.renderLeftAligned(graphics, this.passField.getX() - 20, this.keyField.getY() + this.keyField.getHeight() + (this.hugeGUI() ? 12 : 28), this.getLineHeight(), 0xFFFFFF); - this.passField.render(poseStack, i, j, f); + this.passField.render(graphics, i, j, f); // if (this.algorithmButton != null && this.algorithmButton.isMouseOver(i, j)) { // this.renderTooltip(poseStack, this.algorithmButton.getTooltip(), i, j); // } - super.render(poseStack, i, j, f); + super.render(graphics, i, j, f); if (StringUtil.isNullOrEmpty(this.keyField.getValue()) && !this.keyField.isFocused()) { - Screen.drawString(poseStack, this.font, + graphics.drawString(this.font, Component.translatable("gui.nochatreports.encryption_config.default_key", this.algorithmButton.getValue().getDefaultKey()), this.keyField.getX() + 4, this.keyField.getY() + 5, 0x999999); } if (!this.passField.active) { - Screen.drawString(poseStack, this.font, PASS_NOT_ALLOWED, this.passField.getX() + 4, + graphics.drawString(this.font, PASS_NOT_ALLOWED, this.passField.getX() + 4, this.passField.getY() + 5, 0x999999); - RenderSystem.setShaderTexture(0, ENCRYPTION_ICONS); RenderSystem.enableDepthTest(); - blit(poseStack, this.passField.getX() - 20, this.passField.getY() + 3, 50, 0, 14, 13, 64, 64); + graphics.blit(ENCRYPTION_ICONS, this.passField.getX() - 20, this.passField.getY() + 3, 50, 0, 14, 13, 64, 64); } } diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java b/src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java index 78cba5a..93f5165 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java @@ -6,6 +6,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; @@ -17,7 +18,7 @@ public class InvisibleButton extends Button { } @Override - public void render(PoseStack poseStack, int i, int j, float f) { + public void render(GuiGraphics graphics, int i, int j, float f) { // NO-OP } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java index 2f6e656..32ed839 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java @@ -15,7 +15,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.GuiMessageTag; import net.minecraft.client.GuiMessageTag.Icon; -import net.minecraft.client.gui.GuiComponent; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.resources.ResourceLocation; @Mixin(GuiMessageTag.Icon.class) @@ -29,10 +29,9 @@ public abstract class MixinGuiMessageTagIcon { } @Inject(method = "draw", at = @At("HEAD"), cancellable = true) - public void onDraw(PoseStack stack, int x, int y, CallbackInfo info) { + public void onDraw(GuiGraphics graphics, int x, int y, CallbackInfo info) { if (((Icon)(Object)this).name().equals("CHAT_NCR_ENCRYPTED")) { - RenderSystem.setShaderTexture(0, TEXTURE_NCR); - GuiComponent.blit(stack, x, y, 0, 0, 9, 9, 9, 9); + graphics.blit(TEXTURE_NCR, x, y, 0, 0, 9, 9, 9, 9); info.cancel(); } } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java index b90e9b1..8b5f7b7 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java @@ -17,7 +17,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiComponent; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; import net.minecraft.client.gui.screens.multiplayer.ServerSelectionList; import net.minecraft.client.multiplayer.ServerData; @@ -37,7 +37,7 @@ public abstract class MixinOnlineServerEntry extends ServerSelectionList.Entry { private ServerData serverData; @Inject(method = "render", at = @At("RETURN")) - private void onRender(PoseStack poseStack, int i, int j, int k, int l, int m, int n, int o, boolean bl, float f, CallbackInfo info) { + private void onRender(GuiGraphics graphics, int i, int j, int k, int l, int m, int n, int o, boolean bl, float f, CallbackInfo info) { if (!NCRConfig.getClient().verifiedIconEnabled()) return; @@ -45,9 +45,8 @@ public abstract class MixinOnlineServerEntry extends ServerSelectionList.Entry { int xOffset = NCRConfig.getClient().getVerifiedIconOffsetX(), yOffset = NCRConfig.getClient().getVerifiedIconOffsetY(); - RenderSystem.setShaderTexture(0, VERIFIED_ICON); RenderSystem.enableBlend(); - GuiComponent.blit(poseStack, k + l - 35 + xOffset, j - 1 + yOffset, 0.0f, 0.0f, 14, 14, 14, 14); + graphics.blit(VERIFIED_ICON, k + l - 35 + xOffset, j - 1 + yOffset, 0.0f, 0.0f, 14, 14, 14, 14); RenderSystem.disableBlend(); int t = n - k; diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerGamePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerGamePacketListenerImpl.java index 01232e7..fab0317 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerGamePacketListenerImpl.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerGamePacketListenerImpl.java @@ -40,7 +40,7 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC if (NCRConfig.getCommon().convertToGameMessage()) { if (packet instanceof ClientboundPlayerChatPacket chat) { - packet = new ClientboundSystemChatPacket(chat.chatType().resolve(this.player.level.registryAccess()) + packet = new ClientboundSystemChatPacket(chat.chatType().resolve(this.player.level().registryAccess()) .get().decorate(chat.unsignedContent() != null ? chat.unsignedContent() : Component.literal(chat.body().content())), false); -- cgit v1.2.3