Repo-Mirror/Custom-Fishing
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Fishing.git synced 2025-12-29 03:49:07 +00:00
Code Issues Releases Activity

喵

Browse Source
This commit is contained in:
Xiao-MoMi
2022-10-22 14:45:56 +08:00
parent 809d9d688b
commit 3b4635c2a1
14 changed files with 1033 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/momirealms/customfishing/api/event/FishFinderEvent.java
View File

@@ -49,11 +49,16 @@ public class FishFinderEvent extends PlayerEvent implements Cancellable {
cancelled = cancel;
}
@Override
public @NotNull HandlerList getHandlers() {
public static HandlerList getHandlerList() {
return handlerList;
}
@NotNull
@Override
public HandlerList getHandlers() {
return getHandlerList();
}
public List<Loot> getLoots() {
return loots;
}

9
src/main/java/net/momirealms/customfishing/api/event/FishHookEvent.java
View File

@@ -46,11 +46,16 @@ public class FishHookEvent extends PlayerEvent implements Cancellable {
cancelled = cancel;
}
@Override
public @NotNull HandlerList getHandlers() {
public static HandlerList getHandlerList() {
return handlerList;
}
@NotNull
@Override
public HandlerList getHandlers() {
return getHandlerList();
}
public Difficulty getDifficulty() {
return difficulty;
}

9
src/main/java/net/momirealms/customfishing/api/event/FishResultEvent.java
View File

@@ -52,11 +52,16 @@ public class FishResultEvent extends PlayerEvent implements Cancellable {
cancelled = cancel;
}
@Override
public @NotNull HandlerList getHandlers() {
public static HandlerList getHandlerList() {
return handlerList;
}
@NotNull
@Override
public HandlerList getHandlers() {
return getHandlerList();
}
public boolean isDouble() {
return isDouble;
}

9
src/main/java/net/momirealms/customfishing/api/event/RodCastEvent.java
View File

@@ -46,11 +46,16 @@ public class RodCastEvent extends PlayerEvent implements Cancellable {
this.isCancelled = cancel;
}
@Override
public @NotNull HandlerList getHandlers() {
public static HandlerList getHandlerList() {
return handlerList;
}
@NotNull
@Override
public HandlerList getHandlers() {
return getHandlerList();
}
public Bonus getBonus() {
return bonus;
}

9
src/main/java/net/momirealms/customfishing/api/event/SellFishEvent.java
View File

@@ -27,11 +27,16 @@ public class SellFishEvent extends PlayerEvent implements Cancellable {
cancelled = cancel;
}
@Override
public @NotNull HandlerList getHandlers() {
public static HandlerList getHandlerList() {
return handlerList;
}
@NotNull
@Override
public HandlerList getHandlers() {
return getHandlerList();
}
public float getMoney() {
return money;
}

9
src/main/java/net/momirealms/customfishing/api/event/TotemActivationEvent.java
View File

@@ -50,11 +50,16 @@ public class TotemActivationEvent extends PlayerEvent implements Cancellable {
cancelled = cancel;
}
@Override
public @NotNull HandlerList getHandlers() {
public static HandlerList getHandlerList() {
return handlerList;
}
@NotNull
@Override
public HandlerList getHandlers() {
return getHandlerList();
}
public Totem getTotem() {
return totem;
}

1
src/main/java/net/momirealms/customfishing/commands/SellFishCommand.java
View File

@@ -37,6 +37,7 @@ public class SellFishCommand implements TabExecutor {
AdventureUtil.sendMessage(sender, MessageManager.prefix + MessageManager.noConsole);
return true;
}
player.closeInventory();
CustomFishing.plugin.getSellManager().openGuiForPlayer(player);
return true;
}

2
src/main/java/net/momirealms/customfishing/commands/subcmd/OpenCommand.java
View File

@@ -51,6 +51,7 @@ public class OpenCommand extends AbstractSubCommand {
AdventureUtil.sendMessage(sender, MessageManager.prefix + MessageManager.noPerm);
return true;
}
player.closeInventory();
CustomFishing.plugin.getBagDataManager().openFishingBag(player, player);
}
if (args.size() == 1) {
@@ -63,6 +64,7 @@ public class OpenCommand extends AbstractSubCommand {
AdventureUtil.sendMessage(sender, MessageManager.prefix + MessageManager.playerNotExist);
return true;
}
player.closeInventory();
CustomFishing.plugin.getBagDataManager().openFishingBag(player, offlinePlayer);
}
return true;

5
src/main/java/net/momirealms/customfishing/competition/Competition.java
View File

@@ -62,8 +62,6 @@ public class Competition {
Collection<? extends Player> playerCollections = Bukkit.getOnlinePlayers();
if (playerCollections.size() >= competitionConfig.getMinPlayers() || forceStart) {
currentCompetition = this;
if (ConfigManager.useRedis){
ranking = new RedisRankingImpl();
} else {
@@ -85,8 +83,9 @@ public class Competition {
}
else {
for (Player player : playerCollections) {
AdventureUtil.playerMessage(player, MessageManager.notEnoughPlayers);
AdventureUtil.playerMessage(player, MessageManager.prefix + MessageManager.notEnoughPlayers);
}
currentCompetition = null;
}
}

26
src/main/java/net/momirealms/customfishing/manager/FishingManager.java
View File

@@ -51,10 +51,7 @@ import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Entity;
import org.bukkit.entity.FishHook;
import org.bukkit.entity.Item;
import org.bukkit.entity.Player;
import org.bukkit.entity.*;
import org.bukkit.event.HandlerList;
import org.bukkit.event.player.PlayerFishEvent;
import org.bukkit.event.player.PlayerInteractEvent;
@@ -589,9 +586,6 @@ public class FishingManager extends Function {
}
private void sendSuccessTitle(Player player, String loot) {
nextLoot.remove(player);
AdventureUtil.playerTitle(
player,
ConfigManager.successTitle[new Random().nextInt(ConfigManager.successTitle.length)]
@@ -659,7 +653,6 @@ public class FishingManager extends Function {
action.doOn(player, null);
}
nextLoot.remove(player);
nextBonus.remove(player);
AdventureUtil.playerTitle(
@@ -674,8 +667,18 @@ public class FishingManager extends Function {
public void onCaughtEntity(PlayerFishEvent event) {
final Player player = event.getPlayer();
if (fishingPlayerCache.remove(player) != null && event.getCaught() != null){
AdventureUtil.playerMessage(player, MessageManager.prefix + MessageManager.hookOther);
FishingPlayer fishingPlayer = fishingPlayerCache.remove(player);
if (fishingPlayer != null) {
Entity entity = event.getCaught();
if (entity != null && entity.getType() == EntityType.ARMOR_STAND) {
proceedReelIn(event, player, fishingPlayer);
}
else {
fishingPlayer.cancel();
nextBonus.remove(player);
nextLoot.remove(player);
AdventureUtil.playerMessage(player, MessageManager.prefix + MessageManager.hookOther);
}
}
}
@@ -755,7 +758,7 @@ public class FishingManager extends Function {
NBTItem nbtItem = new NBTItem(itemStack);
NBTCompound cfCompound = nbtItem.getCompound("CustomFishing");
if (cfCompound != null && cfCompound.getString("type").equals("util") && cfCompound.getString("id").equals("fishfinder")) {
if (isCoolDown(player, 2000)) return;
if (isCoolDown(player, 1000)) return;
useFinder(event.getPlayer());
return;
}
@@ -805,7 +808,6 @@ public class FishingManager extends Function {
}
private void useFinder(Player player) {
if (isCoolDown(player, 1000)) return;
FishingCondition fishingCondition = new FishingCondition(player.getLocation(), player);
List<Loot> possibleLoots = getPossibleLootList(fishingCondition, true, LootManager.WATERLOOTS.values());
possibleLoots.addAll(getPossibleLootList(fishingCondition, true, LootManager.LAVALOOTS.values()));

2
src/main/java/net/momirealms/customfishing/manager/LootManager.java
View File

@@ -153,7 +153,7 @@ public class LootManager extends Function {
loot.setSize(size);
}
if (config.contains(key + ".price")) {
loot.setBasicPrice((float) config.getDouble(key + ".price.basic", 0));
loot.setBasicPrice((float) config.getDouble(key + ".price.base", 0));
loot.setSizeBonus((float) config.getDouble(key + ".price.bonus", 0));
}
if (config.contains(key + ".random-enchantments")){