2022-02-23 04:09:15 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Thu, 7 Oct 2021 14:34:55 -0700
|
|
|
|
Subject: [PATCH] Custom Potion Mixes
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/potion/PaperPotionMix.java b/src/main/java/io/papermc/paper/potion/PaperPotionMix.java
|
|
|
|
new file mode 100644
|
2023-10-11 01:07:21 +02:00
|
|
|
index 0000000000000000000000000000000000000000..7ea357ac2f3a93db4ebdf24b5072be7d1cad3e33
|
2022-02-23 04:09:15 +01:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/io/papermc/paper/potion/PaperPotionMix.java
|
2023-10-11 01:07:21 +02:00
|
|
|
@@ -0,0 +1,21 @@
|
2022-02-23 04:09:15 +01:00
|
|
|
+package io.papermc.paper.potion;
|
|
|
|
+
|
2023-10-11 01:07:21 +02:00
|
|
|
+import java.util.function.Predicate;
|
2022-02-23 04:09:15 +01:00
|
|
|
+import net.minecraft.world.item.ItemStack;
|
|
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
|
|
+import org.bukkit.craftbukkit.inventory.CraftRecipe;
|
2023-10-11 01:07:21 +02:00
|
|
|
+import org.bukkit.inventory.RecipeChoice;
|
2022-02-23 04:09:15 +01:00
|
|
|
+
|
2023-10-11 01:07:21 +02:00
|
|
|
+public record PaperPotionMix(ItemStack result, Predicate<ItemStack> input, Predicate<ItemStack> ingredient) {
|
2022-02-23 04:09:15 +01:00
|
|
|
+
|
|
|
|
+ public PaperPotionMix(PotionMix potionMix) {
|
2023-10-11 01:07:21 +02:00
|
|
|
+ this(CraftItemStack.asNMSCopy(potionMix.getResult()), convert(potionMix.getInput()), convert(potionMix.getIngredient()));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ static Predicate<ItemStack> convert(final RecipeChoice choice) {
|
|
|
|
+ if (choice instanceof PredicateRecipeChoice predicateRecipeChoice) {
|
|
|
|
+ return stack -> predicateRecipeChoice.test(CraftItemStack.asBukkitCopy(stack));
|
|
|
|
+ }
|
|
|
|
+ return CraftRecipe.toIngredient(choice, true);
|
2022-02-23 04:09:15 +01:00
|
|
|
+ }
|
|
|
|
+}
|
2023-12-06 17:39:37 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2024-01-18 18:52:00 +01:00
|
|
|
index 15828a88b8b31f4b622a1395eda5cc195d616479..e5dccd330cbf3301a60b65453e87a4005f954716 100644
|
2023-12-06 17:39:37 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2024-01-14 10:46:04 +01:00
|
|
|
@@ -2213,6 +2213,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
2023-12-06 17:39:37 +01:00
|
|
|
|
|
|
|
this.worldData.setDataConfiguration(worlddataconfiguration);
|
|
|
|
this.resources.managers.updateRegistryTags(this.registryAccess());
|
2024-01-18 18:52:00 +01:00
|
|
|
+ net.minecraft.world.item.alchemy.PotionBrewing.reload(); // Paper - Custom Potion Mixes
|
2023-12-06 17:39:37 +01:00
|
|
|
// Paper start
|
|
|
|
if (Thread.currentThread() != this.serverThread) {
|
|
|
|
return;
|
2022-02-23 04:09:15 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java b/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java
|
2024-01-18 18:52:00 +01:00
|
|
|
index ad012400d76c263bf26cfa07e2e24f26dc32276b..054555c6b9c61243b1f14139b5c0eb2579403707 100644
|
2022-02-23 04:09:15 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java
|
2023-12-06 17:00:26 +01:00
|
|
|
@@ -169,7 +169,7 @@ public class BrewingStandMenu extends AbstractContainerMenu {
|
2022-02-23 04:09:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public static boolean mayPlaceItem(ItemStack stack) {
|
|
|
|
- return stack.is(Items.POTION) || stack.is(Items.SPLASH_POTION) || stack.is(Items.LINGERING_POTION) || stack.is(Items.GLASS_BOTTLE);
|
2024-01-18 18:52:00 +01:00
|
|
|
+ return stack.is(Items.POTION) || stack.is(Items.SPLASH_POTION) || stack.is(Items.LINGERING_POTION) || stack.is(Items.GLASS_BOTTLE) || PotionBrewing.isCustomInput(stack); // Paper - Custom Potion Mixes
|
2022-02-23 04:09:15 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/item/alchemy/PotionBrewing.java b/src/main/java/net/minecraft/world/item/alchemy/PotionBrewing.java
|
2024-01-18 18:52:00 +01:00
|
|
|
index 25e909b90293855321b8f05ab3488bad8c064853..0bba74bd22d66881fc6851797d29c1442f509445 100644
|
2022-02-23 04:09:15 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/item/alchemy/PotionBrewing.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/item/alchemy/PotionBrewing.java
|
|
|
|
@@ -14,6 +14,7 @@ public class PotionBrewing {
|
|
|
|
public static final int BREWING_TIME_SECONDS = 20;
|
|
|
|
private static final List<PotionBrewing.Mix<Potion>> POTION_MIXES = Lists.newArrayList();
|
|
|
|
private static final List<PotionBrewing.Mix<Item>> CONTAINER_MIXES = Lists.newArrayList();
|
2024-01-18 18:52:00 +01:00
|
|
|
+ private static final it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap<org.bukkit.NamespacedKey, io.papermc.paper.potion.PaperPotionMix> CUSTOM_MIXES = new it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap<>(); // Paper - Custom Potion Mixes
|
2022-02-23 04:09:15 +01:00
|
|
|
private static final List<Ingredient> ALLOWED_CONTAINERS = Lists.newArrayList();
|
|
|
|
private static final Predicate<ItemStack> ALLOWED_CONTAINER = (stack) -> {
|
|
|
|
for(Ingredient ingredient : ALLOWED_CONTAINERS) {
|
|
|
|
@@ -26,7 +27,7 @@ public class PotionBrewing {
|
|
|
|
};
|
|
|
|
|
|
|
|
public static boolean isIngredient(ItemStack stack) {
|
|
|
|
- return isContainerIngredient(stack) || isPotionIngredient(stack);
|
2024-01-18 18:52:00 +01:00
|
|
|
+ return isContainerIngredient(stack) || isPotionIngredient(stack) || isCustomIngredient(stack); // Paper - Custom Potion Mixes
|
2022-02-23 04:09:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
protected static boolean isContainerIngredient(ItemStack stack) {
|
2023-09-22 17:08:04 +02:00
|
|
|
@@ -60,6 +61,11 @@ public class PotionBrewing {
|
2022-02-23 04:09:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public static boolean hasMix(ItemStack input, ItemStack ingredient) {
|
2024-01-18 18:52:00 +01:00
|
|
|
+ // Paper start - Custom Potion Mixes
|
2022-02-23 04:09:15 +01:00
|
|
|
+ if (hasCustomMix(input, ingredient)) {
|
|
|
|
+ return true;
|
|
|
|
+ }
|
2024-01-18 18:52:00 +01:00
|
|
|
+ // Paper end - Custom Potion Mixes
|
2022-02-23 04:09:15 +01:00
|
|
|
if (!ALLOWED_CONTAINER.test(input)) {
|
|
|
|
return false;
|
|
|
|
} else {
|
2023-09-22 17:08:04 +02:00
|
|
|
@@ -93,6 +99,13 @@ public class PotionBrewing {
|
2022-02-23 04:09:15 +01:00
|
|
|
|
|
|
|
public static ItemStack mix(ItemStack ingredient, ItemStack input) {
|
|
|
|
if (!input.isEmpty()) {
|
2024-01-18 18:52:00 +01:00
|
|
|
+ // Paper start - Custom Potion Mixes
|
2022-02-23 04:09:15 +01:00
|
|
|
+ for (var mix : CUSTOM_MIXES.values()) {
|
|
|
|
+ if (mix.input().test(input) && mix.ingredient().test(ingredient)) {
|
|
|
|
+ return mix.result().copy();
|
|
|
|
+ }
|
|
|
|
+ }
|
2024-01-18 18:52:00 +01:00
|
|
|
+ // Paper end - Custom Potion Mixes
|
2022-02-23 04:09:15 +01:00
|
|
|
Potion potion = PotionUtils.getPotion(input);
|
|
|
|
Item item = input.getItem();
|
2023-09-22 17:08:04 +02:00
|
|
|
|
|
|
|
@@ -112,6 +125,54 @@ public class PotionBrewing {
|
2022-02-23 04:09:15 +01:00
|
|
|
return input;
|
|
|
|
}
|
|
|
|
|
2024-01-18 18:52:00 +01:00
|
|
|
+ // Paper start - Custom Potion Mixes
|
2022-02-23 04:09:15 +01:00
|
|
|
+ public static boolean isCustomIngredient(ItemStack stack) {
|
|
|
|
+ for (var mix : CUSTOM_MIXES.values()) {
|
|
|
|
+ if (mix.ingredient().test(stack)) {
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static boolean isCustomInput(ItemStack stack) {
|
|
|
|
+ for (var mix : CUSTOM_MIXES.values()) {
|
|
|
|
+ if (mix.input().test(stack)) {
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private static boolean hasCustomMix(ItemStack input, ItemStack ingredient) {
|
|
|
|
+ for (var mix : CUSTOM_MIXES.values()) {
|
|
|
|
+ if (mix.input().test(input) && mix.ingredient().test(ingredient)) {
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static void addPotionMix(io.papermc.paper.potion.PotionMix mix) {
|
|
|
|
+ if (CUSTOM_MIXES.containsKey(mix.getKey())) {
|
|
|
|
+ throw new IllegalArgumentException("Duplicate recipe ignored with ID " + mix.getKey());
|
|
|
|
+ }
|
|
|
|
+ CUSTOM_MIXES.putAndMoveToFirst(mix.getKey(), new io.papermc.paper.potion.PaperPotionMix(mix));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static boolean removePotionMix(org.bukkit.NamespacedKey key) {
|
|
|
|
+ return CUSTOM_MIXES.remove(key) != null;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static void reload() {
|
|
|
|
+ POTION_MIXES.clear();
|
|
|
|
+ CONTAINER_MIXES.clear();
|
|
|
|
+ ALLOWED_CONTAINERS.clear();
|
|
|
|
+ CUSTOM_MIXES.clear();
|
|
|
|
+ bootStrap();
|
|
|
|
+ }
|
2024-01-18 18:52:00 +01:00
|
|
|
+ // Paper end - Custom Potion Mixes
|
2022-02-23 04:09:15 +01:00
|
|
|
+
|
|
|
|
public static void bootStrap() {
|
|
|
|
addContainer(Items.POTION);
|
|
|
|
addContainer(Items.SPLASH_POTION);
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
|
2024-01-18 18:52:00 +01:00
|
|
|
index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..bc01481ac5990ad1cfd1def5a16dd0ed2f9de8c9 100644
|
2022-02-23 04:09:15 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
|
2023-03-14 21:55:49 +01:00
|
|
|
@@ -341,7 +341,7 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
|
2022-02-23 04:09:15 +01:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public boolean canPlaceItem(int slot, ItemStack stack) {
|
|
|
|
- return slot == 3 ? PotionBrewing.isIngredient(stack) : (slot == 4 ? stack.is(Items.BLAZE_POWDER) : (stack.is(Items.POTION) || stack.is(Items.SPLASH_POTION) || stack.is(Items.LINGERING_POTION) || stack.is(Items.GLASS_BOTTLE)) && this.getItem(slot).isEmpty());
|
2024-01-18 18:52:00 +01:00
|
|
|
+ return slot == 3 ? PotionBrewing.isIngredient(stack) : (slot == 4 ? stack.is(Items.BLAZE_POWDER) : (stack.is(Items.POTION) || stack.is(Items.SPLASH_POTION) || stack.is(Items.LINGERING_POTION) || stack.is(Items.GLASS_BOTTLE) || PotionBrewing.isCustomInput(stack)) && this.getItem(slot).isEmpty()); // Paper - Custom Potion Mixes
|
2022-02-23 04:09:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2024-01-18 18:52:00 +01:00
|
|
|
index 546b510e8ed683007c1dbcc1ab66374ce0944e70..ead1161020064ceea6d04857de5bdbce460fd59e 100644
|
2022-02-23 04:09:15 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 03:09:28 +01:00
|
|
|
@@ -304,6 +304,7 @@ public final class CraftServer implements Server {
|
2022-02-23 04:09:15 +01:00
|
|
|
private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper
|
|
|
|
public static Exception excessiveVelEx; // Paper - Velocity warnings
|
|
|
|
private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
|
2024-01-18 18:52:00 +01:00
|
|
|
+ private final CraftPotionBrewer potionBrewer = new CraftPotionBrewer(); // Paper - Custom Potion Mixes
|
2022-02-23 04:09:15 +01:00
|
|
|
|
|
|
|
static {
|
|
|
|
ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 03:09:28 +01:00
|
|
|
@@ -330,7 +331,7 @@ public final class CraftServer implements Server {
|
2023-12-06 17:00:26 +01:00
|
|
|
|
|
|
|
CraftRegistry.setMinecraftRegistry(console.registryAccess());
|
2022-02-23 04:09:15 +01:00
|
|
|
|
|
|
|
- Potion.setPotionBrewer(new CraftPotionBrewer());
|
2024-01-18 18:52:00 +01:00
|
|
|
+ Potion.setPotionBrewer(potionBrewer); // Paper - Custom Potion Mixes
|
2022-02-23 04:09:15 +01:00
|
|
|
// Ugly hack :(
|
2023-12-06 17:00:26 +01:00
|
|
|
|
|
|
|
if (!Main.useConsole) {
|
2024-01-14 10:46:04 +01:00
|
|
|
@@ -3076,5 +3077,10 @@ public final class CraftServer implements Server {
|
2022-02-23 04:09:15 +01:00
|
|
|
return datapackManager;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public CraftPotionBrewer getPotionBrewer() {
|
|
|
|
+ return this.potionBrewer;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
|
2024-01-14 10:46:04 +01:00
|
|
|
index 139dff90561ac6c51954c6289918a07aeea13a1b..6ba29875d78ede4aa7978ff689e588f7fed11528 100644
|
2022-02-23 04:09:15 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
|
2024-01-14 10:46:04 +01:00
|
|
|
@@ -15,6 +15,11 @@ public interface CraftRecipe extends Recipe {
|
2022-02-23 04:09:15 +01:00
|
|
|
void addToCraftingManager();
|
|
|
|
|
|
|
|
default Ingredient toNMS(RecipeChoice bukkit, boolean requireNotEmpty) {
|
|
|
|
+ // Paper start
|
|
|
|
+ return toIngredient(bukkit, requireNotEmpty);
|
|
|
|
+ }
|
|
|
|
+ static Ingredient toIngredient(RecipeChoice bukkit, boolean requireNotEmpty) {
|
|
|
|
+ // Paper end
|
|
|
|
Ingredient stack;
|
|
|
|
|
|
|
|
if (bukkit == null) {
|
2023-12-06 17:39:37 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java
|
|
|
|
index 09ac71b6b41c757832792d9ea8ac9288f8a7404f..2909a2736a0c9d863c7ab01e0ec259f7952080cc 100644
|
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java
|
|
|
|
@@ -28,4 +28,21 @@ public class CraftPotionBrewer implements PotionBrewer {
|
|
|
|
public PotionEffect createEffect(PotionEffectType potion, int duration, int amplifier) {
|
|
|
|
return new PotionEffect(potion, potion.isInstant() ? 1 : (int) (duration * potion.getDurationModifier()), amplifier);
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
|
|
|
+ public void addPotionMix(io.papermc.paper.potion.PotionMix potionMix) {
|
|
|
|
+ net.minecraft.world.item.alchemy.PotionBrewing.addPotionMix(potionMix);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void removePotionMix(org.bukkit.NamespacedKey key) {
|
|
|
|
+ net.minecraft.world.item.alchemy.PotionBrewing.removePotionMix(key);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void resetPotionMixes() {
|
|
|
|
+ net.minecraft.world.item.alchemy.PotionBrewing.reload();
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|