feat: ported to 1.20.6 (neoforge)

MichaelHillcox · MichaelHillcox · commit 45b2573d5e1b · 2024-06-09T12:01:17.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           cache: 'gradle'
           distribution: 'temurin'
       - name: Build with Gradle
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           cache: 'gradle'
           distribution: 'temurin'
       - name: Publish & Release to Curse
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
-## [84.0.0]
+## [86.0.0]
 
 ### Changed
 
-- Updated to 1.20.4 for NeoForge
+- Updated to 1.20.6 for NeoForge
diff --git a/build.gradle b/build.gradle
@@ -2,12 +2,11 @@ plugins {
     id 'idea'
     id 'java-library'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.61'
-    id 'net.neoforged.gradle.mixin' version '7.0.61'
+    id 'net.neoforged.gradle.userdev' version '7.0.142'
     id "me.modmuss50.mod-publish-plugin" version "0.4.5"
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 version = mod_version
 group = 'pro.mikey'
@@ -16,10 +15,6 @@ base {
     archivesName = "advanced-xray-neoforge"
 }
 
-mixin {
-    config 'xray.mixins.json'
-}
-
 minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
 
 runs {
@@ -62,7 +57,7 @@ processResources {
     inputs.properties replaceProperties
     replaceProperties.put 'project', project
 
-    filesMatching("META-INF/mods.toml") {
+    filesMatching("META-INF/neoforge.mods.toml") {
         expand replaceProperties
     }
 }
@@ -74,7 +69,7 @@ dependencies {
 
 repositories {
     maven {
-        url "https://maven.saps.dev/mirror"
+        url "https://maven.neoforged.net/releases"
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -3,10 +3,10 @@
 org.gradle.jvmargs=-Xmx4G
 
 mod_id=xray
-mod_version=84.0.0
-minecraft_version=1.20.4
-minecraft_version_range=[%base],1.20.5
+mod_version=86.0.0
+minecraft_version=1.20.6
+minecraft_version_range=[%base],1.21
 
 # Forge
-forge_version=20.4.3-beta
+forge_version=20.6.113-beta
 curse_id=256256
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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -2,7 +2,7 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         maven {
-            url "https://maven.saps.dev/mirror"
+            url "https://maven.neoforged.net/releases"
         }
     }
 }
diff --git a/src/main/java/pro/mikey/xray/ClientController.java b/src/main/java/pro/mikey/xray/ClientController.java
@@ -30,16 +30,17 @@ public class ClientController {
     public static GameBlockStore gameBlockStore = new GameBlockStore();
     public static DiscoveryStorage blockStore = new DiscoveryStorage();
 
-    public static void setup() {
-        IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
+    public static void setup(IEventBus eventBus) {
 
         eventBus.addListener(ClientController::onSetup);
         eventBus.addListener(ClientController::onLoadComplete);
         eventBus.addListener(KeyBindings::registerKeyBinding);
-        ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, Configuration.SPEC);
+
+        ModLoadingContext.get().getActiveContainer()
+                .registerConfig(ModConfig.Type.CLIENT, Configuration.SPEC);
 
         // Keybindings
-        NeoForge.EVENT_BUS.register(KeyBindings.class);
+        NeoForge.EVENT_BUS.addListener(KeyBindings::eventInput);
         NeoForge.EVENT_BUS.addListener(ClientController::onGameJoin);
 
         NeoForge.EVENT_BUS.addListener(Events::tickEnd);
diff --git a/src/main/java/pro/mikey/xray/XRay.java b/src/main/java/pro/mikey/xray/XRay.java
@@ -1,10 +1,8 @@
 package pro.mikey.xray;
 
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.DistExecutor;
-import net.neoforged.fml.IExtensionPoint;
-import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.loading.FMLEnvironment;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -15,8 +13,9 @@ public class XRay {
 
 	public static Logger logger = LogManager.getLogger();
 
-	public XRay() {
-		ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> "", (c, b) -> true));
-		DistExecutor.safeRunWhenOn(Dist.CLIENT, () -> ClientController::setup);
+	public XRay(IEventBus eventBus) {
+		if (FMLEnvironment.dist.isClient()) {
+			ClientController.setup(eventBus);
+		}
 	}
 }
diff --git a/src/main/java/pro/mikey/xray/gui/GuiOverlay.java b/src/main/java/pro/mikey/xray/gui/GuiOverlay.java
@@ -9,19 +9,19 @@
 import net.neoforged.api.distmarker.OnlyIn;
 import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.common.Mod;
-import net.neoforged.neoforge.client.event.RenderGuiOverlayEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.client.event.RenderGuiEvent;
 import pro.mikey.xray.Configuration;
 import pro.mikey.xray.XRay;
 import pro.mikey.xray.xray.Controller;
 
-@Mod.EventBusSubscriber(modid = XRay.MOD_ID, value = Dist.CLIENT)
+@EventBusSubscriber(modid = XRay.MOD_ID, value = Dist.CLIENT)
 public class GuiOverlay {
     private static final ResourceLocation CIRCLE = new ResourceLocation(XRay.PREFIX_GUI + "circle.png");
 
     @OnlyIn(Dist.CLIENT)
     @SubscribeEvent(priority = EventPriority.LOWEST)
-    public static void RenderGameOverlayEvent(RenderGuiOverlayEvent.Post event) {
+    public static void RenderGameOverlayEvent(RenderGuiEvent.Post event) {
         // Draw Indicator
         if(!Controller.isXRayActive() || !Configuration.general.showOverlay.get())
             return;
diff --git a/src/main/java/pro/mikey/xray/gui/utils/ScrollingList.java b/src/main/java/pro/mikey/xray/gui/utils/ScrollingList.java
@@ -19,9 +19,6 @@ public class ScrollingList<E extends AbstractSelectionList.Entry<E>> extends Abs
     public ScrollingList(int x, int y, int width, int height, int slotHeightIn) {
         super(Minecraft.getInstance(), width, height, y - (height / 2), slotHeightIn);
         this.setX(x - (width / 2));
-        this.setRenderBackground(false);
-
-//        this.setRenderTopAndBottom(false); // removes background
     }
 
     @Override
diff --git a/src/main/java/pro/mikey/xray/xray/Events.java b/src/main/java/pro/mikey/xray/xray/Events.java
@@ -3,22 +3,22 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.state.BlockState;
+import net.neoforged.neoforge.client.event.ClientTickEvent;
 import net.neoforged.neoforge.client.event.RenderLevelStageEvent;
-import net.neoforged.neoforge.event.TickEvent;
 
 public class Events {
     public static void breakBlock(BlockPos pos, BlockState blockState) {
         RenderEnqueue.checkBlock(pos, blockState, !blockState.isAir());
     }
 
-    public static void tickEnd(TickEvent.ClientTickEvent event) {
-        if (event.phase == TickEvent.Phase.END && Minecraft.getInstance().player != null && Minecraft.getInstance().level != null) {
+    public static void tickEnd(ClientTickEvent.Post event) {
+        if (Minecraft.getInstance().player != null && Minecraft.getInstance().level != null) {
             Controller.requestBlockFinder(false);
         }
     }
 
     public static void onWorldRenderLast(RenderLevelStageEvent event) {
-        if (event.getStage() != RenderLevelStageEvent.Stage.AFTER_CUTOUT_BLOCKS) {
+        if (event.getStage() != RenderLevelStageEvent.Stage.AFTER_TRANSLUCENT_BLOCKS) {
             return;
         }
 
diff --git a/src/main/java/pro/mikey/xray/xray/Render.java b/src/main/java/pro/mikey/xray/xray/Render.java
@@ -2,13 +2,19 @@
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.*;
+import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.world.phys.Vec3;
+import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.client.event.RenderLevelStageEvent;
 import org.joml.Matrix4f;
+import org.joml.Quaternionf;
 import org.lwjgl.opengl.GL11;
 
+import static net.minecraft.util.Mth.cos;
+import static net.minecraft.util.Mth.sin;
+
 public class Render {
     private static VertexBuffer vertexBuffer;
     public static boolean requestedRefresh = false;
@@ -79,27 +85,29 @@ static void renderBlocks(RenderLevelStageEvent event) {
         }
 
         if (vertexBuffer != null) {
-            Vec3 view = Minecraft.getInstance().getEntityRenderDispatcher().camera.getPosition();
+            Vec3 playerPos = Minecraft.getInstance().gameRenderer.getMainCamera().getPosition();
+
+            RenderSystem.depthMask(false);
+            RenderSystem.enableBlend();
+            RenderSystem.defaultBlendFunc();
 
-            GL11.glEnable(GL11.GL_BLEND);
-            GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-            GL11.glEnable(GL11.GL_LINE_SMOOTH);
-            GL11.glDisable(GL11.GL_DEPTH_TEST);
+            PoseStack poseStack = event.getPoseStack();
+            poseStack.pushPose();
 
             RenderSystem.setShader(GameRenderer::getPositionColorShader);
+            RenderSystem.applyModelViewMatrix();
+            RenderSystem.depthFunc(GL11.GL_ALWAYS);
 
-            PoseStack matrix = event.getPoseStack();
-            matrix.pushPose();
-            matrix.translate(-view.x, -view.y, -view.z);
+            poseStack.mulPose(event.getModelViewMatrix());
+            poseStack.translate(-playerPos.x(), -playerPos.y(), -playerPos.z());
 
             vertexBuffer.bind();
-            vertexBuffer.drawWithShader(matrix.last().pose(), new Matrix4f(event.getProjectionMatrix()), RenderSystem.getShader());
+            vertexBuffer.drawWithShader(poseStack.last().pose(), event.getProjectionMatrix(), RenderSystem.getShader());
             VertexBuffer.unbind();
-            matrix.popPose();
+            RenderSystem.depthFunc(GL11.GL_LEQUAL);
 
-            GL11.glEnable(GL11.GL_DEPTH_TEST);
-            GL11.glDisable(GL11.GL_BLEND);
-            GL11.glDisable(GL11.GL_LINE_SMOOTH);
+            poseStack.popPose();
+            RenderSystem.applyModelViewMatrix();
         }
 	}
 }
diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml
@@ -1,8 +1,10 @@
-modLoader="javafml" #mandatory
-loaderVersion="[1,)" #mandatory
+modLoader="javafml" #required
+loaderVersion="[1,)" #required
 credits="ErrorMikey" #optional
 authors="AdvancedXRay Team" #optional
 license="GNU GPL v3.0 (https://github.com/MichaelHillcox/XRay-Mod/blob/master/LICENSE)"
+displayTest="IGNORE_ALL_VERSION"
+
 [[mods]]
     modId="xray"
     version="${version}"
@@ -11,14 +13,17 @@ license="GNU GPL v3.0 (https://github.com/MichaelHillcox/XRay-Mod/blob/master/LI
 
 [[dependencies.xray]]
     modId="neoforge"
-    mandatory=true
+    required=true
     versionRange="[${forge_version_range},)"
     ordering="NONE"
     side="CLIENT"
 
 [[dependencies.xray]]
     modId="minecraft"
-    mandatory=true
+    required=true
     versionRange="[${minecraft_version_range})"
     ordering="NONE"
     side="CLIENT"
+
+[[mixins]]
+config = 'xray.mixins.json'

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,11 @@ plugins {`
`2`	`2`	`id 'idea'`
`3`	`3`	`id 'java-library'`
`4`	`4`	`id 'maven-publish'`
`5`		`- id 'net.neoforged.gradle.userdev' version '7.0.61'`
`6`		`- id 'net.neoforged.gradle.mixin' version '7.0.61'`
	`5`	`+ id 'net.neoforged.gradle.userdev' version '7.0.142'`
`7`	`6`	`id "me.modmuss50.mod-publish-plugin" version "0.4.5"`
`8`	`7`	`}`
`9`	`8`
`10`		`-java.toolchain.languageVersion = JavaLanguageVersion.of(17)`
	`9`	`+java.toolchain.languageVersion = JavaLanguageVersion.of(21)`
`11`	`10`
`12`	`11`	`version = mod_version`
`13`	`12`	`group = 'pro.mikey'`
`@@ -16,10 +15,6 @@ base {`
`16`	`15`	`archivesName = "advanced-xray-neoforge"`
`17`	`16`	`}`
`18`	`17`
`19`		`-mixin {`
`20`		`- config 'xray.mixins.json'`
`21`		`-}`
`22`		`-`
`23`	`18`	`minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')`
`24`	`19`
`25`	`20`	`runs {`
`@@ -62,7 +57,7 @@ processResources {`
`62`	`57`	`inputs.properties replaceProperties`
`63`	`58`	`replaceProperties.put 'project', project`
`64`	`59`
`65`		`- filesMatching("META-INF/mods.toml") {`
	`60`	`+ filesMatching("META-INF/neoforge.mods.toml") {`
`66`	`61`	`expand replaceProperties`
`67`	`62`	`}`
`68`	`63`	`}`
`@@ -74,7 +69,7 @@ dependencies {`
`74`	`69`
`75`	`70`	`repositories {`
`76`	`71`	`maven {`
`77`		`- url "https://maven.saps.dev/mirror"`
	`72`	`+ url "https://maven.neoforged.net/releases"`
`78`	`73`	`}`
`79`	`74`	`}`
`80`	`75`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ pluginManagement {`
`2`	`2`	`repositories {`
`3`	`3`	`gradlePluginPortal()`
`4`	`4`	`maven {`
`5`		`- url "https://maven.saps.dev/mirror"`
	`5`	`+ url "https://maven.neoforged.net/releases"`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`