新海岛上线

.gitignore

@@ -3,10 +3,11 @@
 .classpath
 bin
 # Package Files #
-*.jar
 *.war
 *.ear
 **/target
+**/build
+/.gradle
 /lib
 /.classpath
 /.project
@@ -17,5 +18,6 @@ bin
 
 *.DS_Store
 
+gradle.properties
 dependency-reduced-pom.xml
-deploy_rsa
+deploy_rsa

progress_requirements_example.yml

@@ -0,0 +1,73 @@
+# Progress Requirements 配置示例
+# 这个文件展示了如何在challenges.yml中配置Progress Requirements
+
+ranks:
+  novice:
+    displayName: "新手"
+    challenges:
+      mining_challenge:
+        name: "挖矿达人"
+        description: "成为一名挖矿专家"
+        type: "onPlayer"
+        requiredItems:
+          - "DIAMOND_PICKAXE:1"
+        requiredProgress:
+          - "blocks_mined:100"  # 简单格式：需要挖掘100个方块
+          - "stone_mined:50"    # 需要挖掘50个石头
+        reward:
+          items:
+            - "DIAMOND:5"
+          currency: 1000
+          xp: 500
+        repeatable: true
+
+      farming_expert:
+        name: "农业专家"
+        description: "种植大量作物"
+        type: "onPlayer"
+        requiredProgress:
+          - "crops_harvested:200:+:25"  # 扩展格式：基础200，每次重复增加25
+          - "seeds_planted:100:*:1.2"   # 基础100，每次重复乘以1.2
+        reward:
+          items:
+            - "GOLDEN_HOE:1"
+          currency: 2000
+          xp: 800
+        repeatable: true
+        repeatLimit: 10
+
+  expert:
+    displayName: "专家"
+    requiredChallenges:
+      - "mining_challenge"
+    challenges:
+      monster_slayer:
+        name: "怪物猎人"
+        description: "击败大量怪物"
+        type: "onPlayer"
+        requiredProgress:
+          - "monsters_killed:500"
+          - "boss_kills:5"
+          - "damage_dealt:10000"
+        reward:
+          items:
+            - "DIAMOND_SWORD:1"
+          currency: 5000
+          xp: 2000
+
+# Progress Keys 说明：
+# - blocks_mined: 挖掘的方块总数
+# - stone_mined: 挖掘的石头数量
+# - crops_harvested: 收获的作物数量
+# - seeds_planted: 种植的种子数量
+# - monsters_killed: 击杀的怪物数量
+# - boss_kills: 击杀的Boss数量
+# - damage_dealt: 造成的总伤害
+# - distance_traveled: 行走的总距离
+# - items_crafted: 制作的物品数量
+# - fish_caught: 钓到的鱼数量
+
+# 操作符说明：
+# + : 每次重复增加固定值
+# - : 每次重复减少固定值
+# * : 每次重复乘以倍数

uSkyBlock-Core/build.gradle.kts

@@ -17,10 +17,10 @@ dependencies {
     testImplementation("junit:junit:4.13.2")
     testImplementation("org.junit.vintage:junit-vintage-engine:5.9.0")
     testImplementation("org.mockito:mockito-core:5.14.2")
-    testImplementation("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
+    testImplementation("org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT")
     testImplementation("com.sk89q.worldedit:worldedit-bukkit:7.2.19")
     compileOnly("net.milkbowl.vault:VaultUnlockedAPI:2.10")
-    compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT")
     compileOnly("com.onarandombox.multiversecore:Multiverse-Core:4.3.1")
     compileOnly("com.onarandombox.multiverseinventories:Multiverse-Inventories:4.2.3")
     compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.2.19")
@@ -36,6 +36,8 @@ dependencies {
     compileOnly("org.apache.commons:commons-text:1.12.0")
     compileOnly("org.apache.httpcomponents:httpclient:4.5.14")
     compileOnly("org.apache.maven:maven-artifact:3.8.6")
+
+    compileOnly(files("libs/SignShop-5.0.0-dev.jar"))
 }
 
 description = "uSkyBlock-Core"

uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/Settings.java

@@ -138,7 +138,7 @@ public static boolean loadPluginConfig(FileConfiguration config) {
         extras_sendToSpawn = config.getBoolean("options.extras.sendToSpawn");
         extras_respawnAtIsland = config.getBoolean("options.extras.respawnAtIsland");
         island_useTopTen = config.getBoolean("options.island.useTopTen");
-        general_worldName = config.getString("options.general.worldName", "skyworld");
+        general_worldName = config.getString("options.general.worldName", "world_acidisland_nether");
         island_removeCreaturesByTeleport = config.getBoolean("options.island.removeCreaturesByTeleport");
         island_allowIslandLock = config.getBoolean("options.island.allowIslandLock");
         island_topTenTimeout = Duration.ofMinutes(config.getLong("options.island.topTenTimeout", 7));

uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/bootstrap/Listeners.java

@@ -9,17 +9,7 @@
 import us.talabrek.ultimateskyblock.PluginConfig;
 import us.talabrek.ultimateskyblock.Settings;
 import us.talabrek.ultimateskyblock.chat.ChatEvents;
-import us.talabrek.ultimateskyblock.event.ExploitEvents;
-import us.talabrek.ultimateskyblock.event.GriefEvents;
-import us.talabrek.ultimateskyblock.event.InternalEvents;
-import us.talabrek.ultimateskyblock.event.ItemDropEvents;
-import us.talabrek.ultimateskyblock.event.MenuEvents;
-import us.talabrek.ultimateskyblock.event.NetherTerraFormEvents;
-import us.talabrek.ultimateskyblock.event.PlayerEvents;
-import us.talabrek.ultimateskyblock.event.SpawnEvents;
-import us.talabrek.ultimateskyblock.event.ToolMenuEvents;
-import us.talabrek.ultimateskyblock.event.WitherTagEvents;
-import us.talabrek.ultimateskyblock.event.WorldGuardEvents;
+import us.talabrek.ultimateskyblock.event.*;
 import us.talabrek.ultimateskyblock.gui.GuiListener;
 import us.talabrek.ultimateskyblock.signs.SignEvents;
 import us.talabrek.ultimateskyblock.command.InviteHandler;
@@ -38,6 +28,7 @@ public class Listeners {
     private final WitherTagEvents witherTagEvents;
     private final GriefEvents griefEvents;
     private final ItemDropEvents itemDropEvents;
+    private final IslandBorderEvent islandBorderEvent;
     private final SpawnEvents spawnEvents;
     private final WorldGuardEvents worldGuardEvents;
     private final NetherTerraFormEvents netherTerraFormEvents;
@@ -58,6 +49,7 @@ public Listeners(
         @NotNull WitherTagEvents witherTagEvents,
         @NotNull GriefEvents griefEvents,
         @NotNull ItemDropEvents itemDropEvents,
+        @NotNull IslandBorderEvent islandBorderEvent,
         @NotNull SpawnEvents spawnEvents,
         @NotNull WorldGuardEvents worldGuardEvents,
         @NotNull NetherTerraFormEvents netherTerraFormEvents,
@@ -76,6 +68,7 @@ public Listeners(
         this.witherTagEvents = witherTagEvents;
         this.griefEvents = griefEvents;
         this.itemDropEvents = itemDropEvents;
+        this.islandBorderEvent = islandBorderEvent;
         this.spawnEvents = spawnEvents;
         this.worldGuardEvents = worldGuardEvents;
         this.netherTerraFormEvents = netherTerraFormEvents;
@@ -99,6 +92,8 @@ public void registerListeners(Plugin plugin) {
         manager.registerEvents(inviteHandler, plugin);
         manager.registerEvents(playerDB, plugin);
 
+        manager.registerEvents(islandBorderEvent, plugin);
+
         // TODO minoneer 06.02.2025: Move this logic. Either into the appropriate listener, or into submodules if we don't want all features active (e.g., the nether)
         if (config.getYamlConfig().getBoolean("options.protection.enabled", true)) {
             manager.registerEvents(griefEvents, plugin);

uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/Challenge.java

@@ -9,6 +9,7 @@
 import org.jetbrains.annotations.NotNull;
 import us.talabrek.ultimateskyblock.player.PlayerInfo;
 import us.talabrek.ultimateskyblock.uSkyBlock;
+import us.talabrek.ultimateskyblock.util.TranslationUtil;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -50,6 +51,7 @@ static Type from(String s) {
     private final List<EntityMatch> requiredEntities;
     private final List<String> requiredChallenges;
     private final double requiredLevel;
+    private List<ProgressRequirement> requiredProgress;
     private final Rank rank;
     private final Duration resetDuration;
     private final ItemStack displayItem;
@@ -64,7 +66,7 @@ static Type from(String s) {
 
     public Challenge(String name, String displayName, String description, Type type, List<ItemRequirement> requiredItems,
                      @NotNull List<BlockRequirement> requiredBlocks, List<EntityMatch> requiredEntities,
-                     List<String> requiredChallenges, double requiredLevel, Rank rank,
+                     List<String> requiredChallenges, double requiredLevel, List<ProgressRequirement> requiredProgress, Rank rank,
                      Duration resetDuration, ItemStack displayItem, String tool, ItemStack lockedItem, int offset,
                      boolean takeItems, int radius, Reward reward, Reward repeatReward, int repeatLimit) {
         this.name = name;
@@ -75,6 +77,7 @@ public Challenge(String name, String displayName, String description, Type type,
         this.requiredEntities = requiredEntities;
         this.requiredChallenges = requiredChallenges;
         this.requiredLevel = requiredLevel;
+        this.requiredProgress = requiredProgress;
         this.rank = rank;
         this.resetDuration = resetDuration;
         this.displayItem = displayItem;
@@ -138,6 +141,10 @@ public List<String> getRequiredChallenges() {
         return requiredChallenges;
     }
 
+    public List<ProgressRequirement> getRequiredProgress() {
+        return requiredProgress != null ? requiredProgress : Collections.emptyList();
+    }
+
     public Rank getRank() {
         return rank;
     }
@@ -182,10 +189,24 @@ public ItemStack getDisplayItem(ChallengeCompletion completion, boolean withCurr
         }
         Map<ItemStack, Integer> requiredItemsForChallenge = getRequiredItems(timesCompleted);
         if (!requiredItemsForChallenge.isEmpty() || !requiredBlocks.isEmpty()
-            || (requiredEntities != null && !requiredEntities.isEmpty())) {
+            || (requiredEntities != null && !requiredEntities.isEmpty()) || !getRequiredProgress().isEmpty()) {
             lores.add(tr("\u00a7eThis challenge requires:"));
         }
         List<String> details = new ArrayList<>();
+
+        // Add progress requirements to details
+        List<ProgressRequirement> progressRequirements = getRequiredProgress();
+        if (!progressRequirements.isEmpty()) {
+            for (ProgressRequirement progressReq : progressRequirements) {
+                if (wrappedDetails(details).size() >= MAX_DETAILS) {
+                    details.add(tr("\u00a77and more..."));
+                    break;
+                }
+                double requiredAmount = progressReq.amountForRepetitions(timesCompleted);
+                details.add(tr("\u00a7f{0}: {1}", progressReq.key(), requiredAmount));
+            }
+        }
+
         if (!requiredItemsForChallenge.isEmpty()) {
             for (Map.Entry<ItemStack, Integer> requiredItem : requiredItemsForChallenge.entrySet()) {
                 if (wrappedDetails(details).size() >= MAX_DETAILS) {
@@ -195,8 +216,8 @@ public ItemStack getDisplayItem(ChallengeCompletion completion, boolean withCurr
                 int requiredAmount = requiredItem.getValue();
                 ItemStack requiredType = requiredItem.getKey();
                 details.add(requiredAmount > 1
-                    ? tr("\u00a7f{0}x \u00a77{1}", requiredAmount, ItemStackUtil.getItemName(requiredType))
-                    : tr("\u00a77{0}", ItemStackUtil.getItemName(requiredType)));
+                    ? tr("\u00a7f{0}x \u00a77{1}", requiredAmount, TranslationUtil.INSTANCE.getItemLocalizedName(requiredType))
+                    : tr("\u00a77{0}", TranslationUtil.INSTANCE.getItemLocalizedName(requiredType)));
             }
         }
         if (!requiredBlocks.isEmpty() && wrappedDetails(details).size() < MAX_DETAILS) {

uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/ChallengeFactory.java

@@ -75,11 +75,12 @@ public static Challenge createChallenge(Rank rank, ConfigurationSection section,
             repeatReward = reward;
         }
         List<String> requiredChallenges = section.getStringList("requiredChallenges");
+        List<ProgressRequirement> requiredProgress = createProgressRequirements(section.getStringList("requiredProgress"));
         int offset = section.getInt("offset", 0);
         int repeatLimit = section.getInt("repeatLimit", 0);
         return new Challenge(name, displayName, description, type,
             requiredItems, requiredBlocks, requiredEntities, requiredChallenges, section.getDouble("requiredLevel", 0d),
-            rank, resetDuration, displayItem, section.getString("tool", null), lockedItem, offset, takeItems,
+            requiredProgress, rank, resetDuration, displayItem, section.getString("tool", null), lockedItem, offset, takeItems,
             radius, reward, repeatReward, repeatLimit);
     }
 
@@ -107,6 +108,59 @@ private static List<EntityMatch> createEntities(List<String> requiredEntities) {
         return entities;
     }
 
+    private static List<ProgressRequirement> createProgressRequirements(List<String> progressRequirements) {
+        List<ProgressRequirement> requirements = new ArrayList<>();
+        for (String progressString : progressRequirements) {
+            requirements.add(createProgressRequirement(progressString));
+        }
+        return requirements;
+    }
+
+    private static ProgressRequirement createProgressRequirement(String progressString) {
+        // Format: "key:amount" or "key:amount:operator:increment"
+        // Examples: "kills:10", "blocks_mined:100:+:5", "trees_planted:50:*:1.5"
+        String[] parts = progressString.split(":");
+        if (parts.length < 2) {
+            throw new IllegalArgumentException("Invalid progress requirement format: " + progressString +
+                ". Expected format: 'key:amount' or 'key:amount:operator:increment'");
+        }
+
+        String key = parts[0];
+        double amount;
+        try {
+            amount = Double.parseDouble(parts[1]);
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("Invalid amount in progress requirement: " + progressString, e);
+        }
+
+        if (parts.length == 2) {
+            // Simple format: just key and amount
+            return ProgressRequirement.of(key, amount);
+        } else if (parts.length == 4) {
+            // Extended format with operator and increment
+            String operatorStr = parts[2];
+            double increment;
+            try {
+                increment = Double.parseDouble(parts[3]);
+            } catch (NumberFormatException e) {
+                throw new IllegalArgumentException("Invalid increment in progress requirement: " + progressString, e);
+            }
+
+            ItemRequirement.Operator operator = switch (operatorStr) {
+                case "+" -> ItemRequirement.Operator.ADD;
+                case "-" -> ItemRequirement.Operator.SUBTRACT;
+                case "*" -> ItemRequirement.Operator.MULTIPLY;
+                default -> throw new IllegalArgumentException("Invalid operator in progress requirement: " + operatorStr +
+                    ". Supported operators: +, -, *");
+            };
+
+            return ProgressRequirement.of(key, amount, operator, increment);
+        } else {
+            throw new IllegalArgumentException("Invalid progress requirement format: " + progressString +
+                ". Expected format: 'key:amount' or 'key:amount:operator:increment'");
+        }
+    }
+
     private static Reward createReward(ConfigurationSection section) {
         if (section == null) {
             return null;