feat: port to neoforge 1.20.3

Author: MichaelHillcox

.github/workflows/release.yml

@@ -20,6 +20,7 @@ jobs:
         env:
           SAPS_TOKEN: ${{ secrets.SAPS_TOKEN }}
           CURSE_DEPLOY_TOKEN: ${{ secrets.CURSE_DEPLOY_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           chmod +x ./gradlew
           ./gradlew build publish publishMods --stacktrace --no-daemon

CHANGELOG.md

@@ -1,6 +1,5 @@
-## [82.0.0]
+## [83.0.0]
 
 ### Changed
 
-- Updated to 1.20.2 for NeoForge
-- Shifted versioning to be inline with Minecraft release numbers for the major game version (1.20.2 being 82 for example)
+- Updated to 1.20.3 for NeoForge

build.gradle

@@ -2,8 +2,8 @@ plugins {
     id 'idea'
     id 'java-library'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.55'
-    id 'net.neoforged.gradle.mixin' version '7.0.55'
+    id 'net.neoforged.gradle.userdev' version '7.0.57'
+    id 'net.neoforged.gradle.mixin' version '7.0.57'
     id "me.modmuss50.mod-publish-plugin" version "0.4.5"
 }
 

gradle.properties

@@ -3,10 +3,10 @@
 org.gradle.jvmargs=-Xmx4G
 
 mod_id=xray
-mod_version=82.0.0
-minecraft_version=1.20.2
-minecraft_version_range=[%base],1.20.3
+mod_version=83.0.0
+minecraft_version=1.20.3
+minecraft_version_range=[%base],1.20.4
 
 # Forge
-forge_version= 20.2.86
+forge_version=20.3.1-beta
 curse_id=256256

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

@@ -10,6 +10,7 @@
 import net.minecraft.client.gui.components.AbstractSelectionList;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.components.ObjectSelectionList;
 import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.locale.Language;
@@ -275,7 +276,7 @@ void updateEntries(List<BlockData> blocks) {
             blocks.forEach(block -> this.addEntry(new BlockSlot(block, this))); // @mcp: addEntry = addEntry
         }
 
-        public static class BlockSlot extends AbstractSelectionList.Entry<ScrollingBlockList.BlockSlot> {
+        public static class BlockSlot extends ObjectSelectionList.Entry<ScrollingBlockList.BlockSlot> {
             BlockData block;
             ScrollingBlockList parent;
 
@@ -305,7 +306,7 @@ public void render(GuiGraphics guiGraphics, int entryIdx, int top, int left, int
 //                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()) {
+                if (mouseX > left && mouseX < (left + entryWidth) && mouseY > top && mouseY < (top + entryHeight) && mouseY < (this.parent.getY() + this.parent.getHeight()) && mouseY > this.parent.getY()) {
                     guiGraphics.renderTooltip(
                             font,
                             Language.getInstance().getVisualOrder(Arrays.asList(Component.translatable("xray.tooltips.edit1"), Component.translatable("xray.tooltips.edit2"))),
@@ -335,6 +336,11 @@ public boolean mouseClicked(double p_mouseClicked_1_, double p_mouseClicked_3_,
                 this.parent.setSelected(this, mouse);
                 return false;
             }
+
+            @Override
+            public Component getNarration() {
+                return Component.empty();
+            }
         }
     }
 }

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

@@ -10,40 +10,40 @@
 import java.util.AbstractList;
 
 /**
- * A bare bones implementation of the {@link AbstractList} / {@link net.minecraft.client.gui.widget.list.ExtendedList}
+ * A bare bones implementation of the {@link AbstractList}
  * without the background or borders. With GL_SCISSOR to crop out the overflow
  *
  * This is how an abstract implementation should look... :cry:
  */
 public class ScrollingList<E extends AbstractSelectionList.Entry<E>> extends AbstractSelectionList<E> {
     public ScrollingList(int x, int y, int width, int height, int slotHeightIn) {
-        super(Minecraft.getInstance(), width, height, y - (height / 2), (y - (height / 2)) + height, slotHeightIn);
-        this.setLeftPos(x - (width / 2));
+        super(Minecraft.getInstance(), width, height, y - (height / 2), slotHeightIn);
+        this.setX(x - (width / 2));
         this.setRenderBackground(false);
 
 //        this.setRenderTopAndBottom(false); // removes background
     }
 
     @Override
-    public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+    public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
         double scale = Minecraft.getInstance().getWindow().getGuiScale();
 
         GL11.glEnable(GL11.GL_SCISSOR_TEST);
-        GL11.glScissor((int)(this.x0  * scale), (int)(Minecraft.getInstance().getWindow().getHeight() - ((this.y0 + this.height) * scale)),
+        GL11.glScissor((int)(this.getX()  * scale), (int)(Minecraft.getInstance().getWindow().getHeight() - ((this.getX() + this.height) * scale)),
                 (int)(this.width * scale), (int)(this.height * scale));
 
-        super.render(guiGraphics, mouseX, mouseY, partialTicks);
+        super.renderWidget(guiGraphics, mouseX, mouseY, partialTicks);
 
         GL11.glDisable(GL11.GL_SCISSOR_TEST);
     }
 
-    @Override // @mcp: getScrollbarPosition = getScrollbarPosition
-    protected int getScrollbarPosition() {
-        return (this.x0 + this.width) - 6;
-    }
-
     @Override
-    public void updateNarration(NarrationElementOutput p_169152_) {
+    protected void updateWidgetNarration(NarrationElementOutput p_259858_) {
 
     }
+
+    @Override // @mcp: getScrollbarPosition = getScrollbarPosition
+    protected int getScrollbarPosition() {
+        return (this.getX() + this.width) - 6;
+    }
 }

src/main/java/pro/mikey/xray/xray/Controller.java

@@ -27,7 +27,7 @@ public class Controller {
         add(Blocks.AIR);
         add(Blocks.BEDROCK);
         add(Blocks.STONE);
-        add(Blocks.GRASS);
+        add(Blocks.GRASS_BLOCK);
         add(Blocks.DIRT);
     }};