net.minecraft.world.item.alchemy

2024-12-13 16:02:20 -08:00
parent f60983ac06
commit fe1744dfd1
3 changed files with 29 additions and 38 deletions
--- a/paper-server/patches/sources/net/minecraft/world/item/alchemy/PotionBrewing.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/item/alchemy/PotionBrewing.java.patch
@@ -0,0 +1,96 @@
+--- a/net/minecraft/world/item/alchemy/PotionBrewing.java
+++ b/net/minecraft/world/item/alchemy/PotionBrewing.java
+@@ -19,6 +_,7 @@
+     private final List<Ingredient> containers;
+     private final List<PotionBrewing.Mix<Potion>> potionMixes;
+     private final List<PotionBrewing.Mix<Item>> containerMixes;
+    private final it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap<org.bukkit.NamespacedKey, io.papermc.paper.potion.PaperPotionMix> customMixes = new it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap<>(); // Paper - Custom Potion Mixes
+ 
+     PotionBrewing(List<Ingredient> containers, List<PotionBrewing.Mix<Potion>> potionMixes, List<PotionBrewing.Mix<Item>> containerMixes) {
+         this.containers = containers;
+@@ -27,7 +_,7 @@
+     }
+ 
+     public boolean isIngredient(ItemStack stack) {
+-        return this.isContainerIngredient(stack) || this.isPotionIngredient(stack);
+        return this.isContainerIngredient(stack) || this.isPotionIngredient(stack) || this.isCustomIngredient(stack); // Paper - Custom Potion Mixes
+     }
+ 
+     private boolean isContainer(ItemStack stack) {
+@@ -71,6 +_,11 @@
+     }
+ 
+     public boolean hasMix(ItemStack reagent, ItemStack potionItem) {
+        // Paper start - Custom Potion Mixes
+        if (this.hasCustomMix(reagent, potionItem)) {
+            return true;
+        }
+        // Paper end - Custom Potion Mixes
+         return this.isContainer(reagent) && (this.hasContainerMix(reagent, potionItem) || this.hasPotionMix(reagent, potionItem));
+     }
+ 
+@@ -103,6 +_,13 @@
+         if (potionItem.isEmpty()) {
+             return potionItem;
+         } else {
+            // Paper start - Custom Potion Mixes
+            for (io.papermc.paper.potion.PaperPotionMix mix : this.customMixes.values()) {
+                if (mix.input().test(potionItem) && mix.ingredient().test(potion)) {
+                    return mix.result().copy();
+                }
+            }
+            // Paper end - Custom Potion Mixes
+             Optional<Holder<Potion>> optional = potionItem.getOrDefault(DataComponents.POTION_CONTENTS, PotionContents.EMPTY).potion();
+             if (optional.isEmpty()) {
+                 return potionItem;
+@@ -189,6 +_,50 @@
+         builder.addMix(Potions.AWKWARD, Items.PHANTOM_MEMBRANE, Potions.SLOW_FALLING);
+         builder.addMix(Potions.SLOW_FALLING, Items.REDSTONE, Potions.LONG_SLOW_FALLING);
+     }
+
+    // Paper start - Custom Potion Mixes
+    public boolean isCustomIngredient(ItemStack stack) {
+        for (io.papermc.paper.potion.PaperPotionMix mix : this.customMixes.values()) {
+            if (mix.ingredient().test(stack)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean isCustomInput(ItemStack stack) {
+        for (io.papermc.paper.potion.PaperPotionMix mix : this.customMixes.values()) {
+            if (mix.input().test(stack)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean hasCustomMix(ItemStack input, ItemStack ingredient) {
+        for (io.papermc.paper.potion.PaperPotionMix mix : this.customMixes.values()) {
+            if (mix.input().test(input) && mix.ingredient().test(ingredient)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void addPotionMix(io.papermc.paper.potion.PotionMix mix) {
+        if (this.customMixes.containsKey(mix.getKey())) {
+            throw new IllegalArgumentException("Duplicate recipe ignored with ID " + mix.getKey());
+        }
+        this.customMixes.putAndMoveToFirst(mix.getKey(), new io.papermc.paper.potion.PaperPotionMix(mix));
+    }
+
+    public boolean removePotionMix(org.bukkit.NamespacedKey key) {
+        return this.customMixes.remove(key) != null;
+    }
+
+    public PotionBrewing reload(FeatureFlagSet flags) {
+        return bootstrap(flags);
+    }
+    // Paper end - Custom Potion Mixes
+ 
+     public static class Builder {
+         private final List<Ingredient> containers = new ArrayList<>();
--- a/paper-server/patches/sources/net/minecraft/world/item/alchemy/PotionContents.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/item/alchemy/PotionContents.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/item/alchemy/PotionContents.java
+++ b/net/minecraft/world/item/alchemy/PotionContents.java
+@@ -158,7 +_,7 @@
+                 if (mobEffectInstance.getEffect().value().isInstantenous()) {
+                     mobEffectInstance.getEffect().value().applyInstantenousEffect(serverLevel, player1, player1, entity, mobEffectInstance.getAmplifier(), 1.0);
+                 } else {
+-                    entity.addEffect(mobEffectInstance);
+                    entity.addEffect(mobEffectInstance, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.POTION_DRINK); // CraftBukkit
+                 }
+             });
+         }