feat: port to 1.20.3

Author: MichaelHillcox

CHANGELOG.md

@@ -1,6 +1,5 @@
-## [82.0.0]
+## [83.0.0]
 
 ### Changed
 
-- Updated to 1.20.2
-- 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

build.gradle

@@ -161,3 +161,13 @@ publishMods {
         file = project.tasks.jar.archiveFile
     }
 }
+
+sourceSets.each {
+    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
+    it.output.resourcesDir = dir
+    it.java.destinationDirectory = dir
+}
+
+tasks.register("idePostSync") {
+
+}

gradle.properties

@@ -3,12 +3,12 @@
 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=48.0.49
+forge_version=49.0.2
 curse_id=256256
 
 loom.platform=forge

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -305,7 +305,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"))),

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

@@ -17,33 +17,33 @@
  */
 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.getY() + 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;
+        return (this.getX() + this.width) - 6;
     }
 
     @Override
-    public void updateNarration(NarrationElementOutput p_169152_) {
+    protected void updateWidgetNarration(NarrationElementOutput narrationElementOutput) {
 
     }
 }

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);
     }};