Repo-Mirror/Custom-Fishing
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Fishing.git synced 2025-12-19 15:09:24 +00:00
Code Issues Releases Activity

2.2.22

Browse Source
This commit is contained in:
XiaoMoMi
2024-09-02 20:56:15 +08:00
parent ca7b64b6bb
commit f3a170026d
7 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/main/java/net/momirealms/customfishing/api/BukkitCustomFishingPlugin.java
View File

@@ -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<String> messageSupplier);
}

3
api/src/main/java/net/momirealms/customfishing/api/mechanic/config/ConfigType.java
View File

@@ -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) -> {

4
api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectImpl.java
View File

@@ -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() +
'}';
}
}

1
api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/CustomFishingHook.java
View File

@@ -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()) {

2
api/src/main/java/net/momirealms/customfishing/api/mechanic/game/AbstractGame.java
View File

@@ -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));
}

6
core/src/main/java/net/momirealms/customfishing/bukkit/BukkitCustomFishingPluginImpl.java
View File

@@ -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<String> messageSupplier) {
this.debugger.accept(messageSupplier.get());
}
}

2
gradle.properties
View File

@@ -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