Loonium with data-driven structure loot

Fabric/src/main/java/vazkii/botania/fabric/FabricCommonInitializer.java

@@ -81,6 +81,7 @@
 import vazkii.botania.common.brew.BotaniaBrews;
 import vazkii.botania.common.brew.BotaniaMobEffects;
 import vazkii.botania.common.command.SkyblockCommand;
+import vazkii.botania.common.config.ConfigDataManager;
 import vazkii.botania.common.crafting.BotaniaRecipeTypes;
 import vazkii.botania.common.entity.BotaniaEntities;
 import vazkii.botania.common.entity.GaiaGuardianEntity;
@@ -138,6 +139,7 @@ public void onInitialize() {
 		PatchouliAPI.get().registerMultiblock(prefix("gaia_ritual"), GaiaGuardianEntity.ARENA_MULTIBLOCK.get());
 
 		OrechidManager.registerListener();
+		ConfigDataManager.registerListener();
 		CraftyCrateBlockEntity.registerListener();
 		CorporeaNodeDetectors.register(new FabricTransferCorporeaNodeDetector());
 

Fabric/src/main/java/vazkii/botania/fabric/data/FabricDatagenInitializer.java

@@ -41,6 +41,8 @@ private static void configureFabricDatagen(FabricDataGenerator.Pack pack) {
 
 	private static void configureXplatDatagen(FabricDataGenerator.Pack pack) {
 		pack.addProvider((PackOutput output) -> new BlockLootProvider(output));
+		pack.addProvider((PackOutput output) -> new LooniumStructureLootProvider(output));
+		pack.addProvider((PackOutput output) -> new LooniumStructureConfigurationProvider(output));
 		BlockTagProvider blockTagProvider = pack.addProvider(BlockTagProvider::new);
 		pack.addProvider((output, registriesFuture) -> new ItemTagProvider(output, registriesFuture, blockTagProvider.contentsGetter()));
 		pack.addProvider(EntityTagProvider::new);

Fabric/src/main/java/vazkii/botania/fabric/internal_caps/CCAInternalEntityComponents.java

@@ -15,12 +15,12 @@
 import dev.onyxstudios.cca.api.v3.entity.EntityComponentInitializer;
 import dev.onyxstudios.cca.api.v3.entity.RespawnCopyStrategy;
 
+import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.item.PrimedTnt;
 import net.minecraft.world.entity.monster.*;
 import net.minecraft.world.entity.vehicle.AbstractMinecart;
 
-import vazkii.botania.common.block.flower.functional.LooniumBlockEntity;
 import vazkii.botania.common.internal_caps.*;
 
 import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
@@ -36,10 +36,7 @@ public class CCAInternalEntityComponents implements EntityComponentInitializer {
 
 	@Override
 	public void registerEntityComponentFactories(EntityComponentFactoryRegistry registry) {
-		for (Class<? extends Monster> clz : LooniumBlockEntity.VALID_MOBS) {
-			registry.registerFor(clz, LOONIUM_DROP, e -> new CCALooniumComponent());
-		}
-
+		registry.registerFor(Mob.class, LOONIUM_DROP, e -> new CCALooniumComponent());
 		registry.registerFor(PrimedTnt.class, TNT_ETHICAL, CCAEthicalComponent::new);
 		registry.registerFor(Slime.class, NARSLIMMUS, e -> new CCANarslimmusComponent());
 		registry.registerFor(ItemEntity.class, INTERNAL_ITEM, e -> new CCAItemFlagsComponent());

Fabric/src/main/java/vazkii/botania/fabric/mixin/LivingEntityFabricMixin.java

@@ -55,7 +55,9 @@ private void dropEnd(DamageSource source, CallbackInfo ci) {
 	private void dropLoonium(DamageSource source, boolean causedByPlayer, CallbackInfo ci) {
 		var self = (LivingEntity) (Object) this;
 		LooniumBlockEntity.dropLooniumItems(self, stack -> {
-			self.spawnAtLocation(stack);
+			if (!stack.isEmpty()) {
+				self.spawnAtLocation(stack);
+			}
 			ci.cancel();
 		});
 	}

Forge/src/main/java/vazkii/botania/forge/ForgeCommonInitializer.java

@@ -94,6 +94,7 @@
 import vazkii.botania.common.brew.BotaniaMobEffects;
 import vazkii.botania.common.brew.effect.SoulCrossMobEffect;
 import vazkii.botania.common.command.SkyblockCommand;
+import vazkii.botania.common.config.ConfigDataManager;
 import vazkii.botania.common.crafting.BotaniaRecipeTypes;
 import vazkii.botania.common.entity.BotaniaEntities;
 import vazkii.botania.common.entity.GaiaGuardianEntity;
@@ -166,6 +167,7 @@ public void commonSetup(FMLCommonSetupEvent evt) {
 		PatchouliAPI.get().registerMultiblock(prefix("gaia_ritual"), GaiaGuardianEntity.ARENA_MULTIBLOCK.get());
 
 		OrechidManager.registerListener();
+		ConfigDataManager.registerListener();
 		CraftyCrateBlockEntity.registerListener();
 		CorporeaNodeDetectors.register(new ForgeCapCorporeaNodeDetector());
 		if (ModList.get().isLoaded("inventorysorter")) {
@@ -393,9 +395,11 @@ private void registerEvents() {
 				});
 				LooniumBlockEntity.dropLooniumItems(living, stack -> {
 					e.getDrops().clear();
-					var ent = new ItemEntity(living.level(), living.getX(), living.getY(), living.getZ(), stack);
-					ent.setDefaultPickUpDelay();
-					e.getDrops().add(ent);
+					if (!stack.isEmpty()) {
+						var ent = new ItemEntity(living.level(), living.getX(), living.getY(), living.getZ(), stack);
+						ent.setDefaultPickUpDelay();
+						e.getDrops().add(ent);
+					}
 				});
 			});
 			bus.addListener((LivingDeathEvent e) -> {

Forge/src/main/java/vazkii/botania/forge/internal_caps/ForgeInternalEntityCapabilities.java

@@ -1,6 +1,7 @@
 package vazkii.botania.forge.internal_caps;
 
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.item.PrimedTnt;
 import net.minecraft.world.entity.monster.Creeper;
@@ -12,7 +13,6 @@
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
-import vazkii.botania.common.block.flower.functional.LooniumBlockEntity;
 import vazkii.botania.common.internal_caps.*;
 import vazkii.botania.common.lib.LibMisc;
 import vazkii.botania.forge.CapabilityUtil;
@@ -60,11 +60,8 @@ public static void attachCapabilities(AttachCapabilitiesEvent<Entity> evt) {
 			if (entity instanceof Player) {
 				evt.addCapability(prefix("kept_items"), CapabilityUtil.makeSavedProvider(KEPT_ITEMS, new KeptItemsComponent()));
 			}
-			for (Class<?> clz : LooniumBlockEntity.VALID_MOBS) {
-				if (clz.isInstance(entity)) {
-					evt.addCapability(prefix("loonium_drop"), CapabilityUtil.makeSavedProvider(LOONIUM_DROP, new LooniumComponent()));
-					break;
-				}
+			if (entity instanceof Mob) {
+				evt.addCapability(prefix("loonium_drop"), CapabilityUtil.makeSavedProvider(LOONIUM_DROP, new LooniumComponent()));
 			}
 			if (entity instanceof Slime) {
 				evt.addCapability(prefix("narslimmus"), CapabilityUtil.makeSavedProvider(NARSLIMMUS, new NarslimmusComponent()));