Updated for forge version

Author: Waterpicker

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.11-SNAPSHOT'
+	id 'dev.architectury.loom' version '0.11.0-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -21,11 +21,15 @@ repositories {
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+//	mappings minecraft.officialMojangMappings()
+
+	forge "net.minecraftforge:forge:${project.forge_version}"
+
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+//	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+//	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 }
 
 processResources {

gradle.properties

@@ -1,16 +1,13 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
-
+loom.platform=forge
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 minecraft_version=1.18.1
 yarn_mappings=1.18.1+build.1
-loader_version=0.12.12
+forge_version=1.18.1-39.1.2
 
 # Mod Properties
 mod_version = 1.0.0
 maven_group = org.dimdev
 archives_base_name = matrix
-
-# Dependencies
-fabric_version=0.46.2+1.18

settings.gradle

@@ -4,6 +4,8 @@ pluginManagement {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
         }
+        maven { url "https://maven.architectury.dev/" }
+        maven { url "https://files.minecraftforge.net/maven/" }
         mavenCentral()
         gradlePluginPortal()
     }

src/main/java/org/dimdev/matrix/Matrix.java

@@ -7,6 +7,9 @@
 import net.minecraft.item.Item;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.registries.DeferredRegister;
+import net.minecraftforge.registries.IForgeRegistryEntry;
 
 /**
  * An Annotation Based Registration Library.
@@ -28,16 +31,19 @@ public class Matrix {
 	 * @param registry The registry that entries should be registered to.
 	 */
 	@SuppressWarnings({"unchecked", "rawtypes"})
-	public static void register(Class<?> clazz, Registry<?> registry) {
-		Registrar registrar = clazz.getAnnotation(Registrar.class);
+	public static <T extends IForgeRegistryEntry<T>> void register(Class<?> target, Class<T> type) {
+		Registrar registrar = target.getAnnotation(Registrar.class);
 		if (registrar == null) {
 			return;
 		}
 
 		String modid = registrar.modid();
 		Class<?> element = registrar.element();
 
-		Arrays.stream(clazz.getFields())
+		DeferredRegister<T> deferredRegister = DeferredRegister.create(type, modid);
+		deferredRegister.register(FMLJavaModLoadingContext.get().getModEventBus());
+
+		Arrays.stream(target.getFields())
 				.filter(field -> field.isAnnotationPresent(RegistryEntry.class)
 						&& Modifier.isPublic(field.getModifiers())
 						&& Modifier.isStatic(field.getModifiers())
@@ -46,8 +52,8 @@ public static void register(Class<?> clazz, Registry<?> registry) {
 				)
 				.forEach(field -> {
 					try {
-						Object value = field.get(null);
-						Registry.register((Registry) registry, new Identifier(modid, field.getAnnotation(RegistryEntry.class).value()), element.cast(value));
+						T value = (T) field.get(null);
+						deferredRegister.register(field.getAnnotation(RegistryEntry.class).value(), () -> value);
 						if (value instanceof BlockItem) {
 							Item.BLOCK_ITEMS.put(((BlockItem) value).getBlock(), (Item) value);
 						}