feat: port to 1.21.4

Author: MichaelHillcox

.gitignore

@@ -28,3 +28,5 @@ bin/
 
 remappedSrc/
 run/
+
+.DS_Store

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [21.4.0]
+
+### Changes
+
+- Ported to 1.21.4
+
 ## [21.2.0]
 
 ### Changes

README.md

@@ -1,33 +1,28 @@
-![XRay Logo](.github/assets/xray-fabric-logo.svg)
+![XRay Logo](https://raw.githubusercontent.com/AdvancedXRay/XRay-Fabric/refs/heads/main/.github/assets/xray-fabric-logo.svg)
 
-# Advanced XRay (Fabric Edition)
+# [Advanced XRay (Fabric Edition)](https://www.curseforge.com/minecraft/mc-mods/advanced-xray-fabric-edition)
 
-![Build and Package](https://github.com/MichaelHillcox/XRay-Mod/workflows/Build%20and%20Package/badge.svg)
-[![GitHub license](https://img.shields.io/github/license/MichaelHillcox/XRay-Fabric)](https://github.com/MichaelHillcox/XRay-Fabric/blob/main/LICENSE)
-[![GitHub stars](https://img.shields.io/github/stars/MichaelHillcox/XRay-Fabric)](https://github.com/MichaelHillcox/XRay-Fabric/stargazers)
-[![GitHub issues](https://img.shields.io/github/issues/MichaelHillcox/XRay-Fabric)](https://github.com/MichaelHillcox/XRay-Fabric/issues)
-![GitHub all releases](https://img.shields.io/github/downloads/michaelhillcox/xray-Fabric/total)
-![GitHub release (latest by date)](https://img.shields.io/github/v/release/michaelhillcox/xray-Fabric)
-![GitHub Release Date](https://img.shields.io/github/release-date/michaelhillcox/xray-Fabric)
-![GitHub last commit](https://img.shields.io/github/last-commit/michaelhillcox/xray-Fabric)
-[![Build Status](https://ci.mikey.pro/buildStatus/icon?job=XRay-Fabric%2Fmain)](https://ci.mikey.pro/job/XRay-Fabric/job/main/)
+Find the project on [CurseForge](https://www.curseforge.com/minecraft/mc-mods/advanced-xray-fabric-edition)
 
-Fabric Loader based XRay mod designed to aid players who don't like the ore searching process. This mod is an exact 1:1 copy of my [Advanced XRay Forge Mod](https://github.com/MichaelHillcox/XRay-Mod/) which is typically the more up-to-date version of the mod.
+[![](https://cf.way2muchnoise.eu/short_444663.svg)](https://www.curseforge.com/minecraft/mc-mods/advanced-xray-fabric-edition)
+[![](https://cf.way2muchnoise.eu/versions/444663.svg)](https://www.curseforge.com/minecraft/mc-mods/advanced-xray-fabric-edition)
 
-[![Discord invite link](.github/assets/discord-join-badge.svg)](https://discord.gg/yYNuqJxucJ)
+[![GitHub license](https://img.shields.io/github/license/advancedxray/XRay-Fabric)](https://github.com/advancedxray/XRay-Fabric/blob/main/LICENSE)
+[![GitHub issues](https://img.shields.io/github/issues/advancedxray/XRay-Fabric)](https://github.com/advancedxray/XRay-Fabric/issues)
+![GitHub Release Date](https://img.shields.io/github/release-date/advancedxray/xray-Fabric)
+![GitHub last commit](https://img.shields.io/github/last-commit/advancedxray/xray-Fabric)
+
+Fabric Loader based XRay mod designed to aid players who don't like the ore searching process. This mod is an exact 1:1 copy of my [Advanced XRay Forge Mod](https://github.com/advancedxray/XRay-Mod/) which is typically the more up-to-date version of the mod.
 
 ##### Looking for the Forge version? Click the button below :tada:
 
-<a href="https://github.com/michaelhillcox/xray-mod"><img src=".github/assets/xray-forge-badge.svg" alt="drawing" width="265"/>
+<a href="https://github.com/advancedxray/xray-mod"><img src="https://raw.githubusercontent.com/AdvancedXRay/XRay-Fabric/refs/heads/main/.github/assets/xray-forge-badge.svg" alt="drawing" width="265"/>
 </a>
 
-## Disclaimer
-I am a `Forge Mod` Developer, not a Fabric Mod Developer, I am doing this mod per user request and out of pure intrest in learning a new API. The current status of this mod is `Unreleased` as the mod is currently a `WIP`. Don't `@` me.
-
 ## Features
 Advanced XRay Fabric Edition is a feature rich XRay / Block ESP mod designed to aid players in the block searching process. I've designed the mod to be as user friendly as possible. Out of the box you'll have *Easy to use GUI for adding, deleting and editing block you want to find*, *Full RGB color picker support*, *Searchable block list with in-hand and in-world options for adding blocks*, *Json Stored list to share and edit easily outside of the game*.
 
-## How to use (TBA)
+## How to use
 
 **Using XRay**
 

gradle.properties

@@ -1,13 +1,13 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx4G
-minecraft_version=1.21.2
+minecraft_version=1.21.4
 
 # Mod Properties
-mod_version=21.2.0
+mod_version=21.4.0
 maven_group=pro.mikey
 archives_base_name=advanced-xray-fabric
 
 loader_version=0.16.9
-fabric_version=0.106.1+1.21.2
+fabric_version=0.112.0+1.21.4
 
 curse_id=444663

src/client/java/pro/mikey/fabric/xray/screens/forge/GuiSelectionScreen.java

@@ -88,9 +88,6 @@ public void init() {
         this.render = Minecraft.getInstance().getItemRenderer();
 //        this.buttons.clear();
 
-        this.scrollList = new ScrollingBlockList((this.getWidth() / 2) - 37, this.getHeight() / 2 + 10, 203, 185, this.itemList, this);
-        this.addRenderableWidget(this.scrollList);
-
         this.search = new EditBox(this.getFontRender(), this.getWidth() / 2 - 137, this.getHeight() / 2 - 105, 202, 18, Component.empty());
         this.search.setCanLoseFocus(true);
 
@@ -170,6 +167,9 @@ public void init() {
             this.minecraft.setScreen(new GuiHelp());
         }).pos(this.getWidth() / 2 + 79, this.getHeight() / 2 + 58).size(60,20).build());
         this.addRenderableWidget(new Button.Builder(Component.translatable("xray.single.close"), button -> this.onClose()).pos((this.getWidth() / 2 + 79) + 62, this.getHeight() / 2 + 58).size(59,20).build());
+
+        this.scrollList = new ScrollingBlockList((this.getWidth() / 2) - 37, this.getHeight() / 2 + 10, 203, 185, this.itemList, this);
+        this.addRenderableWidget(this.scrollList);
     }
 
     private void updateSearch() {
@@ -277,10 +277,6 @@ void updateEntries(List<BlockEntry> blocks) {
             blocks.forEach(block -> this.addEntry(new BlockSlot(block, this))); // @mcp: func_230513_b_ = addEntry
         }
 
-        @Override
-        public Optional<GuiEventListener> getChildAt(double mouseX, double mouseY) {
-            return Optional.empty();
-        }
 
         public class BlockSlot extends AbstractSelectionList.Entry<BlockSlot> {
             BlockEntry block;

src/client/java/pro/mikey/fabric/xray/screens/forge/ScrollingList.java

@@ -22,7 +22,7 @@ public void renderWidget(GuiGraphics stack, int mouseX, int mouseY, float partia
     }
 
     @Override
-    protected int getScrollbarPosition() {
+    protected int scrollBarX() {
         return (this.getX() + this.width) - 6;
     }