Skip to content

Commit e42b625

Browse files
committed
Change Cooking and Brewing events to use AffectSlotEvent
1 parent 289329a commit e42b625

File tree

2 files changed

+6
-31
lines changed

2 files changed

+6
-31
lines changed

src/main/java/org/spongepowered/api/event/block/entity/BrewingEvent.java

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@
2525
package org.spongepowered.api.event.block.entity;
2626

2727
import org.spongepowered.api.block.entity.carrier.BrewingStand;
28-
import org.spongepowered.api.data.Transaction;
2928
import org.spongepowered.api.event.Cancellable;
3029
import org.spongepowered.api.event.Event;
30+
import org.spongepowered.api.event.item.inventory.AffectSlotEvent;
3131
import org.spongepowered.api.item.inventory.ItemStack;
3232
import org.spongepowered.api.item.inventory.ItemStackSnapshot;
3333

34-
import java.util.List;
3534

3635
/**
3736
* Fires during the brewing process where {@link ItemStack}s are brewed into different {@link ItemStack}s
@@ -61,15 +60,7 @@ interface Start extends BrewingEvent, Cancellable {}
6160
/**
6261
* Fired when a fuel item is consumed to refill the fuel bar.
6362
*/
64-
interface ConsumeFuel extends BrewingEvent, Cancellable {
65-
66-
/**
67-
* The consumed fuel transaction.
68-
*
69-
* @return The consumed fuel transaction.
70-
*/
71-
Transaction<ItemStackSnapshot> fuel();
72-
63+
interface ConsumeFuel extends BrewingEvent, AffectSlotEvent, Cancellable {
7364
}
7465

7566
/**
@@ -85,14 +76,6 @@ interface Interrupt extends BrewingEvent {}
8576
/**
8677
* Fires when brewing finished.
8778
*/
88-
interface Finish extends BrewingEvent {
89-
90-
/**
91-
* Gets an immutable {@link List} of {@link ItemStackSnapshot}s that are the result
92-
* of the brew.
93-
*
94-
* @return The brewed items
95-
*/
96-
List<ItemStackSnapshot> brewedItemStacks();
79+
interface Finish extends BrewingEvent, AffectSlotEvent {
9780
}
9881
}

src/main/java/org/spongepowered/api/event/block/entity/CookingEvent.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@
2828
import org.spongepowered.api.block.entity.BlockEntity;
2929
import org.spongepowered.api.event.Cancellable;
3030
import org.spongepowered.api.event.Event;
31-
import org.spongepowered.api.event.item.inventory.AffectItemStackEvent;
31+
import org.spongepowered.api.event.item.inventory.AffectSlotEvent;
3232
import org.spongepowered.api.item.inventory.ItemStackSnapshot;
3333
import org.spongepowered.api.item.recipe.cooking.CookingRecipe;
3434

35-
import java.util.List;
3635
import java.util.Optional;
3736

3837
/**
@@ -74,7 +73,7 @@ interface Start extends CookingEvent, Cancellable {}
7473
* Fires whenever fuel is consumed to refill the current burn time.
7574
* Canceling this event prevents fuel from being consumed in a furnace In the current burn time to 0.
7675
*/
77-
interface ConsumeFuel extends CookingEvent, AffectItemStackEvent {}
76+
interface ConsumeFuel extends CookingEvent, AffectSlotEvent {}
7877

7978
/**
8079
* The cooking timer ticking up or down.
@@ -95,13 +94,6 @@ interface Tick extends CookingEvent, Cancellable {
9594
interface Interrupt extends CookingEvent {
9695
}
9796

98-
interface Finish extends CookingEvent {
99-
/**
100-
* Gets an immutable {@link List} of {@link ItemStackSnapshot}s that are the result of the cooking.
101-
* Always exactly one item.
102-
*
103-
* @return The cooked items
104-
*/
105-
List<ItemStackSnapshot> cookedItems();
97+
interface Finish extends CookingEvent, AffectSlotEvent {
10698
}
10799
}

0 commit comments

Comments
 (0)