mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 15:30:19 +01:00
8c5b837e05
Firstly, the old methods all routed to the CompletableFuture method. However, the CF method could not guarantee that if the caller was off-main that the future would be "completed" on-main. Since the callback methods used the CF one, this meant that the callback methods did not guarantee that the callbacks were to be called on the main thread. Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb) so that the methods with the callback are guaranteed to invoke the callback on the main thread. The CF behavior remains unchanged; it may still appear to complete on main if invoked off-main. Secondly, remove the scheduleOnMain invocation in the async chunk completion. This unnecessarily delays the callback by 1 tick. Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which will load chunks within an area. This method is provided as a helper as keeping all chunks loaded within an area can be complicated to implement for plugins (due to the lacking ticket API), and is already implemented internally anyways. Fourthly, remove the ticket addition that occured with getChunkAt and getChunkAtAsync. The ticket addition may delay the unloading of the chunk unnecessarily. It also fixes a very rare timing bug where the future/callback would be completed after the chunk unloads.
105 lines
4.3 KiB
Diff
105 lines
4.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Thu, 6 May 2021 19:57:58 -0700
|
|
Subject: [PATCH] More Enchantment API
|
|
|
|
== AT ==
|
|
public net.minecraft.world.item.enchantment.Enchantment definition
|
|
|
|
Co-authored-by: Luis <luisc99@icloud.com>
|
|
Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
|
|
index 59c9c970b83f62245d860994c4ac0c21dcc15398..4221a1e9cba35c8dc58e51e162e7fcbd0e8b31af 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
|
|
@@ -5,6 +5,7 @@ import java.util.Locale;
|
|
import net.minecraft.Util;
|
|
import net.minecraft.core.Holder;
|
|
import net.minecraft.core.registries.Registries;
|
|
+import net.minecraft.network.chat.contents.TranslatableContents;
|
|
import net.minecraft.tags.EnchantmentTags;
|
|
import org.bukkit.NamespacedKey;
|
|
import org.bukkit.Registry;
|
|
@@ -90,7 +91,7 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
|
|
|
|
@Override
|
|
public boolean isTreasure() {
|
|
- return !this.handle.is(EnchantmentTags.IN_ENCHANTING_TABLE);
|
|
+ return this.handle.is(EnchantmentTags.TREASURE); // Paper - use treasure tag
|
|
}
|
|
|
|
@Override
|
|
@@ -148,7 +149,7 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
|
|
// Paper start
|
|
@Override
|
|
public net.kyori.adventure.text.Component displayName(int level) {
|
|
- return io.papermc.paper.adventure.PaperAdventure.asAdventure(getHandle().getFullname(level));
|
|
+ return io.papermc.paper.adventure.PaperAdventure.asAdventure(net.minecraft.world.item.enchantment.Enchantment.getFullname(this.handle, level));
|
|
}
|
|
// Paper end
|
|
|
|
@@ -159,10 +160,62 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
|
|
throw new UnsupportedOperationException("Description isn't translatable!"); // Paper
|
|
}
|
|
return translatableContents.getKey();
|
|
-
|
|
}
|
|
// Paper end - add translationKey methods
|
|
|
|
+ // Paper start - more Enchantment API
|
|
+ @Override
|
|
+ public boolean isTradeable() {
|
|
+ return this.handle.is(EnchantmentTags.TRADEABLE);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isDiscoverable() {
|
|
+ return this.handle.is(EnchantmentTags.IN_ENCHANTING_TABLE)
|
|
+ || this.handle.is(EnchantmentTags.ON_RANDOM_LOOT)
|
|
+ || this.handle.is(EnchantmentTags.ON_MOB_SPAWN_EQUIPMENT)
|
|
+ || this.handle.is(EnchantmentTags.TRADEABLE)
|
|
+ || this.handle.is(EnchantmentTags.ON_TRADED_EQUIPMENT);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int getMinModifiedCost(int level) {
|
|
+ return this.getHandle().definition().minCost().calculate(level);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int getMaxModifiedCost(int level) {
|
|
+ return this.getHandle().definition().maxCost().calculate(level);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int getAnvilCost() {
|
|
+ return this.getHandle().definition().anvilCost();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public io.papermc.paper.enchantments.EnchantmentRarity getRarity() {
|
|
+ throw new UnsupportedOperationException("Enchantments don't have a rarity anymore in 1.20.5+.");
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public float getDamageIncrease(int level, org.bukkit.entity.EntityCategory entityCategory) {
|
|
+ throw new UnsupportedOperationException("Enchantments are based on complex effect maps since 1.21, cannot compute a simple damage increase");
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public float getDamageIncrease(int level, org.bukkit.entity.EntityType entityType) {
|
|
+ throw new UnsupportedOperationException("Enchantments are based on complex effect maps since 1.21, cannot compute a simple damage increase");
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public java.util.Set<org.bukkit.inventory.EquipmentSlotGroup> getActiveSlotGroups() {
|
|
+ return this.getHandle().definition().slots().stream()
|
|
+ .map(org.bukkit.craftbukkit.CraftEquipmentSlot::getSlot)
|
|
+ .collect(java.util.stream.Collectors.toSet());
|
|
+ }
|
|
+ // Paper end - more Enchantment API
|
|
+
|
|
@Override
|
|
public String getTranslationKey() {
|
|
return Util.makeDescriptionId("enchantment", this.handle.unwrapKey().get().location());
|