mirror of
https://github.com/Xiao-MoMi/Custom-Fishing.git
synced 2025-12-27 10:59:13 +00:00
2.2.22
This commit is contained in:
@@ -50,6 +50,7 @@ import org.bukkit.entity.Player;
|
|||||||
import org.bukkit.plugin.Plugin;
|
import org.bukkit.plugin.Plugin;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Abstract class representing the main CustomFishing plugin.
|
* Abstract class representing the main CustomFishing plugin.
|
||||||
@@ -375,4 +376,6 @@ public abstract class BukkitCustomFishingPlugin implements CustomFishingPlugin {
|
|||||||
* @param message the message to log
|
* @param message the message to log
|
||||||
*/
|
*/
|
||||||
public abstract void debug(Object message);
|
public abstract void debug(Object message);
|
||||||
|
|
||||||
|
public abstract void debug(Supplier<String> messageSupplier);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ public class ConfigType {
|
|||||||
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getLootFormatFunctions());
|
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getLootFormatFunctions());
|
||||||
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getItemFormatFunctions());
|
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getItemFormatFunctions());
|
||||||
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getEventFormatFunctions());
|
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getEventFormatFunctions());
|
||||||
|
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getBaseEffectFormatFunctions());
|
||||||
return parsers;
|
return parsers;
|
||||||
},
|
},
|
||||||
(id, section, functions) -> {
|
(id, section, functions) -> {
|
||||||
@@ -58,6 +59,7 @@ public class ConfigType {
|
|||||||
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getLootFormatFunctions());
|
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getLootFormatFunctions());
|
||||||
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getEntityFormatFunctions());
|
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getEntityFormatFunctions());
|
||||||
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getEventFormatFunctions());
|
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getEventFormatFunctions());
|
||||||
|
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getBaseEffectFormatFunctions());
|
||||||
return parsers;
|
return parsers;
|
||||||
},
|
},
|
||||||
(id, section, functions) -> {
|
(id, section, functions) -> {
|
||||||
@@ -76,6 +78,7 @@ public class ConfigType {
|
|||||||
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getLootFormatFunctions());
|
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getLootFormatFunctions());
|
||||||
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getBlockFormatFunctions());
|
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getBlockFormatFunctions());
|
||||||
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getEventFormatFunctions());
|
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getEventFormatFunctions());
|
||||||
|
parsers.putAll(BukkitCustomFishingPlugin.getInstance().getConfigManager().getBaseEffectFormatFunctions());
|
||||||
return parsers;
|
return parsers;
|
||||||
},
|
},
|
||||||
(id, section, functions) -> {
|
(id, section, functions) -> {
|
||||||
|
|||||||
@@ -247,8 +247,8 @@ public class EffectImpl implements Effect {
|
|||||||
", waitTimeMultiplier=" + waitTimeMultiplier +
|
", waitTimeMultiplier=" + waitTimeMultiplier +
|
||||||
", difficultyAdder=" + difficultyAdder +
|
", difficultyAdder=" + difficultyAdder +
|
||||||
", difficultyMultiplier=" + difficultyMultiplier +
|
", difficultyMultiplier=" + difficultyMultiplier +
|
||||||
", weightOperations=" + weightOperations +
|
", weightOperations=" + weightOperations.size() +
|
||||||
", weightOperationsIgnored=" + weightOperationsIgnored +
|
", weightOperationsIgnored=" + weightOperationsIgnored.size() +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -192,6 +192,7 @@ public class CustomFishingHook {
|
|||||||
plugin.debug(context);
|
plugin.debug(context);
|
||||||
// get its basic properties
|
// get its basic properties
|
||||||
Effect baseEffect = loot.baseEffect().toEffect(context);
|
Effect baseEffect = loot.baseEffect().toEffect(context);
|
||||||
|
plugin.debug(baseEffect);
|
||||||
tempEffect.combine(baseEffect);
|
tempEffect.combine(baseEffect);
|
||||||
// apply the gears' effects
|
// apply the gears' effects
|
||||||
for (EffectModifier modifier : gears.effectModifiers()) {
|
for (EffectModifier modifier : gears.effectModifiers()) {
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
|
|
||||||
package net.momirealms.customfishing.api.mechanic.game;
|
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.effect.Effect;
|
||||||
import net.momirealms.customfishing.api.mechanic.fishing.CustomFishingHook;
|
import net.momirealms.customfishing.api.mechanic.fishing.CustomFishingHook;
|
||||||
|
|
||||||
@@ -60,6 +61,7 @@ public abstract class AbstractGame implements Game {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public GamingPlayer start(CustomFishingHook hook, Effect effect) {
|
public GamingPlayer start(CustomFishingHook hook, Effect effect) {
|
||||||
|
BukkitCustomFishingPlugin.getInstance().debug(effect);
|
||||||
return gamingPlayerProvider().apply(hook, basics.toGameSetting(hook.getContext(), effect));
|
return gamingPlayerProvider().apply(hook, basics.toGameSetting(hook.getContext(), effect));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -66,6 +66,7 @@ import java.io.InputStream;
|
|||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
public class BukkitCustomFishingPluginImpl extends BukkitCustomFishingPlugin {
|
public class BukkitCustomFishingPluginImpl extends BukkitCustomFishingPlugin {
|
||||||
|
|
||||||
@@ -272,4 +273,9 @@ public class BukkitCustomFishingPluginImpl extends BukkitCustomFishingPlugin {
|
|||||||
public void debug(Object message) {
|
public void debug(Object message) {
|
||||||
this.debugger.accept(message);
|
this.debugger.accept(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void debug(Supplier<String> messageSupplier) {
|
||||||
|
this.debugger.accept(messageSupplier.get());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Project settings
|
# Project settings
|
||||||
# Rule: [major update].[feature update].[bug fix]
|
# Rule: [major update].[feature update].[bug fix]
|
||||||
project_version=2.2.21
|
project_version=2.2.22
|
||||||
config_version=36
|
config_version=36
|
||||||
project_group=net.momirealms
|
project_group=net.momirealms
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user