feat: ported to 1.19.4

Author: MichaelHillcox

build.gradle

@@ -14,7 +14,10 @@ archivesBaseName = "advanced-xray-forge"
 loom {
     silentMojangMappingsLicense()
 
-    forge
+    forge {
+    }
+
+    accessWidenerPath = file("src/main/resources/xray.accesswidener")
 }
 
 repositories {

gradle.properties

@@ -2,11 +2,11 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx4G
 
-mod_version=2.14.0
-minecraft_version=1.19.3
+mod_version=2.15.0
+minecraft_version=1.19.4
 
 # Forge
-forge_version=44.0.37
+forge_version=45.0.23
 curse_id=256256
 
 loom.platform=forge

src/main/java/pro/mikey/xray/gui/GuiSelectionScreen.java

@@ -291,7 +291,7 @@ public void render(PoseStack stack, int entryIdx, int top, int left, int entryWi
                 font.draw(stack, blockData.isDrawing() ? "Enabled" : "Disabled", left + 35, top + 17, blockData.isDrawing() ? Color.GREEN.getRGB() : Color.RED.getRGB());
 
                 Lighting.setupFor3DItems();
-                Minecraft.getInstance().getItemRenderer().renderAndDecorateItem(blockData.getItemStack(), left + 8, top + 7);
+                Minecraft.getInstance().getItemRenderer().renderAndDecorateItem(stack, blockData.getItemStack(), left + 8, top + 7);
                 Lighting.setupForFlatItems();
 
                 if (mouseX > left && mouseX < (left + entryWidth) && mouseY > top && mouseY < (top + entryHeight) && mouseY < (this.parent.getTop() + this.parent.getHeight()) && mouseY > this.parent.getTop()) {

src/main/java/pro/mikey/xray/gui/manage/GuiAddBlock.java

@@ -104,7 +104,7 @@ public void renderExtra(PoseStack stack, int x, int y, float partialTicks) {
         oreName.render(stack, x, y, partialTicks);
 
         Lighting.setupForFlatItems();
-        this.itemRenderer.renderAndDecorateItem(this.itemStack, getWidth() / 2 + 85, getHeight() / 2 - 105);
+        this.itemRenderer.renderAndDecorateItem(stack, this.itemStack, getWidth() / 2 + 85, getHeight() / 2 - 105);
         Lighting.setupFor3DItems();
     }
 

src/main/java/pro/mikey/xray/gui/manage/GuiBlockList.java

@@ -39,7 +39,7 @@ public void init() {
         addRenderableWidget(this.blockList);
 
         search = new EditBox(getFontRender(), getWidth() / 2 - 100, getHeight() / 2 + 85, 140, 18, Component.literal(""));
-        search.changeFocus(true);
+        search.setFocused(true);
         this.setFocused(search);
 
         addRenderableWidget(Button.builder(Component.translatable("xray.single.cancel"), b -> {
@@ -141,7 +141,7 @@ public void render(PoseStack stack, int entryIdx, int top, int left, int entryWi
                 // @mcp: of = unknown... Code recommendation
 
                 Lighting.setupFor3DItems();
-                this.parent.minecraft.getItemRenderer().renderAndDecorateItem(this.block.getItemStack(), left + 8, top + 7);
+                this.parent.minecraft.getItemRenderer().renderAndDecorateItem(stack, this.block.getItemStack(), left + 8, top + 7);
                 Lighting.setupForFlatItems();
             }
 

src/main/java/pro/mikey/xray/gui/manage/GuiEdit.java

@@ -99,7 +99,7 @@ public void renderExtra(PoseStack stack, int x, int y, float partialTicks) {
         fill(stack, this.getWidth() / 2 - 138, this.getHeight() / 2 - 40, (this.getWidth() / 2 - 36) + 100, (this.getHeight() / 2 - 40) + 45, color);
 
         Lighting.setupForFlatItems();
-        this.itemRenderer.renderAndDecorateItem(this.block.getItemStack(), getWidth() / 2 + 50, getHeight() / 2 - 105);
+        this.itemRenderer.renderAndDecorateItem(stack, this.block.getItemStack(), getWidth() / 2 + 50, getHeight() / 2 - 105);
         Lighting.setupFor3DItems();
     }
 

src/main/java/pro/mikey/xray/gui/utils/GuiBase.java

@@ -55,7 +55,7 @@ public void render(PoseStack stack, int x, int y, float partialTicks) {
         if( !this.hasSide )
             blit(stack, width / 2 - this.backgroundWidth / 2 + 1, height / 2 - this.backgroundHeight / 2, 0, 0, this.backgroundWidth, this.backgroundHeight, this.backgroundWidth, this.backgroundHeight);
 
-        RenderSystem.enableTexture();
+//        RenderSystem.enableTexture();
         if( hasTitle() ) {
             if( this.hasSide )
                 getFontRender().drawShadow(stack, title(), (float) width / 2 - 138, (float) height / 2 - 105, 0xffff00);

src/main/resources/xray.accesswidener

@@ -0,0 +1,2 @@
+accessWidener	v1	named
+accessible class net/minecraft/client/gui/components/AbstractSelectionList$Entry