2021-06-11 14:02:28 +02:00
|
|
|
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
|
|
|
|
|
2022-11-20 00:53:20 +01:00
|
|
|
== AT ==
|
2024-04-25 21:16:00 +02:00
|
|
|
public net.minecraft.world.item.enchantment.Enchantment definition
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2023-11-11 21:09:48 +01:00
|
|
|
Co-authored-by: Luis <luisc99@icloud.com>
|
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
|
2024-04-25 21:16:00 +02:00
|
|
|
index bb8a3e670924ebcce48669c5dce57e2df03fad77..bb45dde0fd91796d5fd83a5fd20f5f1d5ad63ee7 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
|
2024-04-24 15:46:45 +02:00
|
|
|
@@ -71,7 +71,7 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public boolean isCursed() {
|
2023-12-06 04:57:46 +01:00
|
|
|
- return this.handle instanceof BindingCurseEnchantment || this.handle instanceof VanishingCurseEnchantment;
|
2024-01-19 13:22:30 +01:00
|
|
|
+ return this.handle.isCurse(); // Paper - More Enchantment API
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
2024-04-25 21:16:00 +02:00
|
|
|
@@ -150,6 +150,63 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
|
2021-08-14 06:11:12 +02:00
|
|
|
public String translationKey() {
|
2023-12-06 19:21:23 +01:00
|
|
|
return this.handle.getDescriptionId();
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isTradeable() {
|
2023-12-06 19:21:23 +01:00
|
|
|
+ return handle.isTradeable();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isDiscoverable() {
|
2023-12-06 19:21:23 +01:00
|
|
|
+ return handle.isDiscoverable();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2023-11-11 21:09:48 +01:00
|
|
|
+ public int getMinModifiedCost(int level) {
|
2023-12-06 19:21:23 +01:00
|
|
|
+ return handle.getMinCost(level);
|
2023-11-11 21:09:48 +01:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int getMaxModifiedCost(int level) {
|
2023-12-06 19:21:23 +01:00
|
|
|
+ return handle.getMaxCost(level);
|
2023-11-11 21:09:48 +01:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2021-06-11 14:02:28 +02:00
|
|
|
+ public io.papermc.paper.enchantments.EnchantmentRarity getRarity() {
|
2024-04-25 21:16:00 +02:00
|
|
|
+ throw new UnsupportedOperationException("Enchantments don't have a rarity anymore in 1.20.5+.");
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public float getDamageIncrease(int level, org.bukkit.entity.EntityCategory entityCategory) {
|
2024-04-25 18:42:50 +02:00
|
|
|
+ return handle.getDamageBonus(level, guessEntityTypeFromEnchantmentCategory(entityCategory));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public float getDamageIncrease(int level, org.bukkit.entity.EntityType entityType) {
|
|
|
|
+ return handle.getDamageBonus(level, org.bukkit.craftbukkit.util.CraftMagicNumbers.getEntityTypes(entityType));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Deprecated(forRemoval = true)
|
|
|
|
+ private net.minecraft.world.entity.EntityType<?> guessEntityTypeFromEnchantmentCategory(
|
|
|
|
+ final org.bukkit.entity.EntityCategory entityCategory
|
|
|
|
+ ) {
|
|
|
|
+ final net.minecraft.tags.TagKey<net.minecraft.world.entity.EntityType<?>> tag = switch (entityCategory) {
|
|
|
|
+ case ARTHROPOD -> net.minecraft.tags.EntityTypeTags.SENSITIVE_TO_BANE_OF_ARTHROPODS;
|
|
|
|
+ case UNDEAD -> net.minecraft.tags.EntityTypeTags.SENSITIVE_TO_SMITE;
|
|
|
|
+ case WATER -> net.minecraft.tags.EntityTypeTags.SENSITIVE_TO_IMPALING;
|
|
|
|
+ default -> null;
|
|
|
|
+ };
|
|
|
|
+ if (tag == null) return null;
|
|
|
|
+
|
|
|
|
+ return net.minecraft.core.registries.BuiltInRegistries.ENTITY_TYPE.getTag(tag)
|
|
|
|
+ .map(e -> e.size() > 0 ? e.get(0).value() : null)
|
|
|
|
+ .orElse(null);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public java.util.Set<org.bukkit.inventory.EquipmentSlot> getActiveSlots() {
|
2024-04-25 21:16:00 +02:00
|
|
|
+ return java.util.stream.Stream.of(handle.definition.slots()).map(org.bukkit.craftbukkit.CraftEquipmentSlot::getSlot).collect(java.util.stream.Collectors.toSet());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
|
2023-12-06 04:57:46 +01:00
|
|
|
@Override
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/test/java/io/papermc/paper/entity/EntityCategoryTest.java b/src/test/java/io/papermc/paper/entity/EntityCategoryTest.java
|
|
|
|
new file mode 100644
|
2023-09-24 09:16:58 +02:00
|
|
|
index 0000000000000000000000000000000000000000..4ee48ef89f0e31a7bda4b04453fca8177874f540
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/test/java/io/papermc/paper/entity/EntityCategoryTest.java
|
|
|
|
@@ -0,0 +1,34 @@
|
|
|
|
+package io.papermc.paper.entity;
|
|
|
|
+
|
|
|
|
+import com.google.common.base.Joiner;
|
|
|
|
+import com.google.common.collect.Maps;
|
|
|
|
+import com.google.common.collect.Sets;
|
2021-06-15 04:59:31 +02:00
|
|
|
+import net.minecraft.world.entity.MobType;
|
2021-06-11 14:02:28 +02:00
|
|
|
+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
|
|
|
|
+import org.bukkit.entity.EntityCategory;
|
2023-09-24 09:16:58 +02:00
|
|
|
+import org.junit.jupiter.api.Test;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+import java.lang.reflect.Field;
|
|
|
|
+import java.util.Map;
|
|
|
|
+import java.util.Set;
|
|
|
|
+
|
2023-09-24 09:16:58 +02:00
|
|
|
+import static org.junit.jupiter.api.Assertions.assertTrue;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+public class EntityCategoryTest {
|
|
|
|
+
|
|
|
|
+ @Test
|
|
|
|
+ public void test() throws IllegalAccessException {
|
|
|
|
+
|
2021-06-15 04:59:31 +02:00
|
|
|
+ Map<MobType, String> enumMonsterTypeFieldMap = Maps.newHashMap();
|
|
|
|
+ for (Field field : MobType.class.getDeclaredFields()) {
|
|
|
|
+ if (field.getType() == MobType.class) {
|
|
|
|
+ enumMonsterTypeFieldMap.put( (MobType) field.get(null), field.getName());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ for (EntityCategory entityCategory : EntityCategory.values()) {
|
|
|
|
+ enumMonsterTypeFieldMap.remove(CraftLivingEntity.fromBukkitEntityCategory(entityCategory));
|
|
|
|
+ }
|
2023-09-24 09:16:58 +02:00
|
|
|
+ assertTrue(enumMonsterTypeFieldMap.size() == 0, MobType.class.getName() + " instance(s): " + Joiner.on(", ").join(enumMonsterTypeFieldMap.values()) + " do not have bukkit equivalents");
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+}
|