SpectrumItemSubPredicateTypes

Author: DaFuqs

src/main/java/de/dafuqs/spectrum/SpectrumCommon.java

@@ -4,6 +4,7 @@
 import de.dafuqs.spectrum.api.energy.color.*;
 import de.dafuqs.spectrum.config.*;
 import de.dafuqs.spectrum.data_loaders.*;
+import de.dafuqs.spectrum.entity.*;
 import de.dafuqs.spectrum.loot.*;
 import de.dafuqs.spectrum.particle.*;
 import de.dafuqs.spectrum.progression.*;
@@ -158,9 +159,9 @@ public SpectrumCommon(IEventBus modBus) {
 //		SpectrumItemDamageImmunities.registerDefaultItemStackImmunities();
 //		logInfo("Registering Enchantment Drops...");
 //		SpectrumLootPoolModifiers.setup();
-//		logInfo("Registering Variant Specific Predicates...");
-//		SpectrumItemSubPredicateTypes.register();
-//		SpectrumEntitySubPredicateTypes.register();
+		logInfo("Registering Variant Specific Predicates...");
+		SpectrumItemSubPredicateTypes.register(modBus);
+		SpectrumEntitySubPredicateTypes.register();
 //
 //		logInfo("Registering Blocks and Items to Fuel Registry...");
 //		FUEL_REGISTRAR.flush();

src/main/java/de/dafuqs/spectrum/registries/SpectrumItemSubPredicateTypes.java

@@ -4,24 +4,27 @@
 import de.dafuqs.spectrum.*;
 import de.dafuqs.spectrum.api.predicate.item.*;
 import net.minecraft.advancements.critereon.*;
-import net.minecraft.core.*;
 import net.minecraft.core.registries.*;
+import net.neoforged.bus.api.*;
+import net.neoforged.neoforge.registries.*;
 
 @SuppressWarnings("unused")
 public class SpectrumItemSubPredicateTypes {
 
-	private static final DeferredRegistrar REGISTRAR = new DeferredRegistrar();
+	private static final DeferredRegister<ItemSubPredicate.Type<?>> REGISTRAR = DeferredRegister.create(Registries.ITEM_SUB_PREDICATE_TYPE, SpectrumCommon.MOD_ID);
 
 	public static ItemSubPredicate.Type<SweetenedPredicate> SWEETENED = register("sweetened", SweetenedPredicate.CODEC);
 	public static ItemSubPredicate.Type<InfusedBeveragePredicate> INFUSED_BEVERAGE = register("infused_beverage", InfusedBeveragePredicate.CODEC);
 	public static ItemSubPredicate.Type<BottomlessStackPredicate> BOTTOMLESS_STACK = register("bottomless_stack", BottomlessStackPredicate.CODEC);
 
 	private static <T extends ItemSubPredicate> ItemSubPredicate.Type<T> register(String id, Codec<T> codec) {
-		return REGISTRAR.defer(new ItemSubPredicate.Type<>(codec), type -> Registry.register(BuiltInRegistries.ITEM_SUB_PREDICATE_TYPE, SpectrumCommon.locate(id), type));
+		var type = new ItemSubPredicate.Type<>(codec);
+		REGISTRAR.register(id, () -> type);
+		return type;
 	}
 
-	public static void register() {
-		REGISTRAR.flush();
+	public static void register(IEventBus bus) {
+		REGISTRAR.register(bus);
 	}
 
 }