Merge pull request #6 from cassiancc/break-legacy-fabric-dependency

Break legacy `fabric` dependency

Author: TropheusJ

src/main/java/one/devos/nautical/canary/Canary.java

@@ -2,13 +2,15 @@
 
 import net.fabricmc.api.ModInitializer;
 import net.minecraft.resources.ResourceLocation;
+import one.devos.nautical.canary.feature.FabricApiCheck;
 
 public class Canary implements ModInitializer {
 	public static final String ID = "canary";
 
 	@Override
 	public void onInitialize() {
 		CanaryPackets.register();
+		FabricApiCheck.checkForDeprecatedApi();
 	}
 
 	public static ResourceLocation id(String path) {

src/main/java/one/devos/nautical/canary/Config.java

@@ -17,7 +17,7 @@
 import net.fabricmc.loader.api.FabricLoader;
 
 public record Config(boolean printBlockStateReport, int diagnosticsPermissionLevel,
-					 List<String> trackedDataWhitelist, List<String> stateBuilderWhitelist) {
+					 List<String> trackedDataWhitelist, List<String> stateBuilderWhitelist, boolean breakLegacyFabricDependency) {
 
 	public static final Path PATH = FabricLoader.getInstance().getConfigDir().resolve("canary.json");
 	private static final Gson gson = new GsonBuilder().setPrettyPrinting().create();
@@ -26,8 +26,9 @@ public record Config(boolean printBlockStateReport, int diagnosticsPermissionLev
 			Codec.BOOL.optionalFieldOf("print_blockstate_report", false).forGetter(Config::printBlockStateReport),
 			Codec.INT.optionalFieldOf("desync_diagnostics_permission_level", 4).forGetter(Config::diagnosticsPermissionLevel),
 			Codec.STRING.listOf().optionalFieldOf("tracked_data_whitelist", List.of()).forGetter(Config::trackedDataWhitelist),
-			Codec.STRING.listOf().optionalFieldOf("state_builder_whitelist", List.of()).forGetter(Config::stateBuilderWhitelist)
-	).apply(instance, Config::new));
+			Codec.STRING.listOf().optionalFieldOf("state_builder_whitelist", List.of()).forGetter(Config::stateBuilderWhitelist),
+			Codec.BOOL.optionalFieldOf("break_legacy_fabric_dependency", true).forGetter(Config::breakLegacyFabricDependency)
+			).apply(instance, Config::new));
 
 	public static final Config INSTANCE = load();
 
@@ -39,7 +40,8 @@ private static Config makeDefault() {
 		return new Config(
 				false, 4,
 				List.of("com.example.mymod.Utilities"),
-				List.of("net.example.examplemod.Utils")
+				List.of("net.example.examplemod.Utils"),
+				true
 		);
 	}
 

src/main/java/one/devos/nautical/canary/feature/FabricApiCheck.java

@@ -0,0 +1,21 @@
+package one.devos.nautical.canary.feature;
+
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
+import net.fabricmc.loader.api.metadata.ModDependency;
+import one.devos.nautical.canary.CanaryException;
+import one.devos.nautical.canary.Config;
+
+public class FabricApiCheck {
+	public static void checkForDeprecatedApi() {
+		if (Config.INSTANCE.breakLegacyFabricDependency()) {
+			for (ModContainer modContainer : FabricLoader.getInstance().getAllMods()) {
+				for (ModDependency dependency : modContainer.getMetadata().getDependencies()) {
+					if (dependency.getModId().equals("fabric")) {
+						throw new CanaryException("Mod "+modContainer.getMetadata().getName()+" depends on `fabric` and not `fabric-api`. This behaviour has been deprecated since 1.19.3.");
+					}
+				}
+			}
+		}
+	}
+}