From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Thu, 6 May 2021 19:57:58 -0700 Subject: [PATCH] More Enchantment API == AT == public net.minecraft.world.item.enchantment.Enchantment slots Co-authored-by: Luis diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java index e8f03a40db4505c1e7f2aeb8946c207833acd416..8f42ee46759b007055b71fd70ab85a3bf4c4c8bc 100644 --- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java +++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java @@ -90,7 +90,7 @@ public class CraftEnchantment extends Enchantment { @Override public boolean isCursed() { - return this.handle instanceof BindingCurseEnchantment || this.handle instanceof VanishingCurseEnchantment; + return this.handle.isCurse(); // Paper } @Override @@ -166,6 +166,55 @@ public class CraftEnchantment extends Enchantment { public String translationKey() { return this.target.getDescriptionId(); } + + @Override + public boolean isTradeable() { + return target.isTradeable(); + } + + @Override + public boolean isDiscoverable() { + return target.isDiscoverable(); + } + + @Override + public int getMinModifiedCost(int level) { + return target.getMinCost(level); + } + + @Override + public int getMaxModifiedCost(int level) { + return target.getMaxCost(level); + } + + @Override + public io.papermc.paper.enchantments.EnchantmentRarity getRarity() { + return fromNMSRarity(target.getRarity()); + } + + @Override + public float getDamageIncrease(int level, org.bukkit.entity.EntityCategory entityCategory) { + return target.getDamageBonus(level, org.bukkit.craftbukkit.entity.CraftLivingEntity.fromBukkitEntityCategory(entityCategory)); + } + + @Override + public java.util.Set getActiveSlots() { + return java.util.stream.Stream.of(target.slots).map(org.bukkit.craftbukkit.CraftEquipmentSlot::getSlot).collect(java.util.stream.Collectors.toSet()); + } + + public static io.papermc.paper.enchantments.EnchantmentRarity fromNMSRarity(net.minecraft.world.item.enchantment.Enchantment.Rarity nmsRarity) { + if (nmsRarity == net.minecraft.world.item.enchantment.Enchantment.Rarity.COMMON) { + return io.papermc.paper.enchantments.EnchantmentRarity.COMMON; + } else if (nmsRarity == net.minecraft.world.item.enchantment.Enchantment.Rarity.UNCOMMON) { + return io.papermc.paper.enchantments.EnchantmentRarity.UNCOMMON; + } else if (nmsRarity == net.minecraft.world.item.enchantment.Enchantment.Rarity.RARE) { + return io.papermc.paper.enchantments.EnchantmentRarity.RARE; + } else if (nmsRarity == net.minecraft.world.item.enchantment.Enchantment.Rarity.VERY_RARE) { + return io.papermc.paper.enchantments.EnchantmentRarity.VERY_RARE; + } + + throw new IllegalArgumentException(String.format("Unable to convert %s to a enum value of %s.", nmsRarity, io.papermc.paper.enchantments.EnchantmentRarity.class)); + } // Paper end @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index 23e1d67bb239fb1ceb66d7b4a69bdba4917fa19c..d54a67c9942b986adc9e0a06640c90d99bdcdada 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -954,5 +954,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public void setHurtDirection(float hurtDirection) { throw new UnsupportedOperationException("Cannot set the hurt direction on a non player"); } + + public static MobType fromBukkitEntityCategory(EntityCategory entityCategory) { + switch (entityCategory) { + case NONE: + return MobType.UNDEFINED; + case UNDEAD: + return MobType.UNDEAD; + case ARTHROPOD: + return MobType.ARTHROPOD; + case ILLAGER: + return MobType.ILLAGER; + case WATER: + return MobType.WATER; + } + throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category"); + } // Paper end } diff --git a/src/test/java/io/papermc/paper/enchantments/EnchantmentRarityTest.java b/src/test/java/io/papermc/paper/enchantments/EnchantmentRarityTest.java new file mode 100644 index 0000000000000000000000000000000000000000..03a53ceb0dc3aaff7b5d10ec57f74d71be90ec3a --- /dev/null +++ b/src/test/java/io/papermc/paper/enchantments/EnchantmentRarityTest.java @@ -0,0 +1,18 @@ +package io.papermc.paper.enchantments; + +import net.minecraft.world.item.enchantment.Enchantment.Rarity; +import org.bukkit.craftbukkit.enchantments.CraftEnchantment; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +public class EnchantmentRarityTest { + + @Test + public void test() { + for (Rarity nmsRarity : Rarity.values()) { + // Will throw exception if a bukkit counterpart is not found + CraftEnchantment.fromNMSRarity(nmsRarity); + } + } +} 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 index 0000000000000000000000000000000000000000..4ee48ef89f0e31a7bda4b04453fca8177874f540 --- /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; +import net.minecraft.world.entity.MobType; +import org.bukkit.craftbukkit.entity.CraftLivingEntity; +import org.bukkit.entity.EntityCategory; +import org.junit.jupiter.api.Test; + +import java.lang.reflect.Field; +import java.util.Map; +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class EntityCategoryTest { + + @Test + public void test() throws IllegalAccessException { + + Map enumMonsterTypeFieldMap = Maps.newHashMap(); + for (Field field : MobType.class.getDeclaredFields()) { + if (field.getType() == MobType.class) { + enumMonsterTypeFieldMap.put( (MobType) field.get(null), field.getName()); + } + } + + for (EntityCategory entityCategory : EntityCategory.values()) { + enumMonsterTypeFieldMap.remove(CraftLivingEntity.fromBukkitEntityCategory(entityCategory)); + } + assertTrue(enumMonsterTypeFieldMap.size() == 0, MobType.class.getName() + " instance(s): " + Joiner.on(", ").join(enumMonsterTypeFieldMap.values()) + " do not have bukkit equivalents"); + } +}