Update to NeoForge 1.20.4

Author: rubensworks

.gitignore

@@ -3,6 +3,7 @@
 doc/info.txt
 /build
 /run
+/runs
 
 # Ignore project specific files
 .classpath
@@ -17,6 +18,7 @@ repo/*
 *.iws
 out/*
 keystore.jks
+.idea
 
 # Ignore mac-specific file(s)
 .DS_Store

build.gradle

@@ -1,15 +1,14 @@
 plugins {
-    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
-    id 'com.matthewprenger.cursegradle' version '1.4.0'
+    id 'net.neoforged.gradle.userdev' version '7.0.97'
+    id 'net.darkhax.curseforgegradle' version '1.0.8'
     id 'com.diffplug.spotless' version '5.14.3'
 	id 'com.modrinth.minotaur' version '2.+'
 }
 
-apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'idea'
 apply plugin: 'maven-publish'
 
-import net.minecraftforge.gradle.common.tasks.SignJar
+import net.neoforged.gradle.common.tasks.PotentiallySignJar
 
 // Determine build number
 String build_number = "DEV" // this will be referenced as simply build_number from now on.
@@ -26,7 +25,10 @@ logger.lifecycle "BUILDING VERSION: " + build_number
 // Set mod details
 version = project.mod_version
 group = "org.cyclops.structuredcrafting"
-archivesBaseName = "StructuredCrafting"
+archivesBaseName = "StructuredCrafting-${project.minecraft_version}-neoforge"
+base {
+    archivesName = archivesBaseName
+}
 
 // Set Java details
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
@@ -56,6 +58,7 @@ sourceSets {
         runtimeClasspath += sourceSets.api.output
     }
 }
+sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 configurations {
     apiImplementation.extendsFrom(implementation)
@@ -77,13 +80,13 @@ repositories {
 }
 
 dependencies {
-    minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
+    implementation "net.neoforged:neoforge:${project.neoforge_version}"
 
     // Add something like 'cyclopscore_version_local=0.1.0-DEV' to your secrets.properties if you want to use a custom local CyclopsCore version.
     if (secrets.cyclopscore_version_local) {
-        implementation "org.cyclops.cyclopscore:cyclopscore:${project.minecraft_version}-${secrets.cyclopscore_version_local}:deobf"
+        implementation "org.cyclops.cyclopscore:cyclopscore-${project.minecraft_version}-neoforge:${secrets.cyclopscore_version_local}:deobf"
     } else {
-        implementation "org.cyclops.cyclopscore:cyclopscore:${project.minecraft_version}-${project.cyclopscore_version}:deobf"
+        implementation "org.cyclops.cyclopscore:cyclopscore-${project.minecraft_version}-neoforge:${project.cyclopscore_version}:deobf"
     }
 
     // Project lombok
@@ -93,44 +96,37 @@ dependencies {
 	testAnnotationProcessor 'org.projectlombok:lombok:1.18.22'
 }
 
-minecraft {
-    mappings channel: "official", version: "${project.minecraft_version}"
-
-    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+runs {
+    configureEach {
+		systemProperty 'forge.logging.markers', 'REGISTRIES'
+        systemProperty 'forge.logging.console.level', 'debug'
+        systemProperty 'forge.logging.console.level', 'debug'
+        modSource project.sourceSets.main
+        modSource project.sourceSets.api
+    }
+	
+    client {
+        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+    }
 
-    runs {
-        client {
-            workingDirectory project.file('run')
-            //property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
-            property 'forge.logging.console.level', 'debug'
-            mods {
-                structuredcrafting.sources((SourceSet[]) [sourceSets.main, sourceSets.api])
-            }
-        }
+    server {
+        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+        programArgument '--nogui'
+    }
 
-        server {
-            workingDirectory project.file('run')
-            property 'forge.logging.console.level', 'debug'
-            mods {
-                structuredcrafting.sources((SourceSet[]) [sourceSets.main, sourceSets.api])
-            }
-        }
+    gameTestServer {
+        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+    }
 
-        data {
-            workingDirectory project.file('run')
-            property 'forge.logging.console.level', 'debug'
-            args '--mod', 'structuredcrafting', '--all', '--output', file('src/generated/resources/')
-            mods {
-                structuredcrafting.sources((SourceSet[]) [sourceSets.main, sourceSets.api])
-            }
-        }
+    data {
+        programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
     }
 }
 
 if (build_number.equals("RELEASE"))
-    version = "${project.minecraft_version}-${project.mod_version}"
+    version = "${project.mod_version}"
 else
-    version = "${project.minecraft_version}-${project.mod_version}-${build_number}"
+    version = "${project.mod_version}-${build_number}"
 
 jar {
     manifest {
@@ -146,15 +142,16 @@ jar {
         ])
     }
 }
-jar.finalizedBy('reobfJar')
 
 javadoc {
     source = [sourceSets.main.allJava]
     // prevent java 8's strict doclint for javadocs from failing builds
     options.addStringOption('Xdoclint:accessibility,html,reference,syntax', '-quiet')
 }
 
-task signJar(type: SignJar, dependsOn: jar) {
+task signJar(type: PotentiallySignJar, dependsOn: jar) {
+	dependsOn(tasks.jar)
+
     onlyIf {
         System.getenv().SIGN_KEYSTORE
     }
@@ -163,10 +160,9 @@ task signJar(type: SignJar, dependsOn: jar) {
     alias = System.getenv().SIGN_ALIAS
     storePass = System.getenv().SIGN_STOREPASS
     keyPass = System.getenv().SIGN_KEYPASS
-    inputFile = jar.archivePath
-    outputFile = jar.archivePath
+    input = jar.archivePath
+    output = jar.archivePath
 }
-build.dependsOn signJar
 
 task deobfJar(type: Jar) {
     from sourceSets.main.output
@@ -211,32 +207,28 @@ artifacts {
     archives javadocJar
 }
 
-curseforge {
-    if(secrets.curseforge_key) {
-        apiKey = secrets.curseforge_key
+task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) {
+    dependsOn(tasks.jar)
+
+    if(secrets.hasProperty("curseforge_key") && secrets.hasProperty("changelog")) {
+        apiToken = secrets.curseforge_key
     } else if(System.getenv().GITHUB_ACTIONS && System.getenv().CURSEFORGE_KEY_SECRET) {
-        apiKey = System.getenv().CURSEFORGE_KEY_SECRET
+        apiToken = System.getenv().CURSEFORGE_KEY_SECRET
+    } else {
+        apiToken = "DUMMY"
     }
 
-    project {
-        id = "233151" // my project url is http://minecraft.curseforge.com/mc-mods/233151/
-        releaseType = project.project.release_type
-		addGameVersion project.minecraft_version
-        mainArtifact(jar) {
-            relations {
-                requiredDependency 'cyclops-core'
-            }
-        }
+    def projectId = "233151" // my project url is http://minecraft.curseforge.com/mc-mods/233151/
 
-        changelog = ""
-        if (new File("resources/changelog/${project.version}.txt").exists()) {
-            changelog = new File("resources/changelog/${project.version}.txt").text
-        }
-
-        addArtifact deobfJar
-        addArtifact sourcesJar
-        addArtifact javadocJar
+    def mainFile = upload(projectId, jar)
+	mainFile.changelogType = "text"
+    if (new File("resources/changelog/${project.version}.txt").exists()) {
+        mainFile.changelog = file("resources/changelog/${project.version}.txt")
     }
+	mainFile.addGameVersion(project.minecraft_version)
+	mainFile.addModLoader("NeoForge")
+
+	mainFile.addRequirement('cyclops-core')
 }
 
 modrinth {
@@ -318,3 +310,7 @@ tasks.register('updateGitHooks', Copy) {
     into './.git/hooks'
 }
 compileJava.dependsOn updateGitHooks
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+}

gradle.properties

@@ -1,7 +1,8 @@
+mod_id=structuredcrafting
 mod_version=0.2.6
-minecraft_version=1.20.1
-forge_version=47.0.1
-cyclopscore_version=1.18.4-340
+minecraft_version=1.20.4
+neoforge_version=20.4.160-beta
+cyclopscore_version=1.19.0-409
 release_type=release
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
 

settings.gradle

@@ -1,10 +1,8 @@
 pluginManagement {
     repositories {
+        mavenLocal()
         gradlePluginPortal()
-        maven {
-            name = 'MinecraftForge'
-            url = 'https://maven.minecraftforge.net/'
-        }
+        maven { url = 'https://maven.neoforged.net/releases' }
     }
 }
 

src/api/java/org/cyclops/commoncapabilities/api

@@ -1,14 +1,14 @@
 package org.cyclops.structuredcrafting;
 
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.CapabilityManager;
-import net.minecraftforge.common.capabilities.CapabilityToken;
+import net.minecraft.core.Direction;
+import net.minecraft.resources.ResourceLocation;
+import net.neoforged.neoforge.capabilities.BlockCapability;
 import org.cyclops.commoncapabilities.api.capability.work.IWorker;
 
 /**
  * Used capabilities for this mod.
  * @author rubensworks
  */
 public class Capabilities {
-    public static Capability<IWorker> WORKER = CapabilityManager.get(new CapabilityToken<>(){});
+    public static BlockCapability<IWorker, Direction> WORKER = BlockCapability.createSided(new ResourceLocation("commoncapabilities", "worker"), IWorker.class);
 }

src/main/java/org/cyclops/structuredcrafting/Capabilities.java

@@ -1,6 +1,6 @@
 package org.cyclops.structuredcrafting;
 
-import net.minecraftforge.fml.config.ModConfig;
+import net.neoforged.fml.config.ModConfig;
 import org.cyclops.cyclopscore.config.ConfigurableProperty;
 import org.cyclops.cyclopscore.config.extendedconfig.DummyConfig;
 import org.cyclops.cyclopscore.init.ModBase;

src/main/java/org/cyclops/structuredcrafting/GeneralConfig.java

@@ -1,9 +1,11 @@
 package org.cyclops.structuredcrafting;
 
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraftforge.registries.ObjectHolder;
+import net.neoforged.neoforge.registries.DeferredHolder;
 import org.cyclops.structuredcrafting.blockentity.BlockEntityStructuredCrafter;
 
 /**
@@ -12,13 +14,10 @@
  */
 public class RegistryEntries {
 
-    @ObjectHolder(registryName = "item", value = "structuredcrafting:structured_crafter")
-    public static final Item ITEM_STRUCTURED_CRAFTER = null;
+    public static final DeferredHolder<Item, Item> ITEM_STRUCTURED_CRAFTER = DeferredHolder.create(Registries.ITEM, new ResourceLocation("structuredcrafting:structured_crafter"));
 
-    @ObjectHolder(registryName = "block", value = "structuredcrafting:structured_crafter")
-    public static final Block BLOCK_STRUCTURED_CRAFTER = null;
+    public static final DeferredHolder<Block, Block> BLOCK_STRUCTURED_CRAFTER = DeferredHolder.create(Registries.BLOCK, new ResourceLocation("structuredcrafting:structured_crafter"));
 
-    @ObjectHolder(registryName = "block_entity_type", value = "structuredcrafting:structured_crafter")
-    public static final BlockEntityType<BlockEntityStructuredCrafter> BLOCK_ENTITY_STRUCTURED_CRAFTER = null;
+    public static final DeferredHolder<BlockEntityType<?>, BlockEntityType<BlockEntityStructuredCrafter>> BLOCK_ENTITY_STRUCTURED_CRAFTER = DeferredHolder.create(Registries.BLOCK_ENTITY_TYPE, new ResourceLocation("structuredcrafting:structured_crafter"));
 
 }

src/main/java/org/cyclops/structuredcrafting/RegistryEntries.java

@@ -2,17 +2,17 @@
 
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
 import org.apache.logging.log4j.Level;
 import org.cyclops.cyclopscore.config.ConfigHandler;
 import org.cyclops.cyclopscore.init.ModBaseVersionable;
 import org.cyclops.cyclopscore.modcompat.ModCompatLoader;
 import org.cyclops.cyclopscore.proxy.IClientProxy;
 import org.cyclops.cyclopscore.proxy.ICommonProxy;
 import org.cyclops.structuredcrafting.block.BlockStructuredCrafterConfig;
-import org.cyclops.structuredcrafting.blockentity.BlockEntityStructuredCrafter;
-import org.cyclops.structuredcrafting.blockentity.TileStructuredCrafterConfig;
+import org.cyclops.structuredcrafting.blockentity.BlockEntityStructuredCrafterConfig;
 import org.cyclops.structuredcrafting.craft.provider.IItemStackProviderRegistry;
 import org.cyclops.structuredcrafting.craft.provider.InventoryItemStackProvider;
 import org.cyclops.structuredcrafting.craft.provider.ItemStackProviderRegistry;
@@ -32,16 +32,16 @@ public class StructuredCrafting extends ModBaseVersionable<StructuredCrafting> {
      */
     public static StructuredCrafting _instance;
 
-    public StructuredCrafting() {
-        super(Reference.MOD_ID, (instance) -> _instance = instance);
+    public StructuredCrafting(IEventBus modEventBus) {
+        super(Reference.MOD_ID, (instance) -> _instance = instance, modEventBus);
     }
 
     @Override
     protected void loadModCompats(ModCompatLoader modCompatLoader) {
         super.loadModCompats(modCompatLoader);
 
         // Capabilities
-        getCapabilityConstructorRegistry().registerTile(BlockEntityStructuredCrafter.class, new WorkerStructuredCrafterTileCompat());
+        getCapabilityConstructorRegistry().registerBlockEntity(RegistryEntries.BLOCK_ENTITY_STRUCTURED_CRAFTER, new WorkerStructuredCrafterTileCompat());
     }
 
     @Override
@@ -78,7 +78,7 @@ protected void onConfigsRegister(ConfigHandler configHandler) {
         configHandler.addConfigurable(new GeneralConfig());
 
         configHandler.addConfigurable(new BlockStructuredCrafterConfig());
-        configHandler.addConfigurable(new TileStructuredCrafterConfig());
+        configHandler.addConfigurable(new BlockEntityStructuredCrafterConfig());
     }
 
     /**