1.20.4

.gitignore

@@ -11,7 +11,6 @@ out
 *.ipr
 *.iws
 *.iml
-.idea
 
 # gradle
 build

build.gradle

@@ -1,10 +1,10 @@
 plugins {
+    id 'java-library'
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle' version '[6.0.18,6.2)'
-    id 'org.spongepowered.mixin' version '0.7.+'
-    id 'org.parchmentmc.librarian.forgegradle' version '1.+'
+    id 'net.neoforged.gradle.userdev' version '7.0.+'
+    id 'net.neoforged.gradle.mixin' version '7.0.+'
 }
 
 evaluationDependsOnChildren()
@@ -40,90 +40,67 @@ if (version.contains("alpha") || version.contains("beta")) {
     setProperty("compatibility", "[" + version + ", " + nextIncompatibleVersion + ")")
 }
 
-
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
-println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
+accessTransformers {
+    file 'src/main/resources/META-INF/accesstransformer.cfg'
+}
 
-minecraft {
-    mappings channel: mapping_channel, version: mapping_version
 
-    copyIdeResources = true
-    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+runs {
+    configureEach {
+        workingDirectory project.file("run/${it.name}")
 
-    runs {
-        // applies to all the run configs below
-        configureEach {
-            workingDirectory project.file("run/${it.name}")
+        systemProperty 'forge.logging.markers', 'SCAN,REGISTRIES'
+        systemProperty 'forge.logging.console.level', 'debug'
 
-            property 'forge.logging.markers', 'SCAN,REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
+        modSource project.sourceSets.main
+        modSource project(':Phosphophyllite').sourceSets.main
 
-            mods {
-                "${mod_id}" {
-                    source sourceSets.main
-                }
-                Phosphophyllite {
-                    source project(':Phosphophyllite').sourceSets.main
-                }
+        dependencies {
+            runtime("org.lwjgl:lwjgl-vulkan:3.3.1") {
+                transitive(false)
             }
         }
+    }
 
-        client {
-            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
-            property 'forge.enabledGameTestNamespaces', mod_id
-        }
-
-        server {
-            property 'forge.enabledGameTestNamespaces', mod_id
-            args '--nogui'
-        }
+    client {
+        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+    }
 
-        // This run config launches GameTestServer and runs all registered gametests, then exits.
-        // By default, the server will crash when no gametests are provided.
-        // The gametest system is also enabled by default for other run configs under the /test command.
-        gameTestServer {
-            property 'forge.enabledGameTestNamespaces', mod_id
-        }
+    server {
+        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+        programArgument '--nogui'
+    }
 
-        data {
-            // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it
-            // workingDirectory project.file('run-data')
+    gameTestServer {
+        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+    }
 
-            // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-            args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-        }
+    data {
+        programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
     }
 }
 
-
 // Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
-mixin {
-    add sourceSets.main, "quartz.refmap.json"
-    config 'quartz.mixins.json'
-    config 'phosphophyllite.mixins.json'
-}
-
 repositories {
     maven {
         url = "https://www.cursemaven.com"
     }
 }
 
 dependencies {
-    minecraft "net.neoforged:forge:${mc_version}-${neo_version}"
-
-    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
+    implementation "net.neoforged:neoforge:${neo_version}"
 
     compileOnly project(':Phosphophyllite')
-    minecraftLibrary ("org.lwjgl:lwjgl-vulkan:3.3.1"){
+    compileOnly("org.lwjgl:lwjgl-vulkan:3.3.1") {
         transitive(false)
     }
 
-    compileOnly fg.deobf('curse.maven:Rubidium-574856:4684247')
-    compileOnly fg.deobf('curse.maven:Oculus-581495:4578741')
+    compileOnly 'curse.maven:Rubidium-574856:4684247'
+    compileOnly 'curse.maven:Oculus-581495:4578741'
 }
 
 gradle.projectsEvaluated {
@@ -138,13 +115,13 @@ gradle.projectsEvaluated {
         var replaceProperties = [
                 minecraft_version : mc_version,
                 neo_version       : neo_version,
-                loader_version    : neo_version.substring(0, neo_version.indexOf('.')),
+                loader_version    : loader_version,
                 version           : version,
                 phos_version_range: project.project(":Phosphophyllite").property("compatibility").toString(),
         ]
         inputs.properties replaceProperties
 
-        filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
+        filesMatching(['META-INF/mods.toml']) {
             expand replaceProperties + [project: project]
         }
     }
@@ -193,27 +170,19 @@ publishing {
     }
 }
 
-// NeoGradle is dumb, and generates the run configs incorrectly, this fixes them
-tasks.register('zzz_copyRunConfigsToTmpDir', Copy) {
-    from '.idea/runConfigurations'
-    into '.idea/runConfigurations1'
-}
-
-tasks.register('zzz_depeteTmpDir', Delete) {
-    delete '.idea/runConfigurations1'
-}
+// NeoGradle bug, this works around it
+gradle.projectsEvaluated {
+    var subProject = project('Phosphophyllite')
 
-tasks.register('_createIntellijRunsThatWork', Copy) {
-    dependsOn 'genIntellijRuns'
-    mustRunAfter 'genIntellijRuns'
-    dependsOn 'zzz_copyRunConfigsToTmpDir'
-    mustRunAfter 'zzz_copyRunConfigsToTmpDir'
+    var neoFormJoinDownloadAssetsTaskName = null
+    for (final def taskName in project.tasks.getNames()) {
+        if (taskName.contains("neoFormJoined") && taskName.contains("DownloadAssets")) {
+            neoFormJoinDownloadAssetsTaskName = taskName
+            break
+        }
+    }
 
-    from '.idea/runConfigurations1'
-    into '.idea/runConfigurations'
-    filter { String line -> line.replace("out/production/classes", "build/classes/java/main") }
-    filter { String line -> line.replace("out/production/resources", "build/resources/main") }
-    filter { String line -> line.replace("copyIntellijResources", "prepareRunClientCompile") }
+    println(neoFormJoinDownloadAssetsTaskName)
 
-    finalizedBy 'zzz_depeteTmpDir'
+    project.tasks.getByPath(neoFormJoinDownloadAssetsTaskName).mustRunAfter(subProject.tasks.getByPath(neoFormJoinDownloadAssetsTaskName))
 }

gradle.properties

@@ -1,10 +1,11 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-mc_version=1.20.1
-mapping_channel=parchment
-mapping_version=2023.07.09-1.20.1
-neo_version=47.1.76
+mc_version=1.20.4
+mapping_channel=official
+mapping_version=1.20.4
+neo_version=20.4.156-beta
+loader_version=1
 
 majorVersion=0
 minorVersion=2

src/main/java/net/roguelogix/quartz/Quartz.java

@@ -2,24 +2,21 @@
 
 import it.unimi.dsi.fastutil.objects.ReferenceArrayList;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.model.ModelBakery;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.RandomSource;
-import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.client.event.ModelEvent;
-import net.minecraftforge.client.model.data.ModelData;
-import net.minecraftforge.eventbus.api.BusBuilder;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.common.Mod;
+import net.neoforged.bus.api.BusBuilder;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.client.model.data.ModelData;
 import net.roguelogix.phosphophyllite.Phosphophyllite;
 import net.roguelogix.phosphophyllite.registry.Registry;
-import org.joml.Vector3ic;
 import net.roguelogix.phosphophyllite.util.NonnullDefault;
 import net.roguelogix.quartz.internal.QuartzCore;
+import org.joml.Vector3ic;
 
 import java.util.function.Consumer;
 
@@ -32,7 +29,7 @@ public Quartz(){
         new Registry(ReferenceArrayList.of(new ResourceLocation(Phosphophyllite.modid, "creative_tab")), new ReferenceArrayList<>());
     }
 
-    public static IEventBus EVENT_BUS = BusBuilder.builder().setTrackPhases(false).build();
+    public static IEventBus EVENT_BUS = BusBuilder.builder().allowPerPhasePost().build();
 
     public static Mesh createStaticMesh(BlockState blockState) {
         return createStaticMesh(builder -> {

src/main/java/net/roguelogix/quartz/QuartzConfig.java

@@ -1,6 +1,6 @@
 package net.roguelogix.quartz;
 
-import net.minecraftforge.fml.loading.FMLLoader;
+import net.neoforged.fml.loading.FMLLoader;
 import net.roguelogix.phosphophyllite.Phosphophyllite;
 import net.roguelogix.phosphophyllite.config.ConfigManager;
 import net.roguelogix.phosphophyllite.config.ConfigType;