mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-08 19:34:09 +01:00
65bc2541a3
By: md_5 <git@md-5.net>
205 lines
10 KiB
Diff
205 lines
10 KiB
Diff
--- a/net/minecraft/world/inventory/ContainerEnchantTable.java
|
|
+++ b/net/minecraft/world/inventory/ContainerEnchantTable.java
|
|
@@ -25,6 +25,21 @@
|
|
import net.minecraft.world.level.block.BlockEnchantmentTable;
|
|
import net.minecraft.world.level.block.Blocks;
|
|
|
|
+// CraftBukkit start
|
|
+import java.util.Map;
|
|
+import net.minecraft.world.item.enchantment.Enchantment;
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.NamespacedKey;
|
|
+import org.bukkit.craftbukkit.inventory.CraftInventoryEnchanting;
|
|
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
|
|
+import org.bukkit.enchantments.EnchantmentOffer;
|
|
+import org.bukkit.event.enchantment.EnchantItemEvent;
|
|
+import org.bukkit.event.enchantment.PrepareItemEnchantEvent;
|
|
+import org.bukkit.entity.Player;
|
|
+// CraftBukkit end
|
|
+
|
|
public class ContainerEnchantTable extends Container {
|
|
|
|
static final MinecraftKey EMPTY_SLOT_LAPIS_LAZULI = new MinecraftKey("item/empty_slot_lapis_lazuli");
|
|
@@ -35,6 +50,10 @@
|
|
public final int[] costs;
|
|
public final int[] enchantClue;
|
|
public final int[] levelClue;
|
|
+ // CraftBukkit start
|
|
+ private CraftInventoryView bukkitEntity = null;
|
|
+ private Player player;
|
|
+ // CraftBukkit end
|
|
|
|
public ContainerEnchantTable(int i, PlayerInventory playerinventory) {
|
|
this(i, playerinventory, ContainerAccess.NULL);
|
|
@@ -48,6 +67,13 @@
|
|
super.setChanged();
|
|
ContainerEnchantTable.this.slotsChanged(this);
|
|
}
|
|
+
|
|
+ // CraftBukkit start
|
|
+ @Override
|
|
+ public Location getLocation() {
|
|
+ return containeraccess.getLocation();
|
|
+ }
|
|
+ // CraftBukkit end
|
|
};
|
|
this.random = RandomSource.create();
|
|
this.enchantmentSeed = ContainerProperty.standalone();
|
|
@@ -55,13 +81,13 @@
|
|
this.enchantClue = new int[]{-1, -1, -1};
|
|
this.levelClue = new int[]{-1, -1, -1};
|
|
this.access = containeraccess;
|
|
- this.addSlot(new Slot(this, this.enchantSlots, 0, 15, 47) {
|
|
+ this.addSlot(new Slot(this.enchantSlots, 0, 15, 47) { // CraftBukkit - decompile error
|
|
@Override
|
|
public int getMaxStackSize() {
|
|
return 1;
|
|
}
|
|
});
|
|
- this.addSlot(new Slot(this, this.enchantSlots, 1, 35, 47) {
|
|
+ this.addSlot(new Slot(this.enchantSlots, 1, 35, 47) { // CraftBukkit - decompile error
|
|
@Override
|
|
public boolean mayPlace(ItemStack itemstack) {
|
|
return itemstack.is(Items.LAPIS_LAZULI);
|
|
@@ -95,6 +121,9 @@
|
|
this.addDataSlot(ContainerProperty.shared(this.levelClue, 0));
|
|
this.addDataSlot(ContainerProperty.shared(this.levelClue, 1));
|
|
this.addDataSlot(ContainerProperty.shared(this.levelClue, 2));
|
|
+ // CraftBukkit start
|
|
+ player = (Player) playerinventory.player.getBukkitEntity();
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
@Override
|
|
@@ -102,7 +131,7 @@
|
|
if (iinventory == this.enchantSlots) {
|
|
ItemStack itemstack = iinventory.getItem(0);
|
|
|
|
- if (!itemstack.isEmpty() && itemstack.isEnchantable()) {
|
|
+ if (!itemstack.isEmpty()) { // CraftBukkit - relax condition
|
|
this.access.execute((world, blockposition) -> {
|
|
int i = 0;
|
|
Iterator iterator = BlockEnchantmentTable.BOOKSHELF_OFFSETS.iterator();
|
|
@@ -141,6 +170,41 @@
|
|
}
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
+ CraftItemStack item = CraftItemStack.asCraftMirror(itemstack);
|
|
+ org.bukkit.enchantments.EnchantmentOffer[] offers = new EnchantmentOffer[3];
|
|
+ for (j = 0; j < 3; ++j) {
|
|
+ org.bukkit.enchantments.Enchantment enchantment = (this.enchantClue[j] >= 0) ? org.bukkit.enchantments.Enchantment.getByKey(CraftNamespacedKey.fromMinecraft(BuiltInRegistries.ENCHANTMENT.getKey(BuiltInRegistries.ENCHANTMENT.byId(this.enchantClue[j])))) : null;
|
|
+ offers[j] = (enchantment != null) ? new EnchantmentOffer(enchantment, this.levelClue[j], this.costs[j]) : null;
|
|
+ }
|
|
+
|
|
+ PrepareItemEnchantEvent event = new PrepareItemEnchantEvent(player, this.getBukkitView(), access.getLocation().getBlock(), item, offers, i);
|
|
+ event.setCancelled(!itemstack.isEnchantable());
|
|
+ world.getCraftServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (event.isCancelled()) {
|
|
+ for (j = 0; j < 3; ++j) {
|
|
+ this.costs[j] = 0;
|
|
+ this.enchantClue[j] = -1;
|
|
+ this.levelClue[j] = -1;
|
|
+ }
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ for (j = 0; j < 3; j++) {
|
|
+ EnchantmentOffer offer = event.getOffers()[j];
|
|
+ if (offer != null) {
|
|
+ this.costs[j] = offer.getCost();
|
|
+ this.enchantClue[j] = BuiltInRegistries.ENCHANTMENT.getId(BuiltInRegistries.ENCHANTMENT.get(CraftNamespacedKey.toMinecraft(offer.getEnchantment().getKey())));
|
|
+ this.levelClue[j] = offer.getEnchantmentLevel();
|
|
+ } else {
|
|
+ this.costs[j] = 0;
|
|
+ this.enchantClue[j] = -1;
|
|
+ this.levelClue[j] = -1;
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
this.broadcastChanges();
|
|
});
|
|
} else {
|
|
@@ -168,21 +232,46 @@
|
|
ItemStack itemstack2 = itemstack;
|
|
List<WeightedRandomEnchant> list = this.getEnchantmentList(world.enabledFeatures(), itemstack, i, this.costs[i]);
|
|
|
|
- if (!list.isEmpty()) {
|
|
- entityhuman.onEnchantmentPerformed(itemstack, j);
|
|
+ // CraftBukkit start
|
|
+ if (true || !list.isEmpty()) {
|
|
+ // entityhuman.onEnchantmentPerformed(itemstack, j); // Moved down
|
|
+ Map<org.bukkit.enchantments.Enchantment, Integer> enchants = new java.util.HashMap<org.bukkit.enchantments.Enchantment, Integer>();
|
|
+ for (WeightedRandomEnchant instance : list) {
|
|
+ enchants.put(org.bukkit.enchantments.Enchantment.getByKey(CraftNamespacedKey.fromMinecraft(BuiltInRegistries.ENCHANTMENT.getKey(instance.enchantment))), instance.level);
|
|
+ }
|
|
+ CraftItemStack item = CraftItemStack.asCraftMirror(itemstack2);
|
|
+
|
|
+ org.bukkit.enchantments.Enchantment hintedEnchantment = org.bukkit.enchantments.Enchantment.getByKey(CraftNamespacedKey.fromMinecraft(BuiltInRegistries.ENCHANTMENT.getKey(Enchantment.byId(enchantClue[i]))));
|
|
+ int hintedEnchantmentLevel = levelClue[i];
|
|
+ EnchantItemEvent event = new EnchantItemEvent((Player) entityhuman.getBukkitEntity(), this.getBukkitView(), access.getLocation().getBlock(), item, this.costs[i], enchants, hintedEnchantment, hintedEnchantmentLevel, i);
|
|
+ world.getCraftServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ int level = event.getExpLevelCost();
|
|
+ if (event.isCancelled() || (level > entityhuman.experienceLevel && !entityhuman.getAbilities().instabuild) || event.getEnchantsToAdd().isEmpty()) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (itemstack.is(Items.BOOK)) {
|
|
itemstack2 = itemstack.transmuteCopy(Items.ENCHANTED_BOOK, 1);
|
|
this.enchantSlots.setItem(0, itemstack2);
|
|
}
|
|
|
|
- Iterator iterator = list.iterator();
|
|
-
|
|
- while (iterator.hasNext()) {
|
|
- WeightedRandomEnchant weightedrandomenchant = (WeightedRandomEnchant) iterator.next();
|
|
+ // CraftBukkit start
|
|
+ for (Map.Entry<org.bukkit.enchantments.Enchantment, Integer> entry : event.getEnchantsToAdd().entrySet()) {
|
|
+ NamespacedKey enchantId = entry.getKey().getKey();
|
|
+ Enchantment nms = BuiltInRegistries.ENCHANTMENT.get(CraftNamespacedKey.toMinecraft(enchantId));
|
|
+ if (nms == null) {
|
|
+ continue;
|
|
+ }
|
|
|
|
+ WeightedRandomEnchant weightedrandomenchant = new WeightedRandomEnchant(nms, entry.getValue());
|
|
itemstack2.enchant(weightedrandomenchant.enchantment, weightedrandomenchant.level);
|
|
}
|
|
|
|
+ entityhuman.onEnchantmentPerformed(itemstack, j);
|
|
+ // CraftBukkit end
|
|
+
|
|
+ // CraftBukkit - TODO: let plugins change this
|
|
if (!entityhuman.hasInfiniteMaterials()) {
|
|
itemstack1.shrink(j);
|
|
if (itemstack1.isEmpty()) {
|
|
@@ -245,6 +334,7 @@
|
|
|
|
@Override
|
|
public boolean stillValid(EntityHuman entityhuman) {
|
|
+ if (!this.checkReachable) return true; // CraftBukkit
|
|
return stillValid(this.access, entityhuman, Blocks.ENCHANTING_TABLE);
|
|
}
|
|
|
|
@@ -295,4 +385,17 @@
|
|
|
|
return itemstack;
|
|
}
|
|
+
|
|
+ // CraftBukkit start
|
|
+ @Override
|
|
+ public CraftInventoryView getBukkitView() {
|
|
+ if (bukkitEntity != null) {
|
|
+ return bukkitEntity;
|
|
+ }
|
|
+
|
|
+ CraftInventoryEnchanting inventory = new CraftInventoryEnchanting(this.enchantSlots);
|
|
+ bukkitEntity = new CraftInventoryView(this.player, inventory, this);
|
|
+ return bukkitEntity;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|