Skip to content

Commit

Permalink
Remove CauseTracked. Graduate Cause to be used in ALL events.
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Sanders <zidane@outlook.com>
  • Loading branch information
Chris Sanders authored and gabizou committed Dec 18, 2015
1 parent 21ef11d commit 588e4eb
Show file tree
Hide file tree
Showing 64 changed files with 243 additions and 240 deletions.
3 changes: 0 additions & 3 deletions build.gradle
Expand Up @@ -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/'
Expand Down
Expand Up @@ -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()) {
Expand Down Expand Up @@ -296,7 +296,7 @@ public List<String> getSuggestions(CommandSource src, String arguments) {
try {
final String[] argSplit = arguments.split(" ", 2);
List<String> 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()) {
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/org/spongepowered/api/event/Event.java
Expand Up @@ -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;

/**
Expand All @@ -35,5 +37,11 @@
*/
@ImplementedBy(AbstractEvent.class)
public interface Event {

/**
* Get the cause for the event.
*
* @return The last cause
*/
@AbsoluteSortPosition(0)
Cause getCause();
}
240 changes: 171 additions & 69 deletions src/main/java/org/spongepowered/api/event/SpongeEventFactory.java

Large diffs are not rendered by default.

Expand Up @@ -25,15 +25,14 @@
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;

/**
* 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.
Expand Down
Expand Up @@ -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;
Expand All @@ -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}.
Expand Down
Expand Up @@ -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
Expand Down
Expand Up @@ -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 {}

Expand Down
Expand Up @@ -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
Expand Down
Expand Up @@ -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;

Expand All @@ -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
Expand Down
Expand Up @@ -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;
Expand All @@ -46,7 +45,7 @@
* Base event for when {@link BlockState}s at {@link Location<World>}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
Expand Down
Expand Up @@ -28,15 +28,14 @@
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;

/**
* 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.
Expand Down
Expand Up @@ -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;
Expand All @@ -42,7 +41,7 @@
* {@link Predicate} such that if the predicate returns <code>false</code>, 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
Expand Down
Expand Up @@ -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 {
}
Expand Up @@ -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;
Expand All @@ -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();
Expand Down
Expand Up @@ -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.
Expand Down
Expand Up @@ -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();
Expand Down
42 changes: 0 additions & 42 deletions src/main/java/org/spongepowered/api/event/cause/CauseTracked.java

This file was deleted.

Expand Up @@ -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.
Expand Down
Expand Up @@ -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.
Expand Down
Expand Up @@ -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;
Expand All @@ -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.
Expand All @@ -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<EntitySnapshot>} of the entity data
Expand Down
Expand Up @@ -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.
Expand Down
Expand Up @@ -25,15 +25,14 @@
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;

/**
* 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.
Expand Down

0 comments on commit 588e4eb

Please sign in to comment.