Repo-Mirror/Custom-Fishing
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Fishing.git synced 2026-01-04 15:41:35 +00:00
Code Issues Releases Activity

new games

Browse Source
This commit is contained in:
XiaoMoMi
2023-10-03 18:41:59 +08:00
parent ec92087704
commit 47914f8bac
9 changed files with 176 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugin/src/main/java/net/momirealms/customfishing/command/CommandManagerImpl.java
View File

@@ -20,7 +20,6 @@ package net.momirealms.customfishing.command;
import dev.jorel.commandapi.CommandAPI;
import dev.jorel.commandapi.CommandAPIBukkitConfig;
import dev.jorel.commandapi.CommandAPICommand;
import dev.jorel.commandapi.CommandPermission;
import dev.jorel.commandapi.arguments.EntitySelectorArgument;
import net.momirealms.customfishing.CustomFishingPluginImpl;
import net.momirealms.customfishing.adventure.AdventureManagerImpl;

2
plugin/src/main/java/net/momirealms/customfishing/command/sub/CompetitionCommand.java
View File

@@ -25,12 +25,10 @@ import dev.jorel.commandapi.arguments.BooleanArgument;
import dev.jorel.commandapi.arguments.StringArgument;
import net.momirealms.customfishing.adventure.AdventureManagerImpl;
import net.momirealms.customfishing.api.CustomFishingPlugin;
import net.momirealms.customfishing.api.event.CompetitionEvent;
import net.momirealms.customfishing.api.mechanic.competition.FishingCompetition;
import net.momirealms.customfishing.setting.CFConfig;
import net.momirealms.customfishing.setting.CFLocale;
import net.momirealms.customfishing.storage.method.database.nosql.RedisManager;
import org.bukkit.Bukkit;
import java.util.Set;

1
plugin/src/main/java/net/momirealms/customfishing/command/sub/ItemCommand.java
View File

@@ -30,7 +30,6 @@ import net.momirealms.customfishing.api.mechanic.condition.Condition;
import net.momirealms.customfishing.api.mechanic.item.BuildableItem;
import net.momirealms.customfishing.api.util.LogUtils;
import net.momirealms.customfishing.setting.CFLocale;
import net.momirealms.customfishing.util.ConfigUtils;
import net.momirealms.customfishing.util.ItemUtils;
import net.momirealms.customfishing.util.NBTUtils;
import org.bukkit.Material;

1
plugin/src/main/java/net/momirealms/customfishing/mechanic/action/ActionManagerImpl.java
View File

@@ -30,7 +30,6 @@ import net.momirealms.customfishing.api.mechanic.action.ActionExpansion;
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 net.momirealms.customfishing.api.mechanic.effect.FishingEffect;
import net.momirealms.customfishing.api.mechanic.loot.Loot;
import net.momirealms.customfishing.api.mechanic.requirement.Requirement;
import net.momirealms.customfishing.api.util.LogUtils;

1
plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/CompetitionManagerImpl.java
View File

@@ -19,7 +19,6 @@ package net.momirealms.customfishing.mechanic.competition;
import net.momirealms.customfishing.api.CustomFishingPlugin;
import net.momirealms.customfishing.api.common.Pair;
import net.momirealms.customfishing.api.event.CompetitionEvent;
import net.momirealms.customfishing.api.manager.CompetitionManager;
import net.momirealms.customfishing.api.mechanic.action.Action;
import net.momirealms.customfishing.api.mechanic.competition.*;

13
plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/FishingManagerImpl.java
View File

@@ -50,16 +50,19 @@ import net.momirealms.customfishing.setting.CFConfig;
import net.momirealms.customfishing.util.ItemUtils;
import org.bukkit.*;
import org.bukkit.entity.*;
import org.bukkit.event.*;
import org.bukkit.event.block.Action;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.event.player.*;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack;
import org.bukkit.persistence.PersistentDataType;
import org.jetbrains.annotations.Nullable;
import java.text.DecimalFormatSymbols;
import java.util.*;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
public class FishingManagerImpl implements Listener, FishingManager {

177
plugin/src/main/java/net/momirealms/customfishing/mechanic/game/GameManagerImpl.java
View File

@@ -55,10 +55,12 @@ public class GameManagerImpl implements GameManager {
}
private void registerInbuiltGames() {
this.registerAccurateClickGame();
this.registerHoldGame();
this.registerTensionGame();
this.registerClickGame();
this.registerAccurateClickGame();
this.registerAccurateClickV2Game();
this.registerAccurateClickV3Game();
}
public void load() {
@@ -210,16 +212,16 @@ public class GameManagerImpl implements GameManager {
var totalWidth = chances.size() * widthPerSection - 1;
var pointerOffset = section.getInt("arguments.pointer-offset");
var pointerWidth = section.getInt("arguments.pointer-width");
var title = section.getStringList("title");
var title = ConfigUtils.stringListArgs(section.get("title"));
var font = section.getString("subtitle.font");
var barImage = section.getString("subtitle.bar");
var pointerImage = section.getString("subtitle.pointer");
return (player, fishHook, settings) -> new AbstractGamingPlayer(player, fishHook, settings) {
private int progress;
private boolean face;
private String sendTitle = title.get(ThreadLocalRandom.current().nextInt(title.size()));
private int progress = -1;
private boolean face = true;
private final String sendTitle = title.get(ThreadLocalRandom.current().nextInt(title.size()));
@Override
public void arrangeTask() {
@@ -390,12 +392,10 @@ public class GameManagerImpl implements GameManager {
+ OffsetUtils.getOffsetChars((int) (barEffectiveWidth - judgement_position - judgementAreaWidth))
+ OffsetUtils.getOffsetChars((int) (-barEffectiveWidth - 1 + fish_position))
+ FontUtils.surroundWithFont(pointerImage, font)
+ OffsetUtils.getOffsetChars((int) (barEffectiveWidth - fish_position - pointerIconWidth + 1))
;
+ OffsetUtils.getOffsetChars((int) (barEffectiveWidth - fish_position - pointerIconWidth + 1));
AdventureManagerImpl.getInstance().sendTitle(
player,
tip != null && !played ? tip : title.replace("{progress}", progress[(int) ((hold_time / time_requirement) * progress.length)])
,
tip != null && !played ? tip : title.replace("{progress}", progress[(int) ((hold_time / time_requirement) * progress.length)]),
bar,
0,
500,
@@ -545,6 +545,165 @@ public class GameManagerImpl implements GameManager {
}));
}
private void registerAccurateClickV2Game() {
this.registerGameType("accurate_click_v2", (section -> {
var barWidth = ConfigUtils.getIntegerPair(section.getString("title.total-width", "15~20"));
var barSuccess = ConfigUtils.getIntegerPair(section.getString("title.success-width","3~4"));
var barBody = section.getString("title.body","");
var barPointer = section.getString("title.pointer", "");
var barTarget = section.getString("title.target","");
var subtitle = section.getString("subtitle", "<gray>Reel in at the most critical moment");
return (player, fishHook, settings) -> new AbstractGamingPlayer(player, fishHook, settings) {
private final int totalWidth = ThreadLocalRandom.current().nextInt(barWidth.right() - barWidth.left() + 1) + barWidth.left();
private final int successWidth = ThreadLocalRandom.current().nextInt(barSuccess.right() - barSuccess.left() + 1) + barSuccess.left();
private final int successPosition = ThreadLocalRandom.current().nextInt((totalWidth - successWidth + 1)) + 1;
private int currentIndex = 0;
private int timer = 0;
private boolean face = true;
@Override
public void arrangeTask() {
this.task = CustomFishingPlugin.get().getScheduler().runTaskAsyncTimer(this, 50, 50, TimeUnit.MILLISECONDS);
}
@Override
public void run() {
super.run();
timer++;
if (timer % (21 - settings.getDifficulty() / 5) == 0) {
movePointer();
}
showUI();
}
private void movePointer() {
if (face) {
currentIndex++;
if (currentIndex >= totalWidth - 1) {
face = false;
}
} else {
currentIndex--;
if (currentIndex <= 0) {
face = true;
}
}
}
public void showUI() {
StringBuilder stringBuilder = new StringBuilder();
for (int i = 1; i <= totalWidth; i++) {
if (i == currentIndex + 1) {
stringBuilder.append(barPointer);
continue;
}
if (i >= successPosition && i <= successPosition + successWidth - 1) {
stringBuilder.append(barTarget);
continue;
}
stringBuilder.append(barBody);
}
AdventureManagerImpl.getInstance().sendTitle(
player,
stringBuilder.toString(),
subtitle,
0,
500,
0
);
}
@Override
public boolean isSuccessful() {
return currentIndex + 1 <= successPosition + successWidth - 1 && currentIndex + 1 >= successPosition;
}
};
}));
}
private void registerAccurateClickV3Game() {
this.registerGameType("accurate_click_v3", (section -> {
var font = section.getString("subtitle.font");
var pointerImage = section.getString("subtitle.pointer");
var barImage = section.getString("subtitle.bar");
var judgementAreaImage = section.getString("subtitle.judgment-area");
var titles = ConfigUtils.stringListArgs(section.get("title"));
var barEffectiveWidth = section.getInt("arguments.bar-effective-area-width");
var judgementAreaWidth = section.getInt("arguments.judgment-area-width");
var judgementAreaOffset = section.getInt("arguments.judgment-area-offset");
var pointerIconWidth = section.getInt("arguments.pointer-icon-width");
var pointerOffset = section.getInt("arguments.pointer-offset");
return (player, fishHook, settings) -> new AbstractGamingPlayer(player, fishHook, settings) {
private int progress = -1;
private boolean face = true;
private final int judgement_position = ThreadLocalRandom.current().nextInt(barEffectiveWidth - judgementAreaWidth + 1);
private final String title = titles.get(ThreadLocalRandom.current().nextInt(titles.size()));
@Override
public void arrangeTask() {
var period = ((double) 10*(200-settings.getDifficulty()))/((double) (1+4*settings.getDifficulty()));
this.task = CustomFishingPlugin.get().getScheduler().runTaskAsyncTimer(
this,
50,
(long) period,
TimeUnit.MILLISECONDS
);
}
@Override
public void run() {
super.run();
if (face) {
progress++;
if (progress >= barEffectiveWidth - 1) {
face = false;
}
} else {
progress--;
if (progress <= 0) {
face = true;
}
}
showUI();
}
public void showUI() {
String bar = FontUtils.surroundWithFont(barImage, font)
+ OffsetUtils.getOffsetChars(judgementAreaOffset + judgement_position)
+ FontUtils.surroundWithFont(judgementAreaImage, font)
+ OffsetUtils.getOffsetChars(barEffectiveWidth - judgement_position - judgementAreaWidth)
+ OffsetUtils.getOffsetChars(progress + pointerOffset)
+ FontUtils.surroundWithFont(pointerImage, font)
+ OffsetUtils.getOffsetChars(barEffectiveWidth - progress - pointerIconWidth + 1);
AdventureManagerImpl.getInstance().sendTitle(
player,
title,
bar,
0,
500,
0
);
}
@Override
public boolean isSuccessful() {
return progress < judgement_position + judgementAreaWidth && progress >= judgement_position;
}
};
}));
}
/**
* Loads minigame expansions from the expansion folder.
*/

1
plugin/src/main/java/net/momirealms/customfishing/setting/CFConfig.java
View File

@@ -24,7 +24,6 @@ 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.CustomFishingPlugin;
import net.momirealms.customfishing.api.mechanic.action.Action;
import net.momirealms.customfishing.api.util.LogUtils;
import net.momirealms.customfishing.api.util.OffsetUtils;
import org.bukkit.Material;