Remove use of arch LifecycleEvent.SETUP

Author: JT122406

common/src/main/java/generations/gg/generations/core/generationscore/GenerationsCore.java

@@ -12,7 +12,6 @@
 import com.cobblemon.mod.common.api.storage.player.PlayerDataExtensionRegistry;
 import com.mojang.logging.LogUtils;
 import dev.architectury.event.events.common.InteractionEvent;
-import dev.architectury.event.events.common.LifecycleEvent;
 import dev.architectury.platform.Platform;
 import generations.gg.generations.core.generationscore.api.data.GenerationsCoreEntityDataSerializers;
 import generations.gg.generations.core.generationscore.api.player.AccountInfo;
@@ -34,7 +33,6 @@
 import generations.gg.generations.core.generationscore.world.item.legends.EnchantableItem;
 import generations.gg.generations.core.generationscore.world.level.block.*;
 import generations.gg.generations.core.generationscore.world.level.block.entities.GenerationsBlockEntities;
-import generations.gg.generations.core.generationscore.world.level.block.entities.MutableBlockEntityType;
 import generations.gg.generations.core.generationscore.world.recipe.GenerationsCoreRecipeSerializers;
 import generations.gg.generations.core.generationscore.world.recipe.GenerationsCoreRecipeTypes;
 import generations.gg.generations.core.generationscore.world.sound.GenerationsSounds;
@@ -118,14 +116,6 @@ public static void init(GenerationsImplementation implementation) {
 			if(result.interruptsFurtherEvaluation() && stack.getItem() instanceof PixelmonInteractions.PixelmonInteraction interaction && interaction.isConsumed()) stack.shrink(1);
 			return result;
 		});
-
-		LifecycleEvent.SETUP.register(() -> MutableBlockEntityType.blocksToAdd.forEach(genericModelBlock -> {
-			if(genericModelBlock.getBlockEntityType() instanceof MutableBlockEntityType<?> mutableBlockEntityType) {
-				mutableBlockEntityType.addBlock(genericModelBlock);
-			}
-		}));
-
-
 	}
 
 	public static void initBuiltinPacks(TriConsumer<PackType, ResourceLocation, MutableComponent> consumer) {

fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/GenerationsCoreFabric.java

@@ -7,6 +7,7 @@
 import generations.gg.generations.core.generationscore.fabric.worldgen.GenerationsFabricBiomemodifiers;
 import generations.gg.generations.core.generationscore.world.feature.GenerationsConfiguredFeatures;
 import generations.gg.generations.core.generationscore.world.feature.GenerationsPlacedFeatures;
+import generations.gg.generations.core.generationscore.world.level.block.entities.MutableBlockEntityType;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener;
@@ -28,7 +29,6 @@
 /**
  * Fabric Main class and entry point for GenerationsCore.
  * @see ModInitializer
- *
  * @see GenerationsCore
  *
  * @author J.T. McQuigg, WaterPicker
@@ -55,6 +55,12 @@ public void onInitialize() {
             ResourceManagerHelper.registerBuiltinResourcePack(s, FabricLoader.getInstance().getModContainer("generations_core").get(), s2, ResourcePackActivationType.DEFAULT_ENABLED);
         });
 
+        MutableBlockEntityType.blocksToAdd.forEach(genericModelBlock -> {
+            if(genericModelBlock.getBlockEntityType() instanceof MutableBlockEntityType<?> mutableBlockEntityType) {
+                mutableBlockEntityType.addBlock(genericModelBlock);
+            }
+        });
+
         GenerationsConfiguredFeatures.init();
         GenerationsPlacedFeatures.init();
         GenerationsFabricBiomemodifiers.generateOres();

forge/src/main/java/generations/gg/generations/core/generationscore/forge/GenerationsCoreForge.java

@@ -7,6 +7,7 @@
 import generations.gg.generations.core.generationscore.compat.VanillaCompat;
 import generations.gg.generations.core.generationscore.config.ConfigLoader;
 import generations.gg.generations.core.generationscore.forge.client.GenerationsCoreClientForge;
+import generations.gg.generations.core.generationscore.world.level.block.entities.MutableBlockEntityType;
 import net.minecraft.ChatFormatting;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.Minecraft;
@@ -140,6 +141,11 @@ private void onInitialize(FMLCommonSetupEvent event) {
         getNetworkManager().registerClientBound();
         getNetworkManager().registerServerBound();
         event.enqueueWork(VanillaCompat::setup);
+        MutableBlockEntityType.blocksToAdd.forEach(genericModelBlock -> {
+            if (genericModelBlock.getBlockEntityType() instanceof MutableBlockEntityType<?> mutableBlockEntityType) {
+                mutableBlockEntityType.addBlock(genericModelBlock);
+            }
+        });
     }
 
     private void onDataPackSync(OnDatapackSyncEvent event) {