Parent backend to API, fix Forge API

EnnuiL · EnnuiL · commit d60870edbf43 · 2025-11-23T22:16:56.000-03:00
diff --git a/api_fabric/src/main/java/page/langeweile/wrench_wrapper/api/WrenchWrapper.java b/api_fabric/src/main/java/page/langeweile/wrench_wrapper/api/WrenchWrapper.java
@@ -17,6 +17,7 @@ public static <C extends ReflectiveConfig> C create(String family, String id, Cl
 		}
 	}
 
+	@NonNull
 	public static ConfigEnvironment getConfigEnvironment() {
 		if (FabricLoader.getInstance().isModLoaded("quilt_loader")) {
 			return QuiltWrapper.getConfigEnvironment();
diff --git a/api_forge/src/main/java/page/langeweile/wrench_wrapper/api/WrenchWrapper.java b/api_forge/src/main/java/page/langeweile/wrench_wrapper/api/WrenchWrapper.java
@@ -3,15 +3,16 @@
 import org.jspecify.annotations.NonNull;
 import org.quiltmc.config.api.ReflectiveConfig;
 import org.quiltmc.config.implementor_api.ConfigEnvironment;
-import page.langeweile.wrench_wrapper.impl.norge.NorgeWrapper;
+import page.langeweile.wrench_wrapper.impl.forge.ForgeWrapper;
 
 public class WrenchWrapper {
 	@NonNull
 	public static <C extends ReflectiveConfig> C create(String family, String id, Class<C> configCreatorClass) {
-		return NorgeWrapper.create(family, id, configCreatorClass);
+		return ForgeWrapper.create(family, id, configCreatorClass);
 	}
 
+	@NonNull
 	public static ConfigEnvironment getConfigEnvironment() {
-		return NorgeWrapper.getConfigEnvironment();
+		return ForgeWrapper.getConfigEnvironment();
 	}
 }
diff --git a/api_forge/src/main/java/page/langeweile/wrench_wrapper/impl/forge/ForgeWrapper.java b/api_forge/src/main/java/page/langeweile/wrench_wrapper/impl/forge/ForgeWrapper.java
@@ -1,19 +1,19 @@
-package page.langeweile.wrench_wrapper.impl.norge;
+package page.langeweile.wrench_wrapper.impl.forge;
 
 import net.minecraftforge.fml.loading.FMLPaths;
 import org.quiltmc.config.api.ReflectiveConfig;
 import org.quiltmc.config.api.serializers.Json5Serializer;
 import org.quiltmc.config.implementor_api.ConfigEnvironment;
 import org.quiltmc.config.implementor_api.ConfigFactory;
 
-public class NorgeWrapper {
+public class ForgeWrapper {
 	private static final ConfigEnvironment CONFIG_ENVIRONMENT = new ConfigEnvironment(FMLPaths.CONFIGDIR.get(), Json5Serializer.INSTANCE, Json5Serializer.INSTANCE);
 
 	public static <C extends ReflectiveConfig> C create(String family, String id, Class<C> configCreatorClass) {
 		return ConfigFactory.create(CONFIG_ENVIRONMENT, family, id, configCreatorClass);
 	}
 
 	public static ConfigEnvironment getConfigEnvironment() {
-		return NorgeWrapper.CONFIG_ENVIRONMENT;
+		return ForgeWrapper.CONFIG_ENVIRONMENT;
 	}
 }
diff --git a/api_neoforge/src/main/java/page/langeweile/wrench_wrapper/api/WrenchWrapper.java b/api_neoforge/src/main/java/page/langeweile/wrench_wrapper/api/WrenchWrapper.java
@@ -3,14 +3,15 @@
 import org.jspecify.annotations.NonNull;
 import org.quiltmc.config.api.ReflectiveConfig;
 import org.quiltmc.config.implementor_api.ConfigEnvironment;
-import page.langeweile.wrench_wrapper.impl.norge.NorgeWrapper;
+import page.langeweile.wrench_wrapper.impl.forge.NorgeWrapper;
 
 public class WrenchWrapper {
 	@NonNull
 	public static <C extends ReflectiveConfig> C create(String family, String id, Class<C> configCreatorClass) {
 		return NorgeWrapper.create(family, id, configCreatorClass);
 	}
 
+	@NonNull
 	public static ConfigEnvironment getConfigEnvironment() {
 		return NorgeWrapper.getConfigEnvironment();
 	}
diff --git a/api_neoforge/src/main/java/page/langeweile/wrench_wrapper/impl/forge/NorgeWrapper.java b/api_neoforge/src/main/java/page/langeweile/wrench_wrapper/impl/forge/NorgeWrapper.java
@@ -1,4 +1,4 @@
-package page.langeweile.wrench_wrapper.impl.norge;
+package page.langeweile.wrench_wrapper.impl.forge;
 
 import net.neoforged.fml.loading.FMLPaths;
 import org.quiltmc.config.api.ReflectiveConfig;
diff --git a/impl/src/main/resources/fabric.mod.json b/impl/src/main/resources/fabric.mod.json
@@ -20,6 +20,7 @@
 	},
 	"custom": {
 		"modmenu": {
+			"parent": "wrench_wrapper",
 			"badges": ["library"]
 		}
 	}
diff --git a/impl/src/main/resources/quilt.mod.json b/impl/src/main/resources/quilt.mod.json
@@ -28,6 +28,7 @@
 		]
 	},
 	"modmenu": {
+		"parent": "wrench_wrapper",
 		"badges": ["library"]
 	}
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -15,9 +15,7 @@ dependencyResolutionManagement {
                 maven("https://maven.quiltmc.org/repository/release/")
             }
             filter {
-                includeGroup("org.quiltmc")
-                includeGroup("org.quiltmc.parsers")
-                includeGroup("org.quiltmc.quilt-config.serializers")
+                includeGroupAndSubgroups("org.quiltmc")
             }
         }
         exclusiveContent {

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public static <C extends ReflectiveConfig> C create(String family, String id, Cl`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
	`20`	`+ @NonNull`
`20`	`21`	`public static ConfigEnvironment getConfigEnvironment() {`
`21`	`22`	`if (FabricLoader.getInstance().isModLoaded("quilt_loader")) {`
`22`	`23`	`return QuiltWrapper.getConfigEnvironment();`
Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,16 @@`
`3`	`3`	`import org.jspecify.annotations.NonNull;`
`4`	`4`	`import org.quiltmc.config.api.ReflectiveConfig;`
`5`	`5`	`import org.quiltmc.config.implementor_api.ConfigEnvironment;`
`6`		`-import page.langeweile.wrench_wrapper.impl.norge.NorgeWrapper;`
	`6`	`+import page.langeweile.wrench_wrapper.impl.forge.ForgeWrapper;`
`7`	`7`
`8`	`8`	`public class WrenchWrapper {`
`9`	`9`	`@NonNull`
`10`	`10`	`public static <C extends ReflectiveConfig> C create(String family, String id, Class<C> configCreatorClass) {`
`11`		`- return NorgeWrapper.create(family, id, configCreatorClass);`
	`11`	`+ return ForgeWrapper.create(family, id, configCreatorClass);`
`12`	`12`	`}`
`13`	`13`
	`14`	`+ @NonNull`
`14`	`15`	`public static ConfigEnvironment getConfigEnvironment() {`
`15`		`- return NorgeWrapper.getConfigEnvironment();`
	`16`	`+ return ForgeWrapper.getConfigEnvironment();`
`16`	`17`	`}`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,19 @@`
`1`		`-package page.langeweile.wrench_wrapper.impl.norge;`
	`1`	`+package page.langeweile.wrench_wrapper.impl.forge;`
`2`	`2`
`3`	`3`	`import net.minecraftforge.fml.loading.FMLPaths;`
`4`	`4`	`import org.quiltmc.config.api.ReflectiveConfig;`
`5`	`5`	`import org.quiltmc.config.api.serializers.Json5Serializer;`
`6`	`6`	`import org.quiltmc.config.implementor_api.ConfigEnvironment;`
`7`	`7`	`import org.quiltmc.config.implementor_api.ConfigFactory;`
`8`	`8`
`9`		`-public class NorgeWrapper {`
	`9`	`+public class ForgeWrapper {`
`10`	`10`	`private static final ConfigEnvironment CONFIG_ENVIRONMENT = new ConfigEnvironment(FMLPaths.CONFIGDIR.get(), Json5Serializer.INSTANCE, Json5Serializer.INSTANCE);`
`11`	`11`
`12`	`12`	`public static <C extends ReflectiveConfig> C create(String family, String id, Class<C> configCreatorClass) {`
`13`	`13`	`return ConfigFactory.create(CONFIG_ENVIRONMENT, family, id, configCreatorClass);`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public static ConfigEnvironment getConfigEnvironment() {`
`17`		`- return NorgeWrapper.CONFIG_ENVIRONMENT;`
	`17`	`+ return ForgeWrapper.CONFIG_ENVIRONMENT;`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package page.langeweile.wrench_wrapper.impl.norge;`
	`1`	`+package page.langeweile.wrench_wrapper.impl.forge;`
`2`	`2`
`3`	`3`	`import net.neoforged.fml.loading.FMLPaths;`
`4`	`4`	`import org.quiltmc.config.api.ReflectiveConfig;`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`},`
`21`	`21`	`"custom": {`
`22`	`22`	`"modmenu": {`
	`23`	`+ "parent": "wrench_wrapper",`
`23`	`24`	`"badges": ["library"]`
`24`	`25`	`}`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`]`
`29`	`29`	`},`
`30`	`30`	`"modmenu": {`
	`31`	`+ "parent": "wrench_wrapper",`
`31`	`32`	`"badges": ["library"]`
`32`	`33`	`}`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,7 @@ dependencyResolutionManagement {`
`15`	`15`	`maven("https://maven.quiltmc.org/repository/release/")`
`16`	`16`	`}`
`17`	`17`	`filter {`
`18`		`- includeGroup("org.quiltmc")`
`19`		`- includeGroup("org.quiltmc.parsers")`
`20`		`- includeGroup("org.quiltmc.quilt-config.serializers")`
	`18`	`+ includeGroupAndSubgroups("org.quiltmc")`
`21`	`19`	`}`
`22`	`20`	`}`
`23`	`21`	`exclusiveContent {`