Skip to content

Commit 36a1650

Browse files
Furnace RecipesUsed API (#7399)
1 parent 7b8e0c3 commit 36a1650

File tree

2 files changed

+99
-0
lines changed

2 files changed

+99
-0
lines changed
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Jake Potrebic <jake.m.potrebic@gmail.com>
3+
Date: Thu, 13 Jan 2022 15:21:08 -0800
4+
Subject: [PATCH] Furnace RecipesUsed API
5+
6+
7+
diff --git a/src/main/java/org/bukkit/block/Furnace.java b/src/main/java/org/bukkit/block/Furnace.java
8+
index dbdf3dbe9517b09a7965cf9d65cae1edd87af67d..8745e5aeaa81cd42d6625f415c623daa28776647 100644
9+
--- a/src/main/java/org/bukkit/block/Furnace.java
10+
+++ b/src/main/java/org/bukkit/block/Furnace.java
11+
@@ -92,6 +92,40 @@ public interface Furnace extends Container {
12+
* @throws IllegalArgumentException if value is more than 200
13+
*/
14+
public void setCookSpeedMultiplier(double multiplier);
15+
+
16+
+ /**
17+
+ * Gets the number of times a recipe has been used since the
18+
+ * last player removed items from the result slot. This is used
19+
+ * to calculate experience rewards when withdrawing items from furnaces.
20+
+ *
21+
+ * @param furnaceRecipe the recipe to query the count for
22+
+ * @return the count or 0 if none found
23+
+ */
24+
+ int getRecipeUsedCount(@NotNull org.bukkit.NamespacedKey furnaceRecipe);
25+
+
26+
+ /**
27+
+ * Checks if the recipe has a used count present on this furnace.
28+
+ *
29+
+ * @param furnaceRecipe the recipe to check if a count exists for
30+
+ * @return true if there is a positive count, else false
31+
+ */
32+
+ boolean hasRecipeUsedCount(@NotNull org.bukkit.NamespacedKey furnaceRecipe);
33+
+
34+
+ /**
35+
+ * Sets the number of times a recipe has been used. This is used
36+
+ * to calculate experience rewards when withdrawing items from furnaces.
37+
+ *
38+
+ * @param furnaceRecipe the recipe to set the count for
39+
+ * @param count the count, a non-positive number will remove the recipe
40+
+ */
41+
+ void setRecipeUsedCount(@NotNull org.bukkit.inventory.CookingRecipe<?> furnaceRecipe, int count);
42+
+
43+
+ /**
44+
+ * Sets all recipes used by this furnace.
45+
+ *
46+
+ * @param recipesUsed the recipes used
47+
+ */
48+
+ void setRecipesUsed(@NotNull Map<CookingRecipe<?>, Integer> recipesUsed);
49+
// Paper end
50+
51+
@NotNull
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Jake Potrebic <jake.m.potrebic@gmail.com>
3+
Date: Thu, 13 Jan 2022 15:20:47 -0800
4+
Subject: [PATCH] Furnace RecipesUsed API
5+
6+
7+
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
8+
index 3da4616c904d47bbecae0d4cb6970496fbec9a8b..f49bb90e6c30dd928b352c867819b687e4557893 100644
9+
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
10+
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
11+
@@ -93,5 +93,37 @@ public abstract class CraftFurnace<T extends AbstractFurnaceBlockEntity> extends
12+
snapshot.cookSpeedMultiplier = multiplier;
13+
snapshot.cookingTotalTime = AbstractFurnaceBlockEntity.getTotalCookTime(this.isPlaced() ? this.world.getHandle() : null, snapshot.recipeType, snapshot, snapshot.cookSpeedMultiplier); // Update the snapshot's current total cook time to scale with the newly set multiplier
14+
}
15+
+
16+
+ @Override
17+
+ public int getRecipeUsedCount(org.bukkit.NamespacedKey furnaceRecipe) {
18+
+ return this.getSnapshot().getRecipesUsed().getInt(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(furnaceRecipe));
19+
+ }
20+
+
21+
+ @Override
22+
+ public boolean hasRecipeUsedCount(org.bukkit.NamespacedKey furnaceRecipe) {
23+
+ return this.getSnapshot().getRecipesUsed().containsKey(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(furnaceRecipe));
24+
+ }
25+
+
26+
+ @Override
27+
+ public void setRecipeUsedCount(org.bukkit.inventory.CookingRecipe<?> furnaceRecipe, int count) {
28+
+ final net.minecraft.resources.ResourceLocation location = org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(furnaceRecipe.getKey());
29+
+ java.util.Optional<? extends net.minecraft.world.item.crafting.Recipe<?>> nmsRecipe = (this.isPlaced() ? this.world.getHandle().getRecipeManager() : net.minecraft.server.MinecraftServer.getServer().getRecipeManager()).byKey(location);
30+
+ com.google.common.base.Preconditions.checkArgument(nmsRecipe.isPresent() && nmsRecipe.get() instanceof net.minecraft.world.item.crafting.AbstractCookingRecipe, furnaceRecipe.getKey() + " is not recognized as a valid and registered furnace recipe");
31+
+ if (count > 0) {
32+
+ this.getSnapshot().getRecipesUsed().put(location, count);
33+
+ } else {
34+
+ this.getSnapshot().getRecipesUsed().removeInt(location);
35+
+ }
36+
+ }
37+
+
38+
+ @Override
39+
+ public void setRecipesUsed(java.util.Map<org.bukkit.inventory.CookingRecipe<?>, Integer> recipesUsed) {
40+
+ this.getSnapshot().getRecipesUsed().clear();
41+
+ recipesUsed.forEach((recipe, integer) -> {
42+
+ if (integer != null) {
43+
+ this.setRecipeUsedCount(recipe, integer);
44+
+ }
45+
+ });
46+
+ }
47+
// Paper end
48+
}

0 commit comments

Comments
 (0)