summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorAizistral2022-07-06 23:43:47 +0200
committerAizistral2022-07-06 23:46:09 +0200
commit6542130b67986f40b40afb858f400859b22a930b (patch)
tree38c53d0ac9efaee88b6610984ef04b07fce8969a /src/main
parenta6a3bb65d8dbe0ec8de6c2f1d4ae77553a2bd3bf (diff)
Blast generics
Fixes #55
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java87
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/MixinJoinMultiplayerScreen.java86
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/MixinScreen.java135
-rw-r--r--src/main/resources/nochatreports.mixins.json1
4 files changed, 170 insertions, 139 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java
index ed374a2..da7f390 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java
@@ -34,9 +34,14 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.FormattedCharSequence;
@Mixin(ChatScreen.class)
-public abstract class MixinChatScreen extends MixinScreen {
+public abstract class MixinChatScreen extends Screen {
private static final ResourceLocation CHAT_STATUS_ICONS = new ResourceLocation("nochatreports", "textures/gui/chat_status_icons.png");
+ protected MixinChatScreen() {
+ super(null);
+ throw new IllegalStateException("Can't touch this");
+ }
+
@Inject(method = "init", at = @At("HEAD"))
private void onInit(CallbackInfo info) {
if (!NoReportsConfig.showServerSafety())
@@ -50,7 +55,6 @@ public abstract class MixinChatScreen extends MixinScreen {
Component.translatable("gui.socialInteractions.report"));
button.active = false;
button.visible = true;
- this.addRenderableOnly(button);
}
private int getXOffset(ServerSafetyLevel level) {
@@ -61,4 +65,83 @@ public abstract class MixinChatScreen extends MixinScreen {
};
}
+ protected void renderTooltipNoGap(PoseStack poseStack, List<? extends FormattedCharSequence> list, int i, int j) {
+ this.renderTooltipInternalNoGap(poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), i, j);
+ }
+
+ protected void renderTooltipInternalNoGap(PoseStack poseStack, List<ClientTooltipComponent> list, int i, int j) {
+ ClientTooltipComponent clientTooltipComponent2;
+ int v;
+ int m;
+ if (list.isEmpty())
+ return;
+ int k = 0;
+ int l = list.size() == 1 ? -2 : 0;
+ for (ClientTooltipComponent clientTooltipComponent : list) {
+ m = clientTooltipComponent.getWidth(this.font);
+ if (m > k) {
+ k = m;
+ }
+ l += clientTooltipComponent.getHeight();
+ }
+ int n = i + 12;
+ int o = j - 12;
+ m = k;
+ int p = l;
+ if (n + k > this.width) {
+ n -= 28 + k;
+ }
+ if (o + p + 6 > this.height) {
+ o = this.height - p - 6;
+ }
+ if (j - p - 8 < 0) {
+ o = j + 8;
+ }
+ poseStack.pushPose();
+ int q = -267386864;
+ int r = 0x505000FF;
+ int s = 1344798847;
+ int t = 400;
+ float f = this.itemRenderer.blitOffset;
+ this.itemRenderer.blitOffset = 400.0f;
+ Tesselator tesselator = Tesselator.getInstance();
+ BufferBuilder bufferBuilder = tesselator.getBuilder();
+ RenderSystem.setShader(GameRenderer::getPositionColorShader);
+ bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
+ Matrix4f matrix4f = poseStack.last().pose();
+ Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 4, n + m + 3, o - 3, 400, -267386864, -267386864);
+ Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 3, n + m + 3, o + p + 4, 400, -267386864, -267386864);
+ Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o + p + 3, 400, -267386864, -267386864);
+ Screen.fillGradient(matrix4f, bufferBuilder, n - 4, o - 3, n - 3, o + p + 3, 400, -267386864, -267386864);
+ Screen.fillGradient(matrix4f, bufferBuilder, n + m + 3, o - 3, n + m + 4, o + p + 3, 400, -267386864, -267386864);
+ Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3 + 1, n - 3 + 1, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
+ Screen.fillGradient(matrix4f, bufferBuilder, n + m + 2, o - 3 + 1, n + m + 3, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
+ Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o - 3 + 1, 400, 0x505000FF, 0x505000FF);
+ Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 2, n + m + 3, o + p + 3, 400, 1344798847, 1344798847);
+ RenderSystem.enableDepthTest();
+ RenderSystem.disableTexture();
+ RenderSystem.enableBlend();
+ RenderSystem.defaultBlendFunc();
+ BufferUploader.drawWithShader(bufferBuilder.end());
+ RenderSystem.disableBlend();
+ RenderSystem.enableTexture();
+ MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
+ poseStack.translate(0.0, 0.0, 400.0);
+ int u = o;
+ for (v = 0; v < list.size(); ++v) {
+ clientTooltipComponent2 = list.get(v);
+ clientTooltipComponent2.renderText(this.font, n, u, matrix4f, bufferSource);
+ u += clientTooltipComponent2.getHeight() /*+ (v == 0 ? 2 : 0)*/;
+ }
+ bufferSource.endBatch();
+ poseStack.popPose();
+ u = o;
+ for (v = 0; v < list.size(); ++v) {
+ clientTooltipComponent2 = list.get(v);
+ clientTooltipComponent2.renderImage(this.font, n, u, poseStack, this.itemRenderer, 400);
+ u += clientTooltipComponent2.getHeight() + (v == 0 ? 2 : 0);
+ }
+ this.itemRenderer.blitOffset = f;
+ }
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinJoinMultiplayerScreen.java
index 3fd542e..36993a2 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinJoinMultiplayerScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinJoinMultiplayerScreen.java
@@ -29,10 +29,15 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.FormattedCharSequence;
@Mixin(JoinMultiplayerScreen.class)
-public abstract class MixinJoinMultiplayerScreen extends MixinScreen {
+public abstract class MixinJoinMultiplayerScreen extends Screen {
private static final ResourceLocation RELOAD_TEXTURE = new ResourceLocation("nochatreports", "textures/gui/config_reload_button.png");
private static final Component RELOAD_TOOLTIP = Component.translatable("gui.nochatrepords.reload_config_tooltip");
+ protected MixinJoinMultiplayerScreen() {
+ super(null);
+ throw new IllegalStateException("Can't touch this");
+ }
+
@Inject(method = "init", at = @At("HEAD"))
private void onInit(CallbackInfo info) {
var button = new ImageButton(this.width/2 + 158, this.height - 52, 20, 20, 0, 0, 20, RELOAD_TEXTURE,
@@ -44,4 +49,83 @@ public abstract class MixinJoinMultiplayerScreen extends MixinScreen {
this.addRenderableWidget(button);
}
+ protected void renderTooltipNoGap(PoseStack poseStack, List<? extends FormattedCharSequence> list, int i, int j) {
+ this.renderTooltipInternalNoGap(poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), i, j);
+ }
+
+ protected void renderTooltipInternalNoGap(PoseStack poseStack, List<ClientTooltipComponent> list, int i, int j) {
+ ClientTooltipComponent clientTooltipComponent2;
+ int v;
+ int m;
+ if (list.isEmpty())
+ return;
+ int k = 0;
+ int l = list.size() == 1 ? -2 : 0;
+ for (ClientTooltipComponent clientTooltipComponent : list) {
+ m = clientTooltipComponent.getWidth(this.font);
+ if (m > k) {
+ k = m;
+ }
+ l += clientTooltipComponent.getHeight();
+ }
+ int n = i + 12;
+ int o = j - 12;
+ m = k;
+ int p = l;
+ if (n + k > this.width) {
+ n -= 28 + k;
+ }
+ if (o + p + 6 > this.height) {
+ o = this.height - p - 6;
+ }
+ if (j - p - 8 < 0) {
+ o = j + 8;
+ }
+ poseStack.pushPose();
+ int q = -267386864;
+ int r = 0x505000FF;
+ int s = 1344798847;
+ int t = 400;
+ float f = this.itemRenderer.blitOffset;
+ this.itemRenderer.blitOffset = 400.0f;
+ Tesselator tesselator = Tesselator.getInstance();
+ BufferBuilder bufferBuilder = tesselator.getBuilder();
+ RenderSystem.setShader(GameRenderer::getPositionColorShader);
+ bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
+ Matrix4f matrix4f = poseStack.last().pose();
+ Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 4, n + m + 3, o - 3, 400, -267386864, -267386864);
+ Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 3, n + m + 3, o + p + 4, 400, -267386864, -267386864);
+ Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o + p + 3, 400, -267386864, -267386864);
+ Screen.fillGradient(matrix4f, bufferBuilder, n - 4, o - 3, n - 3, o + p + 3, 400, -267386864, -267386864);
+ Screen.fillGradient(matrix4f, bufferBuilder, n + m + 3, o - 3, n + m + 4, o + p + 3, 400, -267386864, -267386864);
+ Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3 + 1, n - 3 + 1, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
+ Screen.fillGradient(matrix4f, bufferBuilder, n + m + 2, o - 3 + 1, n + m + 3, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
+ Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o - 3 + 1, 400, 0x505000FF, 0x505000FF);
+ Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 2, n + m + 3, o + p + 3, 400, 1344798847, 1344798847);
+ RenderSystem.enableDepthTest();
+ RenderSystem.disableTexture();
+ RenderSystem.enableBlend();
+ RenderSystem.defaultBlendFunc();
+ BufferUploader.drawWithShader(bufferBuilder.end());
+ RenderSystem.disableBlend();
+ RenderSystem.enableTexture();
+ MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
+ poseStack.translate(0.0, 0.0, 400.0);
+ int u = o;
+ for (v = 0; v < list.size(); ++v) {
+ clientTooltipComponent2 = list.get(v);
+ clientTooltipComponent2.renderText(this.font, n, u, matrix4f, bufferSource);
+ u += clientTooltipComponent2.getHeight() /*+ (v == 0 ? 2 : 0)*/;
+ }
+ bufferSource.endBatch();
+ poseStack.popPose();
+ u = o;
+ for (v = 0; v < list.size(); ++v) {
+ clientTooltipComponent2 = list.get(v);
+ clientTooltipComponent2.renderImage(this.font, n, u, poseStack, this.itemRenderer, 400);
+ u += clientTooltipComponent2.getHeight() + (v == 0 ? 2 : 0);
+ }
+ this.itemRenderer.blitOffset = f;
+ }
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinScreen.java
deleted file mode 100644
index a638ac3..0000000
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinScreen.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.aizistral.nochatreports.mixins;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.BufferUploader;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.Tesselator;
-import com.mojang.blaze3d.vertex.VertexFormat;
-import com.mojang.math.Matrix4f;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.components.Widget;
-import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.narration.NarratableEntry;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
-import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.entity.ItemRenderer;
-import net.minecraft.network.chat.Component;
-import net.minecraft.util.FormattedCharSequence;
-
-/**
- * The fact this has to exist for a couple tooltip rendering methods is ridiculous,
- * but not much we can do here.
- *
- * @author Aizistral
- */
-
-@Mixin(Screen.class)
-public abstract class MixinScreen extends AbstractContainerEventHandler implements Widget {
- @Shadow public int width;
- @Shadow public int height;
- @Shadow protected Font font;
- @Shadow protected ItemRenderer itemRenderer;
- @Shadow protected Minecraft minecraft;
-
- @Shadow
- protected abstract <T extends GuiEventListener & Widget> T addRenderableWidget(T guiEventListener);
-
- @Shadow
- protected abstract <T extends Widget> T addRenderableOnly(T widget);
-
- @Shadow
- protected abstract <T extends GuiEventListener & NarratableEntry> T addWidget(T guiEventListener);
-
- protected void renderTooltipNoGap(PoseStack poseStack, List<? extends FormattedCharSequence> list, int i, int j) {
- this.renderTooltipInternalNoGap(poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), i, j);
- }
-
- protected void renderTooltipInternalNoGap(PoseStack poseStack, List<ClientTooltipComponent> list, int i, int j) {
- ClientTooltipComponent clientTooltipComponent2;
- int v;
- int m;
- if (list.isEmpty())
- return;
- int k = 0;
- int l = list.size() == 1 ? -2 : 0;
- for (ClientTooltipComponent clientTooltipComponent : list) {
- m = clientTooltipComponent.getWidth(this.font);
- if (m > k) {
- k = m;
- }
- l += clientTooltipComponent.getHeight();
- }
- int n = i + 12;
- int o = j - 12;
- m = k;
- int p = l;
- if (n + k > this.width) {
- n -= 28 + k;
- }
- if (o + p + 6 > this.height) {
- o = this.height - p - 6;
- }
- if (j - p - 8 < 0) {
- o = j + 8;
- }
- poseStack.pushPose();
- int q = -267386864;
- int r = 0x505000FF;
- int s = 1344798847;
- int t = 400;
- float f = this.itemRenderer.blitOffset;
- this.itemRenderer.blitOffset = 400.0f;
- Tesselator tesselator = Tesselator.getInstance();
- BufferBuilder bufferBuilder = tesselator.getBuilder();
- RenderSystem.setShader(GameRenderer::getPositionColorShader);
- bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
- Matrix4f matrix4f = poseStack.last().pose();
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 4, n + m + 3, o - 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 3, n + m + 3, o + p + 4, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o + p + 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 4, o - 3, n - 3, o + p + 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n + m + 3, o - 3, n + m + 4, o + p + 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3 + 1, n - 3 + 1, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
- Screen.fillGradient(matrix4f, bufferBuilder, n + m + 2, o - 3 + 1, n + m + 3, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o - 3 + 1, 400, 0x505000FF, 0x505000FF);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 2, n + m + 3, o + p + 3, 400, 1344798847, 1344798847);
- RenderSystem.enableDepthTest();
- RenderSystem.disableTexture();
- RenderSystem.enableBlend();
- RenderSystem.defaultBlendFunc();
- BufferUploader.drawWithShader(bufferBuilder.end());
- RenderSystem.disableBlend();
- RenderSystem.enableTexture();
- MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
- poseStack.translate(0.0, 0.0, 400.0);
- int u = o;
- for (v = 0; v < list.size(); ++v) {
- clientTooltipComponent2 = list.get(v);
- clientTooltipComponent2.renderText(this.font, n, u, matrix4f, bufferSource);
- u += clientTooltipComponent2.getHeight() /*+ (v == 0 ? 2 : 0)*/;
- }
- bufferSource.endBatch();
- poseStack.popPose();
- u = o;
- for (v = 0; v < list.size(); ++v) {
- clientTooltipComponent2 = list.get(v);
- clientTooltipComponent2.renderImage(this.font, n, u, poseStack, this.itemRenderer, 400);
- u += clientTooltipComponent2.getHeight() + (v == 0 ? 2 : 0);
- }
- this.itemRenderer.blitOffset = f;
- }
-
-}
diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json
index 7299a79..2eb8812 100644
--- a/src/main/resources/nochatreports.mixins.json
+++ b/src/main/resources/nochatreports.mixins.json
@@ -22,7 +22,6 @@
"AccessorDisconnectedScreen",
"MixinConnectScreen",
"MixinClientboundHelloPacket",
- "MixinScreen",
"MixinJoinMultiplayerScreen",
"MixinMessageSigner"
],