placeholders);
-
- /**
- * Build an ItemStack for a player based on the provided item ID.
- *
- * @param player The player for whom the ItemStack is being built.
- * @param id The item ID, which include an identification (e.g., "Oraxen:id").
- * @return The constructed ItemStack or null if the ID is not valid.
- */
- @Nullable ItemStack buildAnyPluginItemByID(Player player, String id);
-
- /**
- * Get the item ID associated with the given ItemStack, if available.
- *
- * @param itemStack The ItemStack to retrieve the item ID from.
- * @return The item ID without type or null if not found or if the ItemStack is null or empty.
- */
- @Nullable String getCustomFishingItemID(ItemStack itemStack);
-
- /**
- * Get the item ID associated with the given ItemStack by checking all available item libraries.
- * The detection order is determined by the configuration.
- *
- * @param itemStack The ItemStack to retrieve the item ID from.
- * @return The item ID or "AIR" if not found or if the ItemStack is null or empty.
- */
- @NotNull String getAnyPluginItemID(ItemStack itemStack);
-
- /**
- * Create a ItemBuilder instance for an item configuration section
- *
- * xxx_item: <- section
- * material: xxx
- * custom-model-data: xxx
- *
- * @param section The configuration section containing item settings.
- * @param type The type of the item (e.g., "rod", "bait").
- * @param id The unique identifier for the item.
- * @return A CFBuilder instance representing the configured item, or null if the section is null.
- */
- @Nullable ItemBuilder getItemBuilder(ConfigurationSection section, String type, String id);
-
- /**
- * Get a set of all item keys in the CustomFishing plugin.
- *
- * @return A set of item keys.
- */
- Set getAllItemsKey();
-
- /**
- * Retrieve a BuildableItem by its namespace and value.
- *
- * @param namespace The namespace of the BuildableItem.
- * @param value The value of the BuildableItem.
- * @return The BuildableItem with the specified namespace and value, or null if not found.
- */
- @Nullable
- BuildableItem getBuildableItem(String namespace, String value);
-
- /**
- * Get an itemStack's appearance (material + custom model data)
- *
- * @param player player
- * @param material id
- * @return appearance
- */
- ItemStack getItemStackAppearance(Player player, String material);
-
- /**
- * Register an item library.
- *
- * @param itemLibrary The item library to register.
- * @return True if the item library was successfully registered, false if it already exists.
- */
- boolean registerItemLibrary(ItemLibrary itemLibrary);
-
- /**
- * Unregister an item library.
- *
- * @param identification The item library to unregister.
- * @return True if the item library was successfully unregistered, false if it doesn't exist.
- */
- boolean unRegisterItemLibrary(String identification);
-
- /**
- * Drops an item based on the provided loot, applying velocity from a hook location to a player location.
- *
- * @param player The player for whom the item is intended.
- * @param hookLocation The location where the item will initially drop.
- * @param playerLocation The target location towards which the item's velocity is applied.
- * @param itemStack The loot to drop
- * @param condition A map of placeholders for item customization.
- */
- void dropItem(Player player, Location hookLocation, Location playerLocation, ItemStack itemStack, Condition condition);
-
- /**
- * Checks if the provided ItemStack is a custom fishing item
- *
- * @param itemStack The ItemStack to check.
- * @return True if the ItemStack is a custom fishing item; otherwise, false.
- */
- boolean isCustomFishingItem(ItemStack itemStack);
-
- /**
- * Decreases the durability of an ItemStack by a specified amount and optionally updates its lore.
- *
- * @param itemStack The ItemStack to modify.
- * @param amount The amount by which to decrease the durability.
- * @param updateLore Whether to update the lore of the ItemStack.
- */
- void decreaseDurability(Player player, ItemStack itemStack, int amount, boolean updateLore);
-
- /**
- * Increases the durability of an ItemStack by a specified amount and optionally updates its lore.
- *
- * @param itemStack The ItemStack to modify.
- * @param amount The amount by which to increase the durability.
- * @param updateLore Whether to update the lore of the ItemStack.
- */
- void increaseDurability(ItemStack itemStack, int amount, boolean updateLore);
-
- /**
- * Sets the durability of an ItemStack to a specific amount and optionally updates its lore.
- *
- * @param itemStack The ItemStack to modify.
- * @param amount The new durability value.
- * @param updateLore Whether to update the lore of the ItemStack.
- */
- void setDurability(ItemStack itemStack, int amount, boolean updateLore);
-}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/VersionManager.java b/api/src/main/java/net/momirealms/customfishing/api/manager/VersionManager.java
index ae3d37ba..bb3a0c67 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/manager/VersionManager.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/manager/VersionManager.java
@@ -23,14 +23,16 @@ public interface VersionManager {
boolean isVersionNewerThan1_19();
- boolean isVersionNewerThan1_19_R3();
+ boolean isVersionNewerThan1_19_4();
- boolean isVersionNewerThan1_19_R2();
+ boolean isVersionNewerThan1_19_3();
CompletableFuture checkUpdate();
boolean isVersionNewerThan1_20();
+ boolean isNewerThan1_20_5();
+
boolean isSpigot();
public boolean hasRegionScheduler();
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/GlobalSettings.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/GlobalSettings.java
index 0192b1d9..bc87b73f 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/GlobalSettings.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/GlobalSettings.java
@@ -17,10 +17,9 @@
package net.momirealms.customfishing.api.mechanic;
-import net.momirealms.customfishing.api.CustomFishingPlugin;
+import net.momirealms.customfishing.api.BukkitCustomFishingPlugin;
import net.momirealms.customfishing.api.mechanic.action.Action;
import net.momirealms.customfishing.api.mechanic.action.ActionTrigger;
-import net.momirealms.customfishing.api.mechanic.condition.Condition;
import net.momirealms.customfishing.api.mechanic.effect.EffectModifier;
import org.bukkit.configuration.ConfigurationSection;
@@ -47,7 +46,7 @@ public class GlobalSettings {
if (section == null) return;
for (Map.Entry entry : section.getValues(false).entrySet()) {
if (entry.getValue() instanceof ConfigurationSection inner) {
- HashMap map = CustomFishingPlugin.get().getActionManager().getActionMap(inner);
+ HashMap map = BukkitCustomFishingPlugin.get().getActionManager().getActionMap(inner);
switch (entry.getKey()) {
case "loot" -> lootActions = map;
case "rod" -> rodActions = map;
@@ -79,13 +78,13 @@ public class GlobalSettings {
* Triggers loot-related actions for a specific trigger and condition.
*
* @param trigger The trigger to activate actions for.
- * @param condition The condition that triggered the actions.
+ * @param playerContext The condition that triggered the actions.
*/
- public static void triggerLootActions(ActionTrigger trigger, Condition condition) {
+ public static void triggerLootActions(ActionTrigger trigger, PlayerContext playerContext) {
Action[] actions = lootActions.get(trigger);
if (actions != null) {
for (Action action : actions) {
- action.trigger(condition);
+ action.trigger(playerContext);
}
}
}
@@ -94,13 +93,13 @@ public class GlobalSettings {
* Triggers rod-related actions for a specific trigger and condition.
*
* @param trigger The trigger to activate actions for.
- * @param condition The condition that triggered the actions.
+ * @param playerContext The condition that triggered the actions.
*/
- public static void triggerRodActions(ActionTrigger trigger, Condition condition) {
+ public static void triggerRodActions(ActionTrigger trigger, PlayerContext playerContext) {
Action[] actions = rodActions.get(trigger);
if (actions != null) {
for (Action action : actions) {
- action.trigger(condition);
+ action.trigger(playerContext);
}
}
}
@@ -109,13 +108,13 @@ public class GlobalSettings {
* Triggers bait-related actions for a specific trigger and condition.
*
* @param trigger The trigger to activate actions for.
- * @param condition The condition that triggered the actions.
+ * @param playerContext The condition that triggered the actions.
*/
- public static void triggerBaitActions(ActionTrigger trigger, Condition condition) {
+ public static void triggerBaitActions(ActionTrigger trigger, PlayerContext playerContext) {
Action[] actions = baitActions.get(trigger);
if (actions != null) {
for (Action action : actions) {
- action.trigger(condition);
+ action.trigger(playerContext);
}
}
}
@@ -124,13 +123,13 @@ public class GlobalSettings {
* Triggers hook-related actions for a specific trigger and condition.
*
* @param trigger The trigger to activate actions for.
- * @param condition The condition that triggered the actions.
+ * @param playerContext The condition that triggered the actions.
*/
- public static void triggerHookActions(ActionTrigger trigger, Condition condition) {
+ public static void triggerHookActions(ActionTrigger trigger, PlayerContext playerContext) {
Action[] actions = hookActions.get(trigger);
if (actions != null) {
for (Action action : actions) {
- action.trigger(condition);
+ action.trigger(playerContext);
}
}
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/TempFishingState.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/TempFishingState.java
index 503ef51e..c3e8a898 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/TempFishingState.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/TempFishingState.java
@@ -17,7 +17,6 @@
package net.momirealms.customfishing.api.mechanic;
-import net.momirealms.customfishing.api.mechanic.condition.FishingPreparation;
import net.momirealms.customfishing.api.mechanic.effect.Effect;
import net.momirealms.customfishing.api.mechanic.loot.Loot;
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/Action.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/Action.java
index af44d142..6276916d 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/Action.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/Action.java
@@ -17,10 +17,14 @@
package net.momirealms.customfishing.api.mechanic.action;
-import net.momirealms.customfishing.api.mechanic.condition.Condition;
+import net.momirealms.customfishing.api.mechanic.context.Context;
-public interface Action {
-
- void trigger(Condition condition);
+public interface Action {
+ /**
+ * Triggers the action based on the provided condition.
+ *
+ * @param context the context
+ */
+ void trigger(Context context);
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionExpansion.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionExpansion.java
index bd48cfd1..6fc0ff8c 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionExpansion.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionExpansion.java
@@ -17,13 +17,39 @@
package net.momirealms.customfishing.api.mechanic.action;
-public abstract class ActionExpansion {
+/**
+ * Abstract class representing an expansion of an action in the custom fishing API.
+ * This class should be extended to provide specific implementations of actions.
+ *
+ * @param the type parameter for the action factory
+ */
+public abstract class ActionExpansion {
+ /**
+ * Retrieves the version of this action expansion.
+ *
+ * @return a String representing the version of the action expansion
+ */
public abstract String getVersion();
+ /**
+ * Retrieves the author of this action expansion.
+ *
+ * @return a String representing the author of the action expansion
+ */
public abstract String getAuthor();
+ /**
+ * Retrieves the type of this action.
+ *
+ * @return a String representing the type of action
+ */
public abstract String getActionType();
- public abstract ActionFactory getActionFactory();
+ /**
+ * Retrieves the action factory associated with this action expansion.
+ *
+ * @return an ActionFactory of type T that creates instances of the action
+ */
+ public abstract ActionFactory getActionFactory();
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionFactory.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionFactory.java
index fdaae29d..deb59304 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionFactory.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionFactory.java
@@ -17,7 +17,18 @@
package net.momirealms.customfishing.api.mechanic.action;
-public interface ActionFactory {
+/**
+ * Interface representing a factory for creating actions.
+ *
+ * @param the type of object that the action will operate on
+ */
+public interface ActionFactory {
- Action build(Object args, double chance);
+ /**
+ * Constructs an action based on the provided arguments.
+ *
+ * @param args the args containing the arguments needed to build the action
+ * @return the constructed action
+ */
+ Action process(Object args);
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/ActionManager.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionManager.java
similarity index 80%
rename from api/src/main/java/net/momirealms/customfishing/api/manager/ActionManager.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionManager.java
index 334bd6bf..7ef3913e 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/manager/ActionManager.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/action/ActionManager.java
@@ -15,17 +15,16 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.api.manager;
+package net.momirealms.customfishing.api.mechanic.action;
-import net.momirealms.customfishing.api.mechanic.action.Action;
-import net.momirealms.customfishing.api.mechanic.action.ActionFactory;
-import net.momirealms.customfishing.api.mechanic.action.ActionTrigger;
-import net.momirealms.customfishing.api.mechanic.condition.Condition;
-import org.bukkit.configuration.ConfigurationSection;
+import dev.dejvokep.boostedyaml.block.implementation.Section;
+import net.momirealms.customfishing.api.mechanic.context.Context;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import java.util.HashMap;
-public interface ActionManager {
+public interface ActionManager {
/**
* Registers an ActionFactory for a specific action type.
@@ -35,7 +34,7 @@ public interface ActionManager {
* @param actionFactory The ActionFactory responsible for creating actions of the specified type.
* @return True if the registration was successful (the action type was not already registered), false otherwise.
*/
- boolean registerAction(String type, ActionFactory actionFactory);
+ boolean registerAction(String type, ActionFactory actionFactory);
/**
* Unregisters an ActionFactory for a specific action type.
@@ -59,7 +58,7 @@ public interface ActionManager {
* @param section The ConfigurationSection containing the action configuration.
* @return An Action object created based on the configuration, or an EmptyAction instance if the action type is invalid.
*/
- Action getAction(ConfigurationSection section);
+ Action getAction(Section section);
/**
* Retrieves a mapping of ActionTriggers to arrays of Actions from a ConfigurationSection.
@@ -74,7 +73,7 @@ public interface ActionManager {
* @param section The ConfigurationSection containing action mappings.
* @return A HashMap where keys are ActionTriggers and values are arrays of Action objects.
*/
- HashMap getActionMap(ConfigurationSection section);
+ HashMap[]> getActionMap(Section section);
/**
* Retrieves an array of Action objects from a ConfigurationSection.
@@ -89,7 +88,8 @@ public interface ActionManager {
* @param section The ConfigurationSection containing action configurations.
* @return An array of Action objects created based on the configurations in the section.
*/
- Action[] getActions(ConfigurationSection section);
+ @NotNull
+ Action[] getActions(@NotNull Section section);
/**
* Retrieves an ActionFactory associated with a specific action type.
@@ -97,7 +97,8 @@ public interface ActionManager {
* @param type The action type for which to retrieve the ActionFactory.
* @return The ActionFactory associated with the specified action type, or null if not found.
*/
- ActionFactory getActionFactory(String type);
+ @Nullable
+ ActionFactory getActionFactory(@NotNull String type);
/**
* Retrieves a mapping of success times to corresponding arrays of actions from a ConfigurationSection.
@@ -111,18 +112,19 @@ public interface ActionManager {
* @param section The ConfigurationSection containing success times actions.
* @return A HashMap where success times associated with actions.
*/
- HashMap getTimesActionMap(ConfigurationSection section);
+ @NotNull
+ HashMap[]> getTimesActionMap(@NotNull Section section);
/**
* Triggers a list of actions with the given condition.
* If the list of actions is not null, each action in the list is triggered.
*
* @param actions The list of actions to trigger.
- * @param condition The condition associated with the actions.
+ * @param context The context associated with the actions.
*/
- static void triggerActions(Condition condition, Action... actions) {
+ static void trigger(@NotNull Context context, @Nullable Action... actions) {
if (actions != null)
- for (Action action : actions)
- action.trigger(condition);
+ for (Action action : actions)
+ action.trigger(context);
}
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/BagManager.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/bag/BagManager.java
similarity index 96%
rename from api/src/main/java/net/momirealms/customfishing/api/manager/BagManager.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/bag/BagManager.java
index f83c36d2..8e75fe08 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/manager/BagManager.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/bag/BagManager.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.api.manager;
+package net.momirealms.customfishing.api.mechanic.bag;
import net.momirealms.customfishing.api.data.user.OfflineUser;
import net.momirealms.customfishing.api.mechanic.action.Action;
@@ -30,7 +30,7 @@ import java.util.UUID;
public interface BagManager {
/**
- * Is bag enabled
+ * Is bag mechanics enabled
*
* @return enabled or not
*/
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockDataModifier.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockDataModifier.java
index 6ba31318..e2995779 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockDataModifier.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockDataModifier.java
@@ -21,5 +21,6 @@ import org.bukkit.block.data.BlockData;
import org.bukkit.entity.Player;
public interface BlockDataModifier {
+
void apply(Player player, BlockData blockData);
}
\ No newline at end of file
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/BlockManager.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockManager.java
similarity index 94%
rename from api/src/main/java/net/momirealms/customfishing/api/manager/BlockManager.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockManager.java
index baa69366..ab99950e 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/manager/BlockManager.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockManager.java
@@ -15,11 +15,8 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.api.manager;
+package net.momirealms.customfishing.api.mechanic.block;
-import net.momirealms.customfishing.api.mechanic.block.BlockDataModifierBuilder;
-import net.momirealms.customfishing.api.mechanic.block.BlockLibrary;
-import net.momirealms.customfishing.api.mechanic.block.BlockStateModifierBuilder;
import net.momirealms.customfishing.api.mechanic.loot.Loot;
import org.bukkit.Location;
import org.bukkit.block.Block;
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockStateModifier.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockStateModifier.java
index 60af5f23..6cd59654 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockStateModifier.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/block/BlockStateModifier.java
@@ -21,5 +21,6 @@ import org.bukkit.block.BlockState;
import org.bukkit.entity.Player;
public interface BlockStateModifier {
+
void apply(Player player, BlockState blockState);
}
\ No newline at end of file
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/ActionBarConfig.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/ActionBarConfig.java
deleted file mode 100644
index 06a39372..00000000
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/ActionBarConfig.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) <2022>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package net.momirealms.customfishing.api.mechanic.competition;
-
-public class ActionBarConfig extends AbstractCompetitionInfo {
-
- public static class Builder {
-
- private final ActionBarConfig config;
-
- public Builder() {
- this.config = new ActionBarConfig();
- }
-
- public Builder showToAll(boolean showToAll) {
- this.config.showToAll = showToAll;
- return this;
- }
-
- public Builder refreshRate(int rate) {
- this.config.refreshRate = rate;
- return this;
- }
-
- public Builder switchInterval(int interval) {
- this.config.switchInterval = interval;
- return this;
- }
-
- public Builder text(String[] texts) {
- this.config.texts = texts;
- return this;
- }
-
- public ActionBarConfig build() {
- return this.config;
- }
- }
-}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/BossBarConfig.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/BossBarConfig.java
deleted file mode 100644
index 32458903..00000000
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/BossBarConfig.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) <2022>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package net.momirealms.customfishing.api.mechanic.competition;
-
-import org.bukkit.boss.BarColor;
-
-public class BossBarConfig extends AbstractCompetitionInfo {
-
- private BarColor color;
- private Overlay overlay;
-
- public BarColor getColor() {
- return color;
- }
-
- public Overlay getOverlay() {
- return overlay;
- }
-
- public static class Builder {
-
- private final BossBarConfig config;
-
- public Builder() {
- this.config = new BossBarConfig();
- }
-
- public Builder showToAll(boolean showToAll) {
- this.config.showToAll = showToAll;
- return this;
- }
-
- public Builder refreshRate(int rate) {
- this.config.refreshRate = rate;
- return this;
- }
-
- public Builder switchInterval(int interval) {
- this.config.switchInterval = interval;
- return this;
- }
-
- public Builder text(String[] texts) {
- this.config.texts = texts;
- return this;
- }
-
- public Builder color(BarColor color) {
- this.config.color = color;
- return this;
- }
-
- public Builder overlay(Overlay overlay) {
- this.config.overlay = overlay;
- return this;
- }
-
- public BossBarConfig build() {
- return this.config;
- }
- }
-
- public enum Overlay {
- NOTCHED_6,
- NOTCHED_10,
- NOTCHED_12,
- NOTCHED_20,
- PROGRESS
- }
-}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionConfig.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionConfig.java
index adc698a0..077d7373 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionConfig.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionConfig.java
@@ -18,6 +18,8 @@
package net.momirealms.customfishing.api.mechanic.competition;
import net.momirealms.customfishing.api.mechanic.action.Action;
+import net.momirealms.customfishing.api.mechanic.competition.info.ActionBarConfigImpl;
+import net.momirealms.customfishing.api.mechanic.competition.info.BossBarConfigImpl;
import net.momirealms.customfishing.api.mechanic.requirement.Requirement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -29,8 +31,8 @@ public class CompetitionConfig {
private final String key;
private int duration;
private int minPlayers;
- private BossBarConfig bossBarConfig;
- private ActionBarConfig actionBarConfig;
+ private BossBarConfigImpl bossBarConfigImpl;
+ private ActionBarConfigImpl actionBarConfigImpl;
private Action[] skipActions;
private Action[] startActions;
private Action[] endActions;
@@ -110,13 +112,13 @@ public class CompetitionConfig {
}
@Nullable
- public BossBarConfig getBossBarConfig() {
- return bossBarConfig;
+ public BossBarConfigImpl getBossBarConfig() {
+ return bossBarConfigImpl;
}
@Nullable
- public ActionBarConfig getActionBarConfig() {
- return actionBarConfig;
+ public ActionBarConfigImpl getActionBarConfig() {
+ return actionBarConfigImpl;
}
public static Builder builder(String key) {
@@ -162,14 +164,14 @@ public class CompetitionConfig {
}
@SuppressWarnings("UnusedReturnValue")
- public Builder actionbar(ActionBarConfig actionBarConfig) {
- config.actionBarConfig = actionBarConfig;
+ public Builder actionbar(ActionBarConfigImpl actionBarConfigImpl) {
+ config.actionBarConfigImpl = actionBarConfigImpl;
return this;
}
@SuppressWarnings("UnusedReturnValue")
- public Builder bossbar(BossBarConfig bossBarConfig) {
- config.bossBarConfig = bossBarConfig;
+ public Builder bossbar(BossBarConfigImpl bossBarConfigImpl) {
+ config.bossBarConfigImpl = bossBarConfigImpl;
return this;
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionGoal.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionGoal.java
index 306471a9..bbb169b6 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionGoal.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionGoal.java
@@ -17,17 +17,64 @@
package net.momirealms.customfishing.api.mechanic.competition;
+import net.kyori.adventure.key.Key;
+import net.kyori.adventure.util.Index;
+
import java.util.concurrent.ThreadLocalRandom;
-public enum CompetitionGoal {
+public final class CompetitionGoal {
- CATCH_AMOUNT,
- TOTAL_SCORE,
- MAX_SIZE,
- TOTAL_SIZE,
- RANDOM;
+ public static final CompetitionGoal CATCH_AMOUNT = new CompetitionGoal(Key.key("customfishing", "catch_amount"));
+ public static final CompetitionGoal TOTAL_SCORE = new CompetitionGoal(Key.key("customfishing", "total_score"));
+ public static final CompetitionGoal MAX_SIZE = new CompetitionGoal(Key.key("customfishing", "max_size"));
+ public static final CompetitionGoal TOTAL_SIZE = new CompetitionGoal(Key.key("customfishing", "total_size"));
+ public static final CompetitionGoal RANDOM = new CompetitionGoal(Key.key("customfishing", "random"));
+ private static final CompetitionGoal[] values = new CompetitionGoal[] {
+ CATCH_AMOUNT, TOTAL_SCORE, MAX_SIZE, TOTAL_SIZE, RANDOM
+ };
+
+ private static final Index index = Index.create(CompetitionGoal::key, values());
+
+ /**
+ * Gets an array containing all defined competition goals.
+ *
+ * @return An array of all competition goals.
+ */
+ public static CompetitionGoal[] values() {
+ return values;
+ }
+
+ /**
+ * Gets the index of competition goals by their keys.
+ *
+ * @return An index mapping keys to competition goals.
+ */
+ public static Index index() {
+ return index;
+ }
+
+ /**
+ * Gets a randomly selected competition goal.
+ *
+ * @return A randomly selected competition goal.
+ */
public static CompetitionGoal getRandom() {
return CompetitionGoal.values()[ThreadLocalRandom.current().nextInt(CompetitionGoal.values().length - 1)];
}
+
+ private final Key key;
+
+ private CompetitionGoal(Key key) {
+ this.key = key;
+ }
+
+ /**
+ * Gets the key representing this competition goal.
+ *
+ * @return The key of the competition goal.
+ */
+ public Key key() {
+ return key;
+ }
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/CompetitionManager.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionManager.java
similarity index 91%
rename from api/src/main/java/net/momirealms/customfishing/api/manager/CompetitionManager.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionManager.java
index d78ade4a..4795d037 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/manager/CompetitionManager.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionManager.java
@@ -15,11 +15,8 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.api.manager;
+package net.momirealms.customfishing.api.mechanic.competition;
-import net.momirealms.customfishing.api.mechanic.competition.CompetitionConfig;
-import net.momirealms.customfishing.api.mechanic.competition.CompetitionGoal;
-import net.momirealms.customfishing.api.mechanic.competition.FishingCompetition;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionPlayer.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionPlayer.java
index 5a18ef9e..4463987c 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionPlayer.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionPlayer.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
public class CompetitionPlayer implements Comparable{
- public static CompetitionPlayer empty = new CompetitionPlayer("", 0);
+ private static CompetitionPlayer empty = new CompetitionPlayer("", 0);
private long time;
private final String player;
private double score;
@@ -32,12 +32,13 @@ public class CompetitionPlayer implements Comparable{
this.time = System.currentTimeMillis();
}
- public void addScore(double score){
+ public void addScore(double score) {
this.score += score;
+ if (score <= 0) return;
this.time = System.currentTimeMillis();
}
- public void setScore(double score){
+ public void setScore(double score) {
this.score = score;
this.time = System.currentTimeMillis();
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/FishingCompetition.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/FishingCompetition.java
index 1e5d7b1d..b2c9a62e 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/FishingCompetition.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/FishingCompetition.java
@@ -29,7 +29,7 @@ public interface FishingCompetition {
/**
* Start the fishing competition
*/
- void start();
+ void start(boolean triggerEvent);
/**
* Stop the fishing competition
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/Ranking.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/Ranking.java
index 728ac725..7adc09a9 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/Ranking.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/Ranking.java
@@ -17,7 +17,7 @@
package net.momirealms.customfishing.api.mechanic.competition;
-import net.momirealms.customfishing.api.common.Pair;
+import net.momirealms.customfishing.common.util.Pair;
import org.jetbrains.annotations.Nullable;
import java.util.Iterator;
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/AbstractCompetitionInfo.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/info/AbstractCompetitionInfo.java
similarity index 78%
rename from api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/AbstractCompetitionInfo.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/info/AbstractCompetitionInfo.java
index 434395d7..ecf84ed1 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/AbstractCompetitionInfo.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/info/AbstractCompetitionInfo.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.api.mechanic.competition;
+package net.momirealms.customfishing.api.mechanic.competition.info;
/**
* Abstract base class for competition information.
@@ -28,12 +28,19 @@ public abstract class AbstractCompetitionInfo {
protected boolean showToAll;
protected String[] texts;
+ protected AbstractCompetitionInfo(int refreshRate, int switchInterval, boolean showToAll, String[] texts) {
+ this.refreshRate = refreshRate;
+ this.switchInterval = switchInterval;
+ this.showToAll = showToAll;
+ this.texts = texts;
+ }
+
/**
* Get the refresh rate for updating competition information.
*
* @return The refresh rate in ticks.
*/
- public int getRefreshRate() {
+ public int refreshRate() {
return refreshRate;
}
@@ -42,7 +49,7 @@ public abstract class AbstractCompetitionInfo {
*
* @return The switch interval in ticks.
*/
- public int getSwitchInterval() {
+ public int switchInterval() {
return switchInterval;
}
@@ -51,7 +58,7 @@ public abstract class AbstractCompetitionInfo {
*
* @return True if information is shown to all players, otherwise only to participants.
*/
- public boolean isShowToAll() {
+ public boolean showToAll() {
return showToAll;
}
@@ -60,7 +67,7 @@ public abstract class AbstractCompetitionInfo {
*
* @return An array of competition information texts.
*/
- public String[] getTexts() {
+ public String[] texts() {
return texts;
}
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/info/ActionBarConfig.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/info/ActionBarConfig.java
new file mode 100644
index 00000000..b8122d10
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/info/ActionBarConfig.java
@@ -0,0 +1,91 @@
+package net.momirealms.customfishing.api.mechanic.competition.info;
+
+public interface ActionBarConfig {
+
+ int DEFAULT_REFRESH_RATE = 20;
+ int DEFAULT_SWITCH_INTERVAL = 200;
+ boolean DEFAULT_VISIBILITY = true;
+ String[] DEFAULT_TEXTS = new String[]{""};
+
+ /**
+ * Get the refresh rate for updating the competition information on the action bar.
+ *
+ * @return The refresh rate in ticks.
+ */
+ int refreshRate();
+
+ /**
+ * Get the switch interval for displaying different competition texts.
+ *
+ * @return The switch interval in ticks.
+ */
+ int switchInterval();
+
+ /**
+ * Check if competition information should be shown to all players.
+ *
+ * @return True if information is shown to all players, otherwise only to participants.
+ */
+ boolean showToAll();
+
+ /**
+ * Get an array of competition information texts.
+ *
+ * @return An array of competition information texts.
+ */
+ String[] texts();
+
+ /**
+ * Creates a new builder instance for constructing {@code ActionBarConfig} objects.
+ *
+ * @return A new {@code Builder} instance.
+ */
+ static Builder builder() {
+ return new ActionBarConfigImpl.BuilderImpl();
+ }
+
+ /**
+ * Builder interface for constructing {@code ActionBarConfig} objects.
+ */
+ interface Builder {
+
+ /**
+ * Sets whether the competition information should be shown to all players.
+ *
+ * @param showToAll True to show information to all players, false to show only to participants.
+ * @return The current {@code Builder} instance.
+ */
+ Builder showToAll(boolean showToAll);
+
+ /**
+ * Sets the refresh rate for updating the competition information.
+ *
+ * @param rate The refresh rate in ticks.
+ * @return The current {@code Builder} instance.
+ */
+ Builder refreshRate(int rate);
+
+ /**
+ * Sets the interval for switching between different competition texts.
+ *
+ * @param interval The switch interval in ticks.
+ * @return The current {@code Builder} instance.
+ */
+ Builder switchInterval(int interval);
+
+ /**
+ * Sets the texts to be displayed on the action bar during the competition.
+ *
+ * @param texts An array of competition information texts.
+ * @return The current {@code Builder} instance.
+ */
+ Builder text(String[] texts);
+
+ /**
+ * Builds the {@code ActionBarConfig} object with the configured settings.
+ *
+ * @return The constructed {@code ActionBarConfig} object.
+ */
+ ActionBarConfig build();
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/info/ActionBarConfigImpl.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/info/ActionBarConfigImpl.java
new file mode 100644
index 00000000..f7510460
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/info/ActionBarConfigImpl.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) <2022>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package net.momirealms.customfishing.api.mechanic.competition.info;
+
+public class ActionBarConfigImpl extends AbstractCompetitionInfo implements ActionBarConfig {
+
+ public ActionBarConfigImpl(int refreshRate, int switchInterval, boolean showToAll, String[] texts) {
+ super(refreshRate, switchInterval, showToAll, texts);
+ }
+
+ public static class BuilderImpl implements Builder {
+ private int refreshRate = DEFAULT_REFRESH_RATE;
+ private int switchInterval = DEFAULT_SWITCH_INTERVAL;
+ private boolean showToAll = DEFAULT_VISIBILITY;
+ private String[] texts = DEFAULT_TEXTS;
+ @Override
+ public BuilderImpl showToAll(boolean showToAll) {
+ this.showToAll = showToAll;
+ return this;
+ }
+ @Override
+ public BuilderImpl refreshRate(int rate) {
+ this.refreshRate = rate;
+ return this;
+ }
+ @Override
+ public BuilderImpl switchInterval(int interval) {
+ this.switchInterval = interval;
+ return this;
+ }
+ @Override
+ public BuilderImpl text(String[] texts) {
+ this.texts = texts;
+ return this;
+ }
+ @Override
+ public ActionBarConfigImpl build() {
+ return new ActionBarConfigImpl(refreshRate, switchInterval, showToAll, texts);
+ }
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/info/BossBarConfig.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/info/BossBarConfig.java
new file mode 100644
index 00000000..08c55a0e
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/info/BossBarConfig.java
@@ -0,0 +1,125 @@
+package net.momirealms.customfishing.api.mechanic.competition.info;
+
+import net.kyori.adventure.bossbar.BossBar;
+
+public interface BossBarConfig {
+
+ int DEFAULT_REFRESH_RATE = 20;
+ int DEFAULT_SWITCH_INTERVAL = 200;
+ boolean DEFAULT_VISIBILITY = true;
+ String[] DEFAULT_TEXTS = new String[]{""};
+ BossBar.Color DEFAULT_COLOR = BossBar.Color.BLUE;
+ BossBar.Overlay DEFAULT_OVERLAY = BossBar.Overlay.PROGRESS;
+
+ /**
+ * Get the refresh rate for updating competition information.
+ *
+ * @return The refresh rate in ticks.
+ */
+ int refreshRate();
+
+ /**
+ * Get the switch interval for displaying different competition texts.
+ *
+ * @return The switch interval in ticks.
+ */
+ int switchInterval();
+
+ /**
+ * Check if competition information should be shown to all players.
+ *
+ * @return True if information is shown to all players, otherwise only to participants.
+ */
+ boolean showToAll();
+
+ /**
+ * Get an array of competition information texts.
+ *
+ * @return An array of competition information texts.
+ */
+ String[] texts();
+
+ /**
+ * Gets the color of the boss bar.
+ *
+ * @return The color of the boss bar.
+ */
+ BossBar.Color color();
+
+ /**
+ * Gets the overlay style of the boss bar.
+ *
+ * @return The overlay style of the boss bar.
+ */
+ BossBar.Overlay overlay();
+
+ /**
+ * Creates a new builder instance for constructing {@code BossBarConfig} objects.
+ *
+ * @return A new {@code Builder} instance.
+ */
+ static Builder builder() {
+ return new BossBarConfigImpl.BuilderImpl();
+ }
+
+ /**
+ * Builder interface for constructing {@code BossBarConfig} objects.
+ */
+ interface Builder {
+
+ /**
+ * Sets whether the competition information should be shown to all players.
+ *
+ * @param showToAll True to show information to all players, false to show only to participants.
+ * @return The current {@code Builder} instance.
+ */
+ Builder showToAll(boolean showToAll);
+
+ /**
+ * Sets the refresh rate for updating the competition information.
+ *
+ * @param rate The refresh rate in ticks.
+ * @return The current {@code Builder} instance.
+ */
+ Builder refreshRate(int rate);
+
+ /**
+ * Sets the interval for switching between different competition texts.
+ *
+ * @param interval The switch interval in ticks.
+ * @return The current {@code Builder} instance.
+ */
+ Builder switchInterval(int interval);
+
+ /**
+ * Sets the texts to be displayed on the boss bar during the competition.
+ *
+ * @param texts An array of competition information texts.
+ * @return The current {@code Builder} instance.
+ */
+ Builder text(String[] texts);
+
+ /**
+ * Sets the color of the boss bar.
+ *
+ * @param color The color of the boss bar.
+ * @return The current {@code Builder} instance.
+ */
+ Builder color(BossBar.Color color);
+
+ /**
+ * Sets the overlay style of the boss bar.
+ *
+ * @param overlay The overlay style of the boss bar.
+ * @return The current {@code Builder} instance.
+ */
+ Builder overlay(BossBar.Overlay overlay);
+
+ /**
+ * Builds the {@code BossBarConfig} object with the configured settings.
+ *
+ * @return The constructed {@code BossBarConfig} object.
+ */
+ BossBarConfig build();
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/info/BossBarConfigImpl.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/info/BossBarConfigImpl.java
new file mode 100644
index 00000000..a00ed7d6
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/info/BossBarConfigImpl.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) <2022>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package net.momirealms.customfishing.api.mechanic.competition.info;
+
+import net.kyori.adventure.bossbar.BossBar;
+
+public class BossBarConfigImpl extends AbstractCompetitionInfo implements BossBarConfig {
+
+ private final BossBar.Color color;
+ private final BossBar.Overlay overlay;
+
+ public BossBarConfigImpl(int refreshRate, int switchInterval, boolean showToAll, String[] texts, BossBar.Color color, BossBar.Overlay overlay) {
+ super(refreshRate, switchInterval, showToAll, texts);
+ this.color = color;
+ this.overlay = overlay;
+ }
+
+ @Override
+ public BossBar.Color color() {
+ return color;
+ }
+
+ @Override
+ public BossBar.Overlay overlay() {
+ return overlay;
+ }
+
+ public static class BuilderImpl implements Builder {
+ private int refreshRate = DEFAULT_REFRESH_RATE;
+ private int switchInterval = DEFAULT_SWITCH_INTERVAL;
+ private boolean showToAll = DEFAULT_VISIBILITY;
+ private String[] texts = DEFAULT_TEXTS;
+ private BossBar.Overlay overlay = DEFAULT_OVERLAY;
+ public BossBar.Color color = DEFAULT_COLOR;
+ @Override
+ public BuilderImpl showToAll(boolean showToAll) {
+ this.showToAll = showToAll;
+ return this;
+ }
+ @Override
+ public BuilderImpl refreshRate(int rate) {
+ this.refreshRate = rate;
+ return this;
+ }
+ @Override
+ public BuilderImpl switchInterval(int interval) {
+ this.switchInterval = interval;
+ return this;
+ }
+ @Override
+ public BuilderImpl text(String[] texts) {
+ this.texts = texts;
+ return this;
+ }
+ @Override
+ public BuilderImpl color(BossBar.Color color) {
+ this.color = color;
+ return this;
+ }
+ @Override
+ public BuilderImpl overlay(BossBar.Overlay overlay) {
+ this.overlay = overlay;
+ return this;
+ }
+ @Override
+ public BossBarConfigImpl build() {
+ return new BossBarConfigImpl(refreshRate, switchInterval, showToAll, texts, color, overlay);
+ }
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/condition/Condition.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/condition/Condition.java
deleted file mode 100644
index 8d41e070..00000000
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/condition/Condition.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) <2022>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package net.momirealms.customfishing.api.mechanic.condition;
-
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Represents a condition with associated data
- */
-public class Condition {
-
- protected Location location;
- protected final Player player;
- protected final @NotNull Map args;
-
- /**
- * Creates a new Condition object based on a player's location.
- *
- * @param player The player associated with this condition.
- */
- public Condition(@NotNull Player player) {
- this(player.getLocation(), player, new HashMap<>());
- }
-
- /**
- * Creates a new Condition object with specified arguments.
- *
- * @param player The player associated with this condition.
- * @param args A map of arguments associated with this condition.
- */
- public Condition(@NotNull Player player, @NotNull Map args) {
- this(player.getLocation(), player, args);
- }
-
- /**
- * Creates a new Condition object with a specific location, player, and arguments.
- *
- * @param location The location associated with this condition.
- * @param player The player associated with this condition.
- * @param args A map of arguments associated with this condition.
- */
- public Condition(Location location, Player player, @NotNull Map args) {
- this.location = location;
- this.player = player;
- this.args = args;
- if (player != null)
- this.args.put("{player}", player.getName());
- if (location != null) {
- this.args.put("{x}", String.valueOf(location.getX()));
- this.args.put("{y}", String.valueOf(location.getY()));
- this.args.put("{z}", String.valueOf(location.getZ()));
- this.args.put("{world}", location.getWorld().getName());
- }
- }
-
- /**
- * Sets the location associated with this condition.
- *
- * @param location The new location to set.
- */
- public void setLocation(@NotNull Location location) {
- this.location = location;
- this.args.put("{x}", String.valueOf(location.getX()));
- this.args.put("{y}", String.valueOf(location.getY()));
- this.args.put("{z}", String.valueOf(location.getZ()));
- this.args.put("{world}", location.getWorld().getName());
- }
-
- /**
- * Gets the location associated with this condition.
- *
- * @return The location associated with this condition.
- */
- public Location getLocation() {
- return location;
- }
-
- /**
- * Gets the player associated with this condition.
- *
- * @return The player associated with this condition.
- */
- public Player getPlayer() {
- return player;
- }
-
- /**
- * Gets the map of arguments associated with this condition.
- *
- * @return A map of arguments associated with this condition.
- */
- @NotNull
- public Map getArgs() {
- return args;
- }
-
- /**
- * Gets the value of a specific argument by its key.
- *
- * @param key The key of the argument to retrieve.
- * @return The value of the argument or null if not found.
- */
- @Nullable
- public String getArg(String key) {
- return args.get(key);
- }
-
- /**
- * Inserts or updates an argument with the specified key and value.
- *
- * @param key The key of the argument to insert or update.
- * @param value The value to set for the argument.
- */
- public void insertArg(String key, String value) {
- args.put(key, value);
- }
-
- /**
- * Deletes an argument with the specified key.
- *
- * @param key The key of the argument to delete.
- * @return The value of the deleted argument or null if not found.
- */
- public String delArg(String key) {
- return args.remove(key);
- }
-}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/condition/FishingPreparation.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/condition/FishingPreparation.java
deleted file mode 100644
index 2ce5b509..00000000
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/condition/FishingPreparation.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) <2022>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package net.momirealms.customfishing.api.mechanic.condition;
-
-import net.momirealms.customfishing.api.mechanic.action.ActionTrigger;
-import net.momirealms.customfishing.api.mechanic.effect.FishingEffect;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public abstract class FishingPreparation extends Condition {
-
- public FishingPreparation(Player player) {
- super(player);
- }
-
- /**
- * Retrieves the ItemStack representing the fishing rod.
- *
- * @return The ItemStack representing the fishing rod.
- */
- @NotNull
- public abstract ItemStack getRodItemStack();
-
- /**
- * Retrieves the ItemStack representing the bait (if available).
- *
- * @return The ItemStack representing the bait, or null if no bait is set.
- */
- @Nullable
- public abstract ItemStack getBaitItemStack();
-
- /**
- * Checks if player meet the requirements for fishing gears
- *
- * @return True if can fish, false otherwise.
- */
- public abstract boolean canFish();
-
- /**
- * Merges a FishingEffect into this fishing rod, applying effect modifiers.
- *
- * @param effect The FishingEffect to merge into this rod.
- */
- public abstract void mergeEffect(FishingEffect effect);
-
- /**
- * Triggers actions associated with a specific action trigger.
- *
- * @param actionTrigger The action trigger that initiates the actions.
- */
- public abstract void triggerActions(ActionTrigger actionTrigger);
-}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/config/BukkitConfigManager.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/config/BukkitConfigManager.java
new file mode 100644
index 00000000..68ca2965
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/config/BukkitConfigManager.java
@@ -0,0 +1,163 @@
+package net.momirealms.customfishing.api.mechanic.config;
+
+import dev.dejvokep.boostedyaml.YamlDocument;
+import dev.dejvokep.boostedyaml.dvs.versioning.BasicVersioning;
+import dev.dejvokep.boostedyaml.settings.dumper.DumperSettings;
+import dev.dejvokep.boostedyaml.settings.general.GeneralSettings;
+import dev.dejvokep.boostedyaml.settings.loader.LoaderSettings;
+import dev.dejvokep.boostedyaml.settings.updater.UpdaterSettings;
+import net.momirealms.customfishing.api.mechanic.context.Context;
+import net.momirealms.customfishing.api.mechanic.context.ContextKeys;
+import net.momirealms.customfishing.api.mechanic.misc.function.FormatFunction;
+import net.momirealms.customfishing.api.mechanic.misc.function.ItemPropertyFunction;
+import net.momirealms.customfishing.api.mechanic.misc.value.MathValue;
+import net.momirealms.customfishing.api.mechanic.misc.value.TextValue;
+import net.momirealms.customfishing.common.config.ConfigManager;
+import net.momirealms.customfishing.common.config.node.Node;
+import net.momirealms.customfishing.common.helper.AdventureHelper;
+import net.momirealms.customfishing.common.item.Item;
+import net.momirealms.customfishing.common.plugin.CustomFishingPlugin;
+import net.momirealms.customfishing.common.util.ListUtils;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+public class BukkitConfigManager implements ConfigManager {
+
+ private final CustomFishingPlugin plugin;
+
+ private final HashMap> formatFunctions = new HashMap<>();
+
+ public BukkitConfigManager(CustomFishingPlugin plugin) {
+ this.plugin = plugin;
+ this.registerBuiltInItemProperties();
+ }
+
+ private void registerBuiltInItemProperties() {
+ this.registerItemFunction(arg -> {
+ MathValue mathValue = MathValue.auto(arg);
+ return (item, context) -> item.customModelData((int) mathValue.evaluate(context));
+ }, 4000, "custom-model-data");
+ this.registerItemFunction(arg -> {
+ TextValue textValue = TextValue.auto((String) arg);
+ return (item, context) -> {
+ item.displayName(AdventureHelper.miniMessageToJson(textValue.render(context)));
+ };
+ }, 3000, "display", "name");
+ this.registerItemFunction(arg -> {
+ List list = ListUtils.toList(arg);
+ List> lore = new ArrayList<>();
+ for (String text : list) {
+ lore.add(TextValue.auto(text));
+ }
+ return (item, context) -> {
+ item.lore(lore.stream()
+ .map(it -> AdventureHelper.miniMessageToJson(it.render(context)))
+ .toList());
+ };
+ }, 2000, "display", "lore");
+ this.registerItemFunction(arg -> {
+ boolean enable = (boolean) arg;
+ return (item, context) -> {
+ if (!enable) return;
+ item.setTag(context.arg(ContextKeys.ID), "CustomFishing", "id");
+ item.setTag(context.arg(ContextKeys.TYPE), "CustomFishing", "type");
+ };
+ }, 1000, "tag");
+ }
+
+ private void registerItemFunction(Function, Context>> function, int priority, String... nodes) {
+ registerNodeFunction(nodes, new ItemPropertyFunction(priority, function));
+ }
+
+ public void registerNodeFunction(String[] nodes, FormatFunction formatFunction) {
+ Map> functionMap = formatFunctions;
+ for (int i = 0; i < nodes.length; i++) {
+ if (functionMap.containsKey(nodes[i])) {
+ Node functionNode = functionMap.get(nodes[i]);
+ if (functionNode.nodeValue() != null) {
+ throw new IllegalArgumentException("Format function '" + nodes[i] + "' already exists");
+ }
+ functionMap = functionNode.getChildTree();
+ } else {
+ if (i != nodes.length - 1) {
+ Node newNode = new Node<>();
+ functionMap.put(nodes[i], newNode);
+ functionMap = newNode.getChildTree();
+ } else {
+ functionMap.put(nodes[i], new Node<>(formatFunction));
+ }
+ }
+ }
+ }
+
+ protected Path resolveConfig(String filePath) {
+ if (filePath == null || filePath.equals("")) {
+ throw new IllegalArgumentException("ResourcePath cannot be null or empty");
+ }
+
+ filePath = filePath.replace('\\', '/');
+
+ Path configFile = plugin.getConfigDirectory().resolve(filePath);
+
+ // if the config doesn't exist, create it based on the template in the resources dir
+ if (!Files.exists(configFile)) {
+ try {
+ Files.createDirectories(configFile.getParent());
+ } catch (IOException e) {
+ // ignore
+ }
+
+ try (InputStream is = plugin.getResourceStream(filePath)) {
+
+ if (is == null) {
+ throw new IllegalArgumentException("The embedded resource '" + filePath + "' cannot be found");
+ }
+
+ Files.copy(is, configFile);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ return configFile;
+ }
+
+ @Override
+ public YamlDocument loadConfig(String filePath) {
+ return loadConfig(filePath, '.');
+ }
+
+ @Override
+ public YamlDocument loadConfig(String filePath, char routeSeparator) {
+ try {
+ return YamlDocument.create(
+ resolveConfig(filePath).toFile(),
+ plugin.getResourceStream(filePath),
+ GeneralSettings.builder().setRouteSeparator(routeSeparator).build(),
+ LoaderSettings
+ .builder()
+ .setAutoUpdate(true)
+ .build(),
+ DumperSettings.DEFAULT,
+ UpdaterSettings
+ .builder()
+ .setVersioning(new BasicVersioning("config-version"))
+ .build()
+ );
+ } catch (IOException e) {
+ plugin.getPluginLogger().severe("Failed to load config " + filePath, e);
+ return null;
+ }
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/config/ItemConfig.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/config/ItemConfig.java
new file mode 100644
index 00000000..4a7ad3c2
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/config/ItemConfig.java
@@ -0,0 +1,62 @@
+package net.momirealms.customfishing.api.mechanic.config;
+
+import dev.dejvokep.boostedyaml.block.implementation.Section;
+import net.momirealms.customfishing.api.mechanic.context.Context;
+import net.momirealms.customfishing.api.mechanic.item.CustomFishingItem;
+import net.momirealms.customfishing.api.mechanic.misc.function.FormatFunction;
+import net.momirealms.customfishing.api.mechanic.misc.function.ItemPropertyFunction;
+import net.momirealms.customfishing.api.mechanic.misc.function.PriorityFunction;
+import net.momirealms.customfishing.common.config.node.Node;
+import net.momirealms.customfishing.common.item.Item;
+import net.momirealms.customfishing.common.util.Key;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
+
+public class ItemConfig {
+
+ private final String id;
+ private final String material;
+ private final List, Context>>> tagConsumers = new ArrayList<>();
+
+ public ItemConfig(String id, Section section, Map> functionMap) {
+ this.id = id;
+ this.material = section.getString("material");
+ analyze(section, functionMap);
+ }
+
+ private void analyze(Section section, Map> functionMap) {
+ Map dataMap = section.getStringRouteMappedValues(false);
+ for (Map.Entry entry : dataMap.entrySet()) {
+ String key = entry.getKey();
+ Node node = functionMap.get(key);
+ if (node == null) continue;
+ FormatFunction function = node.nodeValue();
+ if (function != null) {
+ if (function instanceof ItemPropertyFunction propertyFunction) {
+ BiConsumer, Context> result = propertyFunction.accept(entry.getValue());
+ tagConsumers.add(new PriorityFunction<>(, result));
+ }
+ continue;
+ }
+ if (entry.getValue() instanceof Section innerSection) {
+ analyze(innerSection, node.getChildTree());
+ }
+ }
+ }
+
+ public Key key() {
+ return Key.of("item", id);
+ }
+
+ public CustomFishingItem getItem() {
+ return CustomFishingItem.builder()
+ .material(material)
+ .tagConsumers(tagConsumers)
+ .build();
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/context/Context.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/context/Context.java
new file mode 100644
index 00000000..9900e79c
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/context/Context.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) <2022>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package net.momirealms.customfishing.api.mechanic.context;
+
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+
+/**
+ * The Context interface represents a generic context for custom fishing mechanics.
+ * It allows for storing and retrieving arguments, as well as getting the holder
+ * of the context. This can be used to maintain state or pass parameters within
+ * the custom fishing mechanics.
+ *
+ * @param the type of the holder object for this context
+ */
+public interface Context {
+
+ /**
+ * Retrieves the map of arguments associated with this context.
+ *
+ * @return a map where the keys are argument names and the values are argument values.
+ */
+ Map, Object> args();
+
+ Context arg(ContextKeys key, C value);
+
+ C arg(ContextKeys key);
+
+ /**
+ * Gets the holder of this context.
+ *
+ * @return the holder object of type T.
+ */
+ T getHolder();
+
+ /**
+ * Creates a player-specific context.
+ *
+ * @param player the player to be used as the holder of the context.
+ * @return a new Context instance with the specified player as the holder.
+ */
+ static Context player(@NotNull Player player) {
+ return new PlayerContextImpl(player);
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/context/ContextKeys.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/context/ContextKeys.java
new file mode 100644
index 00000000..182b011a
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/context/ContextKeys.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) <2022>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package net.momirealms.customfishing.api.mechanic.context;
+
+import org.bukkit.Location;
+
+import java.util.Objects;
+
+public class ContextKeys {
+
+ public static final ContextKeys LOCATION = of("location", Location.class);
+ public static final ContextKeys X = of("x", Integer.class);
+ public static final ContextKeys Y = of("y", Integer.class);
+ public static final ContextKeys Z = of("z", Integer.class);
+ public static final ContextKeys WORLD = of("world", String.class);
+ public static final ContextKeys ID = of("id", String.class);
+ public static final ContextKeys TYPE = of("type", String.class);
+
+ private final String key;
+ private final Class type;
+
+ private ContextKeys(String key, Class type) {
+ this.key = key;
+ this.type = type;
+ }
+
+ public String key() {
+ return key;
+ }
+
+ public Class type() {
+ return type;
+ }
+
+ public static ContextKeys of(String key, Class type) {
+ return new ContextKeys(key, type);
+ }
+
+ @Override
+ public final boolean equals(final Object other) {
+ if (this == other) {
+ return true;
+ } else if (other != null && this.getClass() == other.getClass()) {
+ ContextKeys that = (ContextKeys) other;
+ return Objects.equals(this.key, that.key);
+ } else {
+ return false;
+ }
+ }
+
+ @Override
+ public final int hashCode() {
+ return Objects.hashCode(this.key);
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/context/PlayerContextImpl.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/context/PlayerContextImpl.java
new file mode 100644
index 00000000..dc1dc1df
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/context/PlayerContextImpl.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) <2022>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package net.momirealms.customfishing.api.mechanic.context;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * The PlayerContextImpl class implements the Context interface specifically
+ * for the Player type. It allows for storing and retrieving arguments related
+ * to a player in the custom fishing mechanics.
+ */
+public final class PlayerContextImpl implements Context {
+
+ private final Player player;
+ private final HashMap, Object> args = new HashMap<>();
+
+ /**
+ * Constructs a new PlayerContextImpl with the specified player.
+ *
+ * @param player the player to be associated with this context.
+ */
+ public PlayerContextImpl(@NotNull Player player) {
+ this.player = player;
+ final Location location = player.getLocation();
+ arg(ContextKeys.LOCATION, location)
+ .arg(ContextKeys.X, location.getBlockX())
+ .arg(ContextKeys.Y, location.getBlockY())
+ .arg(ContextKeys.Z, location.getBlockZ())
+ .arg(ContextKeys.WORLD, location.getWorld().getName());
+ }
+
+ /**
+ * Retrieves the map of arguments associated with this context.
+ *
+ * @return a map where the keys are argument names and the values are argument values.
+ */
+ @Override
+ public Map, Object> args() {
+ return args;
+ }
+
+ /**
+ * Adds an argument to the context and returns the context itself
+ * to allow for method chaining.
+ *
+ * @param key the name of the argument to add.
+ * @param value the value of the argument to add.
+ * @return the PlayerContextImpl instance to allow for method chaining.
+ */
+ @Override
+ public PlayerContextImpl arg(ContextKeys key, C value) {
+ args.put(key, value);
+ return this;
+ }
+
+ /**
+ * Retrieves the value of a specific argument from the context.
+ *
+ * @param key the name of the argument to retrieve.
+ * @return the value of the argument, or null if no argument with the given key exists.
+ */
+ @Override
+ @SuppressWarnings("unchecked")
+ public C arg(ContextKeys key) {
+ return (C) args.get(key);
+ }
+
+ /**
+ * Gets the player associated with this context.
+ *
+ * @return the player object associated with this context.
+ */
+ @Override
+ public Player getHolder() {
+ return player;
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/BaseEffect.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/BaseEffect.java
index 53c716a8..caa8796a4 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/BaseEffect.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/BaseEffect.java
@@ -1,20 +1,20 @@
package net.momirealms.customfishing.api.mechanic.effect;
-import net.momirealms.customfishing.api.mechanic.misc.Value;
+import net.momirealms.customfishing.api.mechanic.misc.value.MathValue;
import org.bukkit.entity.Player;
import java.util.Map;
public class BaseEffect {
- private final Value waitTime;
- private final Value waitTimeMultiplier;
- private final Value difficulty;
- private final Value difficultyMultiplier;
- private final Value gameTime;
- private final Value gameTimeMultiplier;
+ private final MathValue waitTime;
+ private final MathValue waitTimeMultiplier;
+ private final MathValue difficulty;
+ private final MathValue difficultyMultiplier;
+ private final MathValue gameTime;
+ private final MathValue gameTimeMultiplier;
- public BaseEffect(Value waitTime, Value waitTimeMultiplier, Value difficulty, Value difficultyMultiplier, Value gameTime, Value gameTimeMultiplier) {
+ public BaseEffect(MathValue waitTime, MathValue waitTimeMultiplier, MathValue difficulty, MathValue difficultyMultiplier, MathValue gameTime, MathValue gameTimeMultiplier) {
this.waitTime = waitTime;
this.waitTimeMultiplier = waitTimeMultiplier;
this.difficulty = difficulty;
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/Effect.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/Effect.java
index a63f7e90..b7933062 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/Effect.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/Effect.java
@@ -17,40 +17,45 @@
package net.momirealms.customfishing.api.mechanic.effect;
-import net.momirealms.customfishing.api.common.Pair;
-import net.momirealms.customfishing.api.mechanic.misc.WeightModifier;
+import net.momirealms.customfishing.common.util.Pair;
+import org.bukkit.entity.Player;
import java.util.List;
+import java.util.function.BiFunction;
public interface Effect {
- boolean canLavaFishing();
+ boolean allowLavaFishing();
- double getMultipleLootChance();
+ double multipleLootChance();
- double getSize();
+ double sizeAdder();
- double getSizeMultiplier();
+ double sizeMultiplier();
- double getScore();
+ double scoreAdder();
- double getScoreMultiplier();
+ double scoreMultiplier();
- double getWaitTime();
+ double waitTimeAdder();
double getWaitTimeMultiplier();
- double getGameTime();
+ double gameTimeAdder();
- double getGameTimeMultiplier();
+ double gameTimeMultiplier();
- double getDifficulty();
+ double difficultyAdder();
- double getDifficultyMultiplier();
+ double difficultyMultiplier();
- List> getWeightModifier();
+ List>> weightModifier();
- List> getWeightModifierIgnored();
+ List>> weightModifierIgnored();
void merge(Effect effect);
+
+ interface Builder {
+
+ }
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectCarrier.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectCarrier.java
index 103edce2..cd70ca91 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectCarrier.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectCarrier.java
@@ -17,10 +17,9 @@
package net.momirealms.customfishing.api.mechanic.effect;
-import net.momirealms.customfishing.api.common.Key;
+import net.kyori.adventure.key.Key;
import net.momirealms.customfishing.api.mechanic.action.Action;
import net.momirealms.customfishing.api.mechanic.action.ActionTrigger;
-import net.momirealms.customfishing.api.mechanic.condition.Condition;
import net.momirealms.customfishing.api.mechanic.requirement.Requirement;
import org.jetbrains.annotations.Nullable;
@@ -102,10 +101,10 @@ public class EffectCarrier {
}
@SuppressWarnings("BooleanMethodIsAlwaysInverted")
- public boolean isConditionMet(Condition condition) {
+ public boolean isConditionMet(PlayerContext playerContext) {
if (requirements == null) return true;
for (Requirement requirement : requirements) {
- if (!requirement.isConditionMet(condition)) {
+ if (!requirement.check(playerContext)) {
return false;
}
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectImpl.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectImpl.java
new file mode 100644
index 00000000..114393ec
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectImpl.java
@@ -0,0 +1,4 @@
+package net.momirealms.customfishing.api.mechanic.effect;
+
+public class EffectImpl {
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/EffectManager.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectManager.java
similarity index 91%
rename from api/src/main/java/net/momirealms/customfishing/api/manager/EffectManager.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectManager.java
index caccbfd4..f288b28f 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/manager/EffectManager.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectManager.java
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.api.manager;
+package net.momirealms.customfishing.api.mechanic.effect;
-import net.momirealms.customfishing.api.common.Key;
-import net.momirealms.customfishing.api.mechanic.effect.BaseEffect;
-import net.momirealms.customfishing.api.mechanic.effect.EffectCarrier;
-import net.momirealms.customfishing.api.mechanic.effect.EffectModifier;
-import net.momirealms.customfishing.api.mechanic.effect.FishingEffect;
+import net.kyori.adventure.key.Key;
import org.bukkit.configuration.ConfigurationSection;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectModifier.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectModifier.java
index 6df659cf..8bbf20ac 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectModifier.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectModifier.java
@@ -17,9 +17,10 @@
package net.momirealms.customfishing.api.mechanic.effect;
-import net.momirealms.customfishing.api.mechanic.condition.Condition;
+import net.momirealms.customfishing.api.mechanic.context.Context;
+import org.bukkit.entity.Player;
public interface EffectModifier {
- void modify(FishingEffect effect, Condition condition);
+ void modify(FishingEffect effect, Context playerContext);
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/FishingEffect.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/FishingEffect.java
index f8408f48..8d294532 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/FishingEffect.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/FishingEffect.java
@@ -18,7 +18,6 @@
package net.momirealms.customfishing.api.mechanic.effect;
import net.momirealms.customfishing.api.common.Pair;
-import net.momirealms.customfishing.api.mechanic.misc.WeightModifier;
import java.util.ArrayList;
import java.util.List;
@@ -214,7 +213,7 @@ public class FishingEffect implements Effect {
* @return True if lava fishing is enabled, false otherwise.
*/
@Override
- public boolean canLavaFishing() {
+ public boolean allowLavaFishing() {
return lavaFishing;
}
@@ -224,7 +223,7 @@ public class FishingEffect implements Effect {
* @return The multiple loot chance value.
*/
@Override
- public double getMultipleLootChance() {
+ public double multipleLootChance() {
return multipleLootChance;
}
@@ -234,7 +233,7 @@ public class FishingEffect implements Effect {
* @return The size multiplier value.
*/
@Override
- public double getSizeMultiplier() {
+ public double sizeMultiplier() {
return sizeMultiplier;
}
@@ -244,7 +243,7 @@ public class FishingEffect implements Effect {
* @return The size value.
*/
@Override
- public double getSize() {
+ public double sizeAdder() {
return size;
}
@@ -254,7 +253,7 @@ public class FishingEffect implements Effect {
* @return The score multiplier value.
*/
@Override
- public double getScoreMultiplier() {
+ public double scoreMultiplier() {
return scoreMultiplier;
}
@@ -274,7 +273,7 @@ public class FishingEffect implements Effect {
* @return The wait time .
*/
@Override
- public double getWaitTime() {
+ public double waitTimeAdder() {
return waitTime;
}
@@ -284,7 +283,7 @@ public class FishingEffect implements Effect {
* @return The game time value.
*/
@Override
- public double getGameTime() {
+ public double gameTimeAdder() {
return gameTime;
}
@@ -294,7 +293,7 @@ public class FishingEffect implements Effect {
* @return The game time value multiplier.
*/
@Override
- public double getGameTimeMultiplier() {
+ public double gameTimeMultiplier() {
return gameTimeMultiplier;
}
@@ -304,7 +303,7 @@ public class FishingEffect implements Effect {
* @return The score value.
*/
@Override
- public double getScore() {
+ public double scoreAdder() {
return score;
}
@@ -314,7 +313,7 @@ public class FishingEffect implements Effect {
* @return The difficulty value.
*/
@Override
- public double getDifficulty() {
+ public double difficultyAdder() {
return difficulty;
}
@@ -324,7 +323,7 @@ public class FishingEffect implements Effect {
* @return The difficulty multiplier value.
*/
@Override
- public double getDifficultyMultiplier() {
+ public double difficultyMultiplier() {
return difficultyMultiplier;
}
@@ -334,7 +333,7 @@ public class FishingEffect implements Effect {
* @return The list of weight modifiers.
*/
@Override
- public List> getWeightModifier() {
+ public List> weightModifier() {
return weightModifier;
}
@@ -344,7 +343,7 @@ public class FishingEffect implements Effect {
* @return The list of weight modifiers ignoring conditions.
*/
@Override
- public List> getWeightModifierIgnored() {
+ public List> weightModifierIgnored() {
return weightModifierIgnored;
}
@@ -356,18 +355,18 @@ public class FishingEffect implements Effect {
@Override
public void merge(Effect another) {
if (another == null) return;
- if (another.canLavaFishing()) this.lavaFishing = true;
- this.scoreMultiplier += (another.getScoreMultiplier() -1);
- this.score += another.getScore();
- this.sizeMultiplier += (another.getSizeMultiplier() -1);
- this.size += another.getSize();
- this.difficultyMultiplier += (another.getDifficultyMultiplier() -1);
- this.difficulty += another.getDifficulty();
- this.gameTimeMultiplier += (another.getGameTimeMultiplier() - 1);
- this.gameTime += another.getGameTime();
+ if (another.allowLavaFishing()) this.lavaFishing = true;
+ this.scoreMultiplier += (another.scoreMultiplier() -1);
+ this.score += another.scoreAdder();
+ this.sizeMultiplier += (another.sizeMultiplier() -1);
+ this.size += another.sizeAdder();
+ this.difficultyMultiplier += (another.difficultyMultiplier() -1);
+ this.difficulty += another.difficultyAdder();
+ this.gameTimeMultiplier += (another.gameTimeMultiplier() - 1);
+ this.gameTime += another.gameTimeAdder();
this.waitTimeMultiplier += (another.getWaitTimeMultiplier() -1);
- this.multipleLootChance += another.getMultipleLootChance();
- this.weightModifierIgnored.addAll(another.getWeightModifierIgnored());
- this.weightModifier.addAll(another.getWeightModifier());
+ this.multipleLootChance += another.multipleLootChance();
+ this.weightModifierIgnored.addAll(another.weightModifierIgnored());
+ this.weightModifier.addAll(another.weightModifier());
}
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/entity/EntityConfig.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/entity/EntityConfig.java
index 8590a413..84e5b4ac 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/entity/EntityConfig.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/entity/EntityConfig.java
@@ -17,76 +17,104 @@
package net.momirealms.customfishing.api.mechanic.entity;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
import java.util.Map;
-public class EntityConfig implements EntitySettings {
+/**
+ * The EntityConfig interface defines the configuration for an entity used in custom fishing mechanics.
+ * It includes methods to retrieve various properties of the entity such as vectors and an ID, as well
+ * as a nested Builder interface for constructing instances of EntityConfig.
+ */
+public interface EntityConfig {
- private String entity;
- private double horizontalVector;
- private double verticalVector;
- private Map propertyMap;
- private boolean persist;
+ double DEFAULT_HORIZONTAL_VECTOR = 1;
+ double DEFAULT_VERTICAL_VECTOR = 1;
+ String DEFAULT_ENTITY_ID = "";
+ Map DEFAULT_PROPERTY_MAP = Map.of();
- @Override
- public boolean isPersist() {
- return persist;
+ /**
+ * Retrieves the horizontal vector value for the entity.
+ *
+ * @return the horizontal vector value as a double
+ */
+ double getHorizontalVector();
+
+ /**
+ * Retrieves the vertical vector value for the entity.
+ *
+ * @return the vertical vector value as a double
+ */
+ double getVerticalVector();
+
+ /**
+ * Retrieves the unique identifier for the entity.
+ *
+ * @return the entity ID as a non-null String
+ */
+ @NotNull
+ String getEntityID();
+
+ /**
+ * Retrieves a map of properties associated with the entity.
+ *
+ * @return a non-null map where keys are property names and values are property values
+ */
+ @NotNull
+ Map getPropertyMap();
+
+ /**
+ * Creates a new Builder instance for constructing an EntityConfig.
+ *
+ * @return a new Builder instance
+ */
+ static Builder builder() {
+ return new EntityConfigImpl.BuilderImpl();
}
- @Override
- public double getHorizontalVector() {
- return horizontalVector;
- }
+ /**
+ * Builder interface for constructing instances of EntityConfig.
+ */
+ interface Builder {
- @Override
- public double getVerticalVector() {
- return verticalVector;
- }
+ /**
+ * Sets the entity ID for the EntityConfig being built.
+ *
+ * @param value the entity ID as a String
+ * @return the current Builder instance
+ */
+ Builder entityID(String value);
- @Override
- public String getEntityID() {
- return entity;
- }
+ /**
+ * Sets the vertical vector value for the EntityConfig being built.
+ *
+ * @param value the vertical vector value as a double
+ * @return the current Builder instance
+ */
+ Builder verticalVector(double value);
- @Override
- public Map getPropertyMap() {
- return propertyMap;
- }
+ /**
+ * Sets the horizontal vector value for the EntityConfig being built.
+ *
+ * @param value the horizontal vector value as a double
+ * @return the current Builder instance
+ */
+ Builder horizontalVector(double value);
- public static class Builder {
+ /**
+ * Sets the property map for the EntityConfig being built.
+ *
+ * @param value a map of properties where keys are property names and values are property values
+ * @return the current Builder instance
+ */
+ Builder propertyMap(Map value);
- private final EntityConfig config;
-
- public Builder() {
- this.config = new EntityConfig();
- }
-
- public Builder entityID(String value) {
- this.config.entity = value;
- return this;
- }
-
- public Builder persist(boolean value) {
- this.config.persist = value;
- return this;
- }
-
- public Builder verticalVector(double value) {
- this.config.verticalVector = value;
- return this;
- }
-
- public Builder horizontalVector(double value) {
- this.config.horizontalVector = value;
- return this;
- }
-
- public Builder propertyMap(Map value) {
- this.config.propertyMap = value;
- return this;
- }
-
- public EntityConfig build() {
- return config;
- }
+ /**
+ * Builds and returns the EntityConfig instance based on the current state of the Builder.
+ *
+ * @return a new EntityConfig instance
+ */
+ EntityConfig build();
}
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/entity/EntityConfigImpl.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/entity/EntityConfigImpl.java
new file mode 100644
index 00000000..b224a6f7
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/entity/EntityConfigImpl.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) <2022>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package net.momirealms.customfishing.api.mechanic.entity;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+
+public class EntityConfigImpl implements EntityConfig {
+
+ private final String id;
+ private final double horizontalVector;
+ private final double verticalVector;
+ private final Map propertyMap;
+
+ public EntityConfigImpl(String id, double horizontalVector, double verticalVector, Map propertyMap) {
+ this.id = id;
+ this.horizontalVector = horizontalVector;
+ this.verticalVector = verticalVector;
+ this.propertyMap = propertyMap;
+ }
+
+ @Override
+ public double getHorizontalVector() {
+ return horizontalVector;
+ }
+
+ @Override
+ public double getVerticalVector() {
+ return verticalVector;
+ }
+
+ @NotNull
+ @Override
+ public String getEntityID() {
+ return id;
+ }
+
+ @NotNull
+ @Override
+ public Map getPropertyMap() {
+ return propertyMap;
+ }
+
+ public static class BuilderImpl implements Builder {
+ private String entity = DEFAULT_ENTITY_ID;
+ private double horizontalVector = DEFAULT_HORIZONTAL_VECTOR;
+ private double verticalVector = DEFAULT_VERTICAL_VECTOR;
+ private Map propertyMap = DEFAULT_PROPERTY_MAP;
+ @Override
+ public BuilderImpl entityID(String value) {
+ this.entity = value;
+ return this;
+ }
+ @Override
+ public BuilderImpl verticalVector(double value) {
+ this.verticalVector = value;
+ return this;
+ }
+ @Override
+ public BuilderImpl horizontalVector(double value) {
+ this.horizontalVector = value;
+ return this;
+ }
+ @Override
+ public BuilderImpl propertyMap(Map value) {
+ this.propertyMap = value;
+ return this;
+ }
+ @Override
+ public EntityConfigImpl build() {
+ return new EntityConfigImpl(entity, horizontalVector, verticalVector, propertyMap);
+ }
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/entity/EntityLibrary.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/entity/EntityLibrary.java
deleted file mode 100644
index 74f4358e..00000000
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/entity/EntityLibrary.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) <2022>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package net.momirealms.customfishing.api.mechanic.entity;
-
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-
-import java.util.Map;
-
-public interface EntityLibrary {
-
- String identification();
-
- Entity spawn(Location location, String id, Map propertyMap);
-}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/EntityManager.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/entity/EntityManager.java
similarity index 62%
rename from api/src/main/java/net/momirealms/customfishing/api/manager/EntityManager.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/entity/EntityManager.java
index 25de6e97..45b88fbb 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/manager/EntityManager.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/entity/EntityManager.java
@@ -15,30 +15,13 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.api.manager;
+package net.momirealms.customfishing.api.mechanic.entity;
-import net.momirealms.customfishing.api.mechanic.entity.EntityLibrary;
import net.momirealms.customfishing.api.mechanic.loot.Loot;
import org.bukkit.Location;
public interface EntityManager {
- /**
- * Registers an entity library for use in the plugin.
- *
- * @param entityLibrary The entity library to register.
- * @return {@code true} if the entity library was successfully registered, {@code false} if it already exists.
- */
- boolean registerEntityLibrary(EntityLibrary entityLibrary);
-
- /**
- * Unregisters an entity library by its identification key.
- *
- * @param identification The identification key of the entity library to unregister.
- * @return {@code true} if the entity library was successfully unregistered, {@code false} if it does not exist.
- */
- boolean unregisterEntityLibrary(String identification);
-
/**
* Summons an entity based on the given loot configuration to a specified location.
*
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/entity/EntitySettings.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/entity/EntitySettings.java
deleted file mode 100644
index 57ae5d76..00000000
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/entity/EntitySettings.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) <2022>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package net.momirealms.customfishing.api.mechanic.entity;
-
-import java.util.Map;
-
-public interface EntitySettings {
- boolean isPersist();
-
- double getHorizontalVector();
-
- double getVerticalVector();
-
- String getEntityID();
-
- Map getPropertyMap();
-}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/FishingManager.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/FishingManager.java
similarity index 93%
rename from api/src/main/java/net/momirealms/customfishing/api/manager/FishingManager.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/FishingManager.java
index bb9eabbe..529b1bd1 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/manager/FishingManager.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/FishingManager.java
@@ -15,10 +15,9 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.api.manager;
+package net.momirealms.customfishing.api.mechanic.fishing;
import net.momirealms.customfishing.api.mechanic.TempFishingState;
-import net.momirealms.customfishing.api.mechanic.condition.Condition;
import net.momirealms.customfishing.api.mechanic.effect.Effect;
import net.momirealms.customfishing.api.mechanic.game.GameInstance;
import net.momirealms.customfishing.api.mechanic.game.GameSettings;
@@ -81,10 +80,10 @@ public interface FishingManager {
* Starts a fishing game for the specified player with the given condition and effect.
*
* @param player The player starting the fishing game.
- * @param condition The condition used to determine the game.
+ * @param playerContext The condition used to determine the game.
* @param effect The effect applied to the game.
*/
- boolean startFishingGame(Player player, Condition condition, Effect effect);
+ boolean startFishingGame(Player player, PlayerContext playerContext, Effect effect);
/**
* Starts a fishing game for the specified player with the given settings and game instance.
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGamingPlayer.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGamingPlayer.java
index 3a163850..fcd2abf5 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGamingPlayer.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGamingPlayer.java
@@ -17,8 +17,8 @@
package net.momirealms.customfishing.api.mechanic.game;
-import net.momirealms.customfishing.api.CustomFishingPlugin;
-import net.momirealms.customfishing.api.manager.FishingManager;
+import net.momirealms.customfishing.api.BukkitCustomFishingPlugin;
+import net.momirealms.customfishing.api.mechanic.fishing.FishingManager;
import net.momirealms.customfishing.api.mechanic.effect.Effect;
import net.momirealms.customfishing.api.scheduler.CancellableTask;
import org.bukkit.Material;
@@ -41,13 +41,13 @@ public abstract class AbstractGamingPlayer implements GamingPlayer, Runnable {
this.player = player;
this.fishHook = hook;
this.settings = settings;
- this.manager = CustomFishingPlugin.get().getFishingManager();
+ this.manager = BukkitCustomFishingPlugin.get().getFishingManager();
this.deadline = (long) (System.currentTimeMillis() + settings.getTime() * 1000L);
this.arrangeTask();
}
public void arrangeTask() {
- this.task = CustomFishingPlugin.get().getScheduler().runTaskSyncTimer(this, fishHook.getLocation(), 1, 1);
+ this.task = BukkitCustomFishingPlugin.get().getScheduler().runTaskSyncTimer(this, fishHook.getLocation(), 1, 1);
}
@Override
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/BasicGameConfig.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/BasicGameConfig.java
index 5983cc79..97cb5a84 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/BasicGameConfig.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/BasicGameConfig.java
@@ -79,8 +79,8 @@ public class BasicGameConfig {
@Nullable
public GameSettings getGameSetting(Effect effect) {
return new GameSettings(
- ThreadLocalRandom.current().nextInt(minTime, maxTime + 1) * effect.getGameTimeMultiplier() + effect.getGameTime(),
- (int) Math.min(100, Math.max(1, ThreadLocalRandom.current().nextInt(minDifficulty, maxDifficulty + 1) * effect.getDifficultyMultiplier() + effect.getDifficulty()))
+ ThreadLocalRandom.current().nextInt(minTime, maxTime + 1) * effect.gameTimeMultiplier() + effect.gameTimeAdder(),
+ (int) Math.min(100, Math.max(1, ThreadLocalRandom.current().nextInt(minDifficulty, maxDifficulty + 1) * effect.difficultyMultiplier() + effect.difficultyAdder()))
);
}
}
\ No newline at end of file
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/GameManager.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameManager.java
similarity index 84%
rename from api/src/main/java/net/momirealms/customfishing/api/manager/GameManager.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameManager.java
index 305a35af..2ef335cb 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/manager/GameManager.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/GameManager.java
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.api.manager;
+package net.momirealms.customfishing.api.mechanic.game;
import net.momirealms.customfishing.api.common.Pair;
-import net.momirealms.customfishing.api.mechanic.condition.Condition;
-import net.momirealms.customfishing.api.mechanic.game.BasicGameConfig;
-import net.momirealms.customfishing.api.mechanic.game.GameFactory;
-import net.momirealms.customfishing.api.mechanic.game.GameInstance;
import org.jetbrains.annotations.Nullable;
import java.util.HashMap;
@@ -65,8 +61,8 @@ public interface GameManager {
/**
* Retrieves a map of game names and their associated weights based on the specified conditions.
*
- * @param condition The condition to evaluate game weights.
+ * @param playerContext The condition to evaluate game weights.
* @return A {@code HashMap} containing game names as keys and their associated weights as values.
*/
- HashMap getGameWithWeight(Condition condition);
+ HashMap getGameWithWeight(PlayerContext playerContext);
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/HookManager.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/hook/HookManager.java
similarity index 96%
rename from api/src/main/java/net/momirealms/customfishing/api/manager/HookManager.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/hook/HookManager.java
index d0649926..c3a7d701 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/manager/HookManager.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/hook/HookManager.java
@@ -15,9 +15,8 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.api.manager;
+package net.momirealms.customfishing.api.mechanic.hook;
-import net.momirealms.customfishing.api.mechanic.hook.HookSetting;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.Nullable;
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/BuildableItem.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/BuildableItem.java
deleted file mode 100644
index 9ac17591..00000000
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/BuildableItem.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) <2022>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package net.momirealms.customfishing.api.mechanic.item;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public interface BuildableItem {
-
- default ItemStack build() {
- return build(null, new HashMap<>());
- }
-
- default ItemStack build(Player player) {
- return build(player, new HashMap<>());
- }
-
- ItemStack build(Player player, Map placeholders);
-
- /**
- * Whether the item would be removed from cache when reloading
- */
- boolean persist();
-}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/CustomFishingItem.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/CustomFishingItem.java
new file mode 100644
index 00000000..ae8995f3
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/CustomFishingItem.java
@@ -0,0 +1,69 @@
+package net.momirealms.customfishing.api.mechanic.item;
+
+import net.momirealms.customfishing.api.mechanic.context.Context;
+import net.momirealms.customfishing.api.mechanic.misc.function.PriorityFunction;
+import net.momirealms.customfishing.common.item.Item;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.List;
+import java.util.TreeSet;
+import java.util.function.BiConsumer;
+
+public interface CustomFishingItem {
+
+ String DEFAULT_MATERIAL = "PAPER";
+
+ /**
+ * Returns the material type of the custom fishing item.
+ *
+ * @return the material type as a String.
+ */
+ String material();
+
+ /**
+ * Returns a list of tag consumers which are functions that take an item and context as parameters
+ * and perform some operation on them.
+ *
+ * @return a set of BiConsumer instances.
+ */
+ List, Context>> tagConsumers();
+
+ /**
+ * Creates a new Builder instance to construct a CustomFishingItem.
+ *
+ * @return a new Builder instance.
+ */
+ static Builder builder() {
+ return new CustomFishingItemImpl.BuilderImpl();
+ }
+
+ /**
+ * Builder interface for constructing instances of CustomFishingItem.
+ */
+ interface Builder {
+
+ /**
+ * Sets the material type for the CustomFishingItem being built.
+ *
+ * @param material the material type as a String.
+ * @return the Builder instance for method chaining.
+ */
+ Builder material(String material);
+
+ /**
+ * Sets the list of tag consumers for the CustomFishingItem being built.
+ *
+ * @param tagConsumers a list of BiConsumer instances.
+ * @return the Builder instance for method chaining.
+ */
+ Builder tagConsumers(List, Context>>> tagConsumers);
+
+ /**
+ * Builds and returns a new CustomFishingItem instance.
+ *
+ * @return a new CustomFishingItem instance.
+ */
+ CustomFishingItem build();
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/CustomFishingItemImpl.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/CustomFishingItemImpl.java
new file mode 100644
index 00000000..2fb1935c
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/CustomFishingItemImpl.java
@@ -0,0 +1,57 @@
+package net.momirealms.customfishing.api.mechanic.item;
+
+import net.momirealms.customfishing.api.mechanic.context.Context;
+import net.momirealms.customfishing.api.mechanic.misc.function.PriorityFunction;
+import net.momirealms.customfishing.common.item.Item;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.List;
+import java.util.TreeSet;
+import java.util.function.BiConsumer;
+
+public class CustomFishingItemImpl implements CustomFishingItem {
+
+ private final String material;
+
+ private final List, Context>> tagConsumers;
+
+ public CustomFishingItemImpl(String material, List, Context>> tagConsumers) {
+ this.material = material;
+ this.tagConsumers = tagConsumers;
+ }
+
+ @Override
+ public String material() {
+ return material;
+ }
+
+ @Override
+ public List, Context>> tagConsumers() {
+ return tagConsumers;
+ }
+
+ public static class BuilderImpl implements Builder {
+
+ private String material = DEFAULT_MATERIAL;
+
+ private final TreeSet, Context>>> tagConsumers = new TreeSet<>();
+
+ @Override
+ public Builder material(String material) {
+ this.material = material;
+ return this;
+ }
+
+ @Override
+ public Builder tagConsumers(List, Context>>> tagConsumers) {
+ this.tagConsumers.addAll(tagConsumers);
+ return this;
+ }
+
+ @Override
+ public CustomFishingItem build() {
+ return new CustomFishingItemImpl(material, tagConsumers.stream().map(PriorityFunction::get).toList());
+ }
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemBuilder.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemBuilder.java
deleted file mode 100644
index 97d3e4fb..00000000
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemBuilder.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) <2022>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package net.momirealms.customfishing.api.mechanic.item;
-
-import de.tr7zw.changeme.nbtapi.NBTItem;
-import net.momirealms.customfishing.api.common.Pair;
-import net.momirealms.customfishing.api.common.Tuple;
-import net.momirealms.customfishing.api.mechanic.misc.Value;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemFlag;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-public interface ItemBuilder extends BuildableItem {
-
- ItemBuilder customModelData(int value);
-
- ItemBuilder name(String name);
-
- ItemBuilder amount(int amount);
-
- ItemBuilder amount(int min_amount, int max_amount);
-
- ItemBuilder tag(boolean tag, String type, String id);
-
- ItemBuilder unbreakable(boolean unbreakable);
-
- ItemBuilder placeable(boolean placeable);
-
- ItemBuilder lore(List lore);
-
- ItemBuilder nbt(Map nbt);
-
- ItemBuilder itemFlag(List itemFlags);
-
- ItemBuilder nbt(ConfigurationSection section);
-
- ItemBuilder enchantment(List> enchantments, boolean store);
-
- ItemBuilder randomEnchantments(List> enchantments, boolean store);
-
- ItemBuilder enchantmentPool(List> amountPairs, List, Value>> enchantments, boolean store);
-
- ItemBuilder maxDurability(int max);
-
- ItemBuilder price(float base, float bonus);
-
- ItemBuilder size(Pair size);
-
- ItemBuilder stackable(boolean stackable);
-
- ItemBuilder preventGrabbing(boolean prevent);
-
- ItemBuilder head(String base64);
-
- ItemBuilder randomDamage(boolean damage);
-
- @NotNull
- String getId();
-
- @NotNull
- String getLibrary();
-
- int getAmount();
-
- Collection getEditors();
-
- ItemBuilder removeEditor(String type);
-
- ItemBuilder registerCustomEditor(String type, ItemPropertyEditor editor);
-
- interface ItemPropertyEditor {
-
- void edit(Player player, NBTItem nbtItem, Map placeholders);
-
- default void edit(Player player, NBTItem nbtItem) {
- edit(player, nbtItem, null);
- }
- }
-}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemLibrary.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemManager.java
similarity index 76%
rename from api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemLibrary.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemManager.java
index a4419a9b..28f03726 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemLibrary.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/ItemManager.java
@@ -17,14 +17,14 @@
package net.momirealms.customfishing.api.mechanic.item;
+import net.kyori.adventure.key.Key;
+import net.momirealms.customfishing.api.mechanic.context.Context;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
-public interface ItemLibrary {
+public interface ItemManager {
- String identification();
-
- ItemStack buildItem(Player player, String id);
-
- String getItemID(ItemStack itemStack);
+ @Nullable
+ ItemStack build(Context context, Key key);
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/CFLoot.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/CFLoot.java
deleted file mode 100644
index 0b7419a3..00000000
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/CFLoot.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright (C) <2022>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package net.momirealms.customfishing.api.mechanic.loot;
-
-import net.momirealms.customfishing.api.mechanic.action.Action;
-import net.momirealms.customfishing.api.mechanic.action.ActionTrigger;
-import net.momirealms.customfishing.api.mechanic.condition.Condition;
-import net.momirealms.customfishing.api.mechanic.effect.BaseEffect;
-import net.momirealms.customfishing.api.mechanic.statistic.StatisticsKey;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.HashMap;
-
-public class CFLoot implements Loot {
-
- private final String id;
- private final LootType type;
- private final HashMap actionMap;
- private final HashMap successTimesActionMap;
- private String nick;
- private boolean showInFinder;
- private boolean disableGame;
- private boolean disableGlobalAction;
- private boolean disableStats;
- private boolean instanceGame;
- private double score;
- private String[] lootGroup;
- private StatisticsKey statisticsKey;
- private BaseEffect effect;
-
- public CFLoot(String id, LootType type) {
- this.id = id;
- this.type = type;
- this.actionMap = new HashMap<>();
- this.successTimesActionMap = new HashMap<>();
- }
-
- public static Builder builder(String id, LootType type) {
- return new Builder(id, type);
- }
-
- /**
- * Builder class for CFLoot.
- */
- public static class Builder {
-
- private final CFLoot loot;
-
- public Builder(String id, LootType type) {
- this.loot = new CFLoot(id, type);
- }
-
- /**
- * Set the file path for this loot.
- *
- * @param path file path
- * @return The builder.
- */
- public Builder filePath(String path) {
- return this;
- }
-
- /**
- * Set the nickname for this loot.
- *
- * @param nick The nickname.
- * @return The builder.
- */
- public Builder nick(String nick) {
- this.loot.nick = nick;
- return this;
- }
-
- /**
- * Set whether this loot should be shown in the finder.
- *
- * @param show True if it should be shown, false otherwise.
- * @return The builder.
- */
- public Builder showInFinder(boolean show) {
- this.loot.showInFinder = show;
- return this;
- }
-
- /**
- * Set whether this loot should have an instance game.
- *
- * @param instant True if it should be an instance game, false otherwise.
- * @return The builder.
- */
- public Builder instantGame(boolean instant) {
- this.loot.instanceGame = instant;
- return this;
- }
-
- /**
- * Set whether games are disabled for this loot.
- *
- * @param disable True if games are disabled, false otherwise.
- * @return The builder.
- */
- public Builder disableGames(boolean disable) {
- this.loot.disableGame = disable;
- return this;
- }
-
- /**
- * Set whether statistics are disabled for this loot.
- *
- * @param disable True if statistics are disabled, false otherwise.
- * @return The builder.
- */
- public Builder disableStats(boolean disable) {
- this.loot.disableStats = disable;
- return this;
- }
-
- /**
- * Set whether global actions are disabled for this loot.
- *
- * @param disable True if statistics are disabled, false otherwise.
- * @return The builder.
- */
- public Builder disableGlobalActions(boolean disable) {
- this.loot.disableGlobalAction = disable;
- return this;
- }
-
- /**
- * Set the score for this loot.
- *
- * @param score The score.
- * @return The builder.
- */
- public Builder score(double score) {
- this.loot.score = score;
- return this;
- }
-
- /**
- * Set the loot group for this loot.
- *
- * @param groups The loot group.
- * @return The builder.
- */
- public Builder lootGroup(String[] groups) {
- this.loot.lootGroup = groups;
- return this;
- }
-
- /**
- * Set the statistics key for this loot
- *
- * @param statisticsKey statistics key
- * @return The builder.
- */
- public Builder statsKey(StatisticsKey statisticsKey) {
- this.loot.statisticsKey = statisticsKey;
- return this;
- }
-
- /**
- * Set the effects for the loot
- *
- * @param effect effect
- * @return The builder.
- */
- public Builder baseEffect(BaseEffect effect) {
- this.loot.effect = effect;
- return this;
- }
-
- /**
- * Add actions triggered by a specific trigger.
- *
- * @param trigger The trigger for the actions.
- * @param actions The actions to add.
- * @return The builder.
- */
- public Builder addActions(ActionTrigger trigger, Action[] actions) {
- this.loot.actionMap.put(trigger, actions);
- return this;
- }
-
- /**
- * Add actions triggered by multiple triggers.
- *
- * @param actionMap A map of triggers to actions.
- * @return The builder.
- */
- public Builder addActions(HashMap actionMap) {
- this.loot.actionMap.putAll(actionMap);
- return this;
- }
-
- /**
- * Add actions triggered by the number of successes.
- *
- * @param times The number of successes for triggering the actions.
- * @param actions The actions to add.
- * @return The builder.
- */
- public Builder addTimesActions(int times, Action[] actions) {
- this.loot.successTimesActionMap.put(times, actions);
- return this;
- }
-
- /**
- * Add actions triggered by multiple numbers of successes.
- *
- * @param actionMap A map of numbers of successes to actions.
- * @return The builder.
- */
- public Builder addTimesActions(HashMap actionMap) {
- this.loot.successTimesActionMap.putAll(actionMap);
- return this;
- }
-
- /**
- * Build the CFLoot object.
- *
- * @return The built CFLoot object.
- */
- public CFLoot build() {
- return loot;
- }
- }
-
- @Override
- public boolean instanceGame() {
- return this.instanceGame;
- }
-
- @Override
- public String getID() {
- return this.id;
- }
-
- @Override
- public LootType getType() {
- return this.type;
- }
-
- @Override
- public @NotNull String getNick() {
- return this.nick;
- }
-
- @Override
- public StatisticsKey getStatisticKey() {
- return this.statisticsKey;
- }
-
- @Override
- public boolean showInFinder() {
- return this.showInFinder;
- }
-
- @Override
- public double getScore() {
- return this.score;
- }
-
- @Override
- public boolean disableGame() {
- return this.disableGame;
- }
-
- @Override
- public boolean disableStats() {
- return this.disableStats;
- }
-
- @Override
- public boolean disableGlobalAction() {
- return this.disableGlobalAction;
- }
-
- @Override
- public String[] getLootGroup() {
- return lootGroup;
- }
-
- @Override
- public Action[] getActions(ActionTrigger actionTrigger) {
- return actionMap.get(actionTrigger);
- }
-
- @Override
- public void triggerActions(ActionTrigger actionTrigger, Condition condition) {
- Action[] actions = getActions(actionTrigger);
- if (actions != null) {
- for (Action action : actions) {
- action.trigger(condition);
- }
- }
- }
-
- @Override
- public BaseEffect getBaseEffect() {
- return effect;
- }
-
- @Override
- public Action[] getSuccessTimesActions(int times) {
- return successTimesActionMap.get(times);
- }
-
- @Override
- public HashMap getSuccessTimesActionMap() {
- return successTimesActionMap;
- }
-}
\ No newline at end of file
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/Loot.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/Loot.java
index 020c4991..9baa2517 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/Loot.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/Loot.java
@@ -19,9 +19,9 @@ package net.momirealms.customfishing.api.mechanic.loot;
import net.momirealms.customfishing.api.mechanic.action.Action;
import net.momirealms.customfishing.api.mechanic.action.ActionTrigger;
-import net.momirealms.customfishing.api.mechanic.condition.Condition;
import net.momirealms.customfishing.api.mechanic.effect.BaseEffect;
-import net.momirealms.customfishing.api.mechanic.statistic.StatisticsKey;
+import net.momirealms.customfishing.api.mechanic.statistic.StatisticsKeys;
+import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -63,7 +63,7 @@ public interface Loot {
@NotNull
String getNick();
- StatisticsKey getStatisticKey();
+ StatisticsKeys getStatisticKey();
/**
* Check if this loot should be shown in the finder.
@@ -113,9 +113,9 @@ public interface Loot {
* Trigger actions associated with a specific action trigger.
*
* @param actionTrigger The action trigger.
- * @param condition The condition under which the actions are triggered.
+ * @param playerContext The condition under which the actions are triggered.
*/
- void triggerActions(ActionTrigger actionTrigger, Condition condition);
+ void triggerActions(ActionTrigger actionTrigger, PlayerContext playerContext);
/**
* Get effects that bond to this loot
@@ -130,12 +130,12 @@ public interface Loot {
* @param times The number of successes.
* @return The actions triggered by the specified number of successes.
*/
- Action[] getSuccessTimesActions(int times);
+ Action[] getRecordActions(int times);
/**
* Get a map of actions triggered by different numbers of successes.
*
* @return A map of actions triggered by success times.
*/
- HashMap getSuccessTimesActionMap();
+ HashMap[]> getRecordActionMap();
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/LootManager.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/LootManager.java
similarity index 79%
rename from api/src/main/java/net/momirealms/customfishing/api/manager/LootManager.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/LootManager.java
index 75acc6f8..f982e473 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/manager/LootManager.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/LootManager.java
@@ -15,11 +15,9 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.api.manager;
+package net.momirealms.customfishing.api.mechanic.loot;
-import net.momirealms.customfishing.api.mechanic.condition.Condition;
import net.momirealms.customfishing.api.mechanic.effect.Effect;
-import net.momirealms.customfishing.api.mechanic.loot.Loot;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -63,34 +61,34 @@ public interface LootManager {
/**
* Retrieves loot configurations with weights based on a given condition.
*
- * @param condition The condition used to filter loot configurations.
+ * @param playerContext The condition used to filter loot configurations.
* @return A mapping of loot configuration keys to their associated weights.
*/
- HashMap getLootWithWeight(Condition condition);
+ HashMap getLootWithWeight(PlayerContext playerContext);
/**
* Get a collection of possible loot keys based on a given condition.
*
- * @param condition The condition to determine possible loot.
+ * @param playerContext The condition to determine possible loot.
* @return A collection of loot keys.
*/
- Collection getPossibleLootKeys(Condition condition);
+ Collection getPossibleLootKeys(PlayerContext playerContext);
/**
* Get a map of possible loot keys with their corresponding weights, considering fishing effect and condition.
*
* @param initialEffect The effect to apply weight modifiers.
- * @param condition The condition to determine possible loot.
+ * @param playerContext The condition to determine possible loot.
* @return A map of loot keys and their weights.
*/
- @NotNull Map getPossibleLootKeysWithWeight(Effect initialEffect, Condition condition);
+ @NotNull Map getPossibleLootKeysWithWeight(Effect initialEffect, PlayerContext playerContext);
/**
* Get the next loot item based on fishing effect and condition.
*
* @param effect The effect to apply weight modifiers.
- * @param condition The condition to determine possible loot.
+ * @param playerContext The condition to determine possible loot.
* @return The next loot item, or null if it doesn't exist.
*/
- @Nullable Loot getNextLoot(Effect effect, Condition condition);
+ @Nullable Loot getNextLoot(Effect effect, PlayerContext playerContext);
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/MarketManager.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/market/MarketManager.java
similarity index 97%
rename from api/src/main/java/net/momirealms/customfishing/api/manager/MarketManager.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/market/MarketManager.java
index 1388e503..c1bfa514 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/manager/MarketManager.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/market/MarketManager.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.api.manager;
+package net.momirealms.customfishing.api.mechanic.market;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
@@ -44,7 +44,7 @@ public interface MarketManager {
*
* @return An integer representing the current date.
*/
- int getDate();
+ int getRealTimeDate();
/**
* Calculates the price of an ItemStack based on custom data or a predefined price map.
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/WeightModifier.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/WeightModifier.java
deleted file mode 100644
index d481639a..00000000
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/WeightModifier.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) <2022>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package net.momirealms.customfishing.api.mechanic.misc;
-
-import org.bukkit.entity.Player;
-
-public interface WeightModifier {
-
- double modify(Player player, double weight);
-}
\ No newline at end of file
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/function/FormatFunction.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/function/FormatFunction.java
new file mode 100644
index 00000000..066b7b39
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/function/FormatFunction.java
@@ -0,0 +1,4 @@
+package net.momirealms.customfishing.api.mechanic.misc.function;
+
+public interface FormatFunction {
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/function/ItemPropertyFunction.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/function/ItemPropertyFunction.java
new file mode 100644
index 00000000..d92bfa8a
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/function/ItemPropertyFunction.java
@@ -0,0 +1,27 @@
+package net.momirealms.customfishing.api.mechanic.misc.function;
+
+import net.momirealms.customfishing.api.mechanic.context.Context;
+import net.momirealms.customfishing.common.item.Item;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+public class ItemPropertyFunction implements FormatFunction {
+
+ private Function, Context>> function;
+ private int priority;
+
+ public ItemPropertyFunction(int priority, Function, Context>> function) {
+ this.function = function;
+ }
+
+ public BiConsumer, Context> accept(Object object) {
+ return function.apply(object);
+ }
+
+ public int getPriority() {
+ return priority;
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/function/PriorityFunction.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/function/PriorityFunction.java
new file mode 100644
index 00000000..ca5a9119
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/function/PriorityFunction.java
@@ -0,0 +1,23 @@
+package net.momirealms.customfishing.api.mechanic.misc.function;
+
+import org.jetbrains.annotations.NotNull;
+
+public class PriorityFunction implements Comparable> {
+
+ private final int priority;
+ private final T function;
+
+ public PriorityFunction(int priority, T function) {
+ this.priority = priority;
+ this.function = function;
+ }
+
+ public T get() {
+ return function;
+ }
+
+ @Override
+ public int compareTo(@NotNull PriorityFunction o) {
+ return Integer.compare(this.priority, o.priority);
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/season/Season.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/season/Season.java
new file mode 100644
index 00000000..a419eb90
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/season/Season.java
@@ -0,0 +1,9 @@
+package net.momirealms.customfishing.api.mechanic.misc.season;
+
+public enum Season {
+ SPRING,
+ SUMMER,
+ AUTUMN,
+ WINTER,
+ DISABLE
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/ExpressionMathValueImpl.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/ExpressionMathValueImpl.java
new file mode 100644
index 00000000..8760e518
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/ExpressionMathValueImpl.java
@@ -0,0 +1,17 @@
+package net.momirealms.customfishing.api.mechanic.misc.value;
+
+import net.momirealms.customfishing.api.mechanic.context.Context;
+
+public class ExpressionMathValueImpl implements MathValue {
+
+ private String raw;
+
+ public ExpressionMathValueImpl(String raw) {
+ this.raw = raw;
+ }
+
+ @Override
+ public double evaluate(Context context) {
+ return 0;
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/MathValue.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/MathValue.java
new file mode 100644
index 00000000..a16e448f
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/MathValue.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) <2022>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package net.momirealms.customfishing.api.mechanic.misc.value;
+
+import net.momirealms.customfishing.api.mechanic.context.Context;
+
+/**
+ * The MathValue interface represents a mathematical value that can be evaluated
+ * within a specific context. This interface allows for the evaluation of mathematical
+ * expressions or plain numerical values in the context of custom fishing mechanics.
+ *
+ * @param the type of the holder object for the context
+ */
+public interface MathValue {
+
+ /**
+ * Evaluates the mathematical value within the given context.
+ *
+ * @param context the context in which the value is evaluated
+ * @return the evaluated value as a double
+ */
+ double evaluate(Context context);
+
+ /**
+ * Creates a MathValue based on a mathematical expression.
+ *
+ * @param expression the mathematical expression to evaluate
+ * @param the type of the holder object for the context
+ * @return a MathValue instance representing the given expression
+ */
+ static MathValue expression(String expression) {
+ return new ExpressionMathValueImpl<>(expression);
+ }
+
+ /**
+ * Creates a MathValue based on a plain numerical value.
+ *
+ * @param value the numerical value to represent
+ * @param the type of the holder object for the context
+ * @return a MathValue instance representing the given plain value
+ */
+ static MathValue plain(double value) {
+ return new PlainMathValueImpl<>(value);
+ }
+
+ /**
+ * Automatically creates a MathValue based on the given object.
+ * If the object is a String, it is treated as a mathematical expression.
+ * If the object is a numerical type (Double, Integer, Long, Float), it is treated as a plain value.
+ *
+ * @param o the object to evaluate and create a MathValue from
+ * @param the type of the holder object for the context
+ * @return a MathValue instance representing the given object, either as an expression or a plain value
+ * @throws IllegalArgumentException if the object type is not supported
+ */
+ static MathValue auto(Object o) {
+ if (o instanceof String s) {
+ return expression(s);
+ } else if (o instanceof Number n) {
+ return plain(n.doubleValue());
+ }
+ throw new IllegalArgumentException("Unsupported type: " + o.getClass());
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/PlaceholderTextValueImpl.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/PlaceholderTextValueImpl.java
new file mode 100644
index 00000000..12099cc7
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/PlaceholderTextValueImpl.java
@@ -0,0 +1,17 @@
+package net.momirealms.customfishing.api.mechanic.misc.value;
+
+import net.momirealms.customfishing.api.mechanic.context.Context;
+
+public class PlaceholderTextValueImpl implements TextValue {
+
+ private final String raw;
+
+ public PlaceholderTextValueImpl(String raw) {
+ this.raw = raw;
+ }
+
+ @Override
+ public String render(Context context) {
+ return raw;
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/PlainMathValueImpl.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/PlainMathValueImpl.java
new file mode 100644
index 00000000..861cf2e2
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/PlainMathValueImpl.java
@@ -0,0 +1,17 @@
+package net.momirealms.customfishing.api.mechanic.misc.value;
+
+import net.momirealms.customfishing.api.mechanic.context.Context;
+
+public class PlainMathValueImpl implements MathValue {
+
+ private final double value;
+
+ public PlainMathValueImpl(double value) {
+ this.value = value;
+ }
+
+ @Override
+ public double evaluate(Context context) {
+ return value;
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/PlainTextValueImpl.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/PlainTextValueImpl.java
new file mode 100644
index 00000000..e79dff94
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/PlainTextValueImpl.java
@@ -0,0 +1,17 @@
+package net.momirealms.customfishing.api.mechanic.misc.value;
+
+import net.momirealms.customfishing.api.mechanic.context.Context;
+
+public class PlainTextValueImpl implements TextValue {
+
+ private final String raw;
+
+ public PlainTextValueImpl(String raw) {
+ this.raw = raw;
+ }
+
+ @Override
+ public String render(Context context) {
+ return raw;
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/TextValue.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/TextValue.java
new file mode 100644
index 00000000..4094784b
--- /dev/null
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/misc/value/TextValue.java
@@ -0,0 +1,65 @@
+package net.momirealms.customfishing.api.mechanic.misc.value;
+
+import net.momirealms.customfishing.api.mechanic.context.Context;
+
+import java.util.regex.Pattern;
+
+/**
+ * The TextValue interface represents a text value that can be rendered
+ * within a specific context. This interface allows for the rendering of
+ * placeholder-based or plain text values in the context of custom fishing mechanics.
+ *
+ * @param the type of the holder object for the context
+ */
+public interface TextValue {
+
+ Pattern pattern = Pattern.compile("\\{[^{}]+}");
+
+ /**
+ * Renders the text value within the given context.
+ *
+ * @param context the context in which the text value is rendered
+ * @return the rendered text as a String
+ */
+ String render(Context context);
+
+ /**
+ * Creates a TextValue based on a placeholder text.
+ * Placeholders can be dynamically replaced with context-specific values.
+ *
+ * @param text the placeholder text to render
+ * @param the type of the holder object for the context
+ * @return a TextValue instance representing the given placeholder text
+ */
+ static TextValue placeholder(String text) {
+ return new PlaceholderTextValueImpl<>(text);
+ }
+
+ /**
+ * Creates a TextValue based on plain text.
+ *
+ * @param text the plain text to render
+ * @param the type of the holder object for the context
+ * @return a TextValue instance representing the given plain text
+ */
+ static TextValue plain(String text) {
+ return new PlainTextValueImpl<>(text);
+ }
+
+ /**
+ * Automatically creates a TextValue based on the given argument.
+ * If the argument contains placeholders (detected by a regex pattern),
+ * a PlaceholderTextValueImpl instance is created. Otherwise, a PlainTextValueImpl
+ * instance is created.
+ *
+ * @param arg the text to evaluate and create a TextValue from
+ * @param the type of the holder object for the context
+ * @return a TextValue instance representing the given text, either as a placeholder or plain text
+ */
+ static TextValue auto(String arg) {
+ if (pattern.matcher(arg).find())
+ return placeholder(arg);
+ else
+ return plain(arg);
+ }
+}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/Requirement.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/Requirement.java
index 3fac8c48..40d635fb 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/Requirement.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/Requirement.java
@@ -17,15 +17,21 @@
package net.momirealms.customfishing.api.mechanic.requirement;
-import net.momirealms.customfishing.api.mechanic.condition.Condition;
+import net.momirealms.customfishing.api.mechanic.context.Context;
-public interface Requirement {
+/**
+ * Interface representing a requirement that must be met in the custom fishing API.
+ * This can be used to define conditions that need to be satisfied within a given context.
+ *
+ * @param the type parameter for the context
+ */
+public interface Requirement {
/**
- * Is condition met the requirement
+ * Evaluates whether the requirement is met within the given context.
*
- * @param condition condition
- * @return meet or not
+ * @param context the context in which the requirement is evaluated
+ * @return true if the requirement is met, false otherwise
*/
- boolean isConditionMet(Condition condition);
-}
+ boolean isSatisfied(Context context);
+}
\ No newline at end of file
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/RequirementExpansion.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/RequirementExpansion.java
index 11d04713..0e274c47 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/RequirementExpansion.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/RequirementExpansion.java
@@ -21,7 +21,7 @@ package net.momirealms.customfishing.api.mechanic.requirement;
* An abstract class representing a requirement expansion
* Requirement expansions are used to define custom requirements for various functionalities.
*/
-public abstract class RequirementExpansion {
+public abstract class RequirementExpansion {
/**
* Get the version of this requirement expansion.
@@ -49,5 +49,5 @@ public abstract class RequirementExpansion {
*
* @return The requirement factory.
*/
- public abstract RequirementFactory getRequirementFactory();
+ public abstract RequirementFactory getRequirementFactory();
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/RequirementFactory.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/RequirementFactory.java
index adbb1030..a3657b15 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/RequirementFactory.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/RequirementFactory.java
@@ -22,19 +22,21 @@ import net.momirealms.customfishing.api.mechanic.action.Action;
import java.util.List;
/**
- * An interface for a requirement factory that builds requirements.
+ * Interface representing a factory for creating requirements.
+ *
+ * @param the type of object that the requirement will operate on
*/
-public interface RequirementFactory {
+public interface RequirementFactory {
/**
- * Build a requirement with the given arguments, not met actions, and check action flag.
+ * Build a requirement with the given arguments, not satisfied actions, and check run actions flag.
*
- * @param args The arguments used to build the requirement.
- * @param notMetActions Actions to be triggered when the requirement is not met (can be null).
- * @param advanced Flag indicating whether to check the action when building the requirement.
+ * @param args The arguments used to build the requirement.
+ * @param notSatisfiedActions Actions to be triggered when the requirement is not met (can be null).
+ * @param runActions Flag indicating whether to run the action if the requirement is not met.
* @return The built requirement.
*/
- Requirement build(Object args, List notMetActions, boolean advanced);
+ Requirement process(Object args, List> notSatisfiedActions, boolean runActions);
/**
* Build a requirement with the given arguments.
@@ -42,7 +44,7 @@ public interface RequirementFactory {
* @param args The arguments used to build the requirement.
* @return The built requirement.
*/
- default Requirement build(Object args) {
- return build(args, null, false);
+ default Requirement process(Object args) {
+ return process(args, List.of(), false);
}
}
diff --git a/api/src/main/java/net/momirealms/customfishing/api/manager/RequirementManager.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/RequirementManager.java
similarity index 62%
rename from api/src/main/java/net/momirealms/customfishing/api/manager/RequirementManager.java
rename to api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/RequirementManager.java
index d18a6cd2..3866f2f4 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/manager/RequirementManager.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/requirement/RequirementManager.java
@@ -15,26 +15,14 @@
* along with this program. If not, see .
*/
-package net.momirealms.customfishing.api.manager;
+package net.momirealms.customfishing.api.mechanic.requirement;
-import net.momirealms.customfishing.api.mechanic.condition.Condition;
-import net.momirealms.customfishing.api.mechanic.requirement.Requirement;
-import net.momirealms.customfishing.api.mechanic.requirement.RequirementFactory;
-import org.bukkit.configuration.ConfigurationSection;
+import dev.dejvokep.boostedyaml.block.implementation.Section;
+import net.momirealms.customfishing.api.mechanic.context.Context;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-public interface RequirementManager {
-
- /**
- * Legacy format support
- * @param key key
- * @param requirements requirements
- * @param weight weight
- * @return success or not
- */
- @Deprecated
- boolean putLegacyLootToMap(String key, Requirement[] requirements, double weight);
+public interface RequirementManager {
/**
* Registers a custom requirement type with its corresponding factory.
@@ -43,7 +31,7 @@ public interface RequirementManager {
* @param requirementFactory The factory responsible for creating instances of the requirement.
* @return True if registration was successful, false if the type is already registered.
*/
- boolean registerRequirement(String type, RequirementFactory requirementFactory);
+ boolean registerRequirement(@NotNull String type, @NotNull RequirementFactory requirementFactory);
/**
* Unregisters a custom requirement type.
@@ -51,16 +39,17 @@ public interface RequirementManager {
* @param type The type identifier of the requirement to unregister.
* @return True if unregistration was successful, false if the type is not registered.
*/
- boolean unregisterRequirement(String type);
+ boolean unregisterRequirement(@NotNull String type);
/**
* Retrieves an array of requirements based on a configuration section.
*
* @param section The configuration section containing requirement definitions.
- * @param advanced A flag indicating whether to use advanced requirements.
+ * @param runActions A flag indicating whether to use advanced requirements.
* @return An array of Requirement objects based on the configuration section
*/
- @Nullable Requirement[] getRequirements(ConfigurationSection section, boolean advanced);
+ @Nullable
+ Requirement[] getRequirements(@NotNull Section section, boolean runActions);
/**
* If a requirement type exists
@@ -68,7 +57,7 @@ public interface RequirementManager {
* @param type type
* @return exists or not
*/
- boolean hasRequirement(String type);
+ boolean hasRequirement(@NotNull String type);
/**
* Retrieves a Requirement object based on a configuration section and advanced flag.
@@ -78,10 +67,11 @@ public interface RequirementManager {
* value: xxx
*
* @param section The configuration section containing requirement definitions.
- * @param advanced A flag indicating whether to use advanced requirements.
+ * @param runActions A flag indicating whether to use advanced requirements.
* @return A Requirement object based on the configuration section, or an EmptyRequirement if the section is null or invalid.
*/
- @NotNull Requirement getRequirement(ConfigurationSection section, boolean advanced);
+ @NotNull
+ Requirement getRequirement(@NotNull Section section, boolean runActions);
/**
* Gets a requirement based on the provided type and value.
@@ -95,7 +85,8 @@ public interface RequirementManager {
* @param value The value associated with the requirement.
* @return A Requirement instance based on the type and value, or an EmptyRequirement if the type is invalid.
*/
- @NotNull Requirement getRequirement(String type, Object value);
+ @NotNull
+ Requirement getRequirement(@NotNull String type, @NotNull Object value);
/**
* Retrieves a RequirementFactory based on the specified requirement type.
@@ -103,19 +94,13 @@ public interface RequirementManager {
* @param type The requirement type for which to retrieve a factory.
* @return A RequirementFactory for the specified type, or null if no factory is found.
*/
- @Nullable RequirementFactory getRequirementFactory(String type);
+ @Nullable
+ RequirementFactory
-CustomFishing is a Paper plugin that provides minigames and a powerful condition & action library for fishing.
+CustomFishing is a Paper plugin that provides minigames and a powerful playerContext & action library for fishing.
With the new concept of weight system, CustomFishing brings unlimited customization possibilities and best performance.
## How to build
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index c4df5e65..6240aca3 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -1,11 +1,44 @@
-dependencies {
- compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
- compileOnly("com.comphenix.protocol:ProtocolLib:5.1.0")
- compileOnly("de.tr7zw:item-nbt-api:2.12.4")
+plugins {
+ id("io.github.goooler.shadow") version "8.1.7"
}
+repositories {
+ maven("https://repo.codemc.io/repository/maven-public/")
+ maven("https://jitpack.io/")
+}
+
+dependencies {
+ implementation(project(":common"))
+ implementation("dev.dejvokep:boosted-yaml:${rootProject.properties["boosted_yaml_version"]}")
+ implementation("net.kyori:adventure-api:${rootProject.properties["adventure_bundle_version"]}") {
+ exclude(module = "adventure-bom")
+ exclude(module = "checker-qual")
+ exclude(module = "annotations")
+ }
+ implementation("com.saicone.rtag:rtag:1.5.3")
+ implementation("com.saicone.rtag:rtag-item:1.5.3")
+ compileOnly("dev.folia:folia-api:${rootProject.properties["paper_version"]}-R0.1-SNAPSHOT")
+ compileOnly("com.google.code.gson:gson:${rootProject.properties["gson_version"]}")
+}
+
+java {
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
+ toolchain {
+ languageVersion = JavaLanguageVersion.of(17)
+ }
+}
+
+tasks.withType