Called back

Author: IThundxr

src/main/java/com/simibubi/create/api/registrate/CreateRegistrateRegistrationCallback.java

@@ -4,6 +4,7 @@
 
 import com.simibubi.create.foundation.data.CreateRegistrate;
 import com.simibubi.create.impl.registrate.CreateRegistrateRegistrationCallbackImpl;
+import com.tterrag.registrate.util.entry.RegistryEntry;
 
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
@@ -13,7 +14,7 @@
  * Register a callback for when an entry is added to any {@link CreateRegistrate} instance
  */
 public class CreateRegistrateRegistrationCallback {
-	public static <T> void register(ResourceKey<? extends Registry<T>> registry, ResourceLocation id, Consumer<T> callback) {
+	public static <T> void register(ResourceKey<? extends Registry<T>> registry, ResourceLocation id, Consumer<RegistryEntry<T>> callback) {
 		CreateRegistrateRegistrationCallbackImpl.register(registry, id, callback);
 	}
 }

src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java

@@ -36,15 +36,6 @@
 import com.tterrag.registrate.util.nullness.NonNullFunction;
 import com.tterrag.registrate.util.nullness.NonNullSupplier;
 
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fluids.FluidType;
-import net.minecraftforge.fluids.ForgeFlowingFluid;
-import net.minecraftforge.fml.DistExecutor;
-import net.minecraftforge.registries.RegistryObject;
-
 import net.createmod.catnip.platform.CatnipServices;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.Registry;
@@ -61,6 +52,15 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
 
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions;
+import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.fluids.FluidType;
+import net.minecraftforge.fluids.ForgeFlowingFluid;
+import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.registries.RegistryObject;
+
 public class CreateRegistrate extends AbstractRegistrate<CreateRegistrate> {
 	private static final Map<RegistryEntry<?>, RegistryObject<CreativeModeTab>> TAB_LOOKUP = Collections.synchronizedMap(new IdentityHashMap<>());
 
@@ -126,8 +126,8 @@ protected <R, T extends R> RegistryEntry<T> accept(String name, ResourceKey<? ex
 			String modId = callback.id().getNamespace();
 			String entryId = callback.id().getPath();
 			if (callback.registry().equals(type) && getModid().equals(modId) && name.equals(entryId)) {
-				//noinspection unchecked
-				((Consumer<T>) callback.callback()).accept(entry.get());
+				//noinspection unchecked,rawtypes
+				callback.callback().accept((RegistryEntry) entry);
 			}
 		}
 

src/main/java/com/simibubi/create/impl/registrate/CreateRegistrateRegistrationCallbackImpl.java

@@ -7,6 +7,8 @@
 
 import org.jetbrains.annotations.UnmodifiableView;
 
+import com.tterrag.registrate.util.entry.RegistryEntry;
+
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
@@ -17,11 +19,11 @@ public class CreateRegistrateRegistrationCallbackImpl {
 	@UnmodifiableView
 	public static final List<CallbackImpl<?>> CALLBACKS_VIEW = Collections.unmodifiableList(CALLBACKS);
 
-	public static <T> void register(ResourceKey<? extends Registry<T>> registry, ResourceLocation id, Consumer<T> callback) {
+	public static <T> void register(ResourceKey<? extends Registry<T>> registry, ResourceLocation id, Consumer<RegistryEntry<T>> callback) {
 		CALLBACKS.add(new CallbackImpl<>(registry, id, callback));
 	}
 
 	public record CallbackImpl<T>(ResourceKey<? extends Registry<T>> registry, ResourceLocation id,
-								  Consumer<T> callback) {
+								  Consumer<RegistryEntry<T>> callback) {
 	}
 }