diff --git a/api/src/main/java/net/momirealms/customfishing/api/BukkitCustomFishingPlugin.java b/api/src/main/java/net/momirealms/customfishing/api/BukkitCustomFishingPlugin.java index 493283cb..383fc566 100644 --- a/api/src/main/java/net/momirealms/customfishing/api/BukkitCustomFishingPlugin.java +++ b/api/src/main/java/net/momirealms/customfishing/api/BukkitCustomFishingPlugin.java @@ -50,6 +50,7 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import java.io.File; +import java.util.function.Supplier; /** * Abstract class representing the main CustomFishing plugin. @@ -375,4 +376,6 @@ public abstract class BukkitCustomFishingPlugin implements CustomFishingPlugin { * @param message the message to log */ public abstract void debug(Object message); + + public abstract void debug(Supplier messageSupplier); } diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/config/ConfigType.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/config/ConfigType.java index 39b359e9..f44d8c24 100644 --- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/config/ConfigType.java +++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/config/ConfigType.java @@ -40,6 +40,7 @@ public class ConfigType { parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getLootFormatFunctions()); parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getItemFormatFunctions()); parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getEventFormatFunctions()); + parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getBaseEffectFormatFunctions()); return parsers; }, (id, section, functions) -> { @@ -58,6 +59,7 @@ public class ConfigType { parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getLootFormatFunctions()); parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getEntityFormatFunctions()); parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getEventFormatFunctions()); + parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getBaseEffectFormatFunctions()); return parsers; }, (id, section, functions) -> { @@ -76,6 +78,7 @@ public class ConfigType { parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getLootFormatFunctions()); parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getBlockFormatFunctions()); parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getEventFormatFunctions()); + parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getBaseEffectFormatFunctions()); return parsers; }, (id, section, functions) -> { 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 index 434f0049..4cc1a562 100644 --- 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 @@ -247,8 +247,8 @@ public class EffectImpl implements Effect { ", waitTimeMultiplier=" + waitTimeMultiplier + ", difficultyAdder=" + difficultyAdder + ", difficultyMultiplier=" + difficultyMultiplier + - ", weightOperations=" + weightOperations + - ", weightOperationsIgnored=" + weightOperationsIgnored + + ", weightOperations=" + weightOperations.size() + + ", weightOperationsIgnored=" + weightOperationsIgnored.size() + '}'; } } diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/CustomFishingHook.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/CustomFishingHook.java index c2b6fbe0..49917733 100644 --- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/CustomFishingHook.java +++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/CustomFishingHook.java @@ -192,6 +192,7 @@ public class CustomFishingHook { plugin.debug(context); // get its basic properties Effect baseEffect = loot.baseEffect().toEffect(context); + plugin.debug(baseEffect); tempEffect.combine(baseEffect); // apply the gears' effects for (EffectModifier modifier : gears.effectModifiers()) { diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGame.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGame.java index ff0958dc..fdc260d9 100644 --- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGame.java +++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGame.java @@ -17,6 +17,7 @@ package net.momirealms.customfishing.api.mechanic.game; +import net.momirealms.customfishing.api.BukkitCustomFishingPlugin; import net.momirealms.customfishing.api.mechanic.effect.Effect; import net.momirealms.customfishing.api.mechanic.fishing.CustomFishingHook; @@ -60,6 +61,7 @@ public abstract class AbstractGame implements Game { */ @Override public GamingPlayer start(CustomFishingHook hook, Effect effect) { + BukkitCustomFishingPlugin.getInstance().debug(effect); return gamingPlayerProvider().apply(hook, basics.toGameSetting(hook.getContext(), effect)); } diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/BukkitCustomFishingPluginImpl.java b/core/src/main/java/net/momirealms/customfishing/bukkit/BukkitCustomFishingPluginImpl.java index 7a4540c1..0e6b6091 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/BukkitCustomFishingPluginImpl.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/BukkitCustomFishingPluginImpl.java @@ -66,6 +66,7 @@ import java.io.InputStream; import java.nio.file.Path; import java.util.List; import java.util.function.Consumer; +import java.util.function.Supplier; public class BukkitCustomFishingPluginImpl extends BukkitCustomFishingPlugin { @@ -272,4 +273,9 @@ public class BukkitCustomFishingPluginImpl extends BukkitCustomFishingPlugin { public void debug(Object message) { this.debugger.accept(message); } + + @Override + public void debug(Supplier messageSupplier) { + this.debugger.accept(messageSupplier.get()); + } } diff --git a/gradle.properties b/gradle.properties index f9b531da..dc866b66 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=2.2.21 +project_version=2.2.22 config_version=36 project_group=net.momirealms