Overgrown Taintacle only registers with Augmentation

Elite-Modding-Team · May 26, 2024 · 6f93651 · 6f93651
1 parent 28ae461
commit 6f93651
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/src/main/java/com/icarus/crimsonrevelations/entity/boss/EntityOvergrownTaintacle.java b/src/main/java/com/icarus/crimsonrevelations/entity/boss/EntityOvergrownTaintacle.java
@@ -9,20 +9,24 @@
 import net.minecraft.entity.IEntityLivingData;
 import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.ai.attributes.IAttributeInstance;
+import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.item.EntityXPOrb;
 import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.BossInfo;
 import net.minecraft.world.BossInfoServer;
 import net.minecraft.world.DifficultyInstance;
 import net.minecraft.world.World;
 import net.minecraft.util.ResourceLocation;
 import thaumcraft.api.ThaumcraftApiHelper;
 import thaumcraft.api.entities.ITaintedMob;
+import thaumcraft.api.items.ItemsTC;
 import thaumcraft.client.fx.FXDispatcher;
 import thaumcraft.common.entities.monster.mods.ChampionModifier;
 import thaumcraft.common.entities.monster.tainted.EntityTaintacle;
 import thaumcraft.common.lib.SoundsTC;
 import thaumcraft.common.lib.utils.EntityUtils;
+import thecodex6824.thaumicaugmentation.common.entity.EntityItemImportant;
 
 public class EntityOvergrownTaintacle extends EntityTaintacle implements ITaintedMob {
     protected final BossInfoServer bossInfo;
@@ -173,4 +177,32 @@ protected void onDeathUpdate() {
     protected ResourceLocation getLootTable() {
         return LootTableHandler.OVERGROWN_TAINTACLE;
     }
+
+    @Override
+    @Nullable
+    public EntityItem entityDropItem(ItemStack stack, float offsetY) {
+        if (stack.isEmpty()) {
+            return null;
+        } else {
+            EntityItem entity = null;
+            if (stack.getItem() == ItemsTC.primordialPearl) {
+                entity = new EntityItemImportant(world, posX, posY + offsetY, posZ, stack);
+                entity.motionX = 0.0;
+                entity.motionY = 0.1;
+                entity.motionZ = 0.0;
+            } else {
+                entity = new EntityItem(world, posX, posY + offsetY, posZ, stack);
+            }
+
+            entity.setDefaultPickupDelay();
+            entity.setNoDespawn();
+            if (captureDrops) {
+                capturedDrops.add(entity);
+            } else {
+                world.spawnEntity(entity);
+            }
+
+            return entity;
+        }
+    }
 }
diff --git a/src/main/java/com/icarus/crimsonrevelations/init/RegistryHandler.java b/src/main/java/com/icarus/crimsonrevelations/init/RegistryHandler.java
@@ -24,6 +24,7 @@
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.common.util.EnumHelper;
 import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.EntityEntry;
@@ -73,7 +74,8 @@ public static void registerRecipes(RegistryEvent.Register<IRecipe> event) {
     public static void registerEntities(RegistryEvent.Register<EntityEntry> event) {
         int id = 0;
 
-        entityRegistryHelper("overgrown_taintacle", EntityOvergrownTaintacle.class, id++, 64, 3, true, 0x1C1A2F, 0x5649B4);
+        if (Loader.isModLoaded("thaumicaugmentation"))
+            entityRegistryHelper("overgrown_taintacle", EntityOvergrownTaintacle.class, id++, 64, 3, true, 0x1C1A2F, 0x5649B4);
     }
 
     @SubscribeEvent