Fix all the bugs

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

@@ -1,15 +1,10 @@
 package io.github.pylonmc.pylon.base;
 
 import io.github.pylonmc.pylon.base.content.machines.smelting.Slurry;
-import io.github.pylonmc.pylon.base.recipes.CastingRecipe;
-import io.github.pylonmc.pylon.base.recipes.MeltingRecipe;
 import io.github.pylonmc.pylon.core.fluid.PylonFluid;
 import io.github.pylonmc.pylon.core.fluid.tags.FluidTemperature;
-import io.github.pylonmc.pylon.core.recipe.RecipeInput;
 import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.Nullable;
 
 import static io.github.pylonmc.pylon.base.util.BaseUtils.baseKey;
 
@@ -158,171 +153,33 @@ private BaseFluids() {
     // TODO refactor into static blocks as in BaseItems
     public static void initialize() {
         WATER.register();
-
         LAVA.register();
-
         OBSCYRA.register();
-
         SULFUR.register();
-
         MERCURY.register();
-
         COPPER.register();
-        addMetalRecipes(
-                COPPER,
-                1083,
-                new ItemStack(Material.COPPER_INGOT),
-                BaseItems.COPPER_DUST,
-                null,
-                new ItemStack(Material.COPPER_BLOCK)
-        );
-
         GOLD.register();
-        addMetalRecipes(
-                GOLD,
-                1064,
-                new ItemStack(Material.GOLD_INGOT),
-                BaseItems.GOLD_DUST,
-                null,
-                new ItemStack(Material.GOLD_BLOCK)
-        );
-
         IRON.register();
-        addMetalRecipes(
-                IRON,
-                1064,
-                new ItemStack(Material.IRON_INGOT),
-                BaseItems.IRON_DUST,
-                new ItemStack(Material.IRON_NUGGET),
-                new ItemStack(Material.IRON_BLOCK)
-        );
-
         TIN.register();
-        addMetalRecipes(
-                TIN,
-                231.9,
-                BaseItems.TIN_INGOT,
-                BaseItems.TIN_DUST,
-                BaseItems.TIN_NUGGET,
-                BaseItems.TIN_BLOCK
-        );
-
         COBALT.register();
-        addMetalRecipes(
-                COBALT,
-                1495,
-                BaseItems.COBALT_INGOT,
-                BaseItems.COBALT_DUST,
-                BaseItems.COBALT_NUGGET,
-                BaseItems.COBALT_BLOCK
-        );
-
         NICKEL.register();
-        addMetalRecipes(
-                NICKEL,
-                1455,
-                BaseItems.NICKEL_INGOT,
-                BaseItems.NICKEL_DUST,
-                BaseItems.NICKEL_NUGGET,
-                BaseItems.NICKEL_BLOCK
-        );
-
         BRONZE.register();
-        addMetalRecipes(
-                BRONZE,
-                950,
-                BaseItems.BRONZE_INGOT,
-                BaseItems.BRONZE_DUST,
-                BaseItems.BRONZE_NUGGET,
-                BaseItems.BRONZE_BLOCK
-        );
-
         STEEL.register();
-        addMetalRecipes(
-                STEEL,
-                950,
-                BaseItems.STEEL_INGOT,
-                BaseItems.STEEL_DUST,
-                BaseItems.STEEL_NUGGET,
-                BaseItems.STEEL_BLOCK
-        );
 
         SLURRY.register();
-
         COAL_SLURRY.register();
-
         CARBON_SLURRY.register();
-
         SPONGE_IRON_SLURRY.register();
-
         RAW_COPPER_SLURRY.register();
-
         RAW_GOLD_SLURRY.register();
-
         RAW_IRON_SLURRY.register();
-
         RAW_TIN_SLURRY.register();
-
         REDSTONE_SLURRY.register();
 
         PLANT_OIL.register();
-
         HYDRAULIC_FLUID.register();
-
         DIRTY_HYDRAULIC_FLUID.register();
-
         REFLECTOR_FLUID.register();
-
         BIODIESEL.register();
     }
-
-    private static void addMetalRecipes(
-            PylonFluid fluid,
-            double temperature,
-            ItemStack ingot,
-            ItemStack dust,
-            @Nullable ItemStack nugget,
-            ItemStack block
-    ) {
-        CastingRecipe.RECIPE_TYPE.addRecipe(new CastingRecipe(
-                NamespacedKey.fromString(fluid.getKey() + "_to_ingot"),
-                RecipeInput.of(fluid, 144.0),
-                ingot,
-                temperature
-        ));
-
-        MeltingRecipe.RECIPE_TYPE.addRecipe(new MeltingRecipe(
-                NamespacedKey.fromString(fluid.getKey() + "_from_ingot"),
-                RecipeInput.of(ingot),
-                fluid,
-                144.0,
-                temperature
-        ));
-
-        MeltingRecipe.RECIPE_TYPE.addRecipe(new MeltingRecipe(
-                NamespacedKey.fromString(fluid.getKey() + "_from_dust"),
-                RecipeInput.of(dust),
-                fluid,
-                144.0,
-                temperature
-        ));
-
-        if (nugget != null) {
-            MeltingRecipe.RECIPE_TYPE.addRecipe(new MeltingRecipe(
-                    NamespacedKey.fromString(fluid.getKey() + "_from_nugget"),
-                    RecipeInput.of(nugget),
-                    fluid,
-                    16.0,
-                    temperature
-            ));
-        }
-
-        MeltingRecipe.RECIPE_TYPE.addRecipe(new MeltingRecipe(
-                NamespacedKey.fromString(fluid.getKey() + "_from_block"),
-                RecipeInput.of(block),
-                fluid,
-                1296.0,
-                temperature
-        ));
-    }
 }

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

@@ -4,6 +4,8 @@
 import io.github.pylonmc.pylon.base.content.building.IgneousCompositeListener;
 import io.github.pylonmc.pylon.base.content.building.Immobilizer;
 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.tools.HealthTalisman;
 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.tools.ItemMagnet;
@@ -59,9 +61,10 @@ public void onEnable() {
         pm.registerEvents(new Rune.RuneListener(), this);
         pm.registerEvents(new SoulboundRune.SoulboundRuneListener(), this);
         pm.registerEvents(new Bloomery.CreationListener(), this);
+        pm.registerEvents(new Grindstone.PlaceListener(), this);
 
         new ItemMagnet.Ticker().runTaskTimer(this, 0, 10);
-        new HealthTalisman.HealthTalismanTicker().runTaskTimer(this, 0, 40);
+        new HealthTalisman.HealthTalismanTicker().runTaskTimer(this, 0, BaseConfig.HEALTH_TALISMAN_CHECK_INTERVAL);
     }
 
     @Override

src/main/java/io/github/pylonmc/pylon/base/content/building/Immobilizer.java

@@ -9,6 +9,7 @@
 import io.github.pylonmc.pylon.core.config.adapter.ConfigAdapter;
 import io.github.pylonmc.pylon.core.i18n.PylonArgument;
 import io.github.pylonmc.pylon.core.item.PylonItem;
+import io.github.pylonmc.pylon.core.util.gui.unit.UnitFormat;
 import io.github.pylonmc.pylon.core.util.position.BlockPosition;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
@@ -26,6 +27,7 @@
 import org.bukkit.scheduler.BukkitScheduler;
 import org.jetbrains.annotations.NotNull;
 
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -46,9 +48,9 @@ public Item(@NotNull ItemStack stack) {
         @Override
         public @NotNull List<PylonArgument> getPlaceholders() {
             return List.of(
-                    PylonArgument.of("duration", duration),
-                    PylonArgument.of("radius", radius),
-                    PylonArgument.of("cooldown", cooldown)
+                    PylonArgument.of("duration", UnitFormat.formatDuration(Duration.ofSeconds(duration / 20))),
+                    PylonArgument.of("radius", UnitFormat.BLOCKS.format(radius)),
+                    PylonArgument.of("cooldown", UnitFormat.formatDuration(Duration.ofMillis(cooldown * 50L)))
             );
         }
     }

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

@@ -3,7 +3,6 @@
 import io.github.pylonmc.pylon.base.BaseFluids;
 import io.github.pylonmc.pylon.base.BaseKeys;
 import io.github.pylonmc.pylon.core.block.PylonBlock;
-import io.github.pylonmc.pylon.core.block.base.PylonEntityHolderBlock;
 import io.github.pylonmc.pylon.core.block.base.PylonFluidBufferBlock;
 import io.github.pylonmc.pylon.core.block.base.PylonInteractBlock;
 import io.github.pylonmc.pylon.core.block.base.PylonTickingBlock;
@@ -133,13 +132,12 @@ public void tick(double deltaSeconds) {
                 Block block = position.getBlock();
                 if (Tag.MINEABLE_SHOVEL.isTagged(block.getType())) {
                     block.breakNaturally();
+                    removeFluid(BaseFluids.HYDRAULIC_FLUID, hydraulicFluidUsed);
+                    addFluid(BaseFluids.DIRTY_HYDRAULIC_FLUID, hydraulicFluidUsed);
                     break;
                 }
             }
         }
-
-        removeFluid(BaseFluids.HYDRAULIC_FLUID, hydraulicFluidUsed);
-        addFluid(BaseFluids.DIRTY_HYDRAULIC_FLUID, hydraulicFluidUsed);
     }
 
     @Override

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

@@ -182,7 +182,7 @@ public void tick(double deltaSeconds) {
 
         Bukkit.getScheduler().runTaskLater(PylonBase.getInstance(), () -> {
             BaseUtils.animate(getHammerHead(), hammer.cooldownTicks - GO_DOWN_TIME_TICKS, getHeadTransformation(0.7));
-            BaseUtils.animate(getHammerTip(), hammer.cooldownTicks - GO_DOWN_TIME_TICKS, getHeadTransformation(0.7));
+            BaseUtils.animate(getHammerTip(), hammer.cooldownTicks - GO_DOWN_TIME_TICKS, getTipTransformation(-0.3));
 
             new ParticleBuilder(Particle.BLOCK)
                     .data(baseBlock.getBlockData())

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

@@ -15,6 +15,7 @@
 import io.github.pylonmc.pylon.core.config.adapter.ConfigAdapter;
 import io.github.pylonmc.pylon.core.entity.display.ItemDisplayBuilder;
 import io.github.pylonmc.pylon.core.entity.display.transform.TransformBuilder;
+import io.github.pylonmc.pylon.core.event.PrePylonBlockPlaceEvent;
 import io.github.pylonmc.pylon.core.event.PrePylonCraftEvent;
 import io.github.pylonmc.pylon.core.event.PylonCraftEvent;
 import io.github.pylonmc.pylon.core.item.builder.ItemStackBuilder;
@@ -23,8 +24,11 @@
 import org.bukkit.Material;
 import org.bukkit.Particle;
 import org.bukkit.block.Block;
+import org.bukkit.block.data.type.Slab;
 import org.bukkit.entity.ItemDisplay;
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.EquipmentSlot;
@@ -201,4 +205,20 @@ public boolean tryStartRecipe(@NotNull GrindstoneRecipe nextRecipe, @Nullable Pl
                 .rotate(0, rotation, 0)
                 .buildForItemDisplay();
     }
+
+    public static final class PlaceListener implements Listener {
+        @EventHandler
+        private void onPlace(PrePylonBlockPlaceEvent e) {
+            if (!e.getBlockSchema().getKey().equals(BaseKeys.GRINDSTONE)) return;
+            Slab slab = (Slab) e.getBlock().getBlockData();
+            switch (slab.getType()) {
+                case TOP -> {
+                    slab.setType(Slab.Type.BOTTOM);
+                    e.getBlock().setBlockData(slab);
+                }
+                case BOTTOM -> { /* Allow */ }
+                case DOUBLE -> e.setCancelled(true);
+            }
+        }
+    }
 }

src/main/java/io/github/pylonmc/pylon/base/content/machines/smelting/SmelteryController.java

@@ -6,7 +6,9 @@
 import io.github.pylonmc.pylon.base.util.BaseUtils;
 import io.github.pylonmc.pylon.base.util.HslColor;
 import io.github.pylonmc.pylon.core.block.BlockStorage;
-import io.github.pylonmc.pylon.core.block.base.*;
+import io.github.pylonmc.pylon.core.block.base.PylonGuiBlock;
+import io.github.pylonmc.pylon.core.block.base.PylonMultiblock;
+import io.github.pylonmc.pylon.core.block.base.PylonTickingBlock;
 import io.github.pylonmc.pylon.core.block.context.BlockBreakContext;
 import io.github.pylonmc.pylon.core.block.context.BlockCreateContext;
 import io.github.pylonmc.pylon.core.config.Config;
@@ -289,13 +291,12 @@ public void onMultiblockFormed() {
 
     @Override
     public void onMultiblockRefreshed() {
-        double previousCapacity = capacity;
         capacity = height * insidePositions.size() * 1000;
-
-        if (capacity < previousCapacity) {
-            double removeRatio = 1 - (capacity / previousCapacity);
-            for (PylonFluid fluid : new HashSet<>(fluids.keySet())) {
-                removeFluid(fluid, fluids.getDouble(fluid) * removeRatio);
+        double totalFluid = getTotalFluid();
+        if (totalFluid > capacity) {
+            double ratio = capacity / totalFluid;
+            for (PylonFluid fluid : fluids.keySet()) {
+                fluids.computeDouble(fluid, (key, value) -> value * ratio);
             }
         }
 

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

@@ -1,5 +1,6 @@
 package io.github.pylonmc.pylon.base.content.science;
 
+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.core.block.BlockStorage;
@@ -31,11 +32,7 @@
 import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 
 
 @SuppressWarnings("UnstableApiUsage")
@@ -113,6 +110,11 @@ public void onUsedToRightClick(@NotNull PlayerInteractEvent event) {
     }
 
     private static boolean processMaterial(Material type, Player player) {
+        if (!type.isItem()) {
+            player.sendMessage(Component.translatable("pylon.pylonbase.message.loupe.invalid_block"));
+            return true;
+        }
+
         var items = player.getPersistentDataContainer().getOrDefault(CONSUMED_KEY, CONSUMED_TYPE, Map.of());
         ItemRarity rarity = type.getDefaultData(DataComponentTypes.RARITY);
         int maxUses = itemConfigs.get(rarity).uses;
@@ -155,12 +157,12 @@ public void onConsumed(@NotNull PlayerItemConsumeEvent event) {
         // process block aimed at
         Material blockType = toScan.getType();
         BlockType bt = blockType.asBlockType();
-        if (bt == null) return; // shouldn't happen
+        Preconditions.checkNotNull(bt);
 
+        if (!new BlockBreakEvent(toScan, player).callEvent()) return;
         if (addPoints(blockType, Component.translatable(bt.translationKey()), player)) return;
         if (blockType.getHardness() > 0f) { // filter out unbreakable blocks
             toScan.setType(Material.AIR);
-            new BlockBreakEvent(toScan, player).callEvent();
         }
     }