Move criteria trigger registration to registry

VazkiiMods · Aug 28, 2024 · da7fffb · da7fffb
1 parent 3613a88
commit da7fffb
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 37 deletions.
diff --git a/Fabric/src/main/java/vazkii/botania/fabric/FabricCommonInitializer.java b/Fabric/src/main/java/vazkii/botania/fabric/FabricCommonInitializer.java
@@ -215,7 +215,7 @@ private void registryInit() {
 				BotaniaFeatures.MYSTICAL_MUSHROOMS_PLACED_FEATURE);
 
 		// Rest
-		BotaniaCriteriaTriggers.init();
+		BotaniaCriteriaTriggers.init(bind(BuiltInRegistries.TRIGGER_TYPES));
 		BotaniaParticles.registerParticles(bind(BuiltInRegistries.PARTICLE_TYPE));
 		BotaniaLootModifiers.submitLootConditions(bind(BuiltInRegistries.LOOT_CONDITION_TYPE));
 		BotaniaLootModifiers.submitLootFunctions(bind(BuiltInRegistries.LOOT_FUNCTION_TYPE));

diff --git a/NeoForge/src/main/java/vazkii/botania/forge/ForgeCommonInitializer.java b/NeoForge/src/main/java/vazkii/botania/forge/ForgeCommonInitializer.java
@@ -219,7 +219,7 @@ private void registryInit() {
 		bind(Registries.CHUNK_GENERATOR, SkyblockChunkGenerator::submitRegistration);
 
 		// Rest
-		BotaniaCriteriaTriggers.init();
+		bind(Registries.TRIGGER_TYPE, BotaniaCriteriaTriggers::init);
 		bind(Registries.PARTICLE_TYPE, BotaniaParticles::registerParticles);
 
 		bind(Registries.LOOT_CONDITION_TYPE, BotaniaLootModifiers::submitLootConditions);

diff --git a/Xplat/src/main/java/vazkii/botania/common/advancements/BotaniaCriteriaTriggers.java b/Xplat/src/main/java/vazkii/botania/common/advancements/BotaniaCriteriaTriggers.java
@@ -8,17 +8,20 @@
  */
 package vazkii.botania.common.advancements;
 
-import vazkii.botania.mixin.CriteriaTriggersAccessor;
+import net.minecraft.advancements.CriterionTrigger;
+import net.minecraft.resources.ResourceLocation;
+
+import java.util.function.BiConsumer;
 
 public class BotaniaCriteriaTriggers {
-	public static void init() {
-		CriteriaTriggersAccessor.botania_register(AlfheimPortalTrigger.INSTANCE);
-		CriteriaTriggersAccessor.botania_register(CorporeaRequestTrigger.INSTANCE);
-		CriteriaTriggersAccessor.botania_register(GaiaGuardianNoArmorTrigger.INSTANCE);
-		CriteriaTriggersAccessor.botania_register(RelicBindTrigger.INSTANCE);
-		CriteriaTriggersAccessor.botania_register(UseItemSuccessTrigger.INSTANCE);
-		CriteriaTriggersAccessor.botania_register(ManaBlasterTrigger.INSTANCE);
-		CriteriaTriggersAccessor.botania_register(LokiPlaceTrigger.INSTANCE);
-		CriteriaTriggersAccessor.botania_register(AlfheimPortalBreadTrigger.INSTANCE);
+	public static void init(BiConsumer<CriterionTrigger<?>, ResourceLocation> r) {
+		r.accept(AlfheimPortalTrigger.INSTANCE, AlfheimPortalTrigger.ID);
+		r.accept(CorporeaRequestTrigger.INSTANCE, CorporeaRequestTrigger.ID);
+		r.accept(GaiaGuardianNoArmorTrigger.INSTANCE, GaiaGuardianNoArmorTrigger.ID);
+		r.accept(RelicBindTrigger.INSTANCE, RelicBindTrigger.ID);
+		r.accept(UseItemSuccessTrigger.INSTANCE, UseItemSuccessTrigger.ID);
+		r.accept(ManaBlasterTrigger.INSTANCE, ManaBlasterTrigger.ID);
+		r.accept(LokiPlaceTrigger.INSTANCE, LokiPlaceTrigger.ID);
+		r.accept(AlfheimPortalBreadTrigger.INSTANCE, AlfheimPortalBreadTrigger.ID);
 	}
 }
diff --git a/Xplat/src/main/java/vazkii/botania/common/advancements/ManaBlasterTrigger.java b/Xplat/src/main/java/vazkii/botania/common/advancements/ManaBlasterTrigger.java
@@ -23,7 +23,7 @@
 import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
 
 public class ManaBlasterTrigger extends SimpleCriterionTrigger<ManaBlasterTrigger.Instance> {
-	private static final ResourceLocation ID = prefix("fire_mana_blaster");
+	public static final ResourceLocation ID = prefix("fire_mana_blaster");
 	public static final ManaBlasterTrigger INSTANCE = new ManaBlasterTrigger();
 
 	private ManaBlasterTrigger() {}

diff --git a/Xplat/src/main/java/vazkii/botania/mixin/CriteriaTriggersAccessor.java b/Xplat/src/main/java/vazkii/botania/mixin/CriteriaTriggersAccessor.java
diff --git a/Xplat/src/main/resources/botania_xplat.mixins.json b/Xplat/src/main/resources/botania_xplat.mixins.json
@@ -17,7 +17,6 @@
     "CollectingNeighborUpdaterMixin",
     "CreeperAccessor",
     "CreeperMixin",
-    "CriteriaTriggersAccessor",
     "DispenserBlockAccessor",
     "EntityAccessor",
     "EntityMixin",