Add talismans

src/main/java/io/github/pylonmc/pylon/base/BaseConfig.java

@@ -8,7 +8,7 @@ public final class BaseConfig {
 
     private static final Config config = new Config(PylonBase.getInstance(), "config.yml");
     public static final double RUNE_CHECK_RANGE = config.getOrThrow("rune-check-range", ConfigAdapter.DOUBLE);
-    public static final int HEALTH_TALISMAN_CHECK_INTERVAL = config.getOrThrow("health-talisman-check-interval", ConfigAdapter.INT);
+    public static final long DEFAULT_TALISMAN_TICK_INTERVAL = config.getOrThrow("default-talisman-tick-interval", ConfigAdapter.LONG);
 
     private BaseConfig() {}
 }

src/main/java/io/github/pylonmc/pylon/base/BaseItems.java

@@ -19,6 +19,7 @@
 import io.github.pylonmc.pylon.base.content.resources.IronBloom;
 import io.github.pylonmc.pylon.base.content.science.Loupe;
 import io.github.pylonmc.pylon.base.content.science.ResearchPack;
+import io.github.pylonmc.pylon.base.content.talismans.*;
 import io.github.pylonmc.pylon.base.content.tools.*;
 import io.github.pylonmc.pylon.core.config.Settings;
 import io.github.pylonmc.pylon.core.config.adapter.ConfigAdapter;
@@ -42,6 +43,8 @@
 import org.bukkit.inventory.recipe.CraftingBookCategory;
 import org.bukkit.potion.PotionType;
 
+import java.util.Objects;
+
 @SuppressWarnings({"UnstableApiUsage", "OverlyComplexClass"})
 public final class BaseItems {
 
@@ -798,15 +801,15 @@ private BaseItems() {
         BasePages.COMBAT.addItem(HEALTH_TALISMAN_SIMPLE);
     }
 
-    public static final ItemStack HEALTH_TALISMAN_ADVANCED = ItemStackBuilder.pylon(Material.AMETHYST_CLUSTER, BaseKeys.HEALTH_TALISMAN_ADVANCED)
+    public static final ItemStack HEALTH_TALISMAN_ADVANCED = ItemStackBuilder.pylon(Material.AMETHYST_SHARD, BaseKeys.HEALTH_TALISMAN_ADVANCED)
             .set(DataComponentTypes.MAX_STACK_SIZE, 1)
             .build();
     static {
         PylonItem.register(HealthTalisman.class, HEALTH_TALISMAN_ADVANCED);
         BasePages.COMBAT.addItem(HEALTH_TALISMAN_ADVANCED);
     }
 
-    public static final ItemStack HEALTH_TALISMAN_ULTIMATE = ItemStackBuilder.pylon(Material.BUDDING_AMETHYST, BaseKeys.HEALTH_TALISMAN_ULTIMATE)
+    public static final ItemStack HEALTH_TALISMAN_ULTIMATE = ItemStackBuilder.pylon(Material.AMETHYST_SHARD, BaseKeys.HEALTH_TALISMAN_ULTIMATE)
             .set(DataComponentTypes.MAX_STACK_SIZE, 1)
             .build();
     static {
@@ -1886,6 +1889,180 @@ private BaseItems() {
         BasePages.CARGO.addItem(CARGO_INSERTER);
     }
 
+    public static final ItemStack HUNGER_TALISMAN_SIMPLE = ItemStackBuilder.pylon(Material.CLAY_BALL, BaseKeys.HUNGER_TALISMAN_SIMPLE)
+            .set(DataComponentTypes.ITEM_MODEL, Objects.requireNonNull(Material.GOLDEN_APPLE.getDefaultData(DataComponentTypes.ITEM_MODEL)))
+            .build();
+    static {
+        PylonItem.register(HungerTalisman.class, HUNGER_TALISMAN_SIMPLE);
+        BasePages.TALISMANS.addItem(HUNGER_TALISMAN_SIMPLE);
+    }
+
+    public static final ItemStack HUNGER_TALISMAN_ADVANCED = ItemStackBuilder.pylon(Material.CLAY_BALL, BaseKeys.HUNGER_TALISMAN_ADVANCED)
+            .set(DataComponentTypes.ITEM_MODEL, Objects.requireNonNull(Material.GOLDEN_APPLE.getDefaultData(DataComponentTypes.ITEM_MODEL)))
+            .build();
+    static {
+        PylonItem.register(HungerTalisman.class, HUNGER_TALISMAN_ADVANCED);
+        BasePages.TALISMANS.addItem(HUNGER_TALISMAN_ADVANCED);
+    }
+
+    public static final ItemStack HUNGER_TALISMAN_ULTIMATE = ItemStackBuilder.pylon(Material.CLAY_BALL, BaseKeys.HUNGER_TALISMAN_ULTIMATE)
+            .set(DataComponentTypes.ITEM_MODEL, Objects.requireNonNull(Material.GOLDEN_APPLE.getDefaultData(DataComponentTypes.ITEM_MODEL)))
+            .build();
+    static {
+        PylonItem.register(HungerTalisman.class, HUNGER_TALISMAN_ULTIMATE);
+        BasePages.TALISMANS.addItem(HUNGER_TALISMAN_ULTIMATE);
+    }
+
+    public static final ItemStack FARMER_TALISMAN_SIMPLE = ItemStackBuilder.pylon(Material.BOWL, BaseKeys.FARMER_TALISMAN_SIMPLE)
+            .build();
+    static {
+        PylonItem.register(FarmerTalisman.class, FARMER_TALISMAN_SIMPLE);
+        BasePages.TALISMANS.addItem(FARMER_TALISMAN_SIMPLE);
+    }
+
+    public static final ItemStack FARMER_TALISMAN_ADVANCED = ItemStackBuilder.pylon(Material.BOWL, BaseKeys.FARMER_TALISMAN_ADVANCED)
+            .build();
+    static {
+        PylonItem.register(FarmerTalisman.class, FARMER_TALISMAN_ADVANCED);
+        BasePages.TALISMANS.addItem(FARMER_TALISMAN_ADVANCED);
+    }
+
+    public static final ItemStack FARMER_TALISMAN_ULTIMATE = ItemStackBuilder.pylon(Material.BOWL, BaseKeys.FARMER_TALISMAN_ULTIMATE)
+            .build();
+    static {
+        PylonItem.register(FarmerTalisman.class, FARMER_TALISMAN_ULTIMATE);
+        BasePages.TALISMANS.addItem(FARMER_TALISMAN_ULTIMATE);
+    }
+
+    public static final ItemStack BARTERING_TALISMAN_SIMPLE = ItemStackBuilder.pylon(Material.GOLD_INGOT, BaseKeys.BARTERING_TALISMAN_SIMPLE)
+            .build();
+    static {
+        PylonItem.register(BarteringTalisman.class, BARTERING_TALISMAN_SIMPLE);
+        BasePages.TALISMANS.addItem(BARTERING_TALISMAN_SIMPLE);
+    }
+
+    public static final ItemStack BARTERING_TALISMAN_ADVANCED = ItemStackBuilder.pylon(Material.GOLD_INGOT, BaseKeys.BARTERING_TALISMAN_ADVANCED)
+            .build();
+    static {
+        PylonItem.register(BarteringTalisman.class, BARTERING_TALISMAN_ADVANCED);
+        BasePages.TALISMANS.addItem(BARTERING_TALISMAN_ADVANCED);
+    }
+
+    public static final ItemStack BARTERING_TALISMAN_ULTIMATE = ItemStackBuilder.pylon(Material.GOLD_INGOT, BaseKeys.BARTERING_TALISMAN_ULTIMATE)
+            .build();
+    static {
+        PylonItem.register(BarteringTalisman.class, BARTERING_TALISMAN_ULTIMATE);
+        BasePages.TALISMANS.addItem(BARTERING_TALISMAN_ULTIMATE);
+    }
+
+    public static final ItemStack WATER_BREATHING_TALISMAN_SIMPLE = ItemStackBuilder.pylon(Material.NAUTILUS_SHELL, BaseKeys.WATER_BREATHING_TALISMAN_SIMPLE)
+            .build();
+    static {
+        PylonItem.register(WaterBreathingTalisman.class, WATER_BREATHING_TALISMAN_SIMPLE);
+        BasePages.TALISMANS.addItem(WATER_BREATHING_TALISMAN_SIMPLE);
+    }
+
+    public static final ItemStack WATER_BREATHING_TALISMAN_ADVANCED = ItemStackBuilder.pylon(Material.NAUTILUS_SHELL, BaseKeys.WATER_BREATHING_TALISMAN_ADVANCED)
+            .build();
+    static {
+        PylonItem.register(WaterBreathingTalisman.class, WATER_BREATHING_TALISMAN_ADVANCED);
+        BasePages.TALISMANS.addItem(WATER_BREATHING_TALISMAN_ADVANCED);
+    }
+
+    public static final ItemStack WATER_BREATHING_TALISMAN_ULTIMATE = ItemStackBuilder.pylon(Material.NAUTILUS_SHELL, BaseKeys.WATER_BREATHING_TALISMAN_ULTIMATE)
+            .build();
+    static {
+        PylonItem.register(WaterBreathingTalisman.class, WATER_BREATHING_TALISMAN_ULTIMATE);
+        BasePages.TALISMANS.addItem(WATER_BREATHING_TALISMAN_ULTIMATE);
+    }
+
+    public static final ItemStack LUCK_TALISMAN_SIMPLE = ItemStackBuilder.pylon(Material.RABBIT_FOOT, BaseKeys.LUCK_TALISMAN_SIMPLE)
+            .build();
+    static {
+        PylonItem.register(LuckTalisman.class, LUCK_TALISMAN_SIMPLE);
+        BasePages.TALISMANS.addItem(LUCK_TALISMAN_SIMPLE);
+    }
+
+    public static final ItemStack LUCK_TALISMAN_ADVANCED = ItemStackBuilder.pylon(Material.RABBIT_FOOT, BaseKeys.LUCK_TALISMAN_ADVANCED)
+            .build();
+    static {
+        PylonItem.register(LuckTalisman.class, LUCK_TALISMAN_ADVANCED);
+        BasePages.TALISMANS.addItem(LUCK_TALISMAN_ADVANCED);
+    }
+
+    public static final ItemStack LUCK_TALISMAN_ULTIMATE = ItemStackBuilder.pylon(Material.RABBIT_FOOT, BaseKeys.LUCK_TALISMAN_ULTIMATE)
+            .build();
+    static {
+        PylonItem.register(LuckTalisman.class, LUCK_TALISMAN_ULTIMATE);
+        BasePages.TALISMANS.addItem(LUCK_TALISMAN_ULTIMATE);
+    }
+
+    public static final ItemStack BREEDING_TALISMAN_SIMPLE = ItemStackBuilder.pylon(Material.APPLE, BaseKeys.BREEDING_TALISMAN_SIMPLE)
+            .build();
+    static {
+        PylonItem.register(BreedingTalisman.class, BREEDING_TALISMAN_SIMPLE);
+        BasePages.TALISMANS.addItem(BREEDING_TALISMAN_SIMPLE);
+    }
+
+    public static final ItemStack BREEDING_TALISMAN_ADVANCED = ItemStackBuilder.pylon(Material.APPLE, BaseKeys.BREEDING_TALISMAN_ADVANCED)
+            .build();
+    static {
+        PylonItem.register(BreedingTalisman.class, BREEDING_TALISMAN_ADVANCED);
+        BasePages.TALISMANS.addItem(BREEDING_TALISMAN_ADVANCED);
+    }
+
+    public static final ItemStack BREEDING_TALISMAN_ULTIMATE = ItemStackBuilder.pylon(Material.APPLE, BaseKeys.BREEDING_TALISMAN_ULTIMATE)
+            .build();
+    static {
+        PylonItem.register(BreedingTalisman.class, BREEDING_TALISMAN_ULTIMATE);
+        BasePages.TALISMANS.addItem(BREEDING_TALISMAN_ULTIMATE);
+    }
+
+    public static final ItemStack ENCHANTING_TALISMAN_SIMPLE = ItemStackBuilder.pylon(Material.ENCHANTED_BOOK, BaseKeys.ENCHANTING_TALISMAN_SIMPLE)
+            .set(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, false)
+            .build();
+    static {
+        PylonItem.register(EnchantingTalisman.class, ENCHANTING_TALISMAN_SIMPLE);
+        BasePages.TALISMANS.addItem(ENCHANTING_TALISMAN_SIMPLE);
+    }
+
+    public static final ItemStack ENCHANTING_TALISMAN_ADVANCED = ItemStackBuilder.pylon(Material.ENCHANTED_BOOK, BaseKeys.ENCHANTING_TALISMAN_ADVANCED)
+            .set(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, false)
+            .build();
+    static {
+        PylonItem.register(EnchantingTalisman.class, ENCHANTING_TALISMAN_ADVANCED);
+        BasePages.TALISMANS.addItem(ENCHANTING_TALISMAN_ADVANCED);
+    }
+
+    public static final ItemStack ENCHANTING_TALISMAN_ULTIMATE = ItemStackBuilder.pylon(Material.ENCHANTED_BOOK, BaseKeys.ENCHANTING_TALISMAN_ULTIMATE)
+            .set(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, false)
+            .build();
+    static {
+        PylonItem.register(EnchantingTalisman.class, ENCHANTING_TALISMAN_ULTIMATE);
+        BasePages.TALISMANS.addItem(ENCHANTING_TALISMAN_ULTIMATE);
+    }
+
+    public static final ItemStack HUNTING_TALISMAN_SIMPLE = ItemStackBuilder.pylon(Material.SKELETON_SKULL, BaseKeys.HUNTING_TALISMAN_SIMPLE)
+            .build();
+    static {
+        PylonItem.register(HuntingTalisman.class, HUNTING_TALISMAN_SIMPLE);
+        BasePages.TALISMANS.addItem(HUNTING_TALISMAN_SIMPLE);
+    }
+
+    public static final ItemStack HUNTING_TALISMAN_ADVANCED = ItemStackBuilder.pylon(Material.SKELETON_SKULL, BaseKeys.HUNTING_TALISMAN_ADVANCED)
+            .build();
+    static {
+        PylonItem.register(HuntingTalisman.class, HUNTING_TALISMAN_ADVANCED);
+        BasePages.TALISMANS.addItem(HUNTING_TALISMAN_ADVANCED);
+    }
+
+    public static final ItemStack HUNTING_TALISMAN_ULTIMATE = ItemStackBuilder.pylon(Material.SKELETON_SKULL, BaseKeys.HUNTING_TALISMAN_ULTIMATE)
+            .build();
+    static {
+        PylonItem.register(HuntingTalisman.class, HUNTING_TALISMAN_ULTIMATE);
+        BasePages.TALISMANS.addItem(HUNTING_TALISMAN_ULTIMATE);
+    }
+
     // Calling this method forces all the static blocks to run, which initializes our items
     public static void initialize() {
     }

src/main/java/io/github/pylonmc/pylon/base/BaseKeys.java

@@ -302,4 +302,36 @@ public class BaseKeys {
     public static final NamespacedKey CARGO_DUCT = baseKey("cargo_duct");
     public static final NamespacedKey CARGO_EXTRACTOR = baseKey("cargo_extractor");
     public static final NamespacedKey CARGO_INSERTER = baseKey("cargo_inserter");
-}
+
+    public static final NamespacedKey HUNGER_TALISMAN_SIMPLE = baseKey("hunger_talisman_simple");
+    public static final NamespacedKey HUNGER_TALISMAN_ADVANCED = baseKey("hunger_talisman_advanced");
+    public static final NamespacedKey HUNGER_TALISMAN_ULTIMATE = baseKey("hunger_talisman_ultimate");
+
+    public static final NamespacedKey FARMER_TALISMAN_SIMPLE = baseKey("farmer_talisman_simple");
+    public static final NamespacedKey FARMER_TALISMAN_ADVANCED = baseKey("farmer_talisman_advanced");
+    public static final NamespacedKey FARMER_TALISMAN_ULTIMATE = baseKey("farmer_talisman_ultimate");
+
+    public static final NamespacedKey BARTERING_TALISMAN_SIMPLE = baseKey("bartering_talisman_simple");
+    public static final NamespacedKey BARTERING_TALISMAN_ADVANCED = baseKey("bartering_talisman_advanced");
+    public static final NamespacedKey BARTERING_TALISMAN_ULTIMATE = baseKey("bartering_talisman_ultimate");
+
+    public static final NamespacedKey WATER_BREATHING_TALISMAN_SIMPLE = baseKey("water_breathing_talisman_simple");
+    public static final NamespacedKey WATER_BREATHING_TALISMAN_ADVANCED = baseKey("water_breathing_talisman_advanced");
+    public static final NamespacedKey WATER_BREATHING_TALISMAN_ULTIMATE = baseKey("water_breathing_talisman_ultimate");
+
+    public static final NamespacedKey LUCK_TALISMAN_SIMPLE = baseKey("luck_talisman_simple");
+    public static final NamespacedKey LUCK_TALISMAN_ADVANCED = baseKey("luck_talisman_advanced");
+    public static final NamespacedKey LUCK_TALISMAN_ULTIMATE = baseKey("luck_talisman_ultimate");
+
+    public static final NamespacedKey BREEDING_TALISMAN_SIMPLE = baseKey("breeding_talisman_simple");
+    public static final NamespacedKey BREEDING_TALISMAN_ADVANCED = baseKey("breeding_talisman_advanced");
+    public static final NamespacedKey BREEDING_TALISMAN_ULTIMATE = baseKey("breeding_talisman_ultimate");
+
+    public static final NamespacedKey ENCHANTING_TALISMAN_SIMPLE = baseKey("enchanting_talisman_simple");
+    public static final NamespacedKey ENCHANTING_TALISMAN_ADVANCED = baseKey("enchanting_talisman_advanced");
+    public static final NamespacedKey ENCHANTING_TALISMAN_ULTIMATE = baseKey("enchanting_talisman_ultimate");
+
+    public static final NamespacedKey HUNTING_TALISMAN_SIMPLE = baseKey("hunting_talisman_simple");
+    public static final NamespacedKey HUNTING_TALISMAN_ADVANCED = baseKey("hunting_talisman_advanced");
+    public static final NamespacedKey HUNTING_TALISMAN_ULTIMATE = baseKey("hunting_talisman_ultimate");
+}

src/main/java/io/github/pylonmc/pylon/base/BasePages.java

@@ -36,12 +36,15 @@ public boolean shouldDisplay(@NotNull Player player) {
         }
     };
 
+    public static final SimpleStaticGuidePage TALISMANS = new SimpleStaticGuidePage(baseKey("talismans"), Material.TOTEM_OF_UNDYING);
+
     static {
         PylonGuide.getRootPage().addPage(SCIENCE);
         PylonGuide.getRootPage().addPage(RESOURCES);
         PylonGuide.getRootPage().addPage(COMPONENTS);
         PylonGuide.getRootPage().addPage(TOOLS);
         PylonGuide.getRootPage().addPage(COMBAT);
+        PylonGuide.getRootPage().addPage(TALISMANS);
         PylonGuide.getRootPage().addPage(ARMOUR);
         PylonGuide.getRootPage().addPage(FOOD);
 

src/main/java/io/github/pylonmc/pylon/base/PylonBase.java

@@ -6,7 +6,7 @@
 import io.github.pylonmc.pylon.base.content.machines.fluid.Sprinkler;
 import io.github.pylonmc.pylon.base.content.machines.simple.Grindstone;
 import io.github.pylonmc.pylon.base.content.machines.smelting.Bloomery;
-import io.github.pylonmc.pylon.base.content.tools.HealthTalisman;
+import io.github.pylonmc.pylon.base.content.talismans.*;
 import io.github.pylonmc.pylon.base.content.tools.ItemMagnet;
 import io.github.pylonmc.pylon.base.content.tools.SoulboundRune;
 import io.github.pylonmc.pylon.base.content.tools.base.Rune;
@@ -61,7 +61,13 @@ public void onEnable() {
         pm.registerEvents(new Grindstone.PlaceListener(), this);
 
         new ItemMagnet.Ticker().runTaskTimer(this, 0, 10);
-        new HealthTalisman.HealthTalismanTicker().runTaskTimer(this, 0, BaseConfig.HEALTH_TALISMAN_CHECK_INTERVAL);
+
+        pm.registerEvents(new HungerTalisman.JoinListener(), this);
+        pm.registerEvents(new FarmerTalisman.FarmerTalismanListener(), this);
+        pm.registerEvents(new BarteringTalisman.BarteringTalismanListener(), this);
+        pm.registerEvents(new BreedingTalisman.BreedingTalismanListener(), this);
+        pm.registerEvents(new EnchantingTalisman.EnchantingListener(), this);
+        pm.registerEvents(new HuntingTalisman.HuntingTalismanListener(), this);
     }
 
     @Override

src/main/java/io/github/pylonmc/pylon/base/content/science/Loupe.java

@@ -2,7 +2,7 @@
 
 import com.google.common.base.Preconditions;
 import io.github.pylonmc.pylon.base.BaseKeys;
-import io.github.pylonmc.pylon.base.PylonBase;
+import io.github.pylonmc.pylon.base.util.BaseUtils;
 import io.github.pylonmc.pylon.core.block.BlockStorage;
 import io.github.pylonmc.pylon.core.config.ConfigSection;
 import io.github.pylonmc.pylon.core.config.Settings;
@@ -38,7 +38,7 @@
 @SuppressWarnings("UnstableApiUsage")
 public class Loupe extends PylonItem implements PylonInteractor, PylonConsumable {
 
-    private static final NamespacedKey CONSUMED_KEY = new NamespacedKey(PylonBase.getInstance(), "consumed");
+    private static final NamespacedKey CONSUMED_KEY = BaseUtils.baseKey("consumed");
     private static final PersistentDataType<PersistentDataContainer, Map<Material, Integer>> CONSUMED_TYPE =
             PylonSerializers.MAP.mapTypeFrom(
                     PylonSerializers.KEYED.keyedTypeFrom(Material.class, Registry.MATERIAL::getOrThrow),
@@ -142,7 +142,7 @@ public void onConsumed(@NotNull PlayerItemConsumeEvent event) {
         org.bukkit.entity.Item entityItem = hasValidItem(toScan, items);
         if (entityItem != null) {
             ItemStack stack = entityItem.getItemStack();
-            if(addPoints(stack.getType(), stack.effectiveName(), player)) return;
+            if (addPoints(stack.getType(), stack.effectiveName(), player)) return;
 
             if (stack.getAmount() == 1) {
                 entityItem.remove();

src/main/java/io/github/pylonmc/pylon/base/content/talismans/AttributeTalisman.java

@@ -0,0 +1,41 @@
+package io.github.pylonmc.pylon.base.content.talismans;
+
+import com.google.common.base.Preconditions;
+import io.github.pylonmc.pylon.core.config.adapter.ConfigAdapter;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeInstance;
+import org.bukkit.attribute.AttributeModifier;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+public abstract class AttributeTalisman extends Talisman {
+    public final double attrBonus = getSettings().getOrThrow("attr-bonus", ConfigAdapter.DOUBLE);
+    private final AttributeModifier modifier = new AttributeModifier(
+            getTalismanKey(),
+            attrBonus,
+            AttributeModifier.Operation.ADD_NUMBER
+    );
+
+    public AttributeTalisman(@NotNull ItemStack stack) {
+        super(stack);
+    }
+
+    @Override
+    public void applyEffect(@NotNull Player player) {
+        super.applyEffect(player);
+        AttributeInstance attr = player.getAttribute(getAttribute());
+        Preconditions.checkNotNull(attr);
+        attr.addModifier(modifier);
+    }
+
+    @Override
+    public void removeEffect(@NotNull Player player) {
+        super.removeEffect(player);
+        AttributeInstance attr = player.getAttribute(getAttribute());
+        Preconditions.checkNotNull(attr);
+        attr.removeModifier(getTalismanKey());
+    }
+
+    protected abstract Attribute getAttribute();
+}