feat: port to 1.21.2

MichaelHillcox · MichaelHillcox · commit 79d963e60cdc · 2024-12-15T16:06:38.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## [21.2.0]
+
+### Changes
+
+- Ported to 1.21.2
+- Tooltip on entry hover has how been moved to help text under the main gui
+
+### Fixed
+
+- Scrollbar should no longer click through to the entry behind it
+
 ## [21.0.0]
 
 ### Changes
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.6-SNAPSHOT'
+    id 'fabric-loom' version '1.8-SNAPSHOT'
     id 'maven-publish'
     id 'pro.mikey.plugins.insaniam' version "0.1-SNAPSHOT"
     id "me.modmuss50.mod-publish-plugin" version "0.5.1"
diff --git a/gradle.properties b/gradle.properties
@@ -1,13 +1,13 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx4G
-minecraft_version=1.21
+minecraft_version=1.21.2
 
 # Mod Properties
-mod_version=21.0.0
+mod_version=21.2.0
 maven_group=pro.mikey
 archives_base_name=advanced-xray-fabric
 
-loader_version=0.15.11
-fabric_version=0.100.1+1.21
+loader_version=0.16.9
+fabric_version=0.106.1+1.21.2
 
 curse_id=444663
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/client/java/pro/mikey/fabric/xray/ScanTask.java b/src/client/java/pro/mikey/fabric/xray/ScanTask.java
@@ -108,7 +108,7 @@ private Set<BlockPosWithColor> collectBlocks() {
 
                 for (int k = chunkStartX; k < chunkStartX + 16; k++) {
                     for (int l = chunkStartZ; l < chunkStartZ + 16; l++) {
-                        for (int m = world.getMinBuildHeight(); m < world.getMaxBuildHeight() + (1 << 4); m++) {
+                        for (int m = world.getMinY(); m < world.getMaxY() + (1 << 4); m++) {
                             BlockPos pos = new BlockPos(k, m, l);
                             BasicColor validBlock = isValidBlock(pos, world, blocks);
                             if (validBlock != null) {
diff --git a/src/client/java/pro/mikey/fabric/xray/cache/BlockSearchEntry.java b/src/client/java/pro/mikey/fabric/xray/cache/BlockSearchEntry.java
@@ -31,7 +31,7 @@ public static BlockState blockStateFromStringNBT(String nbt) {
             return Blocks.AIR.defaultBlockState();
         }
 
-        return NbtUtils.readBlockState(BuiltInRegistries.BLOCK.asLookup(), tag);
+        return NbtUtils.readBlockState(BuiltInRegistries.BLOCK, tag);
     }
 
     public static String blockStateToStringNBT(BlockState state) {
diff --git a/src/client/java/pro/mikey/fabric/xray/records/BasicColor.java b/src/client/java/pro/mikey/fabric/xray/records/BasicColor.java
@@ -19,4 +19,19 @@ public static BasicColor of(String hex) {
     String toHex() {
         return String.format("#%02x%02x%02x", this.red, this.green, this.blue);
     }
+
+    /**
+     * Convert the color to an int along with a alpha value of 255
+     */
+    public int toInt() {
+        return (255 << 24) + (this.red << 16) + (this.green << 8) + this.blue;
+    }
+
+    public int toInt(int alpha) {
+        return (alpha << 24) + (this.red << 16) + (this.green << 8) + this.blue;
+    }
+
+    public static int rgbaToInt(int red, int green, int blue, float alpha) {
+        return ((int) (alpha * 255) << 24) + (red << 16) + (green << 8) + blue;
+    }
 }
diff --git a/src/client/java/pro/mikey/fabric/xray/render/RenderOutlines.java b/src/client/java/pro/mikey/fabric/xray/render/RenderOutlines.java
@@ -1,10 +1,12 @@
 package pro.mikey.fabric.xray.render;
 
+import com.mojang.blaze3d.buffers.BufferUsage;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.*;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.Camera;
+import net.minecraft.client.renderer.CoreShaders;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.world.phys.Vec3;
 import org.joml.Matrix4f;
@@ -37,7 +39,7 @@ public static synchronized void render(WorldRenderContext context) {
 
         if (vertexBuffer == null || requestedRefresh.get()) {
             requestedRefresh.set(false);
-            vertexBuffer = new VertexBuffer(VertexBuffer.Usage.STATIC);
+            vertexBuffer = new VertexBuffer(BufferUsage.STATIC_WRITE);
 
             Tesselator tessellator = Tesselator.getInstance();
             BufferBuilder buffer = tessellator.begin(VertexFormat.Mode.DEBUG_LINES, DefaultVertexFormat.POSITION_COLOR);
@@ -59,13 +61,12 @@ public static synchronized void render(WorldRenderContext context) {
             Camera camera = context.camera();
             Vec3 cameraPos = camera.getPosition();
 
+            PoseStack poseStack = context.matrixStack();
+
             RenderSystem.depthMask(false);
             RenderSystem.enableBlend();
             RenderSystem.defaultBlendFunc();
 
-            RenderSystem.applyModelViewMatrix();
-
-            PoseStack poseStack = context.matrixStack();
             poseStack.pushPose();
 
             if (canvasLoaded == 1) { // canvas compat
@@ -75,19 +76,23 @@ public static synchronized void render(WorldRenderContext context) {
                 poseStack.mulPose(new Quaternionf(0.0, 1.0 * sin(f/2.0f), 0.0, cos(f/2.0f)));
             }
 
-            RenderSystem.setShader(GameRenderer::getPositionColorShader);
-            RenderSystem.applyModelViewMatrix();
+            RenderSystem.setShader(CoreShaders.POSITION_COLOR);
             RenderSystem.depthFunc(GL11.GL_ALWAYS);
 
-            context.projectionMatrix().lookAt(cameraPos.toVector3f(), cameraPos.toVector3f().add(camera.getLookVector()), camera.getUpVector());
+            Matrix4f matrix4f = new Matrix4f(context.projectionMatrix());
+
+            matrix4f.lookAt(cameraPos.toVector3f(), cameraPos.toVector3f().add(camera.getLookVector()), camera.getUpVector());
 
             vertexBuffer.bind();
-            vertexBuffer.drawWithShader(poseStack.last().pose(), new Matrix4f(context.projectionMatrix()), RenderSystem.getShader());
+            vertexBuffer.drawWithShader(poseStack.last().pose(), matrix4f, RenderSystem.getShader());
             VertexBuffer.unbind();
+
+            // Reset everything
             RenderSystem.depthFunc(GL11.GL_LEQUAL);
+            RenderSystem.disableBlend();
+            RenderSystem.depthMask(true);
 
             poseStack.popPose();
-            RenderSystem.applyModelViewMatrix();
         }
     }
 
diff --git a/src/client/java/pro/mikey/fabric/xray/screens/AbstractScreen.java b/src/client/java/pro/mikey/fabric/xray/screens/AbstractScreen.java
@@ -4,6 +4,7 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.renderer.RenderType;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import pro.mikey.fabric.xray.Utils;
@@ -19,14 +20,10 @@ public abstract class AbstractScreen extends Screen {
     public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) {
         super.render(guiGraphics, mouseX, mouseY, delta);
 
-        //    RenderSystem.pushMatrix();
-        //    RenderSystem.translatef(0.0F, 0.0F, 100.0F);
-//        RenderSystem.setShaderTexture(0, TEXTURE);
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
         int i = (this.width - 147) / 2;
         int j = (this.height - 166) / 2;
 
-        guiGraphics.blit(TEXTURE, i, j, 1, 1, 147, 166);
-        //    RenderSystem.popMatrix();
+        guiGraphics.blit(RenderType::guiTextured, TEXTURE, i, j, 1, 1, 147, 166, 256, 256);
     }
 }
diff --git a/src/client/java/pro/mikey/fabric/xray/screens/forge/GuiBase.java b/src/client/java/pro/mikey/fabric/xray/screens/forge/GuiBase.java
@@ -1,10 +1,12 @@
 package pro.mikey.fabric.xray.screens.forge;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.renderer.RenderType;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import pro.mikey.fabric.xray.Utils;
@@ -38,12 +40,16 @@ public boolean charTyped(char keyTyped, int __unknown) {
 
     @Override
     public void render(GuiGraphics guiGraphics, int x, int y, float partialTicks) {
+        super.render(guiGraphics, x, y, partialTicks);
+        this.renderExtra(guiGraphics, x, y, partialTicks);
+
         this.renderBackground(guiGraphics, x, y, partialTicks);
         int width = this.width;
         int height = this.height;
         if (this.hasSide) {
-            guiGraphics.blit(this.getBackground(), width / 2 + 60, height / 2 - 180 / 2, 0, 0, 150, 180, 150, 180);
+            guiGraphics.blit(RenderType::guiTextured, this.getBackground(), width / 2 + 60, height / 2 - 180 / 2, 0, 0, 150, 180, 150, 180);
             guiGraphics.blit(
+                    RenderType::guiTextured,
                     this.getBackground(),
                     width / 2 - 150,
                     height / 2 - 118,
@@ -54,14 +60,11 @@ public void render(GuiGraphics guiGraphics, int x, int y, float partialTicks) {
                     this.backgroundWidth,
                     this.backgroundHeight
             );
-
-            if (this.hasSideTitle()) {
-                guiGraphics.drawString(this.font, this.sideTitle, width / 2 + 80, height / 2 - 77, 0xffff00);
-            }
         }
 
         if (!this.hasSide) {
             guiGraphics.blit(
+                    RenderType::guiTextured,
                     this.getBackground(),
                     width / 2 - this.backgroundWidth / 2 + 1,
                     height / 2 - this.backgroundHeight / 2,
@@ -74,27 +77,33 @@ public void render(GuiGraphics guiGraphics, int x, int y, float partialTicks) {
             );
         }
 
-//        RenderSystem.enableTexture();
+        PoseStack pose = guiGraphics.pose();
+        pose.pushPose();
+        for (Renderable renderable : this.renderables) {
+            renderable.render(guiGraphics, x, y, partialTicks);
+        }
+        pose.popPose();
+
+        this.renderExtra(guiGraphics, x, y, partialTicks);
+
         if (this.hasTitle()) {
             if (this.hasSide) {
                 guiGraphics.drawString(
-                                this.font, this.title(), width / 2 - 138,  height / 2 - 105, 0xffff00);
+                        this.font, this.title(), width / 2 - 138,  height / 2 - 105, 0xffff00);
             } else {
                 guiGraphics.drawString(
                         this.font,
-                                this.title(),
-                                width / 2 - ( this.backgroundWidth / 2) + 14,
-                                 height / 2 - ( this.backgroundHeight / 2) + 13,
-                                0xffff00
-                        );
+                        this.title(),
+                        width / 2 - ( this.backgroundWidth / 2) + 14,
+                        height / 2 - ( this.backgroundHeight / 2) + 13,
+                        0xffff00
+                );
             }
         }
 
-        for (Renderable renderable : this.renderables) {
-            renderable.render(guiGraphics, x, y, partialTicks);
+        if (this.hasSide && this.hasSideTitle()) {
+            guiGraphics.drawString(this.font, this.sideTitle, width / 2 + 80, height / 2 - 77, 0xffff00);
         }
-
-        this.renderExtra(guiGraphics, x, y, partialTicks);
     }
 
     public ResourceLocation getBackground() {
diff --git a/src/client/java/pro/mikey/fabric/xray/screens/forge/GuiBlockList.java b/src/client/java/pro/mikey/fabric/xray/screens/forge/GuiBlockList.java
@@ -1,5 +1,6 @@
 package pro.mikey.fabric.xray.screens.forge;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractSelectionList;
@@ -12,6 +13,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Block;
+import pro.mikey.fabric.xray.records.BasicColor;
 import pro.mikey.fabric.xray.records.BlockWithStack;
 
 import java.awt.*;
@@ -38,6 +40,9 @@ public void init() {
         this.search.setFocused(true);
         this.setFocused(this.search);
 
+        this.addRenderableWidget(this.search);
+        this.addRenderableWidget(this.blockList);
+
         this.addRenderableWidget(new Button.Builder(Component.translatable("xray.single.cancel"), b -> {
             assert this.getMinecraft() != null;
             this.getMinecraft().setScreen(new GuiSelectionScreen());
@@ -67,8 +72,8 @@ private void reloadBlocks() {
 
     @Override
     public void renderExtra(GuiGraphics guiGraphics, int x, int y, float partialTicks) {
-        this.search.render(guiGraphics, x, y, partialTicks);
-        this.blockList.render(guiGraphics, x, y, partialTicks);
+//        this.search.render(guiGraphics, x, y, partialTicks);
+//        this.blockList.render(guiGraphics, x, y, partialTicks);
     }
 
     @Override
@@ -101,7 +106,6 @@ public void setSelected(BlockSlot entry) {
             }
 
             assert this.minecraft.player != null;
-            this.minecraft.player.clientSideCloseContainer();
             this.minecraft.setScreen(new GuiAddBlock(entry.getBlock().block().defaultBlockState(), GuiBlockList::new));
         }
 
@@ -128,14 +132,10 @@ public void render(GuiGraphics graphics, int entryIdx, int top, int left, int en
                 Font font = this.parent.minecraft.font;
 
                 ResourceLocation resource = BuiltInRegistries.BLOCK.getKey(this.block.block());
-                graphics.drawString(font, this.block.stack().getItem().getDescription().getString(), left + 35, top + 7, Color.WHITE.getRGB());
+                graphics.drawString(font, this.block.stack().getItem().getName().getString(), left + 35, top + 7, Color.WHITE.getRGB());
                 graphics.drawString(font, resource.getNamespace(), left + 35, top + 17, Color.WHITE.getRGB());
 
-                // TODO: CHECK
-//                Lighting.setupFor3DItems();
                 graphics.renderItem(this.block.stack(), left + 10, top + 7);
-//                this.parent.minecraft.getItemRenderer().renderAndDecorateItem(stack, this.block.stack(), left + 10, top + 7);
-//                Lighting.setupForFlatItems();
             }
 
             @Override
diff --git a/src/client/java/pro/mikey/fabric/xray/screens/forge/GuiOverlay.java b/src/client/java/pro/mikey/fabric/xray/screens/forge/GuiOverlay.java
@@ -5,6 +5,7 @@
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.resources.ResourceLocation;
 import pro.mikey.fabric.xray.Utils;
@@ -28,13 +29,9 @@ public static void RenderGameOverlayEvent(GuiGraphics guiGraphics, DeltaTracker
             y = Minecraft.getInstance().getWindow().getGuiScaledHeight() - 10;
         }
 
-        RenderSystem.setShaderColor(0, 1f, 0, 1f);
-//        RenderSystem.setShaderTexture(0, circle);
-        guiGraphics.blit(circle, x, y, 0f, 0f, 5, 5, 5, 5);
+        guiGraphics.blit(RenderType::guiTextured, circle, x, y, 0f, 0f, 5, 5, 5, 5, 0xFF00FF00);
 
         int width = Minecraft.getInstance().font.width(I18n.get("xray.overlay"));
-        guiGraphics.drawString(Minecraft.getInstance().font, I18n.get("xray.overlay"), x + (!renderDebug ? 10 : -width - 5), y - (!renderDebug ? 1 : 2), 0xffffffff);
-
-        RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+        guiGraphics.drawString(Minecraft.getInstance().font, I18n.get("xray.overlay"), x + (!renderDebug ? 10 : -width - 5), y - (!renderDebug ? 1 : 2), 0xff00ff00);
     }
 }
diff --git a/src/client/java/pro/mikey/fabric/xray/screens/forge/GuiSelectionScreen.java b/src/client/java/pro/mikey/fabric/xray/screens/forge/GuiSelectionScreen.java
diff --git a/src/client/java/pro/mikey/fabric/xray/screens/forge/ScrollingList.java b/src/client/java/pro/mikey/fabric/xray/screens/forge/ScrollingList.java
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public static BlockState blockStateFromStringNBT(String nbt) {`
`31`	`31`	`return Blocks.AIR.defaultBlockState();`
`32`	`32`	`}`
`33`	`33`
`34`		`- return NbtUtils.readBlockState(BuiltInRegistries.BLOCK.asLookup(), tag);`
	`34`	`+ return NbtUtils.readBlockState(BuiltInRegistries.BLOCK, tag);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public static String blockStateToStringNBT(BlockState state) {`