From f7eb9422e6c901bc33b17c66da9d1ec8d613f63b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 7 Jan 2019 16:39:48 -0600 Subject: [PATCH] Make Diva Charm/Heisei Dream less janky, and fix diva charm particles not being visible. Closes #2820 --- .../functional/SubTileHeiseiDream.java | 31 +++++------ .../item/equipment/bauble/ItemDivaCharm.java | 55 +++++++++++-------- .../common/network/PacketBotaniaEffect.java | 14 +++++ src/main/resources/META-INF/botania_at.cfg | 1 - 4 files changed, 61 insertions(+), 40 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index f9922a78c..8311383e5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -15,6 +15,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIAttackMelee; +import net.minecraft.entity.ai.EntityAIBase; +import net.minecraft.entity.ai.EntityAIHurtByTarget; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; import net.minecraft.entity.monster.IMob; @@ -62,36 +64,33 @@ public class SubTileHeiseiDream extends SubTileFunctional { EntityLivingBase target = entity.getAttackTarget(); boolean did = false; - if(target == null || !(target instanceof IMob)) { + if(!(target instanceof IMob)) { IMob newTarget; do newTarget = mobs.get(entity.world.rand.nextInt(mobs.size())); while(newTarget == entity); if(newTarget instanceof EntityLiving) { - List entries = new ArrayList<>(entity.tasks.taskEntries); - entries.addAll(new ArrayList<>(entity.targetTasks.taskEntries)); + entity.setAttackTarget(null); - for(EntityAITaskEntry entry : entries) - if(entry.action instanceof EntityAINearestAttackableTarget) { - messWithGetTargetAI((EntityAINearestAttackableTarget) entry.action, (EntityLiving) newTarget); - did = true; - } else if(entry.action instanceof EntityAIAttackMelee) { - did = true; + // Move any EntityAIHurtByTarget to highest priority + for (EntityAITaskEntry entry : entity.targetTasks.taskEntries) { + if (entry.action instanceof EntityAIHurtByTarget) { + // Concurrent modification OK since we break out of the loop + entity.targetTasks.removeTask(entry.action); + entity.targetTasks.addTask(-1, entry.action); + break; } + } - if(did) - entity.setAttackTarget((EntityLiving) newTarget); + // Now set revenge target, which EntityAIHurtByTarget will pick up + entity.setRevengeTarget((EntityLiving) newTarget); + did = true; } } return did; } - private static void messWithGetTargetAI(EntityAINearestAttackableTarget aiEntry, EntityLivingBase target) { - aiEntry.targetClass = Entity.class; - aiEntry.targetEntitySelector = e -> e == target; // todo will this leak target? - } - @Override public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toBlockPos(), RANGE); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index e3606a852..9f2e9b20b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item.equipment.bauble; import baubles.api.BaubleType; import baubles.api.BaublesApi; import com.google.common.base.Predicates; +import com.google.common.util.concurrent.ListenableFutureTask; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -23,10 +24,12 @@ import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; @@ -39,6 +42,8 @@ import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; +import vazkii.botania.common.network.PacketBotaniaEffect; +import vazkii.botania.common.network.PacketHandler; import java.util.List; @@ -51,35 +56,39 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble @SubscribeEvent public void onEntityDamaged(LivingHurtEvent event) { - if(event.getSource().getImmediateSource() instanceof EntityPlayer && event.getEntityLiving() instanceof EntityLiving && !event.getEntityLiving().world.isRemote && Math.random() < 0.6F) { - EntityPlayer player = (EntityPlayer) event.getSource().getImmediateSource(); - ItemStack amulet = BaublesApi.getBaublesHandler(player).getStackInSlot(6); - if(!amulet.isEmpty() && amulet.getItem() == this) { - final int cost = 250; - if(ManaItemHandler.requestManaExact(amulet, player, cost, false)) { - final int range = 20; + if (event.getSource().getImmediateSource() instanceof EntityPlayer && event.getEntityLiving() instanceof EntityLiving && !event.getEntityLiving().world.isRemote && Math.random() < 0.6F) { + Runnable lambda = () -> { + EntityLiving target = (EntityLiving) event.getEntityLiving(); + EntityPlayer player = (EntityPlayer) event.getSource().getImmediateSource(); + ItemStack amulet = BaublesApi.getBaublesHandler(player).getStackInSlot(6); - List mobs = player.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(event.getEntityLiving().posX - range, event.getEntityLiving().posY - range, event.getEntityLiving().posZ - range, event.getEntityLiving().posX + range, event.getEntityLiving().posY + range, event.getEntityLiving().posZ + range), Predicates.instanceOf(IMob.class)); - if(mobs.size() > 1) { - if(SubTileHeiseiDream.brainwashEntity((EntityLiving) event.getEntityLiving(), (List) mobs)) { - if(event.getEntityLiving() instanceof EntityCreeper) - ((EntityCreeper) event.getEntityLiving()).timeSinceIgnited = 2; - event.getEntityLiving().heal(event.getEntityLiving().getMaxHealth()); - if(event.getEntityLiving().isDead) - event.getEntityLiving().isDead = false; + if(!amulet.isEmpty() && amulet.getItem() == this) { + final int cost = 250; + if(ManaItemHandler.requestManaExact(amulet, player, cost, false)) { + final int range = 20; - ManaItemHandler.requestManaExact(amulet, player, cost, true); - player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.divaCharm, SoundCategory.PLAYERS, 1F, 1F); + List mobs = player.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(target.posX - range, target.posY - range, target.posZ - range, target.posX + range, target.posY + range, target.posZ + range), Predicates.instanceOf(IMob.class)); + if(mobs.size() > 1) { + if(SubTileHeiseiDream.brainwashEntity(target, (List) mobs)) { + target.heal(target.getMaxHealth()); + target.isDead = false; + if(target instanceof EntityCreeper) + ((EntityCreeper) event.getEntityLiving()).timeSinceIgnited = 2; - double x = event.getEntityLiving().posX; - double y = event.getEntityLiving().posY; - double z = event.getEntityLiving().posZ; - - for(int i = 0; i < 50; i++) - Botania.proxy.sparkleFX(x + Math.random() * event.getEntityLiving().width, y + Math.random() * event.getEntityLiving().height, z + Math.random() * event.getEntityLiving().width, 1F, 1F, 0.25F, 1F, 3); + ManaItemHandler.requestManaExact(amulet, player, cost, true); + player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.divaCharm, SoundCategory.PLAYERS, 1F, 1F); + PacketHandler.sendToNearby(target.world, target, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.DIVA_EFFECT, target.posX, target.posY, target.posZ, target.getEntityId())); + } } } } + }; + + // Have to delay a tick because setAttackTarget(player) is called *after* the event fires, and we want to get rid of that + // addScheduledTask runs the lambda immediately if on the main thread, hence this trickery + MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); + synchronized (server.futureTaskQueue) { + server.futureTaskQueue.add(ListenableFutureTask.create(lambda, null)); } } } diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index cf4e54a10..fff8234c7 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -254,6 +254,19 @@ public class PacketBotaniaEffect implements IMessage { new Vector3(message.args[0] + 0.5, message.args[1] + 0.5, message.args[2] + 0.5)); break; } + case DIVA_EFFECT: { + Entity target = Minecraft.getMinecraft().world.getEntityByID(message.args[0]); + if(target == null) + break; + + double x = target.posX; + double y = target.posY; + double z = target.posZ; + + for(int i = 0; i < 50; i++) + Botania.proxy.sparkleFX(x + Math.random() * target.width, y + Math.random() * target.height, z + Math.random() * target.width, 1F, 1F, 0.25F, 1F, 3); + break; + } } } }); @@ -273,6 +286,7 @@ public class PacketBotaniaEffect implements IMessage { TERRA_PLATE(0), FLUGEL_EFFECT(1), // Arg: Entity ID PARTICLE_BEAM(3), // Args: dest xyz + DIVA_EFFECT(1), // Arg: EntityID ; private final int argCount; diff --git a/src/main/resources/META-INF/botania_at.cfg b/src/main/resources/META-INF/botania_at.cfg index 72de64e55..6ff183b85 100644 --- a/src/main/resources/META-INF/botania_at.cfg +++ b/src/main/resources/META-INF/botania_at.cfg @@ -11,7 +11,6 @@ public net.minecraft.entity.item.EntityItem field_70292_b # age public net.minecraft.entity.item.EntityItem field_145804_b # delayBeforeCanPickup public-f net.minecraft.entity.ai.EntityAINearestAttackableTarget field_75307_b # targetClass -public-f net.minecraft.entity.ai.EntityAINearestAttackableTarget field_82643_g # targetEntitySelector public-f net.minecraft.entity.ai.EntityAIAvoidEntity field_181064_i # classToAvoid