feat(game.enchantment): EnchantmentPredicates

auioc · Oct 9, 2022 · 6bbd6f3 · 6bbd6f3
1 parent b4e5d65
commit 6bbd6f3
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/enchantment/EnchantmentPredicates.java b/src/main/java/org/auioc/mcmod/arnicalib/game/enchantment/EnchantmentPredicates.java
@@ -0,0 +1,22 @@
+package org.auioc.mcmod.arnicalib.game.enchantment;
+
+import java.util.function.Predicate;
+import org.auioc.mcmod.arnicalib.game.registry.VanillaPredicates;
+import net.minecraft.world.item.enchantment.Enchantment;
+import net.minecraft.world.item.enchantment.Enchantment.Rarity;
+
+public class EnchantmentPredicates {
+
+    public static final Predicate<Enchantment> IS_VANILLA = (e) -> VanillaPredicates.REGISTRY_ENTRY.test(e);
+
+    public static final Predicate<Enchantment> IS_TREASURE_ONLY = (e) -> e.isTreasureOnly();
+    public static final Predicate<Enchantment> IS_CURSE = (e) -> e.isCurse();
+    public static final Predicate<Enchantment> IS_TRADEABLE = (e) -> e.isTradeable();
+    public static final Predicate<Enchantment> IS_DISCOVERABLE = (e) -> e.isDiscoverable();
+
+    public static final Predicate<Enchantment> IS_COMMON = (e) -> e.getRarity() == Rarity.COMMON;
+    public static final Predicate<Enchantment> IS_UNCOMMON = (e) -> e.getRarity() == Rarity.UNCOMMON;
+    public static final Predicate<Enchantment> IS_RARE = (e) -> e.getRarity() == Rarity.RARE;
+    public static final Predicate<Enchantment> IS_VERY_RARE = (e) -> e.getRarity() == Rarity.VERY_RARE;
+
+}
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/item/ItemPredicates.java b/src/main/java/org/auioc/mcmod/arnicalib/game/item/ItemPredicates.java
@@ -8,8 +8,11 @@
 
 public class ItemPredicates {
 
-    public static final Predicate<ItemStack> IS_VANILLA_ITEM = (itemStack) -> VanillaPredicates.REGISTRY_ENTRY.test(itemStack.getItem());
+    public static final Predicate<ItemStack> IS_VANILLA = (itemStack) -> VanillaPredicates.REGISTRY_ENTRY.test(itemStack.getItem());
     public static final Predicate<Item> IS_AIR = (item) -> item == Items.AIR;
     public static final Predicate<Item> IS_CATEGORIZED = (item) -> item.getItemCategory() != null;
 
+    @Deprecated(since = "5.6.2", forRemoval = true)
+    public static final Predicate<ItemStack> IS_VANILLA_ITEM = IS_VANILLA;
+
 }
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/registry/VanillaPredicates.java b/src/main/java/org/auioc/mcmod/arnicalib/game/registry/VanillaPredicates.java
@@ -4,10 +4,10 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.registries.ForgeRegistryEntry;
 
-public interface VanillaPredicates {
+public class VanillaPredicates {
 
-    Predicate<ResourceLocation> ID = (id) -> id.getNamespace().equals("minecraft");
-    Predicate<String> STRING_ID = (id) -> ID.test(new ResourceLocation(id));
-    Predicate<ForgeRegistryEntry<?>> REGISTRY_ENTRY = (entry) -> ID.test(entry.getRegistryName());
+    public static final Predicate<ResourceLocation> ID = (id) -> id.getNamespace().equals("minecraft");
+    public static final Predicate<String> STRING_ID = (id) -> ID.test(new ResourceLocation(id));
+    public static final Predicate<ForgeRegistryEntry<?>> REGISTRY_ENTRY = (entry) -> ID.test(entry.getRegistryName());
 
 }