feat: port to 1.21.5

Rendering is complicated :cry;

Author: MichaelHillcox

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: CI Build & Release
 on:
   push:
     tags:
-      - mc/*/*
+      - v/*
 
 jobs:
   build:

CHANGELOG.md

@@ -1,5 +1,5 @@
-## [21.4.0]
+## [21.5.0]
 
 ### Changes
 
-- Ported to 1.21.4
+- Ported to 1.21.5

build.gradle

@@ -2,8 +2,12 @@ plugins {
     id 'idea'
     id 'java-library'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.171'
-    id "me.modmuss50.mod-publish-plugin" version "0.5.1"
+    id 'net.neoforged.moddev' version '2.0.78'
+    id "me.modmuss50.mod-publish-plugin" version "0.8.4"
+}
+
+tasks.named('wrapper', Wrapper).configure {
+    distributionType = Wrapper.DistributionType.BIN
 }
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(21)
@@ -15,38 +19,30 @@ base {
     archivesName = "advanced-xray-neoforge"
 }
 
-minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
-
-runs {
-    // applies to all the run configs below
-    configureEach {
-        systemProperty 'forge.logging.markers', 'REGISTRIES'
-        systemProperty 'forge.logging.console.level', 'debug'
-
-        modSource project.sourceSets.main
-    }
-
-    client {
-        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
-    }
+neoForge {
+    version = project.forge_version
+    accessTransformers = project.files('src/main/resources/META-INF/accesstransformer.cfg')
 
-    server {
-        systemProperty 'forge.enabledGameTestNamespaces', mod_id
-        programArgument '--nogui'
-    }
+    runs {
+        // applies to all the run configs below
+        configureEach {
+            systemProperty 'forge.logging.markers', 'REGISTRIES'
+            logLevel = org.slf4j.event.Level.DEBUG
+        }
 
-    gameTestServer {
-        systemProperty 'forge.enabledGameTestNamespaces', mod_id
+        client {
+            client()
+            systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+        }
     }
 
-    data {
-        runType "client"
-        programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+    mods {
+        "${mod_id}" {
+            sourceSet(sourceSets.main)
+        }
     }
 }
 
-sourceSets.main.resources { srcDir 'src/generated/resources' }
-
 def replaceProperties = [
     minecraft_version: minecraft_version,
     minecraft_version_range: minecraft_version_range.replace("[%base]", minecraft_version),
@@ -56,16 +52,17 @@ def replaceProperties = [
 
 processResources {
     inputs.properties replaceProperties
-    replaceProperties.put 'project', project
 
     filesMatching("META-INF/neoforge.mods.toml") {
         expand replaceProperties
     }
 }
 
-dependencies {
-    implementation "net.neoforged:neoforge:${forge_version}"
+configurations {
+    runtimeClasspath.extendsFrom localRuntime
+}
 
+dependencies {
 }
 
 repositories {
@@ -74,10 +71,6 @@ repositories {
     }
 }
 
-compileJava {
-    options.encoding = "UTF-8"
-}
-
 java {
     withSourcesJar()
 }
@@ -129,8 +122,13 @@ publishMods {
     }
 }
 
-sourceSets.each {
-    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
-    it.output.resourcesDir = dir
-    it.java.destinationDirectory = dir
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8'
+}
+
+idea {
+    module {
+        downloadSources = true
+        downloadJavadoc = true
+    }
 }

gradle.properties

@@ -1,18 +1,21 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx4G
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configuration-cache=true
 
 # https://parchmentmc.org/docs/getting-started
-neogradle.subsystems.parchment.minecraftVersion=1.20.6
-neogradle.subsystems.parchment.mappingsVersion=2024.06.02
-
+parchment_minecraft_version=1.21.4
+parchment_mappings_version=2025.03.23
 
 mod_id=xray
-mod_version=21.4.0
-minecraft_version=1.21.4
-minecraft_version_range=[%base],1.21.5
+mod_version=21.5.0
+minecraft_version=1.21.5
+minecraft_version_range=[%base],1.21.6
 
 # Forge
-forge_version=21.4.42-beta
-forge_version_range=21.4
+forge_version=21.5.7-beta
+forge_version_range=21.5
 curse_id=256256

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -1,10 +1,11 @@
 pluginManagement {
     repositories {
+        mavenLocal()
         gradlePluginPortal()
-        maven {
-            url "https://maven.neoforged.net/releases"
-        }
+        maven { url = 'https://maven.neoforged.net/releases' }
     }
 }
 
-rootProject.name = 'advanced-xray-neoforge'
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
+}

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

@@ -8,6 +8,7 @@
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.config.ModConfig;
+import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.neoforged.fml.event.lifecycle.FMLLoadCompleteEvent;
 import net.neoforged.neoforge.common.NeoForge;
@@ -27,29 +28,15 @@ public class ClientController {
     // This contains all the games blocks to allow us to reference them
     // when needed. This allows us to avoid continually rebuilding
     public static GameBlockStore gameBlockStore = new GameBlockStore();
-    public static DiscoveryStorage blockStore = new DiscoveryStorage();
+    public static DiscoveryStorage blockStore;
 
-    public static void setup(IEventBus eventBus) {
-
-        eventBus.addListener(ClientController::onSetup);
-        eventBus.addListener(ClientController::onLoadComplete);
-        eventBus.addListener(KeyBindings::registerKeyBinding);
-
-        ModLoadingContext.get().getActiveContainer()
-                .registerConfig(ModConfig.Type.CLIENT, Configuration.SPEC);
-
-        // Keybindings
-        NeoForge.EVENT_BUS.addListener(KeyBindings::eventInput);
-        NeoForge.EVENT_BUS.addListener(ClientController::onGameJoin);
-
-        NeoForge.EVENT_BUS.addListener(Events::tickEnd);
-        NeoForge.EVENT_BUS.addListener(Events::onWorldRenderLast);
-
-    }
-
-    private static void onSetup(final FMLCommonSetupEvent event) {
+    static void onSetup(final FMLClientSetupEvent event) {
         XRay.logger.debug(I18n.get("xray.debug.init"));
 
+        blockStore = new DiscoveryStorage();
+        ClientController.gameBlockStore.populate();
+        Controller.init();
+
         KeyBindings.setup();
         List<BlockData.SerializableBlockData> data = ClientController.blockStore.read();
         if( data.isEmpty() )
@@ -59,7 +46,7 @@ private static void onSetup(final FMLCommonSetupEvent event) {
         Controller.getBlockStore().setStore(map);
     }
 
-    private static void onGameJoin(final EntityJoinLevelEvent event) {
+    static void onGameJoin(final EntityJoinLevelEvent event) {
         if (!Configuration.firstRun.get()) {
             return;
         }
@@ -77,8 +64,4 @@ private static void onGameJoin(final EntityJoinLevelEvent event) {
         Configuration.firstRun.set(false);
         Configuration.firstRun.save();
     }
-
-    private static void onLoadComplete(FMLLoadCompleteEvent event) {
-        ClientController.gameBlockStore.populate();
-    }
 }

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

@@ -1,10 +1,17 @@
 package pro.mikey.xray;
 
 import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.config.ModConfig;
 import net.neoforged.fml.loading.FMLEnvironment;
+import net.neoforged.neoforge.client.event.RegisterRenderPipelinesEvent;
+import net.neoforged.neoforge.common.NeoForge;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import pro.mikey.xray.keybinding.KeyBindings;
+import pro.mikey.xray.xray.Events;
+import pro.mikey.xray.xray.Render;
 
 @Mod(XRay.MOD_ID)
 public class XRay {
@@ -14,8 +21,26 @@ public class XRay {
 	public static Logger logger = LogManager.getLogger();
 
 	public XRay(IEventBus eventBus) {
-		if (FMLEnvironment.dist.isClient()) {
-			ClientController.setup(eventBus);
+		if (!FMLEnvironment.dist.isClient()) {
+			return;
 		}
+
+		ModLoadingContext.get().getActiveContainer()
+				.registerConfig(ModConfig.Type.CLIENT, Configuration.SPEC);
+
+		eventBus.addListener(ClientController::onSetup);
+		eventBus.addListener(KeyBindings::registerKeyBinding);
+		eventBus.addListener(this::registerPipeline);
+
+		// Keybindings
+		NeoForge.EVENT_BUS.addListener(KeyBindings::eventInput);
+		NeoForge.EVENT_BUS.addListener(ClientController::onGameJoin);
+
+		NeoForge.EVENT_BUS.addListener(Events::tickEnd);
+		NeoForge.EVENT_BUS.addListener(Events::onWorldRenderLast);
+	}
+
+	private void registerPipeline(RegisterRenderPipelinesEvent event) {
+		event.registerPipeline(Render.LINES_NO_DEPTH);
 	}
 }

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

@@ -1,6 +1,6 @@
 package pro.mikey.xray.gui;
 
-import com.mojang.blaze3d.platform.GlDebug;
+import com.mojang.blaze3d.systems.GpuDevice;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
@@ -31,7 +31,8 @@ public static void RenderGameOverlayEvent(RenderGuiEvent.Post event) {
 
         GuiGraphics guiGraphics = event.getGuiGraphics();
 
-        boolean renderDebug = GlDebug.isDebugEnabled();
+        GpuDevice gpuDevice = RenderSystem.tryGetDevice();
+        boolean renderDebug = gpuDevice != null && gpuDevice.isDebuggingEnabled();
 
         int x = 5, y = 5;
         if (renderDebug) {

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

@@ -1,7 +1,5 @@
 package pro.mikey.xray.gui;
 
-import com.mojang.blaze3d.platform.GlStateManager;
-import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
@@ -12,7 +10,6 @@
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.client.resources.language.I18n;
-import net.minecraft.locale.Language;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.InteractionHand;
@@ -321,14 +318,10 @@ public void render(GuiGraphics guiGraphics, int entryIdx, int top, int left, int
 
                 var stack = guiGraphics.pose();
                 stack.pushPose();
-                RenderSystem.enableBlend();
-                RenderSystem.blendFunc(
-                        GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
 
                 guiGraphics.blit(RenderType::guiTextured, GuiSelectionScreen.CIRCLE, (left + entryWidth) - 23, (int) (top + (entryHeight / 2f) - 9), 0, 0, 14, 14, 14, 14, 0x7F000000);
                 guiGraphics.blit(RenderType::guiTextured, GuiSelectionScreen.CIRCLE, (left + entryWidth) - 21, (int) (top + (entryHeight / 2f) - 7), 0, 0, 10, 10, 10, 10, 0xFF000000 | blockData.getColor());
 
-                RenderSystem.disableBlend();
                 stack.popPose();
             }