From 588e4eb89b7562b0c082028452cd3bc03898c482 Mon Sep 17 00:00:00 2001 From: Chris Sanders Date: Sat, 12 Dec 2015 01:15:07 -0600 Subject: [PATCH] Remove CauseTracked. Graduate Cause to be used in ALL events. Signed-off-by: Chris Sanders --- build.gradle | 3 - .../api/command/SimpleCommandManager.java | 4 +- .../org/spongepowered/api/event/Event.java | 10 +- .../api/event/SpongeEventFactory.java | 240 +++++++++++++----- .../achievement/GrantAchievementEvent.java | 3 +- .../api/event/action/FishingEvent.java | 3 +- .../api/event/action/InteractEvent.java | 3 +- .../api/event/action/LightningEvent.java | 3 +- .../api/event/action/MessageEvent.java | 3 +- .../api/event/action/SleepingEvent.java | 3 +- .../api/event/block/ChangeBlockEvent.java | 3 +- .../api/event/block/CollideBlockEvent.java | 3 +- .../event/block/NotifyNeighborBlockEvent.java | 3 +- .../api/event/block/TickBlockEvent.java | 3 +- .../event/block/tileentity/BrewingEvent.java | 3 +- .../block/tileentity/ChangeSignEvent.java | 3 +- .../event/block/tileentity/SmeltEvent.java | 3 +- .../api/event/cause/CauseTracked.java | 42 --- .../api/event/command/SendCommandEvent.java | 3 +- .../command/TabCompleteCommandEvent.java | 3 +- .../api/event/entity/AffectEntityEvent.java | 4 +- .../entity/ChangeEntityExperienceEvent.java | 3 +- .../entity/ChangeEntityPotionEffectEvent.java | 3 +- .../api/event/entity/CollideEntityEvent.java | 3 +- .../event/entity/ConstructEntityEvent.java | 3 +- .../api/event/entity/DamageEntityEvent.java | 4 +- .../api/event/entity/DestructEntityEvent.java | 3 +- .../api/event/entity/DismountEntityEvent.java | 3 +- .../api/event/entity/DisplaceEntityEvent.java | 3 +- .../api/event/entity/ExpireEntityEvent.java | 3 +- .../api/event/entity/HarvestEntityEvent.java | 3 +- .../api/event/entity/HealEntityEvent.java | 3 +- .../api/event/entity/IgniteEntityEvent.java | 3 +- .../api/event/entity/LeashEntityEvent.java | 3 +- .../api/event/entity/MountEntityEvent.java | 3 +- .../api/event/entity/TameEntityEvent.java | 3 +- .../api/event/entity/UnleashEntityEvent.java | 3 +- .../event/entity/item/ItemMergeItemEvent.java | 3 +- .../living/humanoid/ChangeGameModeEvent.java | 3 +- .../living/humanoid/ChangeLevelEvent.java | 3 +- .../humanoid/player/RespawnPlayerEvent.java | 3 +- .../projectile/LaunchProjectileEvent.java | 3 +- .../api/event/impl/AbstractModifierEvent.java | 6 +- .../item/inventory/AffectItemStackEvent.java | 3 +- .../item/inventory/ChangeInventoryEvent.java | 3 +- .../event/item/inventory/DropItemEvent.java | 3 +- .../inventory/InteractInventoryEvent.java | 3 +- .../item/inventory/UseItemStackEvent.java | 3 +- .../network/ChannelRegistrationEvent.java | 4 +- .../event/statistic/ChangeStatisticEvent.java | 3 +- .../api/event/user/BanUserEvent.java | 3 +- .../api/event/user/PardonUserEvent.java | 3 +- .../event/world/ChangeWorldGameRuleEvent.java | 3 +- .../event/world/ChangeWorldWeatherEvent.java | 3 +- .../api/event/world/ConstructPortalEvent.java | 3 +- .../api/event/world/ConstructWorldEvent.java | 3 +- .../api/event/world/ExplosionEvent.java | 3 +- .../api/event/world/GenerateChunkEvent.java | 3 +- .../api/event/world/LoadWorldEvent.java | 3 +- .../api/event/world/UnloadWorldEvent.java | 3 +- .../api/event/world/chunk/LoadChunkEvent.java | 3 +- .../event/world/chunk/PopulateChunkEvent.java | 3 +- .../event/world/chunk/UnforcedChunkEvent.java | 4 +- .../event/world/chunk/UnloadChunkEvent.java | 3 +- 64 files changed, 243 insertions(+), 240 deletions(-) delete mode 100644 src/main/java/org/spongepowered/api/event/cause/CauseTracked.java diff --git a/build.gradle b/build.gradle index 5f522b849b3..836710845bd 100644 --- a/build.gradle +++ b/build.gradle @@ -70,13 +70,10 @@ genEventImpl { 'src/main/java/org/spongepowered/api/event/game/', 'src/main/java/org/spongepowered/api/event/item/inventory/', 'src/main/java/org/spongepowered/api/event/network/', - 'src/main/java/org/spongepowered/api/event/plugin/', - 'src/main/java/org/spongepowered/api/event/rcon/', 'src/main/java/org/spongepowered/api/event/server/', 'src/main/java/org/spongepowered/api/event/statistic/', 'src/main/java/org/spongepowered/api/event/user/', 'src/main/java/org/spongepowered/api/event/world/', - 'src/main/java/org/spongepowered/api/event/Event.java', ] excludeSrc = [] outputDir = 'src/main/java/' diff --git a/src/main/java/org/spongepowered/api/command/SimpleCommandManager.java b/src/main/java/org/spongepowered/api/command/SimpleCommandManager.java index 6ed0d058a4f..1b5f07ff4eb 100644 --- a/src/main/java/org/spongepowered/api/command/SimpleCommandManager.java +++ b/src/main/java/org/spongepowered/api/command/SimpleCommandManager.java @@ -238,7 +238,7 @@ public boolean containsMapping(CommandMapping mapping) { @Override public CommandResult process(CommandSource source, String commandLine) { final String[] argSplit = commandLine.split(" ", 2); - final SendCommandEvent event = SpongeEventFactory.createSendCommandEvent(this.game, Cause.of(NamedCause.source(source)), + final SendCommandEvent event = SpongeEventFactory.createSendCommandEvent(Cause.of(NamedCause.source(source)), argSplit.length > 1 ? argSplit[1] : "", argSplit[0], CommandResult.empty()); this.game.getEventManager().post(event); if (event.isCancelled()) { @@ -296,7 +296,7 @@ public List getSuggestions(CommandSource src, String arguments) { try { final String[] argSplit = arguments.split(" ", 2); List suggestions = new ArrayList<>(this.dispatcher.getSuggestions(src, arguments)); - final TabCompleteCommandEvent event = SpongeEventFactory.createTabCompleteCommandEvent(this.game, Cause.of(NamedCause.source(src)), + final TabCompleteCommandEvent event = SpongeEventFactory.createTabCompleteCommandEvent(Cause.of(NamedCause.source(src)), argSplit.length > 1 ? argSplit[1] : "", argSplit[0], suggestions); this.game.getEventManager().post(event); if (event.isCancelled()) { diff --git a/src/main/java/org/spongepowered/api/event/Event.java b/src/main/java/org/spongepowered/api/event/Event.java index 8c603fa61e7..24f6804ec12 100644 --- a/src/main/java/org/spongepowered/api/event/Event.java +++ b/src/main/java/org/spongepowered/api/event/Event.java @@ -24,7 +24,9 @@ */ package org.spongepowered.api.event; +import org.spongepowered.api.event.cause.Cause; import org.spongepowered.api.event.impl.AbstractEvent; +import org.spongepowered.api.eventgencore.annotation.AbsoluteSortPosition; import org.spongepowered.api.eventgencore.annotation.ImplementedBy; /** @@ -35,5 +37,11 @@ */ @ImplementedBy(AbstractEvent.class) public interface Event { - + /** + * Get the cause for the event. + * + * @return The last cause + */ + @AbsoluteSortPosition(0) + Cause getCause(); } diff --git a/src/main/java/org/spongepowered/api/event/SpongeEventFactory.java b/src/main/java/org/spongepowered/api/event/SpongeEventFactory.java index 43af08ef3a9..d1966f0e9c6 100644 --- a/src/main/java/org/spongepowered/api/event/SpongeEventFactory.java +++ b/src/main/java/org/spongepowered/api/event/SpongeEventFactory.java @@ -206,18 +206,6 @@ import org.spongepowered.api.world.weather.Weather; public class SpongeEventFactory { - /** - * AUTOMATICALLY GENERATED, DO NOT EDIT. - * Creates a new instance of - * {@link org.spongepowered.api.event.Event}. - * - * @return A new event - */ - public static Event createEvent() { - Map values = Maps.newHashMap(); - return SpongeEventFactoryUtils.createEventImpl(Event.class, values); - } - /** * AUTOMATICALLY GENERATED, DO NOT EDIT. * Creates a new instance of @@ -807,11 +795,13 @@ public static NotifyNeighborBlockEvent createNotifyNeighborBlockEvent(Cause caus * Creates a new instance of * {@link org.spongepowered.api.event.block.TargetBlockEvent}. * + * @param cause The cause * @param targetBlock The target block * @return A new target block event */ - public static TargetBlockEvent createTargetBlockEvent(BlockSnapshot targetBlock) { + public static TargetBlockEvent createTargetBlockEvent(Cause cause, BlockSnapshot targetBlock) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("targetBlock", targetBlock); return SpongeEventFactoryUtils.createEventImpl(TargetBlockEvent.class, values); } @@ -1073,11 +1063,13 @@ public static SmeltEvent.Tick createSmeltEventTick(Cause cause, ItemStackSnapsho * Creates a new instance of * {@link org.spongepowered.api.event.block.tileentity.TargetTileEntityEvent}. * + * @param cause The cause * @param targetTile The target tile * @return A new target tile entity event */ - public static TargetTileEntityEvent createTargetTileEntityEvent(TileEntity targetTile) { + public static TargetTileEntityEvent createTargetTileEntityEvent(Cause cause, TileEntity targetTile) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("targetTile", targetTile); return SpongeEventFactoryUtils.createEventImpl(TargetTileEntityEvent.class, values); } @@ -1173,11 +1165,13 @@ public static TabCompleteCommandEvent createTabCompleteCommandEvent(Cause cause, * Creates a new instance of * {@link org.spongepowered.api.event.data.ChangeDataHolderEvent}. * + * @param cause The cause * @param targetHolder The target holder * @return A new change data holder event */ - public static ChangeDataHolderEvent createChangeDataHolderEvent(DataHolder targetHolder) { + public static ChangeDataHolderEvent createChangeDataHolderEvent(Cause cause, DataHolder targetHolder) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("targetHolder", targetHolder); return SpongeEventFactoryUtils.createEventImpl(ChangeDataHolderEvent.class, values); } @@ -1187,12 +1181,14 @@ public static ChangeDataHolderEvent createChangeDataHolderEvent(DataHolder targe * Creates a new instance of * {@link org.spongepowered.api.event.data.ChangeDataHolderEvent.ValueChange}. * + * @param cause The cause * @param originalChanges The original changes * @param targetHolder The target holder * @return A new value change change data holder event */ - public static ChangeDataHolderEvent.ValueChange createChangeDataHolderEventValueChange(DataTransactionResult originalChanges, DataHolder targetHolder) { + public static ChangeDataHolderEvent.ValueChange createChangeDataHolderEventValueChange(Cause cause, DataTransactionResult originalChanges, DataHolder targetHolder) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("originalChanges", originalChanges); values.put("targetHolder", targetHolder); return SpongeEventFactoryUtils.createEventImpl(ChangeDataHolderEvent.ValueChange.class, values); @@ -1285,14 +1281,16 @@ public static BreedEntityEvent.FindMate createBreedEntityEventFindMate(Cause cau * Creates a new instance of * {@link org.spongepowered.api.event.entity.ChangeEntityEquipmentEvent}. * + * @param cause The cause * @param originalItemStack The original item stack * @param itemStack The item stack * @param targetEntity The target entity * @param targetInventory The target inventory * @return A new change entity equipment event */ - public static ChangeEntityEquipmentEvent createChangeEntityEquipmentEvent(Optional originalItemStack, Optional> itemStack, Entity targetEntity, Slot targetInventory) { + public static ChangeEntityEquipmentEvent createChangeEntityEquipmentEvent(Cause cause, Optional originalItemStack, Optional> itemStack, Entity targetEntity, Slot targetInventory) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("originalItemStack", originalItemStack); values.put("itemStack", itemStack); values.put("targetEntity", targetEntity); @@ -1305,14 +1303,16 @@ public static ChangeEntityEquipmentEvent createChangeEntityEquipmentEvent(Option * Creates a new instance of * {@link org.spongepowered.api.event.entity.ChangeEntityEquipmentEvent.TargetHumanoid}. * + * @param cause The cause * @param originalItemStack The original item stack * @param itemStack The item stack * @param targetEntity The target entity * @param targetInventory The target inventory * @return A new target humanoid change entity equipment event */ - public static ChangeEntityEquipmentEvent.TargetHumanoid createChangeEntityEquipmentEventTargetHumanoid(Optional originalItemStack, Optional> itemStack, Humanoid targetEntity, Slot targetInventory) { + public static ChangeEntityEquipmentEvent.TargetHumanoid createChangeEntityEquipmentEventTargetHumanoid(Cause cause, Optional originalItemStack, Optional> itemStack, Humanoid targetEntity, Slot targetInventory) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("originalItemStack", originalItemStack); values.put("itemStack", itemStack); values.put("targetEntity", targetEntity); @@ -1325,14 +1325,16 @@ public static ChangeEntityEquipmentEvent.TargetHumanoid createChangeEntityEquipm * Creates a new instance of * {@link org.spongepowered.api.event.entity.ChangeEntityEquipmentEvent.TargetLiving}. * + * @param cause The cause * @param originalItemStack The original item stack * @param itemStack The item stack * @param targetEntity The target entity * @param targetInventory The target inventory * @return A new target living change entity equipment event */ - public static ChangeEntityEquipmentEvent.TargetLiving createChangeEntityEquipmentEventTargetLiving(Optional originalItemStack, Optional> itemStack, Living targetEntity, Slot targetInventory) { + public static ChangeEntityEquipmentEvent.TargetLiving createChangeEntityEquipmentEventTargetLiving(Cause cause, Optional originalItemStack, Optional> itemStack, Living targetEntity, Slot targetInventory) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("originalItemStack", originalItemStack); values.put("itemStack", itemStack); values.put("targetEntity", targetEntity); @@ -1345,14 +1347,16 @@ public static ChangeEntityEquipmentEvent.TargetLiving createChangeEntityEquipmen * Creates a new instance of * {@link org.spongepowered.api.event.entity.ChangeEntityEquipmentEvent.TargetPlayer}. * + * @param cause The cause * @param originalItemStack The original item stack * @param itemStack The item stack * @param targetEntity The target entity * @param targetInventory The target inventory * @return A new target player change entity equipment event */ - public static ChangeEntityEquipmentEvent.TargetPlayer createChangeEntityEquipmentEventTargetPlayer(Optional originalItemStack, Optional> itemStack, Player targetEntity, Slot targetInventory) { + public static ChangeEntityEquipmentEvent.TargetPlayer createChangeEntityEquipmentEventTargetPlayer(Cause cause, Optional originalItemStack, Optional> itemStack, Player targetEntity, Slot targetInventory) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("originalItemStack", originalItemStack); values.put("itemStack", itemStack); values.put("targetEntity", targetEntity); @@ -1625,13 +1629,15 @@ public static DismountEntityEvent createDismountEntityEvent(Cause cause, Entity * Creates a new instance of * {@link org.spongepowered.api.event.entity.DisplaceEntityEvent}. * + * @param cause The cause * @param fromTransform The from transform * @param toTransform The to transform * @param targetEntity The target entity * @return A new displace entity event */ - public static DisplaceEntityEvent createDisplaceEntityEvent(Transform fromTransform, Transform toTransform, Entity targetEntity) { + public static DisplaceEntityEvent createDisplaceEntityEvent(Cause cause, Transform fromTransform, Transform toTransform, Entity targetEntity) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("fromTransform", fromTransform); values.put("toTransform", toTransform); values.put("targetEntity", targetEntity); @@ -1643,13 +1649,15 @@ public static DisplaceEntityEvent createDisplaceEntityEvent(Transform fro * Creates a new instance of * {@link org.spongepowered.api.event.entity.DisplaceEntityEvent.Move}. * + * @param cause The cause * @param fromTransform The from transform * @param toTransform The to transform * @param targetEntity The target entity * @return A new move displace entity event */ - public static DisplaceEntityEvent.Move createDisplaceEntityEventMove(Transform fromTransform, Transform toTransform, Entity targetEntity) { + public static DisplaceEntityEvent.Move createDisplaceEntityEventMove(Cause cause, Transform fromTransform, Transform toTransform, Entity targetEntity) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("fromTransform", fromTransform); values.put("toTransform", toTransform); values.put("targetEntity", targetEntity); @@ -1661,13 +1669,15 @@ public static DisplaceEntityEvent.Move createDisplaceEntityEventMove(Transform fromTransform, Transform toTransform, Humanoid targetEntity) { + public static DisplaceEntityEvent.Move.TargetHumanoid createDisplaceEntityEventMoveTargetHumanoid(Cause cause, Transform fromTransform, Transform toTransform, Humanoid targetEntity) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("fromTransform", fromTransform); values.put("toTransform", toTransform); values.put("targetEntity", targetEntity); @@ -1679,13 +1689,15 @@ public static DisplaceEntityEvent.Move.TargetHumanoid createDisplaceEntityEventM * Creates a new instance of * {@link org.spongepowered.api.event.entity.DisplaceEntityEvent.Move.TargetLiving}. * + * @param cause The cause * @param fromTransform The from transform * @param toTransform The to transform * @param targetEntity The target entity * @return A new target living move displace entity event */ - public static DisplaceEntityEvent.Move.TargetLiving createDisplaceEntityEventMoveTargetLiving(Transform fromTransform, Transform toTransform, Living targetEntity) { + public static DisplaceEntityEvent.Move.TargetLiving createDisplaceEntityEventMoveTargetLiving(Cause cause, Transform fromTransform, Transform toTransform, Living targetEntity) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("fromTransform", fromTransform); values.put("toTransform", toTransform); values.put("targetEntity", targetEntity); @@ -1697,13 +1709,15 @@ public static DisplaceEntityEvent.Move.TargetLiving createDisplaceEntityEventMov * Creates a new instance of * {@link org.spongepowered.api.event.entity.DisplaceEntityEvent.Move.TargetPlayer}. * + * @param cause The cause * @param fromTransform The from transform * @param toTransform The to transform * @param targetEntity The target entity * @return A new target player move displace entity event */ - public static DisplaceEntityEvent.Move.TargetPlayer createDisplaceEntityEventMoveTargetPlayer(Transform fromTransform, Transform toTransform, Player targetEntity) { + public static DisplaceEntityEvent.Move.TargetPlayer createDisplaceEntityEventMoveTargetPlayer(Cause cause, Transform fromTransform, Transform toTransform, Player targetEntity) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("fromTransform", fromTransform); values.put("toTransform", toTransform); values.put("targetEntity", targetEntity); @@ -1715,13 +1729,15 @@ public static DisplaceEntityEvent.Move.TargetPlayer createDisplaceEntityEventMov * Creates a new instance of * {@link org.spongepowered.api.event.entity.DisplaceEntityEvent.TargetHumanoid}. * + * @param cause The cause * @param fromTransform The from transform * @param toTransform The to transform * @param targetEntity The target entity * @return A new target humanoid displace entity event */ - public static DisplaceEntityEvent.TargetHumanoid createDisplaceEntityEventTargetHumanoid(Transform fromTransform, Transform toTransform, Humanoid targetEntity) { + public static DisplaceEntityEvent.TargetHumanoid createDisplaceEntityEventTargetHumanoid(Cause cause, Transform fromTransform, Transform toTransform, Humanoid targetEntity) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("fromTransform", fromTransform); values.put("toTransform", toTransform); values.put("targetEntity", targetEntity); @@ -1733,13 +1749,15 @@ public static DisplaceEntityEvent.TargetHumanoid createDisplaceEntityEventTarget * Creates a new instance of * {@link org.spongepowered.api.event.entity.DisplaceEntityEvent.TargetLiving}. * + * @param cause The cause * @param fromTransform The from transform * @param toTransform The to transform * @param targetEntity The target entity * @return A new target living displace entity event */ - public static DisplaceEntityEvent.TargetLiving createDisplaceEntityEventTargetLiving(Transform fromTransform, Transform toTransform, Living targetEntity) { + public static DisplaceEntityEvent.TargetLiving createDisplaceEntityEventTargetLiving(Cause cause, Transform fromTransform, Transform toTransform, Living targetEntity) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("fromTransform", fromTransform); values.put("toTransform", toTransform); values.put("targetEntity", targetEntity); @@ -1751,13 +1769,15 @@ public static DisplaceEntityEvent.TargetLiving createDisplaceEntityEventTargetLi * Creates a new instance of * {@link org.spongepowered.api.event.entity.DisplaceEntityEvent.TargetPlayer}. * + * @param cause The cause * @param fromTransform The from transform * @param toTransform The to transform * @param targetEntity The target entity * @return A new target player displace entity event */ - public static DisplaceEntityEvent.TargetPlayer createDisplaceEntityEventTargetPlayer(Transform fromTransform, Transform toTransform, Player targetEntity) { + public static DisplaceEntityEvent.TargetPlayer createDisplaceEntityEventTargetPlayer(Cause cause, Transform fromTransform, Transform toTransform, Player targetEntity) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("fromTransform", fromTransform); values.put("toTransform", toTransform); values.put("targetEntity", targetEntity); @@ -2205,11 +2225,13 @@ public static TameEntityEvent createTameEntityEvent(Cause cause, Entity targetEn * Creates a new instance of * {@link org.spongepowered.api.event.entity.TargetEntityEvent}. * + * @param cause The cause * @param targetEntity The target entity * @return A new target entity event */ - public static TargetEntityEvent createTargetEntityEvent(Entity targetEntity) { + public static TargetEntityEvent createTargetEntityEvent(Cause cause, Entity targetEntity) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("targetEntity", targetEntity); return SpongeEventFactoryUtils.createEventImpl(TargetEntityEvent.class, values); } @@ -2235,14 +2257,16 @@ public static UnleashEntityEvent createUnleashEntityEvent(Cause cause, Entity ta * Creates a new instance of * {@link org.spongepowered.api.event.entity.ai.AITaskEvent}. * + * @param cause The cause * @param goal The goal * @param targetEntity The target entity * @param task The task * @param priority The priority * @return A new a i task event */ - public static AITaskEvent createAITaskEvent(Goal goal, Agent targetEntity, AITask task, int priority) { + public static AITaskEvent createAITaskEvent(Cause cause, Goal goal, Agent targetEntity, AITask task, int priority) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("goal", goal); values.put("targetEntity", targetEntity); values.put("task", task); @@ -2255,6 +2279,7 @@ public static AITaskEvent createAITaskEvent(Goal goal, Agent ta * Creates a new instance of * {@link org.spongepowered.api.event.entity.ai.AITaskEvent.Add}. * + * @param cause The cause * @param originalPriority The original priority * @param priority The priority * @param goal The goal @@ -2262,9 +2287,10 @@ public static AITaskEvent createAITaskEvent(Goal goal, Agent ta * @param task The task * @return A new add a i task event */ - public static AITaskEvent.Add createAITaskEventAdd(int originalPriority, int priority, Goal goal, Agent targetEntity, AITask task) { + public static AITaskEvent.Add createAITaskEventAdd(Cause cause, int originalPriority, int priority, Goal goal, Agent targetEntity, AITask task) { Preconditions.checkArgument(((goal.getOwner()) == targetEntity), String.format("The target entity \'%s\' is not the owner of the goal \'%s\'!", goal, targetEntity)); Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("originalPriority", originalPriority); values.put("priority", priority); values.put("goal", goal); @@ -2278,15 +2304,17 @@ public static AITaskEvent.Add createAITaskEventAdd(int originalPriority, int pri * Creates a new instance of * {@link org.spongepowered.api.event.entity.ai.AITaskEvent.Remove}. * + * @param cause The cause * @param goal The goal * @param targetEntity The target entity * @param task The task * @param priority The priority * @return A new remove a i task event */ - public static AITaskEvent.Remove createAITaskEventRemove(Goal goal, Agent targetEntity, AITask task, int priority) { + public static AITaskEvent.Remove createAITaskEventRemove(Cause cause, Goal goal, Agent targetEntity, AITask task, int priority) { Preconditions.checkArgument(((goal.getOwner()) == targetEntity), String.format("The target entity \'%s\' is not the owner of the goal \'%s\'!", goal, targetEntity)); Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("goal", goal); values.put("targetEntity", targetEntity); values.put("task", task); @@ -2317,11 +2345,13 @@ public static ItemMergeItemEvent createItemMergeItemEvent(Cause cause, Item item * Creates a new instance of * {@link org.spongepowered.api.event.entity.item.TargetItemEvent}. * + * @param cause The cause * @param targetEntity The target entity * @return A new target item event */ - public static TargetItemEvent createTargetItemEvent(Item targetEntity) { + public static TargetItemEvent createTargetItemEvent(Cause cause, Item targetEntity) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("targetEntity", targetEntity); return SpongeEventFactoryUtils.createEventImpl(TargetItemEvent.class, values); } @@ -2331,11 +2361,13 @@ public static TargetItemEvent createTargetItemEvent(Item targetEntity) { * Creates a new instance of * {@link org.spongepowered.api.event.entity.living.TargetAgentEvent}. * + * @param cause The cause * @param targetEntity The target entity * @return A new target agent event */ - public static TargetAgentEvent createTargetAgentEvent(Agent targetEntity) { + public static TargetAgentEvent createTargetAgentEvent(Cause cause, Agent targetEntity) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("targetEntity", targetEntity); return SpongeEventFactoryUtils.createEventImpl(TargetAgentEvent.class, values); } @@ -2345,11 +2377,13 @@ public static TargetAgentEvent createTargetAgentEvent(Agent targetEntity) { * Creates a new instance of * {@link org.spongepowered.api.event.entity.living.TargetLivingEvent}. * + * @param cause The cause * @param targetEntity The target entity * @return A new target living event */ - public static TargetLivingEvent createTargetLivingEvent(Living targetEntity) { + public static TargetLivingEvent createTargetLivingEvent(Cause cause, Living targetEntity) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("targetEntity", targetEntity); return SpongeEventFactoryUtils.createEventImpl(TargetLivingEvent.class, values); } @@ -2439,11 +2473,13 @@ public static ChangeLevelEvent.TargetPlayer createChangeLevelEventTargetPlayer(C * Creates a new instance of * {@link org.spongepowered.api.event.entity.living.humanoid.TargetHumanoidEvent}. * + * @param cause The cause * @param targetEntity The target entity * @return A new target humanoid event */ - public static TargetHumanoidEvent createTargetHumanoidEvent(Humanoid targetEntity) { + public static TargetHumanoidEvent createTargetHumanoidEvent(Cause cause, Humanoid targetEntity) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("targetEntity", targetEntity); return SpongeEventFactoryUtils.createEventImpl(TargetHumanoidEvent.class, values); } @@ -2477,13 +2513,15 @@ public static KickPlayerEvent createKickPlayerEvent(Cause cause, Text originalMe * Creates a new instance of * {@link org.spongepowered.api.event.entity.living.humanoid.player.ResourcePackStatusEvent}. * + * @param cause The cause * @param pack The pack * @param player The player * @param status The status * @return A new resource pack status event */ - public static ResourcePackStatusEvent createResourcePackStatusEvent(ResourcePack pack, Player player, ResourcePackStatusEvent.ResourcePackStatus status) { + public static ResourcePackStatusEvent createResourcePackStatusEvent(Cause cause, ResourcePack pack, Player player, ResourcePackStatusEvent.ResourcePackStatus status) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("pack", pack); values.put("player", player); values.put("status", status); @@ -2517,11 +2555,13 @@ public static RespawnPlayerEvent createRespawnPlayerEvent(Cause cause, Transform * Creates a new instance of * {@link org.spongepowered.api.event.entity.living.humanoid.player.TargetPlayerEvent}. * + * @param cause The cause * @param targetEntity The target entity * @return A new target player event */ - public static TargetPlayerEvent createTargetPlayerEvent(Player targetEntity) { + public static TargetPlayerEvent createTargetPlayerEvent(Cause cause, Player targetEntity) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("targetEntity", targetEntity); return SpongeEventFactoryUtils.createEventImpl(TargetPlayerEvent.class, values); } @@ -2547,11 +2587,13 @@ public static LaunchProjectileEvent createLaunchProjectileEvent(Cause cause, Pro * Creates a new instance of * {@link org.spongepowered.api.event.entity.projectile.TargetProjectileEvent}. * + * @param cause The cause * @param targetEntity The target entity * @return A new target projectile event */ - public static TargetProjectileEvent createTargetProjectileEvent(Projectile targetEntity) { + public static TargetProjectileEvent createTargetProjectileEvent(Cause cause, Projectile targetEntity) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("targetEntity", targetEntity); return SpongeEventFactoryUtils.createEventImpl(TargetProjectileEvent.class, values); } @@ -2561,11 +2603,13 @@ public static TargetProjectileEvent createTargetProjectileEvent(Projectile targe * Creates a new instance of * {@link org.spongepowered.api.event.game.state.GameAboutToStartServerEvent}. * + * @param cause The cause * @param state The state * @return A new game about to start server event */ - public static GameAboutToStartServerEvent createGameAboutToStartServerEvent(GameState state) { + public static GameAboutToStartServerEvent createGameAboutToStartServerEvent(Cause cause, GameState state) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("state", state); return SpongeEventFactoryUtils.createEventImpl(GameAboutToStartServerEvent.class, values); } @@ -2575,11 +2619,13 @@ public static GameAboutToStartServerEvent createGameAboutToStartServerEvent(Game * Creates a new instance of * {@link org.spongepowered.api.event.game.state.GameConstructionEvent}. * + * @param cause The cause * @param state The state * @return A new game construction event */ - public static GameConstructionEvent createGameConstructionEvent(GameState state) { + public static GameConstructionEvent createGameConstructionEvent(Cause cause, GameState state) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("state", state); return SpongeEventFactoryUtils.createEventImpl(GameConstructionEvent.class, values); } @@ -2589,11 +2635,13 @@ public static GameConstructionEvent createGameConstructionEvent(GameState state) * Creates a new instance of * {@link org.spongepowered.api.event.game.state.GameInitializationEvent}. * + * @param cause The cause * @param state The state * @return A new game initialization event */ - public static GameInitializationEvent createGameInitializationEvent(GameState state) { + public static GameInitializationEvent createGameInitializationEvent(Cause cause, GameState state) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("state", state); return SpongeEventFactoryUtils.createEventImpl(GameInitializationEvent.class, values); } @@ -2603,11 +2651,13 @@ public static GameInitializationEvent createGameInitializationEvent(GameState st * Creates a new instance of * {@link org.spongepowered.api.event.game.state.GameLoadCompleteEvent}. * + * @param cause The cause * @param state The state * @return A new game load complete event */ - public static GameLoadCompleteEvent createGameLoadCompleteEvent(GameState state) { + public static GameLoadCompleteEvent createGameLoadCompleteEvent(Cause cause, GameState state) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("state", state); return SpongeEventFactoryUtils.createEventImpl(GameLoadCompleteEvent.class, values); } @@ -2617,11 +2667,13 @@ public static GameLoadCompleteEvent createGameLoadCompleteEvent(GameState state) * Creates a new instance of * {@link org.spongepowered.api.event.game.state.GamePostInitializationEvent}. * + * @param cause The cause * @param state The state * @return A new game post initialization event */ - public static GamePostInitializationEvent createGamePostInitializationEvent(GameState state) { + public static GamePostInitializationEvent createGamePostInitializationEvent(Cause cause, GameState state) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("state", state); return SpongeEventFactoryUtils.createEventImpl(GamePostInitializationEvent.class, values); } @@ -2631,11 +2683,13 @@ public static GamePostInitializationEvent createGamePostInitializationEvent(Game * Creates a new instance of * {@link org.spongepowered.api.event.game.state.GamePreInitializationEvent}. * + * @param cause The cause * @param state The state * @return A new game pre initialization event */ - public static GamePreInitializationEvent createGamePreInitializationEvent(GameState state) { + public static GamePreInitializationEvent createGamePreInitializationEvent(Cause cause, GameState state) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("state", state); return SpongeEventFactoryUtils.createEventImpl(GamePreInitializationEvent.class, values); } @@ -2645,11 +2699,13 @@ public static GamePreInitializationEvent createGamePreInitializationEvent(GameSt * Creates a new instance of * {@link org.spongepowered.api.event.game.state.GameStartedServerEvent}. * + * @param cause The cause * @param state The state * @return A new game started server event */ - public static GameStartedServerEvent createGameStartedServerEvent(GameState state) { + public static GameStartedServerEvent createGameStartedServerEvent(Cause cause, GameState state) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("state", state); return SpongeEventFactoryUtils.createEventImpl(GameStartedServerEvent.class, values); } @@ -2659,11 +2715,13 @@ public static GameStartedServerEvent createGameStartedServerEvent(GameState stat * Creates a new instance of * {@link org.spongepowered.api.event.game.state.GameStartingServerEvent}. * + * @param cause The cause * @param state The state * @return A new game starting server event */ - public static GameStartingServerEvent createGameStartingServerEvent(GameState state) { + public static GameStartingServerEvent createGameStartingServerEvent(Cause cause, GameState state) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("state", state); return SpongeEventFactoryUtils.createEventImpl(GameStartingServerEvent.class, values); } @@ -2673,11 +2731,13 @@ public static GameStartingServerEvent createGameStartingServerEvent(GameState st * Creates a new instance of * {@link org.spongepowered.api.event.game.state.GameStateEvent}. * + * @param cause The cause * @param state The state * @return A new game state event */ - public static GameStateEvent createGameStateEvent(GameState state) { + public static GameStateEvent createGameStateEvent(Cause cause, GameState state) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("state", state); return SpongeEventFactoryUtils.createEventImpl(GameStateEvent.class, values); } @@ -2687,11 +2747,13 @@ public static GameStateEvent createGameStateEvent(GameState state) { * Creates a new instance of * {@link org.spongepowered.api.event.game.state.GameStoppedEvent}. * + * @param cause The cause * @param state The state * @return A new game stopped event */ - public static GameStoppedEvent createGameStoppedEvent(GameState state) { + public static GameStoppedEvent createGameStoppedEvent(Cause cause, GameState state) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("state", state); return SpongeEventFactoryUtils.createEventImpl(GameStoppedEvent.class, values); } @@ -2701,11 +2763,13 @@ public static GameStoppedEvent createGameStoppedEvent(GameState state) { * Creates a new instance of * {@link org.spongepowered.api.event.game.state.GameStoppedServerEvent}. * + * @param cause The cause * @param state The state * @return A new game stopped server event */ - public static GameStoppedServerEvent createGameStoppedServerEvent(GameState state) { + public static GameStoppedServerEvent createGameStoppedServerEvent(Cause cause, GameState state) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("state", state); return SpongeEventFactoryUtils.createEventImpl(GameStoppedServerEvent.class, values); } @@ -2715,11 +2779,13 @@ public static GameStoppedServerEvent createGameStoppedServerEvent(GameState stat * Creates a new instance of * {@link org.spongepowered.api.event.game.state.GameStoppingEvent}. * + * @param cause The cause * @param state The state * @return A new game stopping event */ - public static GameStoppingEvent createGameStoppingEvent(GameState state) { + public static GameStoppingEvent createGameStoppingEvent(Cause cause, GameState state) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("state", state); return SpongeEventFactoryUtils.createEventImpl(GameStoppingEvent.class, values); } @@ -2729,11 +2795,13 @@ public static GameStoppingEvent createGameStoppingEvent(GameState state) { * Creates a new instance of * {@link org.spongepowered.api.event.game.state.GameStoppingServerEvent}. * + * @param cause The cause * @param state The state * @return A new game stopping server event */ - public static GameStoppingServerEvent createGameStoppingServerEvent(GameState state) { + public static GameStoppingServerEvent createGameStoppingServerEvent(Cause cause, GameState state) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("state", state); return SpongeEventFactoryUtils.createEventImpl(GameStoppingServerEvent.class, values); } @@ -3495,11 +3563,13 @@ public static InteractInventoryEvent.Open createInteractInventoryEventOpen(Cause * Creates a new instance of * {@link org.spongepowered.api.event.item.inventory.TargetContainerEvent}. * + * @param cause The cause * @param targetInventory The target inventory * @return A new target container event */ - public static TargetContainerEvent createTargetContainerEvent(Container targetInventory) { + public static TargetContainerEvent createTargetContainerEvent(Cause cause, Container targetInventory) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("targetInventory", targetInventory); return SpongeEventFactoryUtils.createEventImpl(TargetContainerEvent.class, values); } @@ -3509,11 +3579,13 @@ public static TargetContainerEvent createTargetContainerEvent(Container targetIn * Creates a new instance of * {@link org.spongepowered.api.event.item.inventory.TargetInventoryEvent}. * + * @param cause The cause * @param targetInventory The target inventory * @return A new target inventory event */ - public static TargetInventoryEvent createTargetInventoryEvent(Inventory targetInventory) { + public static TargetInventoryEvent createTargetInventoryEvent(Cause cause, Inventory targetInventory) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("targetInventory", targetInventory); return SpongeEventFactoryUtils.createEventImpl(TargetInventoryEvent.class, values); } @@ -3625,11 +3697,13 @@ public static UseItemStackEvent.Tick createUseItemStackEventTick(Cause cause, in * Creates a new instance of * {@link org.spongepowered.api.event.network.BanIpEvent}. * + * @param cause The cause * @param ban The ban * @return A new ban ip event */ - public static BanIpEvent createBanIpEvent(Ban.Ip ban) { + public static BanIpEvent createBanIpEvent(Cause cause, Ban.Ip ban) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("ban", ban); return SpongeEventFactoryUtils.createEventImpl(BanIpEvent.class, values); } @@ -3687,10 +3761,12 @@ public static ChannelRegistrationEvent.Unregister createChannelRegistrationEvent * Creates a new instance of * {@link org.spongepowered.api.event.network.ClientConnectionEvent}. * + * @param cause The cause * @return A new client connection event */ - public static ClientConnectionEvent createClientConnectionEvent() { + public static ClientConnectionEvent createClientConnectionEvent(Cause cause) { Map values = Maps.newHashMap(); + values.put("cause", cause); return SpongeEventFactoryUtils.createEventImpl(ClientConnectionEvent.class, values); } @@ -3805,11 +3881,13 @@ public static ClientConnectionEvent.Login createClientConnectionEventLogin(Cause * Creates a new instance of * {@link org.spongepowered.api.event.network.PardonIpEvent}. * + * @param cause The cause * @param ban The ban * @return A new pardon ip event */ - public static PardonIpEvent createPardonIpEvent(Ban.Ip ban) { + public static PardonIpEvent createPardonIpEvent(Cause cause, Ban.Ip ban) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("ban", ban); return SpongeEventFactoryUtils.createEventImpl(PardonIpEvent.class, values); } @@ -3819,11 +3897,13 @@ public static PardonIpEvent createPardonIpEvent(Ban.Ip ban) { * Creates a new instance of * {@link org.spongepowered.api.event.network.rcon.RconConnectionEvent}. * + * @param cause The cause * @param source The source * @return A new rcon connection event */ - public static RconConnectionEvent createRconConnectionEvent(RconSource source) { + public static RconConnectionEvent createRconConnectionEvent(Cause cause, RconSource source) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("source", source); return SpongeEventFactoryUtils.createEventImpl(RconConnectionEvent.class, values); } @@ -3833,11 +3913,13 @@ public static RconConnectionEvent createRconConnectionEvent(RconSource source) { * Creates a new instance of * {@link org.spongepowered.api.event.network.rcon.RconConnectionEvent.Connect}. * + * @param cause The cause * @param source The source * @return A new connect rcon connection event */ - public static RconConnectionEvent.Connect createRconConnectionEventConnect(RconSource source) { + public static RconConnectionEvent.Connect createRconConnectionEventConnect(Cause cause, RconSource source) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("source", source); return SpongeEventFactoryUtils.createEventImpl(RconConnectionEvent.Connect.class, values); } @@ -3847,11 +3929,13 @@ public static RconConnectionEvent.Connect createRconConnectionEventConnect(RconS * Creates a new instance of * {@link org.spongepowered.api.event.network.rcon.RconConnectionEvent.Disconnect}. * + * @param cause The cause * @param source The source * @return A new disconnect rcon connection event */ - public static RconConnectionEvent.Disconnect createRconConnectionEventDisconnect(RconSource source) { + public static RconConnectionEvent.Disconnect createRconConnectionEventDisconnect(Cause cause, RconSource source) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("source", source); return SpongeEventFactoryUtils.createEventImpl(RconConnectionEvent.Disconnect.class, values); } @@ -3861,11 +3945,13 @@ public static RconConnectionEvent.Disconnect createRconConnectionEventDisconnect * Creates a new instance of * {@link org.spongepowered.api.event.network.rcon.RconConnectionEvent.Login}. * + * @param cause The cause * @param source The source * @return A new login rcon connection event */ - public static RconConnectionEvent.Login createRconConnectionEventLogin(RconSource source) { + public static RconConnectionEvent.Login createRconConnectionEventLogin(Cause cause, RconSource source) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("source", source); return SpongeEventFactoryUtils.createEventImpl(RconConnectionEvent.Login.class, values); } @@ -3875,12 +3961,14 @@ public static RconConnectionEvent.Login createRconConnectionEventLogin(RconSourc * Creates a new instance of * {@link org.spongepowered.api.event.server.ClientPingServerEvent}. * + * @param cause The cause * @param client The client * @param response The response * @return A new client ping server event */ - public static ClientPingServerEvent createClientPingServerEvent(StatusClient client, ClientPingServerEvent.Response response) { + public static ClientPingServerEvent createClientPingServerEvent(Cause cause, StatusClient client, ClientPingServerEvent.Response response) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("client", client); values.put("response", response); return SpongeEventFactoryUtils.createEventImpl(ClientPingServerEvent.class, values); @@ -3929,10 +4017,12 @@ public static ClientPingServerEvent.Response.Players createClientPingServerEvent * Creates a new instance of * {@link org.spongepowered.api.event.server.query.QueryServerEvent}. * + * @param cause The cause * @return A new query server event */ - public static QueryServerEvent createQueryServerEvent() { + public static QueryServerEvent createQueryServerEvent(Cause cause) { Map values = Maps.newHashMap(); + values.put("cause", cause); return SpongeEventFactoryUtils.createEventImpl(QueryServerEvent.class, values); } @@ -3941,6 +4031,7 @@ public static QueryServerEvent createQueryServerEvent() { * Creates a new instance of * {@link org.spongepowered.api.event.server.query.QueryServerEvent.Basic}. * + * @param cause The cause * @param address The address * @param gameType The game type * @param map The map @@ -3951,8 +4042,9 @@ public static QueryServerEvent createQueryServerEvent() { * @param size The size * @return A new basic query server event */ - public static QueryServerEvent.Basic createQueryServerEventBasic(InetSocketAddress address, String gameType, String map, String motd, int maxPlayerCount, int maxSize, int playerCount, int size) { + public static QueryServerEvent.Basic createQueryServerEventBasic(Cause cause, InetSocketAddress address, String gameType, String map, String motd, int maxPlayerCount, int maxSize, int playerCount, int size) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("address", address); values.put("gameType", gameType); values.put("map", map); @@ -3969,6 +4061,7 @@ public static QueryServerEvent.Basic createQueryServerEventBasic(InetSocketAddre * Creates a new instance of * {@link org.spongepowered.api.event.server.query.QueryServerEvent.Full}. * + * @param cause The cause * @param address The address * @param customValuesMap The custom values map * @param gameId The game id @@ -3984,8 +4077,9 @@ public static QueryServerEvent.Basic createQueryServerEventBasic(InetSocketAddre * @param size The size * @return A new full query server event */ - public static QueryServerEvent.Full createQueryServerEventFull(InetSocketAddress address, Map customValuesMap, String gameId, String gameType, String map, String motd, List players, String plugins, String version, int maxPlayerCount, int maxSize, int playerCount, int size) { + public static QueryServerEvent.Full createQueryServerEventFull(Cause cause, InetSocketAddress address, Map customValuesMap, String gameId, String gameType, String map, String motd, List players, String plugins, String version, int maxPlayerCount, int maxSize, int playerCount, int size) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("address", address); values.put("customValuesMap", customValuesMap); values.put("gameId", gameId); @@ -4125,11 +4219,13 @@ public static PardonUserEvent.TargetPlayer createPardonUserEventTargetPlayer(Cau * Creates a new instance of * {@link org.spongepowered.api.event.user.TargetUserEvent}. * + * @param cause The cause * @param targetUser The target user * @return A new target user event */ - public static TargetUserEvent createTargetUserEvent(User targetUser) { + public static TargetUserEvent createTargetUserEvent(Cause cause, User targetUser) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("targetUser", targetUser); return SpongeEventFactoryUtils.createEventImpl(TargetUserEvent.class, values); } @@ -4381,11 +4477,13 @@ public static SaveWorldEvent createSaveWorldEvent(Game game, Cause cause, World * Creates a new instance of * {@link org.spongepowered.api.event.world.TargetWorldEvent}. * + * @param cause The cause * @param targetWorld The target world * @return A new target world event */ - public static TargetWorldEvent createTargetWorldEvent(World targetWorld) { + public static TargetWorldEvent createTargetWorldEvent(Cause cause, World targetWorld) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("targetWorld", targetWorld); return SpongeEventFactoryUtils.createEventImpl(TargetWorldEvent.class, values); } @@ -4411,13 +4509,15 @@ public static UnloadWorldEvent createUnloadWorldEvent(Cause cause, World targetW * Creates a new instance of * {@link org.spongepowered.api.event.world.chunk.ForcedChunkEvent}. * + * @param cause The cause * @param chunkCoords The chunk coords * @param targetChunk The target chunk * @param ticket The ticket * @return A new forced chunk event */ - public static ForcedChunkEvent createForcedChunkEvent(Vector3i chunkCoords, Chunk targetChunk, ChunkTicketManager.LoadingTicket ticket) { + public static ForcedChunkEvent createForcedChunkEvent(Cause cause, Vector3i chunkCoords, Chunk targetChunk, ChunkTicketManager.LoadingTicket ticket) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("chunkCoords", chunkCoords); values.put("targetChunk", targetChunk); values.put("ticket", ticket); @@ -4513,11 +4613,13 @@ public static PopulateChunkEvent.Pre createPopulateChunkEventPre(Cause cause, Li * Creates a new instance of * {@link org.spongepowered.api.event.world.chunk.TargetChunkEvent}. * + * @param cause The cause * @param targetChunk The target chunk * @return A new target chunk event */ - public static TargetChunkEvent createTargetChunkEvent(Chunk targetChunk) { + public static TargetChunkEvent createTargetChunkEvent(Cause cause, Chunk targetChunk) { Map values = Maps.newHashMap(); + values.put("cause", cause); values.put("targetChunk", targetChunk); return SpongeEventFactoryUtils.createEventImpl(TargetChunkEvent.class, values); } diff --git a/src/main/java/org/spongepowered/api/event/achievement/GrantAchievementEvent.java b/src/main/java/org/spongepowered/api/event/achievement/GrantAchievementEvent.java index 023d0f8edbc..592495d96d8 100644 --- a/src/main/java/org/spongepowered/api/event/achievement/GrantAchievementEvent.java +++ b/src/main/java/org/spongepowered/api/event/achievement/GrantAchievementEvent.java @@ -25,7 +25,6 @@ package org.spongepowered.api.event.achievement; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.command.MessageSinkEvent; import org.spongepowered.api.event.entity.living.humanoid.player.TargetPlayerEvent; import org.spongepowered.api.statistic.achievement.Achievement; @@ -33,7 +32,7 @@ /** * Represents an event that is called when an {@link Achievement} is granted */ -public interface GrantAchievementEvent extends MessageSinkEvent, Cancellable, CauseTracked { +public interface GrantAchievementEvent extends MessageSinkEvent, Cancellable { /** * Gets the achievement being targeted. diff --git a/src/main/java/org/spongepowered/api/event/action/FishingEvent.java b/src/main/java/org/spongepowered/api/event/action/FishingEvent.java index 6568f625737..cca1612e1bf 100644 --- a/src/main/java/org/spongepowered/api/event/action/FishingEvent.java +++ b/src/main/java/org/spongepowered/api/event/action/FishingEvent.java @@ -34,7 +34,6 @@ import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.Event; import org.spongepowered.api.event.block.CollideBlockEvent; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.entity.ChangeEntityExperienceEvent; import org.spongepowered.api.event.entity.TargetEntityEvent; import org.spongepowered.api.item.ItemTypes; @@ -45,7 +44,7 @@ * An event when a "fishing" action is performed. Always involves a * {@link FishHook}. */ -public interface FishingEvent extends Event, CauseTracked { +public interface FishingEvent extends Event { /** * Gets the original {@link FishHook}, as a {@link EntitySnapshot}. diff --git a/src/main/java/org/spongepowered/api/event/action/InteractEvent.java b/src/main/java/org/spongepowered/api/event/action/InteractEvent.java index af144c39483..1e0e3a42ba9 100644 --- a/src/main/java/org/spongepowered/api/event/action/InteractEvent.java +++ b/src/main/java/org/spongepowered/api/event/action/InteractEvent.java @@ -27,14 +27,13 @@ import com.flowpowered.math.vector.Vector3d; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.Event; -import org.spongepowered.api.event.cause.CauseTracked; import java.util.Optional; /** * Base event for all interactions. */ -public interface InteractEvent extends Event, Cancellable, CauseTracked { +public interface InteractEvent extends Event, Cancellable { /** * Gets the point of interaction where the interaction occurred as a diff --git a/src/main/java/org/spongepowered/api/event/action/LightningEvent.java b/src/main/java/org/spongepowered/api/event/action/LightningEvent.java index 660517edeed..aaff1a5d168 100644 --- a/src/main/java/org/spongepowered/api/event/action/LightningEvent.java +++ b/src/main/java/org/spongepowered/api/event/action/LightningEvent.java @@ -27,10 +27,9 @@ import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.Event; import org.spongepowered.api.event.block.ChangeBlockEvent; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.entity.AffectEntityEvent; -public interface LightningEvent extends Event, CauseTracked { +public interface LightningEvent extends Event { interface Pre extends LightningEvent, Cancellable {} diff --git a/src/main/java/org/spongepowered/api/event/action/MessageEvent.java b/src/main/java/org/spongepowered/api/event/action/MessageEvent.java index 2772e7edcbb..ef037084a2e 100644 --- a/src/main/java/org/spongepowered/api/event/action/MessageEvent.java +++ b/src/main/java/org/spongepowered/api/event/action/MessageEvent.java @@ -26,13 +26,12 @@ import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.event.Event; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.text.Text; /** * Describes events when a {@link CommandSource} sends a {@link Text} message. */ -public interface MessageEvent extends Event, CauseTracked { +public interface MessageEvent extends Event { /** * Gets the {@link Text} message created by the {@link CommandSource} before diff --git a/src/main/java/org/spongepowered/api/event/action/SleepingEvent.java b/src/main/java/org/spongepowered/api/event/action/SleepingEvent.java index 511f8136449..3f6ed3b5b48 100644 --- a/src/main/java/org/spongepowered/api/event/action/SleepingEvent.java +++ b/src/main/java/org/spongepowered/api/event/action/SleepingEvent.java @@ -28,7 +28,6 @@ import org.spongepowered.api.entity.Transform; import org.spongepowered.api.entity.living.Humanoid; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.entity.TargetEntityEvent; import org.spongepowered.api.world.World; @@ -37,7 +36,7 @@ /** * Called when a {@link Humanoid} enters a bed to sleep in. */ -public interface SleepingEvent extends TargetEntityEvent, CauseTracked { +public interface SleepingEvent extends TargetEntityEvent { /** * Gets the {@link BlockSnapshot} of the bed being used to sleep diff --git a/src/main/java/org/spongepowered/api/event/block/ChangeBlockEvent.java b/src/main/java/org/spongepowered/api/event/block/ChangeBlockEvent.java index 6cfca40c786..0cd2d47f420 100644 --- a/src/main/java/org/spongepowered/api/event/block/ChangeBlockEvent.java +++ b/src/main/java/org/spongepowered/api/event/block/ChangeBlockEvent.java @@ -34,7 +34,6 @@ import org.spongepowered.api.entity.Entity; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.cause.Cause; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.world.TargetWorldEvent; import org.spongepowered.api.world.Location; import org.spongepowered.api.world.World; @@ -46,7 +45,7 @@ * Base event for when {@link BlockState}s at {@link Location}s are being * changed. */ -public interface ChangeBlockEvent extends TargetWorldEvent, Cancellable, CauseTracked { +public interface ChangeBlockEvent extends TargetWorldEvent, Cancellable { /** * Gets a list of the {@link Transaction}s for this event. If a diff --git a/src/main/java/org/spongepowered/api/event/block/CollideBlockEvent.java b/src/main/java/org/spongepowered/api/event/block/CollideBlockEvent.java index eb825bf848e..87fd6b61281 100644 --- a/src/main/java/org/spongepowered/api/event/block/CollideBlockEvent.java +++ b/src/main/java/org/spongepowered/api/event/block/CollideBlockEvent.java @@ -28,7 +28,6 @@ import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.Event; import org.spongepowered.api.event.cause.Cause; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.util.Direction; import org.spongepowered.api.world.Location; import org.spongepowered.api.world.World; @@ -36,7 +35,7 @@ /** * Fired when something collides a {@link BlockState} due to a {@link Cause}. */ -public interface CollideBlockEvent extends Event, Cancellable, CauseTracked { +public interface CollideBlockEvent extends Event, Cancellable { /** * Gets the target {@link Location} being interacted with. diff --git a/src/main/java/org/spongepowered/api/event/block/NotifyNeighborBlockEvent.java b/src/main/java/org/spongepowered/api/event/block/NotifyNeighborBlockEvent.java index ec6adfbfce2..07a304f1c34 100644 --- a/src/main/java/org/spongepowered/api/event/block/NotifyNeighborBlockEvent.java +++ b/src/main/java/org/spongepowered/api/event/block/NotifyNeighborBlockEvent.java @@ -29,7 +29,6 @@ import org.spongepowered.api.block.BlockType; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.Event; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.util.Direction; import java.util.Map; @@ -42,7 +41,7 @@ * {@link Predicate} such that if the predicate returns false, the * {@link Direction} will be removed from the {@link #getNeighbors()} map. */ -public interface NotifyNeighborBlockEvent extends Event, Cancellable, CauseTracked { +public interface NotifyNeighborBlockEvent extends Event, Cancellable { /** * Gets the immutable {@link Map} of {@link Direction} to {@link diff --git a/src/main/java/org/spongepowered/api/event/block/TickBlockEvent.java b/src/main/java/org/spongepowered/api/event/block/TickBlockEvent.java index 8154f16917c..a6fd4d3bf6d 100644 --- a/src/main/java/org/spongepowered/api/event/block/TickBlockEvent.java +++ b/src/main/java/org/spongepowered/api/event/block/TickBlockEvent.java @@ -26,10 +26,9 @@ import org.spongepowered.api.block.BlockState; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; /** * Called when a {@link BlockState} receives a tick. */ -public interface TickBlockEvent extends TargetBlockEvent, Cancellable, CauseTracked { +public interface TickBlockEvent extends TargetBlockEvent, Cancellable { } diff --git a/src/main/java/org/spongepowered/api/event/block/tileentity/BrewingEvent.java b/src/main/java/org/spongepowered/api/event/block/tileentity/BrewingEvent.java index 76249a4d8a6..e2f1b693382 100644 --- a/src/main/java/org/spongepowered/api/event/block/tileentity/BrewingEvent.java +++ b/src/main/java/org/spongepowered/api/event/block/tileentity/BrewingEvent.java @@ -26,7 +26,6 @@ import org.spongepowered.api.block.tileentity.carrier.BrewingStand; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.item.inventory.AffectItemStackEvent; import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.ItemStackSnapshot; @@ -37,7 +36,7 @@ * Fires during the brewing process where {@link ItemStack}s are brewed into different {@link ItemStack}s * based on an ingredient which is also an {@link ItemStack} within a {@link BrewingStand}. */ -public interface BrewingEvent extends TargetTileEntityEvent, CauseTracked { +public interface BrewingEvent extends TargetTileEntityEvent { @Override BrewingStand getTargetTile(); diff --git a/src/main/java/org/spongepowered/api/event/block/tileentity/ChangeSignEvent.java b/src/main/java/org/spongepowered/api/event/block/tileentity/ChangeSignEvent.java index 354e6b2e704..0c04a9b2bea 100644 --- a/src/main/java/org/spongepowered/api/event/block/tileentity/ChangeSignEvent.java +++ b/src/main/java/org/spongepowered/api/event/block/tileentity/ChangeSignEvent.java @@ -28,9 +28,8 @@ import org.spongepowered.api.data.manipulator.immutable.tileentity.ImmutableSignData; import org.spongepowered.api.data.manipulator.mutable.tileentity.SignData; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; -public interface ChangeSignEvent extends TargetTileEntityEvent, Cancellable, CauseTracked { +public interface ChangeSignEvent extends TargetTileEntityEvent, Cancellable { /** * Gets the target {@link Sign} being changed. diff --git a/src/main/java/org/spongepowered/api/event/block/tileentity/SmeltEvent.java b/src/main/java/org/spongepowered/api/event/block/tileentity/SmeltEvent.java index 87f35d53e24..cf6fd7214ad 100644 --- a/src/main/java/org/spongepowered/api/event/block/tileentity/SmeltEvent.java +++ b/src/main/java/org/spongepowered/api/event/block/tileentity/SmeltEvent.java @@ -26,13 +26,12 @@ import org.spongepowered.api.block.tileentity.carrier.Furnace; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.item.inventory.AffectItemStackEvent; import org.spongepowered.api.item.inventory.ItemStackSnapshot; import java.util.List; -public interface SmeltEvent extends TargetTileEntityEvent, CauseTracked { +public interface SmeltEvent extends TargetTileEntityEvent { @Override Furnace getTargetTile(); diff --git a/src/main/java/org/spongepowered/api/event/cause/CauseTracked.java b/src/main/java/org/spongepowered/api/event/cause/CauseTracked.java deleted file mode 100644 index 4463207f52a..00000000000 --- a/src/main/java/org/spongepowered/api/event/cause/CauseTracked.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.event.cause; - -import org.spongepowered.api.eventgencore.annotation.AbsoluteSortPosition; - -/** - * Something that keeps track of the cause. - */ -public interface CauseTracked { - - /** - * Get the cause for the event. - * - * @return The last cause - */ - @AbsoluteSortPosition(0) - Cause getCause(); - -} diff --git a/src/main/java/org/spongepowered/api/event/command/SendCommandEvent.java b/src/main/java/org/spongepowered/api/event/command/SendCommandEvent.java index 5b358a37c17..2262062f2ae 100644 --- a/src/main/java/org/spongepowered/api/event/command/SendCommandEvent.java +++ b/src/main/java/org/spongepowered/api/event/command/SendCommandEvent.java @@ -27,12 +27,11 @@ import org.spongepowered.api.command.CommandResult; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.Event; -import org.spongepowered.api.event.cause.CauseTracked; /** * Fired when a command is sent */ -public interface SendCommandEvent extends Event, Cancellable, CauseTracked { +public interface SendCommandEvent extends Event, Cancellable { /** * Get the command as a string, without any sort of command prefix. diff --git a/src/main/java/org/spongepowered/api/event/command/TabCompleteCommandEvent.java b/src/main/java/org/spongepowered/api/event/command/TabCompleteCommandEvent.java index d3909ef50cb..0ca50449554 100644 --- a/src/main/java/org/spongepowered/api/event/command/TabCompleteCommandEvent.java +++ b/src/main/java/org/spongepowered/api/event/command/TabCompleteCommandEvent.java @@ -26,14 +26,13 @@ import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.Event; -import org.spongepowered.api.event.cause.CauseTracked; import java.util.List; /** * Fired when a command is tab complete. */ -public interface TabCompleteCommandEvent extends Event, Cancellable, CauseTracked { +public interface TabCompleteCommandEvent extends Event, Cancellable { /** * Get the command as a string, without any sort of command prefix. diff --git a/src/main/java/org/spongepowered/api/event/entity/AffectEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/AffectEntityEvent.java index 5c632797314..097ee9dc2fd 100644 --- a/src/main/java/org/spongepowered/api/event/entity/AffectEntityEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/AffectEntityEvent.java @@ -28,7 +28,6 @@ import org.spongepowered.api.entity.EntitySnapshot; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.Event; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.world.TargetWorldEvent; import org.spongepowered.api.world.Location; import org.spongepowered.api.world.World; @@ -37,7 +36,6 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; -import java.util.stream.Collectors; /** * An event that affects multiple {@link Entity} instances as a bulk action. @@ -48,7 +46,7 @@ * {@link Explosion} "damaging" a varying amount of {@link Entity} instances. * Other cases will be included as necessary. */ -public interface AffectEntityEvent extends TargetWorldEvent, Cancellable, CauseTracked { +public interface AffectEntityEvent extends TargetWorldEvent, Cancellable { /** * Gets an {@link List} of the entity data diff --git a/src/main/java/org/spongepowered/api/event/entity/ChangeEntityExperienceEvent.java b/src/main/java/org/spongepowered/api/event/entity/ChangeEntityExperienceEvent.java index 13695c0cbbc..dfcde0bc72c 100644 --- a/src/main/java/org/spongepowered/api/event/entity/ChangeEntityExperienceEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/ChangeEntityExperienceEvent.java @@ -25,12 +25,11 @@ package org.spongepowered.api.event.entity; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; /** * An event that is related to experience. */ -public interface ChangeEntityExperienceEvent extends TargetEntityEvent, Cancellable, CauseTracked { +public interface ChangeEntityExperienceEvent extends TargetEntityEvent, Cancellable { /** * Gets the original experience unmodified by event changes. diff --git a/src/main/java/org/spongepowered/api/event/entity/ChangeEntityPotionEffectEvent.java b/src/main/java/org/spongepowered/api/event/entity/ChangeEntityPotionEffectEvent.java index c08cb4da076..ef3eb851c74 100644 --- a/src/main/java/org/spongepowered/api/event/entity/ChangeEntityPotionEffectEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/ChangeEntityPotionEffectEvent.java @@ -25,7 +25,6 @@ package org.spongepowered.api.event.entity; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.effect.potion.PotionEffect; import java.util.List; @@ -33,7 +32,7 @@ /** * An event that involves a living entity having effects added and removed. */ -public interface ChangeEntityPotionEffectEvent extends TargetEntityEvent, Cancellable, CauseTracked { +public interface ChangeEntityPotionEffectEvent extends TargetEntityEvent, Cancellable { /** * Gets a copy of all current effects applied on the entity. diff --git a/src/main/java/org/spongepowered/api/event/entity/CollideEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/CollideEntityEvent.java index 5fd9fc8a3b4..b1e11e15ea7 100644 --- a/src/main/java/org/spongepowered/api/event/entity/CollideEntityEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/CollideEntityEvent.java @@ -27,7 +27,6 @@ import com.google.common.collect.Lists; import org.spongepowered.api.entity.Entity; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.world.TargetWorldEvent; import org.spongepowered.api.world.Location; import org.spongepowered.api.world.World; @@ -38,7 +37,7 @@ /** * Fired when something collides with one or more {@link Entity}'s. */ -public interface CollideEntityEvent extends TargetWorldEvent, Cancellable, CauseTracked { +public interface CollideEntityEvent extends TargetWorldEvent, Cancellable { /** * Gets the immutable list of {@link List} who will be affected after event diff --git a/src/main/java/org/spongepowered/api/event/entity/ConstructEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/ConstructEntityEvent.java index b5461649fda..6d3c1e0e8f1 100644 --- a/src/main/java/org/spongepowered/api/event/entity/ConstructEntityEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/ConstructEntityEvent.java @@ -29,14 +29,13 @@ import org.spongepowered.api.entity.Transform; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.Event; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.world.World; /** * Base event during the construction of an {@link Entity}. * */ -public interface ConstructEntityEvent extends Event, CauseTracked { +public interface ConstructEntityEvent extends Event { /** * Gets the {@link Transform} that the {@link Entity} will be constructed with. diff --git a/src/main/java/org/spongepowered/api/event/entity/DamageEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/DamageEntityEvent.java index cae65bcdf8a..d426870e732 100644 --- a/src/main/java/org/spongepowered/api/event/entity/DamageEntityEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/DamageEntityEvent.java @@ -33,8 +33,6 @@ import org.spongepowered.api.entity.projectile.Arrow; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.cause.Cause; -import org.spongepowered.api.event.cause.CauseTracked; -import org.spongepowered.api.event.cause.NamedCause; import org.spongepowered.api.event.cause.entity.damage.DamageModifier; import org.spongepowered.api.event.cause.entity.damage.DamageModifierType; import org.spongepowered.api.event.cause.entity.damage.DamageModifierTypes; @@ -141,7 +139,7 @@ * associated with the targeted {@link Entity}.

*/ @ImplementedBy(AbstractDamageEntityEvent.class) -public interface DamageEntityEvent extends TargetEntityEvent, CauseTracked, Cancellable { +public interface DamageEntityEvent extends TargetEntityEvent, Cancellable { /** * For use with the {@link DamageSource} that is known as the "source" diff --git a/src/main/java/org/spongepowered/api/event/entity/DestructEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/DestructEntityEvent.java index 47ce45748b9..530f39da8bf 100644 --- a/src/main/java/org/spongepowered/api/event/entity/DestructEntityEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/DestructEntityEvent.java @@ -26,7 +26,6 @@ import org.spongepowered.api.entity.Entity; import org.spongepowered.api.entity.living.Living; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.command.MessageSinkEvent; import org.spongepowered.api.event.entity.living.TargetLivingEvent; @@ -34,7 +33,7 @@ * An event where the {@link Entity} is being either removed usually due to * the {@link Entity} being marked as "dead". Happens before {@link HarvestEntityEvent}. */ -public interface DestructEntityEvent extends TargetEntityEvent, MessageSinkEvent, CauseTracked { +public interface DestructEntityEvent extends TargetEntityEvent, MessageSinkEvent { /** * A derivative of {@link DestructEntityEvent} where the removal of the {@link Living}, the {@link TargetLivingEvent#getTargetEntity()}, diff --git a/src/main/java/org/spongepowered/api/event/entity/DismountEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/DismountEntityEvent.java index 147c4fb346c..451227a870a 100644 --- a/src/main/java/org/spongepowered/api/event/entity/DismountEntityEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/DismountEntityEvent.java @@ -27,7 +27,6 @@ import org.spongepowered.api.entity.Entity; import org.spongepowered.api.entity.living.animal.Horse; import org.spongepowered.api.entity.living.player.Player; -import org.spongepowered.api.event.cause.CauseTracked; /** * Raised when the targeted {@link Entity} is being dismounted from another @@ -35,6 +34,6 @@ * {@link Horse}, and the {@link Player} "dismounts", the {@link Horse} * would be the {@link #getTargetEntity()} in this event. */ -public interface DismountEntityEvent extends TargetEntityEvent, CauseTracked { +public interface DismountEntityEvent extends TargetEntityEvent { } diff --git a/src/main/java/org/spongepowered/api/event/entity/DisplaceEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/DisplaceEntityEvent.java index 01f32615811..2ee04fd2354 100644 --- a/src/main/java/org/spongepowered/api/event/entity/DisplaceEntityEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/DisplaceEntityEvent.java @@ -30,7 +30,6 @@ import org.spongepowered.api.entity.living.Living; import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.entity.living.TargetLivingEvent; import org.spongepowered.api.event.entity.living.humanoid.TargetHumanoidEvent; import org.spongepowered.api.event.entity.living.humanoid.player.TargetPlayerEvent; @@ -94,7 +93,7 @@ interface TargetHumanoid extends TargetLiving, DisplaceEntityEvent.TargetHumanoi interface TargetPlayer extends TargetHumanoid, DisplaceEntityEvent.TargetPlayer { } } - interface Teleport extends DisplaceEntityEvent, CauseTracked { + interface Teleport extends DisplaceEntityEvent { /// TODO review teleporter stuff. diff --git a/src/main/java/org/spongepowered/api/event/entity/ExpireEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/ExpireEntityEvent.java index 814b488808d..b7079aa8746 100644 --- a/src/main/java/org/spongepowered/api/event/entity/ExpireEntityEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/ExpireEntityEvent.java @@ -28,7 +28,6 @@ import org.spongepowered.api.entity.Item; import org.spongepowered.api.entity.living.monster.Endermite; import org.spongepowered.api.entity.weather.Lightning; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.entity.item.TargetItemEvent; /** @@ -36,7 +35,7 @@ * include when an {@link Endermite} expires, or when {@link Lightning} * expires. */ -public interface ExpireEntityEvent extends TargetEntityEvent, CauseTracked { +public interface ExpireEntityEvent extends TargetEntityEvent { /** * An event where the target is an {@link Item} entity. diff --git a/src/main/java/org/spongepowered/api/event/entity/HarvestEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/HarvestEntityEvent.java index 4bfbdcf4533..b4ccc2d73ac 100644 --- a/src/main/java/org/spongepowered/api/event/entity/HarvestEntityEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/HarvestEntityEvent.java @@ -29,7 +29,6 @@ import org.spongepowered.api.entity.living.Living; import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.entity.living.TargetLivingEvent; import org.spongepowered.api.event.entity.living.humanoid.TargetHumanoidEvent; import org.spongepowered.api.event.entity.living.humanoid.player.TargetPlayerEvent; @@ -38,7 +37,7 @@ * Called when an {@link Entity} has been killed and is being "harvested" (drops/etc). Happens * after {@link DestructEntityEvent}. */ -public interface HarvestEntityEvent extends TargetEntityEvent, ChangeEntityExperienceEvent, Cancellable, CauseTracked { +public interface HarvestEntityEvent extends TargetEntityEvent, ChangeEntityExperienceEvent, Cancellable { /** * An event where the target is a {@link Living}. diff --git a/src/main/java/org/spongepowered/api/event/entity/HealEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/HealEntityEvent.java index 4a37cccd9ff..40756659aa4 100644 --- a/src/main/java/org/spongepowered/api/event/entity/HealEntityEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/HealEntityEvent.java @@ -26,7 +26,6 @@ import org.spongepowered.api.entity.Entity; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.cause.entity.health.HealthModifier; import org.spongepowered.api.event.cause.entity.health.source.HealingSource; import org.spongepowered.api.event.impl.AbstractHealEntityEvent; @@ -44,7 +43,7 @@ * the {@link DamageEntityEvent}, this event uses various modifiers */ @ImplementedBy(AbstractHealEntityEvent.class) -public interface HealEntityEvent extends TargetEntityEvent, Cancellable, CauseTracked { +public interface HealEntityEvent extends TargetEntityEvent, Cancellable { /** * Gets the original amount to "heal" the targeted {@link Entity}. diff --git a/src/main/java/org/spongepowered/api/event/entity/IgniteEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/IgniteEntityEvent.java index 8b02334939b..983756245d5 100644 --- a/src/main/java/org/spongepowered/api/event/entity/IgniteEntityEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/IgniteEntityEvent.java @@ -25,12 +25,11 @@ package org.spongepowered.api.event.entity; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; /** * An event that occurs when an entity becomes ignited. */ -public interface IgniteEntityEvent extends TargetEntityEvent, Cancellable, CauseTracked { +public interface IgniteEntityEvent extends TargetEntityEvent, Cancellable { /** * Gets the original amount of fire ticks the entity will remain on fire. diff --git a/src/main/java/org/spongepowered/api/event/entity/LeashEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/LeashEntityEvent.java index ea37fdf2b42..d61c0786c94 100644 --- a/src/main/java/org/spongepowered/api/event/entity/LeashEntityEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/LeashEntityEvent.java @@ -25,11 +25,10 @@ package org.spongepowered.api.event.entity; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; /** * An event that is called when an entity becomes leashed. */ -public interface LeashEntityEvent extends TargetEntityEvent, Cancellable, CauseTracked { +public interface LeashEntityEvent extends TargetEntityEvent, Cancellable { } diff --git a/src/main/java/org/spongepowered/api/event/entity/MountEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/MountEntityEvent.java index 60057f0a4eb..8cea0b5f91a 100644 --- a/src/main/java/org/spongepowered/api/event/entity/MountEntityEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/MountEntityEvent.java @@ -26,10 +26,9 @@ import org.spongepowered.api.entity.Entity; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; /** * Raised when an {@link Entity} is being mounted */ -public interface MountEntityEvent extends TargetEntityEvent, Cancellable, CauseTracked { +public interface MountEntityEvent extends TargetEntityEvent, Cancellable { } diff --git a/src/main/java/org/spongepowered/api/event/entity/TameEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/TameEntityEvent.java index 9d427c44c21..841f03be78d 100644 --- a/src/main/java/org/spongepowered/api/event/entity/TameEntityEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/TameEntityEvent.java @@ -28,7 +28,6 @@ import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.cause.Cause; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.item.inventory.ItemStack; /** @@ -45,7 +44,7 @@ * {@link ItemStack}The {@link ItemStack} used to tame the entity * */ -public interface TameEntityEvent extends TargetEntityEvent, Cancellable, CauseTracked { +public interface TameEntityEvent extends TargetEntityEvent, Cancellable { String USED_ITEM = "UsedItem"; diff --git a/src/main/java/org/spongepowered/api/event/entity/UnleashEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/UnleashEntityEvent.java index fc82421ab1b..1b77d298591 100644 --- a/src/main/java/org/spongepowered/api/event/entity/UnleashEntityEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/UnleashEntityEvent.java @@ -25,11 +25,10 @@ package org.spongepowered.api.event.entity; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; /** * An event that is called when an entity becomes unleashed. */ -public interface UnleashEntityEvent extends TargetEntityEvent, Cancellable, CauseTracked { +public interface UnleashEntityEvent extends TargetEntityEvent, Cancellable { } diff --git a/src/main/java/org/spongepowered/api/event/entity/item/ItemMergeItemEvent.java b/src/main/java/org/spongepowered/api/event/entity/item/ItemMergeItemEvent.java index 5524178273a..dda2db33c12 100644 --- a/src/main/java/org/spongepowered/api/event/entity/item/ItemMergeItemEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/item/ItemMergeItemEvent.java @@ -26,12 +26,11 @@ import org.spongepowered.api.entity.Item; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; /** * Called when an {@link Item} is merged with another {@link Item}. */ -public interface ItemMergeItemEvent extends TargetItemEvent, Cancellable, CauseTracked { +public interface ItemMergeItemEvent extends TargetItemEvent, Cancellable { /** * Gets a copy of the second item to be merged. diff --git a/src/main/java/org/spongepowered/api/event/entity/living/humanoid/ChangeGameModeEvent.java b/src/main/java/org/spongepowered/api/event/entity/living/humanoid/ChangeGameModeEvent.java index 215b93db6dd..74d1025fee3 100644 --- a/src/main/java/org/spongepowered/api/event/entity/living/humanoid/ChangeGameModeEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/living/humanoid/ChangeGameModeEvent.java @@ -27,13 +27,12 @@ import org.spongepowered.api.entity.living.Humanoid; import org.spongepowered.api.entity.living.player.gamemode.GameMode; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.entity.living.humanoid.player.TargetPlayerEvent; /** * Called when a {@link Humanoid} changes {@link GameMode}. */ -public interface ChangeGameModeEvent extends TargetHumanoidEvent, Cancellable, CauseTracked { +public interface ChangeGameModeEvent extends TargetHumanoidEvent, Cancellable { /** * Gets the original {@link GameMode}. diff --git a/src/main/java/org/spongepowered/api/event/entity/living/humanoid/ChangeLevelEvent.java b/src/main/java/org/spongepowered/api/event/entity/living/humanoid/ChangeLevelEvent.java index 9ce374d5fc8..644b31a7f0c 100644 --- a/src/main/java/org/spongepowered/api/event/entity/living/humanoid/ChangeLevelEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/living/humanoid/ChangeLevelEvent.java @@ -25,13 +25,12 @@ package org.spongepowered.api.event.entity.living.humanoid; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.entity.living.humanoid.player.TargetPlayerEvent; /** * Called when a human's level is changed. */ -public interface ChangeLevelEvent extends TargetHumanoidEvent, Cancellable, CauseTracked { +public interface ChangeLevelEvent extends TargetHumanoidEvent, Cancellable { /** * Gets the original level of the human. diff --git a/src/main/java/org/spongepowered/api/event/entity/living/humanoid/player/RespawnPlayerEvent.java b/src/main/java/org/spongepowered/api/event/entity/living/humanoid/player/RespawnPlayerEvent.java index 1eee4da8085..93b07fb15e3 100644 --- a/src/main/java/org/spongepowered/api/event/entity/living/humanoid/player/RespawnPlayerEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/living/humanoid/player/RespawnPlayerEvent.java @@ -26,13 +26,12 @@ import org.spongepowered.api.entity.Transform; import org.spongepowered.api.entity.living.player.Player; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.world.World; /** * Called when a {@link Player} re-spawns. */ -public interface RespawnPlayerEvent extends TargetPlayerEvent, CauseTracked { +public interface RespawnPlayerEvent extends TargetPlayerEvent { /** * Gets a copy of the transform that the entity came from. diff --git a/src/main/java/org/spongepowered/api/event/entity/projectile/LaunchProjectileEvent.java b/src/main/java/org/spongepowered/api/event/entity/projectile/LaunchProjectileEvent.java index fd34a275fb9..0e86e66e7e0 100644 --- a/src/main/java/org/spongepowered/api/event/entity/projectile/LaunchProjectileEvent.java +++ b/src/main/java/org/spongepowered/api/event/entity/projectile/LaunchProjectileEvent.java @@ -26,11 +26,10 @@ import org.spongepowered.api.entity.projectile.Projectile; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; /** * Called when a {@link Projectile} is launched. */ -public interface LaunchProjectileEvent extends TargetProjectileEvent, Cancellable, CauseTracked { +public interface LaunchProjectileEvent extends TargetProjectileEvent, Cancellable { } diff --git a/src/main/java/org/spongepowered/api/event/impl/AbstractModifierEvent.java b/src/main/java/org/spongepowered/api/event/impl/AbstractModifierEvent.java index d485496108e..850d80977ff 100644 --- a/src/main/java/org/spongepowered/api/event/impl/AbstractModifierEvent.java +++ b/src/main/java/org/spongepowered/api/event/impl/AbstractModifierEvent.java @@ -44,7 +44,7 @@ * An abstract base class for implementations of {@link DamageEntityEvent} and {@link HealEntityEvent} * @param The modifier type to use */ -public class AbstractModifierEvent extends AbstractEvent { +public abstract class AbstractModifierEvent extends AbstractEvent { protected double originalFinalAmount; protected List> originalModifiers; @@ -53,11 +53,10 @@ public class AbstractModifierEvent extends AbstractEvent { protected final List>> modifierFunctions = new ArrayList<>(); protected ImmutableList>> init(double originalValue, List>> originalFunctions) { - final double damage = originalValue; final ImmutableList.Builder> modifierMapBuilder = ImmutableList.builder(); final ImmutableList.Builder>> functionListBuilder = ImmutableList.builder(); final ImmutableMap.Builder mapBuilder = ImmutableMap.builder(); - double finalDamage = damage; + double finalDamage = originalValue; for (Tuple> tuple : originalFunctions) { this.modifierFunctions.add(new Tuple<>(tuple.getFirst(), tuple.getSecond())); double tempDamage = checkNotNull(tuple.getSecond().apply(finalDamage)); @@ -108,5 +107,4 @@ public final List>> getModifiers() { } return builder.build(); } - } diff --git a/src/main/java/org/spongepowered/api/event/item/inventory/AffectItemStackEvent.java b/src/main/java/org/spongepowered/api/event/item/inventory/AffectItemStackEvent.java index f7f4b091f0b..c09821fafba 100644 --- a/src/main/java/org/spongepowered/api/event/item/inventory/AffectItemStackEvent.java +++ b/src/main/java/org/spongepowered/api/event/item/inventory/AffectItemStackEvent.java @@ -28,7 +28,6 @@ import org.spongepowered.api.data.Transaction; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.Event; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.item.inventory.Inventory; import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.ItemStackSnapshot; @@ -39,7 +38,7 @@ /** * Fired when {@link ItemStack}s are generated into a {@link Inventory} */ -public interface AffectItemStackEvent extends Event, Cancellable, CauseTracked { +public interface AffectItemStackEvent extends Event, Cancellable { /** * Gets a list of the {@link Transaction}s for this event. If a diff --git a/src/main/java/org/spongepowered/api/event/item/inventory/ChangeInventoryEvent.java b/src/main/java/org/spongepowered/api/event/item/inventory/ChangeInventoryEvent.java index 11accbbab42..cf23cd219a9 100644 --- a/src/main/java/org/spongepowered/api/event/item/inventory/ChangeInventoryEvent.java +++ b/src/main/java/org/spongepowered/api/event/item/inventory/ChangeInventoryEvent.java @@ -26,10 +26,9 @@ import org.spongepowered.api.entity.living.Living; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.item.inventory.ItemStack; -public interface ChangeInventoryEvent extends TargetInventoryEvent, AffectSlotEvent, CauseTracked, Cancellable { +public interface ChangeInventoryEvent extends TargetInventoryEvent, AffectSlotEvent, Cancellable { /** * Fired when a {@link Living} changes it's equipment. diff --git a/src/main/java/org/spongepowered/api/event/item/inventory/DropItemEvent.java b/src/main/java/org/spongepowered/api/event/item/inventory/DropItemEvent.java index b88cc686090..a72158d1db8 100644 --- a/src/main/java/org/spongepowered/api/event/item/inventory/DropItemEvent.java +++ b/src/main/java/org/spongepowered/api/event/item/inventory/DropItemEvent.java @@ -30,7 +30,6 @@ import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.Event; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.entity.SpawnEntityEvent; import org.spongepowered.api.item.inventory.Container; import org.spongepowered.api.item.inventory.Inventory; @@ -44,7 +43,7 @@ * "dropped" onto the ground. This will happen before they are physically * dropped, let alone spawned. */ -public interface DropItemEvent extends Event, Cancellable, CauseTracked { +public interface DropItemEvent extends Event, Cancellable { /** * Handles {@link ItemStack}s and may be called before an {@link Item} diff --git a/src/main/java/org/spongepowered/api/event/item/inventory/InteractInventoryEvent.java b/src/main/java/org/spongepowered/api/event/item/inventory/InteractInventoryEvent.java index 90ca9e75383..d9cfd05fb40 100644 --- a/src/main/java/org/spongepowered/api/event/item/inventory/InteractInventoryEvent.java +++ b/src/main/java/org/spongepowered/api/event/item/inventory/InteractInventoryEvent.java @@ -26,10 +26,9 @@ import org.spongepowered.api.data.Transaction; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.item.inventory.ItemStackSnapshot; -public interface InteractInventoryEvent extends TargetContainerEvent, CauseTracked, Cancellable { +public interface InteractInventoryEvent extends TargetContainerEvent, Cancellable { Transaction getCursorTransaction(); diff --git a/src/main/java/org/spongepowered/api/event/item/inventory/UseItemStackEvent.java b/src/main/java/org/spongepowered/api/event/item/inventory/UseItemStackEvent.java index ded06c90d3d..16fd5ac035c 100644 --- a/src/main/java/org/spongepowered/api/event/item/inventory/UseItemStackEvent.java +++ b/src/main/java/org/spongepowered/api/event/item/inventory/UseItemStackEvent.java @@ -28,12 +28,11 @@ import org.spongepowered.api.effect.potion.PotionEffectType; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.Event; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.item.ItemType; import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.ItemStackSnapshot; -public interface UseItemStackEvent extends Event, Cancellable, CauseTracked { +public interface UseItemStackEvent extends Event, Cancellable { /** * Gets the original remaining duration of {@link ItemStack} in use. diff --git a/src/main/java/org/spongepowered/api/event/network/ChannelRegistrationEvent.java b/src/main/java/org/spongepowered/api/event/network/ChannelRegistrationEvent.java index f46a0e736ad..a165370b91a 100644 --- a/src/main/java/org/spongepowered/api/event/network/ChannelRegistrationEvent.java +++ b/src/main/java/org/spongepowered/api/event/network/ChannelRegistrationEvent.java @@ -24,12 +24,12 @@ */ package org.spongepowered.api.event.network; -import org.spongepowered.api.event.cause.CauseTracked; +import org.spongepowered.api.event.Event; /** * Fired when a channel is registered or unregistered. */ -public interface ChannelRegistrationEvent extends CauseTracked { +public interface ChannelRegistrationEvent extends Event { /** * Gets the name of the channel being registered or unregistered. diff --git a/src/main/java/org/spongepowered/api/event/statistic/ChangeStatisticEvent.java b/src/main/java/org/spongepowered/api/event/statistic/ChangeStatisticEvent.java index 68f2e2cc7a9..2cd7f328cf1 100644 --- a/src/main/java/org/spongepowered/api/event/statistic/ChangeStatisticEvent.java +++ b/src/main/java/org/spongepowered/api/event/statistic/ChangeStatisticEvent.java @@ -26,7 +26,6 @@ import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.Event; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.entity.living.humanoid.player.TargetPlayerEvent; import org.spongepowered.api.statistic.Statistic; @@ -34,7 +33,7 @@ * Represents an event that is triggered if a {@link Statistic}'s value is being * modified. */ -public interface ChangeStatisticEvent extends Event, Cancellable, CauseTracked { +public interface ChangeStatisticEvent extends Event, Cancellable { /** * Gets the {@link Statistic}. * diff --git a/src/main/java/org/spongepowered/api/event/user/BanUserEvent.java b/src/main/java/org/spongepowered/api/event/user/BanUserEvent.java index a91d8a7e391..8ef835387b5 100644 --- a/src/main/java/org/spongepowered/api/event/user/BanUserEvent.java +++ b/src/main/java/org/spongepowered/api/event/user/BanUserEvent.java @@ -25,14 +25,13 @@ package org.spongepowered.api.event.user; import org.spongepowered.api.entity.living.player.Player; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.entity.living.humanoid.player.TargetPlayerEvent; import org.spongepowered.api.util.ban.Ban; /** * Occurs when a user is banned. */ -public interface BanUserEvent extends TargetUserEvent, CauseTracked { +public interface BanUserEvent extends TargetUserEvent { /** * Gets the ban involved in this event. diff --git a/src/main/java/org/spongepowered/api/event/user/PardonUserEvent.java b/src/main/java/org/spongepowered/api/event/user/PardonUserEvent.java index cad2e5a3985..feb80056a41 100644 --- a/src/main/java/org/spongepowered/api/event/user/PardonUserEvent.java +++ b/src/main/java/org/spongepowered/api/event/user/PardonUserEvent.java @@ -25,14 +25,13 @@ package org.spongepowered.api.event.user; import org.spongepowered.api.entity.living.player.Player; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.entity.living.humanoid.player.TargetPlayerEvent; import org.spongepowered.api.util.ban.Ban; /** * Occurs when a user is pardoned. */ -public interface PardonUserEvent extends TargetUserEvent, CauseTracked { +public interface PardonUserEvent extends TargetUserEvent { /** * Gets the ban involved in this event. diff --git a/src/main/java/org/spongepowered/api/event/world/ChangeWorldGameRuleEvent.java b/src/main/java/org/spongepowered/api/event/world/ChangeWorldGameRuleEvent.java index 30b5439e88f..a4175736001 100644 --- a/src/main/java/org/spongepowered/api/event/world/ChangeWorldGameRuleEvent.java +++ b/src/main/java/org/spongepowered/api/event/world/ChangeWorldGameRuleEvent.java @@ -25,12 +25,11 @@ package org.spongepowered.api.event.world; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; /** * Called when a GameRule is changed. */ -public interface ChangeWorldGameRuleEvent extends TargetWorldEvent, Cancellable, CauseTracked { +public interface ChangeWorldGameRuleEvent extends TargetWorldEvent, Cancellable { /** * Gets the original value of the GameRule. diff --git a/src/main/java/org/spongepowered/api/event/world/ChangeWorldWeatherEvent.java b/src/main/java/org/spongepowered/api/event/world/ChangeWorldWeatherEvent.java index f7986fa9b71..20a7e6d6657 100644 --- a/src/main/java/org/spongepowered/api/event/world/ChangeWorldWeatherEvent.java +++ b/src/main/java/org/spongepowered/api/event/world/ChangeWorldWeatherEvent.java @@ -25,14 +25,13 @@ package org.spongepowered.api.event.world; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.world.weather.Weather; import org.spongepowered.api.world.weather.WeatherUniverse; /** * Called when a {@link WeatherUniverse}'s {@link Weather} changes. */ -public interface ChangeWorldWeatherEvent extends TargetWorldEvent, Cancellable, CauseTracked { +public interface ChangeWorldWeatherEvent extends TargetWorldEvent, Cancellable { /** * Gets the original {@link Weather} that the event is creating. diff --git a/src/main/java/org/spongepowered/api/event/world/ConstructPortalEvent.java b/src/main/java/org/spongepowered/api/event/world/ConstructPortalEvent.java index 0354cf3336c..ca716ab3406 100644 --- a/src/main/java/org/spongepowered/api/event/world/ConstructPortalEvent.java +++ b/src/main/java/org/spongepowered/api/event/world/ConstructPortalEvent.java @@ -28,7 +28,6 @@ import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.Event; import org.spongepowered.api.event.block.ChangeBlockEvent; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.world.Location; import org.spongepowered.api.world.World; @@ -36,7 +35,7 @@ * An event where a portal is created. Usually, this happens after a * {@link ChangeBlockEvent} from any source. */ -public interface ConstructPortalEvent extends Event, Cancellable, CauseTracked { +public interface ConstructPortalEvent extends Event, Cancellable { Location getPortalLocation(); diff --git a/src/main/java/org/spongepowered/api/event/world/ConstructWorldEvent.java b/src/main/java/org/spongepowered/api/event/world/ConstructWorldEvent.java index 3ed4971471f..c46bdf51097 100644 --- a/src/main/java/org/spongepowered/api/event/world/ConstructWorldEvent.java +++ b/src/main/java/org/spongepowered/api/event/world/ConstructWorldEvent.java @@ -25,7 +25,6 @@ package org.spongepowered.api.event.world; import org.spongepowered.api.event.Event; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.world.WorldCreationSettings; import org.spongepowered.api.world.storage.WorldProperties; @@ -33,7 +32,7 @@ * An event for when a world has been created. Often paired with a * {@link LoadWorldEvent}, but that is not guaranteed. */ -public interface ConstructWorldEvent extends Event, CauseTracked { +public interface ConstructWorldEvent extends Event { /** * Gets the properties of the newly created world. diff --git a/src/main/java/org/spongepowered/api/event/world/ExplosionEvent.java b/src/main/java/org/spongepowered/api/event/world/ExplosionEvent.java index 9e412d1041b..743c911849e 100644 --- a/src/main/java/org/spongepowered/api/event/world/ExplosionEvent.java +++ b/src/main/java/org/spongepowered/api/event/world/ExplosionEvent.java @@ -26,7 +26,6 @@ import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.block.ChangeBlockEvent; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.entity.AffectEntityEvent; import org.spongepowered.api.world.World; import org.spongepowered.api.world.explosion.Explosion; @@ -34,7 +33,7 @@ /** * Called when an {@link Explosion} occurs in a {@link World}. */ -public interface ExplosionEvent extends TargetWorldEvent, CauseTracked { +public interface ExplosionEvent extends TargetWorldEvent { /** * Gets the {@link Explosion} involved in this event. diff --git a/src/main/java/org/spongepowered/api/event/world/GenerateChunkEvent.java b/src/main/java/org/spongepowered/api/event/world/GenerateChunkEvent.java index d3922624f91..b6fb7c64a92 100644 --- a/src/main/java/org/spongepowered/api/event/world/GenerateChunkEvent.java +++ b/src/main/java/org/spongepowered/api/event/world/GenerateChunkEvent.java @@ -24,14 +24,13 @@ */ package org.spongepowered.api.event.world; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.event.world.chunk.TargetChunkEvent; import org.spongepowered.api.world.Chunk; /** * Called when a {@link Chunk} is about to be generated. */ -public interface GenerateChunkEvent extends TargetChunkEvent, CauseTracked { +public interface GenerateChunkEvent extends TargetChunkEvent { interface Pre extends GenerateChunkEvent { diff --git a/src/main/java/org/spongepowered/api/event/world/LoadWorldEvent.java b/src/main/java/org/spongepowered/api/event/world/LoadWorldEvent.java index 31e9f4dd555..a338e94aa37 100644 --- a/src/main/java/org/spongepowered/api/event/world/LoadWorldEvent.java +++ b/src/main/java/org/spongepowered/api/event/world/LoadWorldEvent.java @@ -25,12 +25,11 @@ package org.spongepowered.api.event.world; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.world.World; /** * Base event for when a {@link World} is loaded. */ -public interface LoadWorldEvent extends TargetWorldEvent, Cancellable, CauseTracked { +public interface LoadWorldEvent extends TargetWorldEvent, Cancellable { } diff --git a/src/main/java/org/spongepowered/api/event/world/UnloadWorldEvent.java b/src/main/java/org/spongepowered/api/event/world/UnloadWorldEvent.java index 9759da8863d..05a10bf51ec 100644 --- a/src/main/java/org/spongepowered/api/event/world/UnloadWorldEvent.java +++ b/src/main/java/org/spongepowered/api/event/world/UnloadWorldEvent.java @@ -25,11 +25,10 @@ package org.spongepowered.api.event.world; import org.spongepowered.api.event.Cancellable; -import org.spongepowered.api.event.cause.CauseTracked; /** * Base event for when a @link World} is unloaded. */ -public interface UnloadWorldEvent extends TargetWorldEvent, Cancellable, CauseTracked { +public interface UnloadWorldEvent extends TargetWorldEvent, Cancellable { } diff --git a/src/main/java/org/spongepowered/api/event/world/chunk/LoadChunkEvent.java b/src/main/java/org/spongepowered/api/event/world/chunk/LoadChunkEvent.java index 36363c275a5..649da5d53ca 100644 --- a/src/main/java/org/spongepowered/api/event/world/chunk/LoadChunkEvent.java +++ b/src/main/java/org/spongepowered/api/event/world/chunk/LoadChunkEvent.java @@ -24,12 +24,11 @@ */ package org.spongepowered.api.event.world.chunk; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.world.Chunk; /** * Base event for when a {@link Chunk} is triggered to load. */ -public interface LoadChunkEvent extends TargetChunkEvent, CauseTracked { +public interface LoadChunkEvent extends TargetChunkEvent { } diff --git a/src/main/java/org/spongepowered/api/event/world/chunk/PopulateChunkEvent.java b/src/main/java/org/spongepowered/api/event/world/chunk/PopulateChunkEvent.java index 38989e5702a..333389f8c6e 100644 --- a/src/main/java/org/spongepowered/api/event/world/chunk/PopulateChunkEvent.java +++ b/src/main/java/org/spongepowered/api/event/world/chunk/PopulateChunkEvent.java @@ -27,14 +27,13 @@ import org.spongepowered.api.block.BlockSnapshot; import org.spongepowered.api.data.Transaction; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.world.gen.Populator; import org.spongepowered.api.world.gen.PopulatorType; import java.util.List; import java.util.Map; -public interface PopulateChunkEvent extends TargetChunkEvent, CauseTracked { +public interface PopulateChunkEvent extends TargetChunkEvent { interface Pre extends PopulateChunkEvent { diff --git a/src/main/java/org/spongepowered/api/event/world/chunk/UnforcedChunkEvent.java b/src/main/java/org/spongepowered/api/event/world/chunk/UnforcedChunkEvent.java index d847281fc0f..8c804b8a01c 100644 --- a/src/main/java/org/spongepowered/api/event/world/chunk/UnforcedChunkEvent.java +++ b/src/main/java/org/spongepowered/api/event/world/chunk/UnforcedChunkEvent.java @@ -27,11 +27,9 @@ import com.flowpowered.math.vector.Vector3i; import org.spongepowered.api.event.Cancellable; import org.spongepowered.api.event.Event; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.world.ChunkTicketManager; -// NOTE: This does not extend TargetChunkEvent as Chunk may not be currently loaded. -public interface UnforcedChunkEvent extends Event, CauseTracked, Cancellable { +public interface UnforcedChunkEvent extends Event, Cancellable { /** * Gets the ticket that the chunk was removed from. diff --git a/src/main/java/org/spongepowered/api/event/world/chunk/UnloadChunkEvent.java b/src/main/java/org/spongepowered/api/event/world/chunk/UnloadChunkEvent.java index 6fb4fbaaac9..999b656eae4 100644 --- a/src/main/java/org/spongepowered/api/event/world/chunk/UnloadChunkEvent.java +++ b/src/main/java/org/spongepowered/api/event/world/chunk/UnloadChunkEvent.java @@ -24,12 +24,11 @@ */ package org.spongepowered.api.event.world.chunk; -import org.spongepowered.api.event.cause.CauseTracked; import org.spongepowered.api.world.Chunk; /** * An event where a {@link Chunk} is being unloaded. */ -public interface UnloadChunkEvent extends TargetChunkEvent, CauseTracked { +public interface UnloadChunkEvent extends TargetChunkEvent { }