feat: add BukkitHourlyClaimBlocksEvent for AxBoosters integration + Fix User Caching

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
       - name: 'Build with Gradle 🏗️'
         uses: gradle/gradle-build-action@v3
         with:
-          arguments: build test publish
+          arguments: build test publish --refresh-dependencies
         env:
           SNAPSHOTS_MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           SNAPSHOTS_MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
@@ -73,4 +73,4 @@ jobs:
             target/HuskClaims-Fabric-${{ env.version_name }}+mc.1.21.1.jar
             target/HuskClaims-Fabric-${{ env.version_name }}+mc.1.21.4.jar
             target/HuskClaims-Fabric-${{ env.version_name }}+mc.1.21.5.jar
-            target/HuskClaims-Fabric-${{ env.version_name }}+mc.1.21.7.jar
+            target/HuskClaims-Fabric-${{ env.version_name }}+mc.1.21.7.jar

build.gradle

@@ -76,7 +76,6 @@ allprojects {
         maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
         maven { url 'https://repo.papermc.io/repository/maven-public/' }
         maven { url 'https://repo.william278.net/releases/' }
-        maven { url 'https://mvn-repo.arim.space/lesser-gpl3/' }
         maven { url 'https://repo.mikeprimm.com/' }
         maven { url 'https://repo.minebench.de/' }
         maven { url 'https://api.modrinth.com/maven/' }
@@ -85,6 +84,7 @@ allprojects {
         maven { url 'https://maven.enginehub.org/repo/' }
         maven { url 'https://repo.william278.net/snapshots/' }
         maven { url 'https://jitpack.io' }
+        maven { url 'https://mvn-repo.arim.space/lesser-gpl3/' }
     }
 
     dependencies {

bukkit/build.gradle

@@ -59,4 +59,4 @@ shadowJar {
     relocate 'net.roxeez', 'net.william278.huskclaims.libraries'
 
     minimize()
-}
+}

bukkit/src/main/java/net/william278/huskclaims/event/BukkitEventDispatcher.java

@@ -30,12 +30,14 @@
 import net.william278.huskclaims.user.OnlineUser;
 import net.william278.huskclaims.user.SavedUserProvider;
 import net.william278.huskclaims.user.User;
+import net.william278.huskclaims.user.BukkitUser;
 import org.bukkit.event.Cancellable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.Map;
+import java.util.function.Consumer;
 
 public interface BukkitEventDispatcher extends EventDispatcher {
 
@@ -45,6 +47,22 @@ default <T extends Event> boolean fireIsCancelled(@NotNull T event) {
         return event instanceof Cancellable cancellable && cancellable.isCancelled();
     }
 
+    @Override
+    default void fireHourlyClaimBlocksEvent(@NotNull OnlineUser user, long amount,
+                                            @NotNull Consumer<Long> callback) {
+        if (!(user instanceof BukkitUser bukkitUser)) {
+            callback.accept(amount);
+            return;
+        }
+        final BukkitHourlyClaimBlocksEvent event = new BukkitHourlyClaimBlocksEvent(
+                bukkitUser.getBukkitPlayer(), amount
+        );
+        getPlugin().runSync(() -> {
+            ((BukkitHuskClaims) getPlugin()).getServer().getPluginManager().callEvent(event);
+            getPlugin().runAsync(() -> callback.accept(event.getAmount()));
+        });
+    }
+
     @Override
     @NotNull
     default ClaimBlocksChangeEvent getClaimBlocksChangeEvent(@NotNull User user, long oldBlocks, long newBlocks,

bukkit/src/main/java/net/william278/huskclaims/event/BukkitHourlyClaimBlocksEvent.java

@@ -0,0 +1,71 @@
+/*
+ * This file is part of HuskClaims, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.huskclaims.event;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Bukkit event fired when a player receives hourly claim blocks.
+ * <p>
+ * This event is designed for integration with booster plugins (e.g. AxBoosters)
+ * that modify values via reflection using getter/setter methods.
+ * <p>
+ * AxBoosters config example:
+ * <pre>
+ * huskclaims:
+ *   icon: GRASS_BLOCK
+ *   event: net.william278.huskclaims.event.BukkitHourlyClaimBlocksEvent
+ *   player: getPlayer
+ *   getter: getAmount
+ *   setter: setAmount
+ * </pre>
+ */
+@Getter
+public class BukkitHourlyClaimBlocksEvent extends Event {
+
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
+    private final Player player;
+
+    @Setter
+    private long amount;
+
+    public BukkitHourlyClaimBlocksEvent(@NotNull Player player, long amount) {
+        super(false);
+        this.player = player;
+        this.amount = amount;
+    }
+
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+
+}

bukkit/src/main/java/net/william278/huskclaims/user/BukkitUserProvider.java

@@ -40,10 +40,9 @@ default BukkitUser getOnlineUser(@Nullable Player player) {
             throw new IllegalArgumentException("Player is not online");
         }
         BukkitUser user = (BukkitUser) getOnlineUserMap().get(player.getUniqueId());
-        if (user == null) {
+        if (user == null || user.getBukkitPlayer() != player || !user.getBukkitPlayer().isOnline()) {
             user = BukkitUser.adapt(player, getPlugin());
             getOnlineUserMap().put(player.getUniqueId(), user);
-            return user;
         }
         return user;
     }

common/src/main/java/net/william278/huskclaims/claim/ClaimWorld.java

@@ -381,6 +381,27 @@ public void cacheUser(@NotNull User user) {
         userCache.put(user.getUuid(), user.getName());
     }
 
+    /**
+     * Refresh the cached username for a user already known to this world (e.g. after a Minecraft name change).
+     * <p>
+     * Only updates users already present in the cache (claim owners and trustees), so this never adds spurious
+     * entries. Does nothing if the name is unchanged.
+     *
+     * @param uuid the UUID of the user
+     * @param name the user's current username
+     * @return {@code true} if the cached name was changed, {@code false} otherwise
+     * @since 1.4
+     */
+    @ApiStatus.Internal
+    public boolean refreshUserName(@NotNull UUID uuid, @NotNull String name) {
+        final String cached = userCache.get(uuid);
+        if (cached == null || cached.equals(name)) {
+            return false;
+        }
+        userCache.put(uuid, name);
+        return true;
+    }
+
     /**
      * Get the claims a region overlaps with, except for certain claims
      *

common/src/main/java/net/william278/huskclaims/event/EventDispatcher.java

@@ -75,6 +75,11 @@ default void fireClaimBlocksChangeEvent(@NotNull User user, long oldClaimBlocks,
         fireEvent(getClaimBlocksChangeEvent(user, oldClaimBlocks, newClaimBlocks, reason), callback);
     }
 
+    default void fireHourlyClaimBlocksEvent(@NotNull OnlineUser user, long amount,
+                                            @NotNull Consumer<Long> callback) {
+        callback.accept(amount);
+    }
+
     default void fireCreateChildClaimEvent(@NotNull OnlineUser claimer, @NotNull Claim parent,
                                            @NotNull Region childRegion, @NotNull ClaimWorld claimWorld,
                                            @NotNull Consumer<CreateChildClaimEvent> callback) {

common/src/main/java/net/william278/huskclaims/listener/UserListener.java

@@ -32,6 +32,7 @@ public interface UserListener {
     default void onUserJoin(@NotNull OnlineUser user) {
         getPlugin().runAsync(() -> {
             getPlugin().cacheSavedUser(user);
+            refreshClaimWorldUserName(user);
             final Preferences prefs = getPlugin().getCachedUserPreferences(user.getUuid()).orElse(Preferences.DEFAULTS);
             final Settings.ClaimSettings settings = getPlugin().getSettings().getClaims();
 
@@ -75,6 +76,17 @@ default void onUserSwitchHeldItem(@NotNull OnlineUser user, @NotNull String main
         }
     }
 
+    // Refresh the user's cached name in all loaded claim worlds, in case they changed their Minecraft name
+    // while the server was running. Without this, claim owner placeholders show the old name until a claim
+    // operation (e.g. trust/transfer) rewrites the cache.
+    private void refreshClaimWorldUserName(@NotNull OnlineUser user) {
+        getPlugin().getClaimWorlds().values().forEach(world -> {
+            if (world.refreshUserName(user.getUuid(), user.getName())) {
+                getPlugin().runQueued(() -> getPlugin().getDatabase().updateClaimWorld(world));
+            }
+        });
+    }
+
     // Check if a user is ignoring claims on join and if they can't do so anymore, toggle
     private void checkIgnoringClaimsOnLogin(@NotNull OnlineUser u) {
         if (getPlugin().canUseCommand(IgnoreClaimsCommand.class, u)) {

common/src/main/java/net/william278/huskclaims/user/ClaimBlocksManager.java

@@ -37,7 +37,7 @@
 public interface ClaimBlocksManager {
 
     // How many times per hour to run the claim block update task for all users
-    int HOURLY_BLOCKS_UPDATES = 4;
+    int HOURLY_BLOCKS_UPDATES = 5;
 
     // Permission to grant hourly claim blocks
     String HOURLY_BLOCKS_PERMISSION = "huskclaims.hourly_blocks.";
@@ -156,18 +156,26 @@ default void grantHourlyClaimBlocks(@NotNull OnlineUser user) {
             return;
         }
 
-        try {
-            // Double-check user is still online right before block editing to minimize TOCTOU window
-            if (!getPlugin().getOnlineUserMap().containsKey(user.getUuid())) {
-                return;
-            }
-            editClaimBlocks(user, ClaimBlockSource.HOURLY_BLOCKS, (blocks -> blocks + hourlyBlocks));
-        } catch (IllegalArgumentException e) {
-            // Log warning if user data becomes unavailable during execution
-            // This can happen if user disconnects after validation but before block editing
-            getPlugin().log(Level.WARNING, "Failed to grant hourly claim blocks to user " + 
-                user.getUuid() + " (user data unavailable): " + e.getMessage());
+        if (!getPlugin().getOnlineUserMap().containsKey(user.getUuid())) {
+            return;
         }
+
+        // Fire hourly claim blocks event to allow booster plugins (e.g. AxBoosters) to modify the amount
+        getPlugin().fireHourlyClaimBlocksEvent(user, hourlyBlocks, (adjustedAmount) -> {
+            try {
+                // Double-check user is still online right before block editing to minimize TOCTOU window
+                if (!getPlugin().getOnlineUserMap().containsKey(user.getUuid())) {
+                    return;
+                }
+                editClaimBlocks(user, ClaimBlockSource.HOURLY_BLOCKS,
+                        (blocks -> blocks + adjustedAmount));
+            } catch (IllegalArgumentException e) {
+                // Log warning if user data becomes unavailable during execution
+                // This can happen if user disconnects after validation but before block editing
+                getPlugin().log(Level.WARNING, "Failed to grant hourly claim blocks to user "
+                        + user.getUuid() + " (user data unavailable): " + e.getMessage());
+            }
+        });
     }
 
     default void loadClaimBlockScheduler() {

fabric/build.gradle

@@ -6,7 +6,6 @@ plugins {
 loom.serverOnlyMinecraftJar()
 
 repositories {
-    maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
     maven { url 'https://maven.impactdev.net/repository/development/' }
     maven { url 'https://maven.nucleoid.xyz/' }
 }
@@ -79,4 +78,4 @@ remapJar {
     archiveClassifier.set('')
 }
 
-shadowJar.finalizedBy(remapJar)
+shadowJar.finalizedBy(remapJar)