Prefer entry points over custom entries for Early Risers

Now that they are filled much earlier reliably, they can be used instead
Chocohead · Feb 13, 2020 · 9547496 · 9547496
1 parent fa896f5
commit 9547496
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/example/resources/fabric.mod.json b/example/resources/fabric.mod.json
@@ -16,9 +16,7 @@
 	"entrypoints": {
 		"main": [
 			"com.chocohead.mm.testing.ExampleMod"
-		]
-	},
-	"custom": {
+		],
 		"mm:early_risers": [
 			"com.chocohead.mm.testing.EarlyRiser"
 		]

diff --git a/src/com/chocohead/mm/Plugin.java b/src/com/chocohead/mm/Plugin.java
@@ -324,14 +324,13 @@ public String getRefMapperConfig() {
 	}
 
 	@Override
-	@SuppressWarnings("deprecation") //Not removed in the last Loader version we support
 	public List<String> getMixins() {
 		//System.out.println("Have " + mixins);
-		//Entry points are only created once the game starts, which is way too late if we want to be transforming the game
-		//FabricLoader.getInstance().getEntrypoints("mm:early_riser", Runnable.class).forEach(Runnable::run);
+		FabricLoader.getInstance().getEntrypoints("mm:early_risers", Runnable.class).forEach(Runnable::run);
 		for (ModContainer mod : FabricLoader.getInstance().getAllMods()) {
-			if (mod.getMetadata().containsCustomElement("mm:early_risers")) {
-				for (JsonElement riser : mod.getMetadata().getCustomElement("mm:early_risers").getAsJsonArray()) {
+			if (mod.getMetadata().containsCustomValue("mm:early_risers")) {
+				System.out.println(mod.getMetadata().getName() + " is still using the traditional Early Riser initialisation");
+				for (CustomValue riser : mod.getMetadata().getCustomValue("mm:early_risers").getAsArray()) {
 					try {
 						Class.forName(riser.getAsString()).asSubclass(Runnable.class).newInstance().run();
 					} catch (ReflectiveOperationException e) {