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

1.1.3

Browse Source
This commit is contained in:
Xiao-MoMi
2022-08-31 00:03:29 +08:00
parent 29ccb81c9b
commit 3b0b519a1d
13 changed files with 245 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/net/momirealms/customfishing/ConfigReader.java
View File

@@ -103,6 +103,8 @@ public class ConfigReader{
public static boolean showBar;
public static boolean mcMMOLoot;
public static boolean hasWhitelist;
public static boolean needRodFishing;
public static boolean disableJobXp;
public static int fishFinderCoolDown;
public static double timeMultiply;
public static double vanillaRatio;
@@ -169,6 +171,13 @@ public class ConfigReader{
AdventureUtil.consoleMessage("[CustomFishing] <color:#00BFFF>EcoSkills <color:#E1FFFF>Hooked!");
}
}
if(config.getBoolean("config.integrations.JobsReborn",false)){
if (Bukkit.getPluginManager().getPlugin("Jobs") == null) CustomFishing.instance.getLogger().warning("Failed to initialize JobsReborn!");
else {
skillXP = new JobsReborn();
AdventureUtil.consoleMessage("[CustomFishing] <color:#00BFFF>JobsReborn <color:#E1FFFF>Hooked!");
}
}
season = null;
if (config.getBoolean("config.integrations.RealisticSeasons",false)){
@@ -199,7 +208,9 @@ public class ConfigReader{
convertMMOItems = config.getBoolean("config.convert-MMOITEMS", false);
needOpenWater = config.getBoolean("config.need-open-water", false);
needSpecialRod = config.getBoolean("config.need-special-rod", false);
needSpecialRod = config.getBoolean("config.need-special-rod.for-loots", false);
needRodFishing = config.getBoolean("config.need-special-rod.to-fish", false);
loseDurability = config.getBoolean("config.rod-lose-durability", true);
preventPick = config.getBoolean("config.prevent-other-players-pick-up-loot", false);
@@ -208,6 +219,7 @@ public class ConfigReader{
timeMultiply = config.getDouble("config.time-multiply");
lang = config.getString("config.lang","cn");
competition = config.getBoolean("config.fishing-competition",true);
disableJobXp = config.getBoolean("config.disable-JobsReborn-fishing-exp",false);
hasWhitelist = config.getBoolean("config.whitelist-worlds.enable",false);
@@ -362,7 +374,8 @@ public class ConfigReader{
loot.setDifficulty(difficulty);
loot.setTime(time);
loot.setWeight(weight);
loot.setNick(config.getString(key + ".nick", key));
if (config.contains(key + ".nick")) loot.setNick(config.getString(key + ".nick"));
else loot.setNick(config.getString(key + ".display.name", key));
loot.setScore(config.getDouble(key + ".score",0));
loot.setShowInFinder(config.getBoolean(key + ".show-in-fishfinder", true));
loot.setRandomDurability(config.getBoolean(key + ".random-durability", false));
@@ -549,7 +562,8 @@ public class ConfigReader{
loot.setDifficulty(difficulty);
loot.setTime(time);
loot.setWeight(weight);
loot.setNick(config.getString(key + ".name", key));
if (config.contains(key + ".nick")) loot.setNick(config.getString(key + ".nick"));
else loot.setNick(config.getString(key + ".display.name", key));
loot.setScore(config.getDouble(key + ".score",0));
loot.setShowInFinder(config.getBoolean(key + ".show-in-fishfinder", true));
loot.setMmLevel(config.getInt(key + ".level", 0));

30
src/main/java/net/momirealms/customfishing/CustomFishing.java
View File

@@ -25,6 +25,7 @@ import net.momirealms.customfishing.competition.CompetitionSchedule;
import net.momirealms.customfishing.competition.bossbar.BossBarManager;
import net.momirealms.customfishing.helper.LibraryLoader;
import net.momirealms.customfishing.hook.Placeholders;
import net.momirealms.customfishing.hook.skill.JobsReborn;
import net.momirealms.customfishing.listener.*;
import net.momirealms.customfishing.utils.AdventureUtil;
import net.momirealms.customfishing.utils.ConfigUtil;
@@ -51,6 +52,7 @@ public final class CustomFishing extends JavaPlugin {
@Override
public void onEnable() {
adventure = BukkitAudiences.create(this);
miniMessage = MiniMessage.miniMessage();
Objects.requireNonNull(Bukkit.getPluginCommand("customfishing")).setExecutor(new Execute());
@@ -62,18 +64,13 @@ public final class CustomFishing extends JavaPlugin {
Bukkit.getScheduler().runTaskAsynchronously(this, ()-> {
ConfigReader.Reload();
if (ConfigReader.Config.competition){
competitionSchedule = new CompetitionSchedule();
competitionSchedule.checkTime();
Bukkit.getScheduler().runTask(this, () -> {
Bukkit.getPluginManager().registerEvents(new BossBarManager(), this);
});
}
if (ConfigReader.Config.convertMMOItems){
Bukkit.getScheduler().runTask(this, () -> {
Bukkit.getPluginManager().registerEvents(new MMOItemsConverter(), this);
});
Bukkit.getScheduler().runTask(this, () -> Bukkit.getPluginManager().registerEvents(new BossBarManager(), this));
}
if (ConfigReader.Config.papi){
placeholders = new Placeholders();
Bukkit.getScheduler().runTask(this, () -> {
@@ -81,15 +78,18 @@ public final class CustomFishing extends JavaPlugin {
Bukkit.getPluginManager().registerEvents(new PapiUnregister(), this);
});
}
if (ConfigReader.Config.preventPick){
Bukkit.getScheduler().runTask(this, () -> {
Bukkit.getPluginManager().registerEvents(new PickUpListener(),this);
});
}
if (!Objects.equals(ConfigReader.Config.version, "7")){
if (ConfigReader.Config.preventPick)
Bukkit.getScheduler().runTask(this, () -> Bukkit.getPluginManager().registerEvents(new PickUpListener(),this));
if (!Objects.equals(ConfigReader.Config.version, "8"))
ConfigUtil.update();
}
if (ConfigReader.Config.convertMMOItems)
Bukkit.getScheduler().runTask(this, () -> Bukkit.getPluginManager().registerEvents(new MMOItemsListener(), this));
if (ConfigReader.Config.disableJobXp)
Bukkit.getScheduler().runTask(this, () -> Bukkit.getPluginManager().registerEvents(new JobsListener(), this));
ConfigReader.tryEnableJedis();
AdventureUtil.consoleMessage("<gradient:#0070B3:#A0EACF>[CustomFishing] </gradient><color:#E1FFFF>Plugin Enabled!");
});
}

44
src/main/java/net/momirealms/customfishing/hook/skill/JobsReborn.java Normal file
View File

@@ -0,0 +1,44 @@
package net.momirealms.customfishing.hook.skill;
import com.gamingmesh.jobs.Jobs;
import com.gamingmesh.jobs.container.Job;
import com.gamingmesh.jobs.container.JobProgression;
import com.gamingmesh.jobs.container.JobsPlayer;
import org.bukkit.entity.Player;
import java.util.List;
public class JobsReborn implements SkillXP{
@Override
public void addXp(Player player, double amount) {
JobsPlayer jobsPlayer = Jobs.getPlayerManager().getJobsPlayer(player);
if (jobsPlayer != null) {
List<JobProgression> jobs = jobsPlayer.getJobProgression();
Job job = Jobs.getJob("Fisherman");
for (JobProgression progression : jobs)
if (progression.getJob().equals(job)){
progression.addExperience(amount);
}
}
}
@Override
public int getLevel(Player player) {
JobsPlayer jobsPlayer = Jobs.getPlayerManager().getJobsPlayer(player);
if (jobsPlayer != null) {
List<JobProgression> jobs = jobsPlayer.getJobProgression();
Job job = Jobs.getJob("Fisherman");
for (JobProgression progression : jobs)
if (progression.getJob().equals(job))
return progression.getLevel();
}
return 0;
}
}

33
src/main/java/net/momirealms/customfishing/listener/FishListener.java
View File

@@ -328,12 +328,6 @@ public class FishListener implements Listener {
}
}
if (ConfigReader.Config.needSpecialRod && noSpecialRod){
if (!ConfigReader.Config.vanillaLoot)
AdventureUtil.playerMessage(player, ConfigReader.Message.prefix + ConfigReader.Message.noRod);
nextLoot.put(player, null);
}
FishHook hook = event.getHook();
hook.setMaxWaitTime((int) (timeModifier * hook.getMaxWaitTime()));
hook.setMinWaitTime((int) (timeModifier * hook.getMinWaitTime()));
@@ -352,6 +346,18 @@ public class FishListener implements Listener {
return;
}
if (ConfigReader.Config.needSpecialRod && noSpecialRod){
if (!ConfigReader.Config.vanillaLoot)
AdventureUtil.playerMessage(player, ConfigReader.Message.prefix + ConfigReader.Message.noRod);
nextLoot.put(player, null);
}
if (ConfigReader.Config.needRodFishing && noSpecialRod){
nextLoot.put(player, new Loot("none"));
}
if ((ConfigReader.Config.needSpecialRod || ConfigReader.Config.needRodFishing) && noSpecialRod) return;
double[] weights = new double[possibleLoots.size()];
int index = 0;
for (Loot loot : possibleLoots){
@@ -400,14 +406,19 @@ public class FishListener implements Listener {
});
}
case CAUGHT_FISH -> {
if (ConfigReader.Config.needRodFishing && nextLoot.get(player) != null && nextLoot.get(player).getKey().equals("none")){
return;
}
//是否需要两次拉杆
if (ConfigReader.Config.doubleRealIn) {
FishingPlayer fishingPlayer = fishingPlayers.remove(player);
Entity entity = event.getCaught();
if (fishingPlayer == null){
Entity entity = event.getCaught();
if (entity instanceof Item item){
//是否有原版战利品
if (ConfigReader.Config.vanillaLoot) {
@@ -447,7 +458,6 @@ public class FishListener implements Listener {
}
else {
Entity entity = event.getCaught();
if (entity instanceof Item item){
item.remove();
event.setExpToDrop(0);
@@ -503,6 +513,7 @@ public class FishListener implements Listener {
//如果玩家正在钓鱼
//那么拉杆的时候可能也会遇到上钩点，进行正常收杆判断
FishingPlayer fishingPlayer = fishingPlayers.remove(player);
if (fishingPlayer != null){
item.remove();
@@ -579,6 +590,7 @@ public class FishListener implements Listener {
}
}
case REEL_IN -> {
FishingPlayer fishingPlayer = fishingPlayers.remove(player);
//首先得是钓鱼中的玩家
if (fishingPlayer != null){
@@ -649,6 +661,7 @@ public class FishListener implements Listener {
}
}
case BITE -> {
if (ConfigReader.Config.doubleRealIn) return;
if (fishingPlayers.get(player) != null) return;
@@ -657,6 +670,10 @@ public class FishListener implements Listener {
if (loot == null) return;
if (ConfigReader.Config.needRodFishing && loot.getKey().equals("none")){
return;
}
String layout;
if (loot.getLayout() != null){
layout = loot.getLayout().get((int) (loot.getLayout().size() * Math.random()));

18
src/main/java/net/momirealms/customfishing/listener/JobsListener.java Normal file
View File

@@ -0,0 +1,18 @@
package net.momirealms.customfishing.listener;
import com.gamingmesh.jobs.Jobs;
import com.gamingmesh.jobs.api.JobsExpGainEvent;
import com.gamingmesh.jobs.container.Job;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
public class JobsListener implements Listener {
@EventHandler
public void onExpAdd(JobsExpGainEvent event){
Job job = Jobs.getJob("Fisherman");
if (event.getJob().equals(job)){
event.setExp(0);
}
}
}

84
src/main/java/net/momirealms/customfishing/listener/MMOItemsListener.java Normal file
View File

@@ -0,0 +1,84 @@
/*
* Copyright (C) <2022> <XiaoMoMi>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package net.momirealms.customfishing.listener;
import de.tr7zw.changeme.nbtapi.NBTCompound;
import de.tr7zw.changeme.nbtapi.NBTItem;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerFishEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import java.util.HashMap;
public class MMOItemsListener implements Listener {
private final HashMap<Player, Long> coolDown = new HashMap<>();
@EventHandler
public void onFish(PlayerFishEvent event){
if (event.getState() == PlayerFishEvent.State.FISHING){
Player player = event.getPlayer();
long time = System.currentTimeMillis();
if (time - (coolDown.getOrDefault(player, time - 5000)) < 5000) {
return;
}
coolDown.put(player, time);
PlayerInventory inventory = player.getInventory();
ItemStack mainHand = inventory.getItemInMainHand();
if(mainHand.getType() == Material.FISHING_ROD){
NBTItem nbtItem = new NBTItem(mainHand);
if (nbtItem.getCompound("CustomFishing") == null) {
if (!nbtItem.getString("MMOITEMS_ITEM_ID").equals("")){
NBTCompound nbtCompound = nbtItem.addCompound("CustomFishing");
nbtCompound.setString("type","rod");
nbtCompound.setString("id",nbtItem.getString("MMOITEMS_ITEM_ID"));
mainHand.setItemMeta(nbtItem.getItem().getItemMeta());
}
}
}
ItemStack offHand = inventory.getItemInOffHand();
if(offHand.getType() == Material.FISHING_ROD){
NBTItem nbtItem = new NBTItem(offHand);
if (nbtItem.getCompound("CustomFishing") == null) {
if (!nbtItem.getString("MMOITEMS_ITEM_ID").equals("")){
NBTCompound nbtCompound = nbtItem.addCompound("CustomFishing");
nbtCompound.setString("type", "rod");
nbtCompound.setString("id", nbtItem.getString("MMOITEMS_ITEM_ID"));
offHand.setItemMeta(nbtItem.getItem().getItemMeta());
}
}
}
}
}
@EventHandler
public void onQuit(PlayerQuitEvent event){
coolDown.remove(event.getPlayer());
}
}

3
src/main/java/net/momirealms/customfishing/requirements/CustomPapi.java
View File

@@ -33,6 +33,7 @@ public class CustomPapi implements Requirement {
allPapi.add(papi);
switch (type){
case "==" -> papiRequirement = new PapiEquals(papi, value);
case "!=" -> papiRequirement = new PapiNotEquals(papi, value);
case ">=" -> papiRequirement = new PapiNoLess(papi, Double.parseDouble(value));
case "<=" -> papiRequirement = new PapiNoLarger(papi, Double.parseDouble(value));
case "<" -> papiRequirement = new PapiSmaller(papi, Double.parseDouble(value));
@@ -67,6 +68,7 @@ public class CustomPapi implements Requirement {
allPapi.add(papi);
switch (type){
case "==" -> andRequirements.add(new PapiEquals(papi, value));
case "!=" -> andRequirements.add(new PapiNotEquals(papi, value));
case ">=" -> andRequirements.add(new PapiNoLess(papi, Double.parseDouble(value)));
case "<=" -> andRequirements.add(new PapiNoLarger(papi, Double.parseDouble(value)));
case "<" -> andRequirements.add(new PapiSmaller(papi, Double.parseDouble(value)));
@@ -97,6 +99,7 @@ public class CustomPapi implements Requirement {
allPapi.add(papi);
switch (type){
case "==" -> orRequirements.add(new PapiEquals(papi, value));
case "!=" -> orRequirements.add(new PapiNotEquals(papi, value));
case ">=" -> orRequirements.add(new PapiNoLess(papi, Double.parseDouble(value)));
case "<=" -> orRequirements.add(new PapiNoLarger(papi, Double.parseDouble(value)));
case "<" -> orRequirements.add(new PapiSmaller(papi, Double.parseDouble(value)));

13
src/main/java/net/momirealms/customfishing/requirements/papi/PapiNotEquals.java Normal file
View File

@@ -0,0 +1,13 @@
package net.momirealms.customfishing.requirements.papi;
import java.util.HashMap;
import java.util.Objects;
public record PapiNotEquals(String papi, String requirement) implements PapiRequirement{
@Override
public boolean isMet(HashMap<String, String> papiMap) {
String value = papiMap.get(papi);
return !Objects.equals(value, requirement);
}
}

3
src/main/java/net/momirealms/customfishing/titlebar/TimerTask.java
View File

@@ -88,6 +88,7 @@ public class TimerTask extends BukkitRunnable {
bukkitScheduler.cancelTask(taskID);
return;
}
int timer = difficulty.getTimer() - 1;
int speed = difficulty.getSpeed();
//设置指针方向
@@ -119,7 +120,7 @@ public class TimerTask extends BukkitRunnable {
}
}
stringBuilder.append(end);
AdventureUtil.playerTitle(player, title, stringBuilder.toString(),0,300,0);
AdventureUtil.playerTitle(player, title, stringBuilder.toString(),0,500,0);
//移除切换物品的玩家
PlayerInventory playerInventory = player.getInventory();
if (playerInventory.getItemInMainHand().getType() != Material.FISHING_ROD && playerInventory.getItemInOffHand().getType() != Material.FISHING_ROD){