Task/misc 2

src/main/java/io/github/pylonmc/pylon/PylonConfig.java

@@ -2,13 +2,18 @@
 
 import io.github.pylonmc.rebar.config.Config;
 import io.github.pylonmc.rebar.config.adapter.ConfigAdapter;
+import io.github.pylonmc.rebar.util.RandomizedSound;
 
 
 public final class PylonConfig {
 
     private static final Config config = new Config(Pylon.getInstance(), "config.yml");
     public static final double RUNE_CHECK_RANGE = config.getOrThrow("rune-check-range", ConfigAdapter.DOUBLE);
     public static final long DEFAULT_TALISMAN_TICK_INTERVAL = config.getOrThrow("default-talisman-tick-interval", ConfigAdapter.LONG);
+    public static final RandomizedSound BARTERING_TALISMAN_TRIGGER_SOUND = config.getOrThrow("talismans.bartering-trigger-sound", ConfigAdapter.RANDOMIZED_SOUND);
+    public static final RandomizedSound ENCHANTING_TALISMAN_TRIGGER_SOUND = config.getOrThrow("talismans.enchanting-trigger-sound", ConfigAdapter.RANDOMIZED_SOUND);
+    public static final RandomizedSound FARMING_TALISMAN_TRIGGER_SOUND = config.getOrThrow("talismans.farming-trigger-sound", ConfigAdapter.RANDOMIZED_SOUND);
+    public static final RandomizedSound HUNTING_TALISMAN_TRIGGER_SOUND = config.getOrThrow("talismans.hunting-trigger-sound", ConfigAdapter.RANDOMIZED_SOUND);
 
     private PylonConfig() {}
 }

src/main/java/io/github/pylonmc/pylon/content/machines/diesel/machines/DieselBreaker.java

@@ -23,7 +23,6 @@
 import io.github.pylonmc.rebar.util.gui.unit.UnitFormat;
 import io.github.pylonmc.rebar.util.position.ChunkPosition;
 import io.github.pylonmc.rebar.waila.WailaDisplay;
-import io.papermc.paper.datacomponent.DataComponentTypes;
 import io.papermc.paper.event.block.BlockBreakBlockEvent;
 import io.papermc.paper.event.block.BlockPreDispenseEvent;
 import net.kyori.adventure.text.Component;
@@ -179,10 +178,11 @@ public void tick() {
                 .count(0)
                 .extra(0.05)
                 .spawn();
-        new ParticleBuilder(Particle.BLOCK)
+        new ParticleBuilder(Particle.ITEM)
                 .count(5)
+                .extra(0.05)
                 .location(getBlock().getLocation().toCenterLocation().add(0, 0.6, 0))
-                .data(drilling.getBlockData())
+                .data(new ItemStack(drilling.getType()))
                 .spawn();
     }
 

src/main/java/io/github/pylonmc/pylon/content/machines/diesel/machines/DieselBrickMolder.java

@@ -171,10 +171,11 @@ public void tick() {
                 .count(0)
                 .extra(0.05)
                 .spawn();
-        new ParticleBuilder(Particle.BLOCK)
+        new ParticleBuilder(Particle.ITEM)
                 .count(5)
+                .extra(0.05)
                 .location(getBlock().getLocation().toCenterLocation().add(0, 0.75, 0))
-                .data(getHeldEntityOrThrow(ItemDisplay.class, "item").getItemStack().getType().createBlockData())
+                .data(getHeldEntityOrThrow(ItemDisplay.class, "item").getItemStack())
                 .spawn();
     }
 

src/main/java/io/github/pylonmc/pylon/content/machines/diesel/machines/DieselHammerHead.java

@@ -286,4 +286,4 @@ public void onBreak(@NotNull List<@NotNull ItemStack> drops, @NotNull BlockBreak
     public @NotNull Map<String, VirtualInventory> getVirtualInventories() {
         return Map.of("hammer", hammerInventory);
     }
-}
+}

src/main/java/io/github/pylonmc/pylon/content/machines/diesel/machines/DieselTableSaw.java

@@ -174,10 +174,11 @@ public void tick() {
                 .count(0)
                 .extra(0.05)
                 .spawn();
-        new ParticleBuilder(Particle.BLOCK)
+        new ParticleBuilder(Particle.ITEM)
                 .count(5)
+                .extra(0.05)
                 .location(getBlock().getLocation().toCenterLocation().add(0, 0.75, 0))
-                .data(getCurrentRecipe().particleData())
+                .data(getCurrentRecipe().particleItem())
                 .spawn();
         progressRecipe(tickInterval);
     }

src/main/java/io/github/pylonmc/pylon/content/machines/hydraulics/HydraulicBreaker.java

@@ -22,7 +22,6 @@
 import io.github.pylonmc.rebar.util.gui.unit.UnitFormat;
 import io.github.pylonmc.rebar.util.position.ChunkPosition;
 import io.github.pylonmc.rebar.waila.WailaDisplay;
-import io.papermc.paper.datacomponent.DataComponentTypes;
 import io.papermc.paper.event.block.BlockBreakBlockEvent;
 import net.kyori.adventure.text.format.TextColor;
 import org.bukkit.Material;
@@ -167,10 +166,11 @@ public void tick() {
 
         progressProcess(tickInterval);
         Block drilling = getBlock().getRelative(getFacing());
-        new ParticleBuilder(Particle.BLOCK)
+        new ParticleBuilder(Particle.ITEM)
                 .count(5)
+                .extra(0.05)
                 .location(getBlock().getLocation().toCenterLocation().add(0, 0.6, 0))
-                .data(drilling.getBlockData())
+                .data(new ItemStack(drilling.getType()))
                 .spawn();
     }
 

src/main/java/io/github/pylonmc/pylon/content/machines/hydraulics/HydraulicPipeBender.java

@@ -180,10 +180,11 @@ public void tick() {
         }
 
         if (isProcessingRecipe()) {
-            new ParticleBuilder(Particle.BLOCK)
+            new ParticleBuilder(Particle.ITEM)
                     .count(5)
+                    .extra(0.05)
                     .location(getBlock().getLocation().toCenterLocation().add(0, 0.75, 0))
-                    .data(getCurrentRecipe().particleData())
+                    .data(getCurrentRecipe().particleItem())
                     .spawn();
             removeFluid(PylonFluids.HYDRAULIC_FLUID, hydraulicFluidToConsume);
             addFluid(PylonFluids.DIRTY_HYDRAULIC_FLUID, hydraulicFluidToConsume);

src/main/java/io/github/pylonmc/pylon/content/machines/hydraulics/HydraulicTableSaw.java

@@ -150,10 +150,11 @@ public void tick() {
         }
 
         if (isProcessingRecipe()) {
-            new ParticleBuilder(Particle.BLOCK)
+            new ParticleBuilder(Particle.ITEM)
                     .count(5)
+                    .extra(0.05)
                     .location(getBlock().getLocation().toCenterLocation().add(0, 0.75, 0))
-                    .data(getCurrentRecipe().particleData())
+                    .data(getCurrentRecipe().particleItem())
                     .spawn();
             removeFluid(PylonFluids.HYDRAULIC_FLUID, hydraulicFluidToConsume);
             addFluid(PylonFluids.DIRTY_HYDRAULIC_FLUID, hydraulicFluidToConsume);

src/main/java/io/github/pylonmc/pylon/content/machines/simple/CoreDrill.java

@@ -34,7 +34,6 @@
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix4f;
 
-import java.time.Duration;
 import java.util.List;
 
 public abstract class CoreDrill extends RebarBlock implements
@@ -145,9 +144,10 @@ private void doRotationAnimation() {
 
                 PylonUtils.animate(getDrillDisplay(), rotationDuration / 4, getDrillDisplayMatrix(rotation));
                 if (spawnBlockParticles) {
-                    new ParticleBuilder(Particle.BLOCK)
+                    new ParticleBuilder(Particle.ITEM)
                             .count(5)
-                            .data(getBlock().getRelative(BlockFace.DOWN, 3).getBlockData())
+                            .extra(0.05)
+                            .data(new ItemStack(getBlock().getRelative(BlockFace.DOWN, 3).getType()))
                             .location(getBlock()
                                     .getRelative(BlockFace.DOWN, 2)
                                     .getLocation()

src/main/java/io/github/pylonmc/pylon/content/resources/IronBloom.java

@@ -94,8 +94,9 @@ public long getBaseTickInterval() {
 
     @Override
     public void onTick(@NotNull Player player) {
-        if (player.getInventory().getItemInMainHand().isSimilar(PylonItems.TONGS) ||
-                player.getInventory().getItemInOffHand().isSimilar(PylonItems.TONGS)) {
+        if (getTemperature() == 0
+                || player.getInventory().getItemInMainHand().isSimilar(PylonItems.TONGS)
+                || player.getInventory().getItemInOffHand().isSimilar(PylonItems.TONGS)) {
             return;
         }
         player.damage(UNPROTECTED_DAMAGE, DamageSource.builder(DamageType.HOT_FLOOR).build());

src/main/java/io/github/pylonmc/pylon/content/talismans/BarteringTalisman.java

@@ -1,5 +1,6 @@
 package io.github.pylonmc.pylon.content.talismans;
 
+import io.github.pylonmc.pylon.PylonConfig;
 import io.github.pylonmc.pylon.util.PylonUtils;
 import io.github.pylonmc.rebar.config.adapter.ConfigAdapter;
 import io.github.pylonmc.rebar.i18n.RebarArgument;
@@ -68,6 +69,8 @@ public void onBarter(PiglinBarterEvent event) {
             Item item = event.getEntity().getWorld().dropItem(event.getEntity().getLocation(), event.getInput().clone());
             if (!new EntityDropItemEvent(event.getEntity(), item).callEvent()) {
                 item.remove();
+            } else {
+                item.getWorld().playSound(PylonConfig.BARTERING_TALISMAN_TRIGGER_SOUND.create(), item);
             }
         }
     }

src/main/java/io/github/pylonmc/pylon/content/talismans/EnchantingTalisman.java

@@ -1,5 +1,6 @@
 package io.github.pylonmc.pylon.content.talismans;
 
+import io.github.pylonmc.pylon.PylonConfig;
 import io.github.pylonmc.pylon.util.PylonUtils;
 import io.github.pylonmc.rebar.config.adapter.ConfigAdapter;
 import io.github.pylonmc.rebar.i18n.RebarArgument;
@@ -107,6 +108,7 @@ public void onEnchant(EnchantItemEvent event) {
                 return;
             }
             UUID itemId = UUID.fromString(itemIdStr);
+            Player player = event.getEnchanter();
             for (Enchantment enchant : event.getEnchantsToAdd().keySet()) {
                 // regenerate the seed used to set the offers and check the rng again
                 Random randGen = new Random(etableView.getEnchantmentSeed()
@@ -119,6 +121,7 @@ public void onEnchant(EnchantItemEvent event) {
                 }
                 // if the offer level was increased, then also increase the applied enchant
                 event.getEnchantsToAdd().replace(enchant, Math.min(event.getEnchantsToAdd().get(enchant) + 1, enchant.getMaxLevel()));
+                player.playSound(PylonConfig.ENCHANTING_TALISMAN_TRIGGER_SOUND.create(), player);
             }
         }
     }

src/main/java/io/github/pylonmc/pylon/content/talismans/ExperienceTalisman.java

@@ -52,7 +52,7 @@ public static class XPTalismanListener implements Listener {
         @EventHandler(priority = EventPriority.LOWEST)
         public void onPlayerGainXP(PlayerPickupExperienceEvent event){
             Float xpMultiplier = event.getPlayer().getPersistentDataContainer().get(XP_MULTIPLIER_KEY, PersistentDataType.FLOAT);
-            if(xpMultiplier == null){
+            if (xpMultiplier == null){
                 return;
             }
             event.getExperienceOrb().setExperience(

src/main/java/io/github/pylonmc/pylon/content/talismans/FarmingTalisman.java

@@ -1,11 +1,15 @@
 package io.github.pylonmc.pylon.content.talismans;
 
+import io.github.pylonmc.pylon.PylonConfig;
 import io.github.pylonmc.pylon.util.PylonUtils;
 import io.github.pylonmc.rebar.config.adapter.ConfigAdapter;
 import io.github.pylonmc.rebar.i18n.RebarArgument;
 import io.github.pylonmc.rebar.util.gui.unit.UnitFormat;
+import org.bukkit.Location;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Tag;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.data.Ageable;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -53,18 +57,22 @@ public void removeEffect(@NotNull Player player) {
     public static class FarmingTalismanListener implements Listener {
         @EventHandler
         public void onBlockBreak(BlockDropItemEvent event) {
-            if (!event.getPlayer().getPersistentDataContainer().has(FARMING_TALISMAN_CHANCE_KEY)) {
+            BlockState block = event.getBlockState();
+            Location loc = block.getLocation();
+            if (!Tag.CROPS.isTagged(block.getType())
+                    || !event.getPlayer().getPersistentDataContainer().has(FARMING_TALISMAN_CHANCE_KEY)
+                    || !(block.getBlockData() instanceof Ageable ageable)
+                    || ageable.getAge() != ageable.getMaximumAge())
+            {
                 return;
             }
             List<Item> additionalDrops = new ArrayList<>();
             for (Item drop : event.getItems()) {
-                if (!Tag.CROPS.isTagged(drop.getItemStack().getType())) {
-                    continue;
-                }
                 if (ThreadLocalRandom.current().nextFloat() > event.getPlayer().getPersistentDataContainer().get(FARMING_TALISMAN_CHANCE_KEY, PersistentDataType.FLOAT)) {
                     continue;
                 }
                 additionalDrops.add(drop.getWorld().dropItem(drop.getLocation(), drop.getItemStack().clone()));
+                loc.getWorld().playSound(PylonConfig.FARMING_TALISMAN_TRIGGER_SOUND.create(), loc.getX(), loc.getY(), loc.getZ());
             }
             event.getItems().addAll(additionalDrops);
         }

src/main/java/io/github/pylonmc/pylon/content/talismans/HuntingTalisman.java

@@ -1,9 +1,11 @@
 package io.github.pylonmc.pylon.content.talismans;
 
+import io.github.pylonmc.pylon.PylonConfig;
 import io.github.pylonmc.pylon.util.PylonUtils;
 import io.github.pylonmc.rebar.config.adapter.ConfigAdapter;
 import io.github.pylonmc.rebar.i18n.RebarArgument;
 import io.github.pylonmc.rebar.util.gui.unit.UnitFormat;
+import org.bukkit.Location;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -65,6 +67,7 @@ public void onEntityDeath(EntityDeathEvent event) {
             if (event.getEntity().getType() == EntityType.PLAYER) {
                 return;
             }
+            Location source = event.getEntity().getLocation();
             @SuppressWarnings("DataFlowIssue")
             double chanceForExtraItem = player.getPersistentDataContainer().get(HUNTING_TALISMAN_BONUS_KEY, PersistentDataType.DOUBLE);
             for (ItemStack drop : event.getDrops()) {
@@ -75,6 +78,7 @@ public void onEntityDeath(EntityDeathEvent event) {
                     continue;
                 }
                 drop.setAmount(drop.getAmount() + 1);
+                source.getWorld().playSound(PylonConfig.HUNTING_TALISMAN_TRIGGER_SOUND.create(), source.getX(), source.getY(), source.getZ());
             }
         }
     }

src/main/java/io/github/pylonmc/pylon/content/tools/Hammer.java

@@ -273,4 +273,4 @@ private static MiningLevel getMiningLevel(@NotNull NamespacedKey key) {
                 PylonKeys.DIAMOND_HAMMER, MiningLevel.DIAMOND
         ).get(key);
     }
-}
+}