Skip to content

Commit 01d6cb6

Browse files
committed
chore(git): merge api-12 additions
Signed-off-by: Gabriel Harris-Rouquette <gabizou@me.com>
2 parents 5686ae7 + 84b580b commit 01d6cb6

File tree

2 files changed

+31
-0
lines changed

2 files changed

+31
-0
lines changed

src/main/java/org/spongepowered/api/ResourceKey.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,17 @@ static ResourceKey of(final PluginContainer plugin, final String value) {
131131
return Sponge.game().factoryProvider().provide(Factory.class).of(Objects.requireNonNull(plugin, "plugin"), Objects.requireNonNull(value, "value"));
132132
}
133133

134+
/**
135+
* Creates a resource key.
136+
*
137+
* @param key The Key
138+
* @return A new resource key
139+
*/
140+
static ResourceKey of(final Key key) {
141+
Objects.requireNonNull(key, "key");
142+
return ResourceKey.of(key.namespace(), key.value());
143+
}
144+
134145
/**
135146
* Resolves a resource key from a string.
136147
*

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
import org.spongepowered.api.event.Cancellable;
3030
import org.spongepowered.api.event.Event;
3131
import org.spongepowered.api.event.item.inventory.AffectSlotEvent;
32+
import org.spongepowered.api.event.item.inventory.container.ClickContainerEvent;
33+
import org.spongepowered.api.item.inventory.ItemStack;
3234
import org.spongepowered.api.item.inventory.ItemStackSnapshot;
35+
import org.spongepowered.api.item.inventory.slot.FuelSlot;
3336
import org.spongepowered.api.item.recipe.cooking.CookingRecipe;
3437

3538
import java.util.Optional;
@@ -64,6 +67,23 @@ public interface CookingEvent extends Event {
6467

6568
Optional<ResourceKey> recipeKey();
6669

70+
/**
71+
* Called when a {@link CookingRecipe} is used to place an
72+
* {@link ItemStack} into an {@link FuelSlot}
73+
*/
74+
interface Recipe extends CookingEvent, ClickContainerEvent, Cancellable {
75+
76+
/**
77+
* Fires when the Client requests a recipe to be smelted once.
78+
*/
79+
interface Single extends CookingEvent.Recipe {}
80+
81+
/**
82+
* Fires when the client requests a recipe to be cooking as much as possible.
83+
*/
84+
interface All extends CookingEvent.Recipe {}
85+
}
86+
6787
/**
6888
* The first tick of an item cooking.
6989
*/

0 commit comments

Comments
 (0)