Skip to content

Commit d82e15e

Browse files
RisasDevRisasDev
committed
Other things
1 parent 1a65545 commit d82e15e

8 files changed

Lines changed: 87 additions & 35 deletions

File tree

‎src/main/java/dev/panda/combofly/ComboFly.java‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package dev.panda.combofly;
22

33
import dev.panda.chat.ChatUtil;
4+
import dev.panda.combofly.balance.Balance;
45
import dev.panda.combofly.commands.PandaFlyCommand;
56
import dev.panda.combofly.commands.essentials.*;
67
import dev.panda.combofly.commands.network.*;
@@ -31,17 +32,16 @@
3132
import dev.panda.combofly.providers.ScoreboardProvider;
3233
import dev.panda.combofly.utilities.Animation;
3334
import dev.panda.combofly.utilities.Description;
34-
import dev.panda.combofly.utilities.balance.Balance;
35-
import dev.panda.combofly.utilities.balance.impl.Normal;
36-
import dev.panda.combofly.utilities.balance.impl.Vault;
35+
import dev.panda.combofly.balance.impl.Normal;
36+
import dev.panda.combofly.balance.impl.Vault;
37+
import dev.panda.combofly.utilities.hooks.PandaAbilityHook;
38+
import dev.panda.combofly.utilities.hooks.PlaceholderAPIHook;
3739
import dev.panda.combofly.utilities.menu.ButtonListener;
38-
import dev.panda.combofly.utilities.placeholder.PlaceholderAPI;
3940
import dev.panda.combofly.utilities.scoreboard.Assemble;
4041
import dev.panda.combofly.utilities.scoreboard.AssembleStyle;
4142
import dev.panda.command.CommandManager;
4243
import dev.panda.file.FileConfig;
4344
import dev.panda.rank.RankManager;
44-
import dev.panda.utilities.Server;
4545
import lombok.Getter;
4646
import lombok.Setter;
4747
import net.milkbowl.vault.chat.Chat;
@@ -78,7 +78,6 @@ public class ComboFly extends JavaPlugin {
7878
private Chat chat;
7979
private Economy econ;
8080
private Balance balanceType;
81-
private boolean pandaAbility = false;
8281

8382
public void onEnable() {
8483
loadConfigs();
@@ -92,21 +91,22 @@ public void onEnable() {
9291
setupEconomy();
9392
onlineDonors();
9493

94+
if (Bukkit.getPluginManager().getPlugin("PandaAbility") != null) {
95+
PandaAbilityHook.init();
96+
}
9597
if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
96-
new PlaceholderAPI(this).register();
98+
new PlaceholderAPIHook(this).register();
9799
}
98100

99-
pandaAbility = getServer().getPluginManager().getPlugin("PandaAbility") != null;
100-
101-
Bukkit.getConsoleSender().sendMessage(ChatUtil.translate("&aLoading plugin..."));
102-
Bukkit.getConsoleSender().sendMessage(ChatUtil.translate(ChatUtil.NORMAL_LINE));
103-
Bukkit.getConsoleSender().sendMessage(ChatUtil.translate(" "));
104-
Bukkit.getConsoleSender().sendMessage(ChatUtil.translate(" &4\u2764 &c&l" + Description.getName() + " &4\u2764"));
105-
Bukkit.getConsoleSender().sendMessage(ChatUtil.translate(""));
106-
Bukkit.getConsoleSender().sendMessage(ChatUtil.translate(" &7\u27A5 &cAuthor&7: &f" + Description.getAuthors()).replace("[", "").replace("]", ""));
107-
Bukkit.getConsoleSender().sendMessage(ChatUtil.translate(" &7\u27A5 &cVersion&7: &f" + Description.getVersion()));
108-
Bukkit.getConsoleSender().sendMessage(ChatUtil.translate(" &7\u27A5 &cRank System&7: &f" + getRankManager().getRankSystem()));
109-
Bukkit.getConsoleSender().sendMessage(ChatUtil.translate(ChatUtil.NORMAL_LINE));
101+
ChatUtil.log("&aLoading plugin...");
102+
ChatUtil.log(ChatUtil.NORMAL_LINE);
103+
ChatUtil.log(" ");
104+
ChatUtil.log(" &4\u2764 &c&l" + Description.getName() + " &4\u2764");
105+
ChatUtil.log("");
106+
ChatUtil.log(" &7\u27A5 &cAuthor&7: &f" + Description.getAuthors());
107+
ChatUtil.log(" &7\u27A5 &cVersion&7: &f" + Description.getVersion());
108+
ChatUtil.log(" &7\u27A5 &cRank System&7: &f" + this.getRankManager().getRankSystem());
109+
ChatUtil.log(ChatUtil.NORMAL_LINE);
110110
}
111111

112112
public void onDisable() {
@@ -156,6 +156,7 @@ private void loadCommands() {
156156
new KothCommand();
157157
new HostCommand();
158158
new LeaderboardCommand();
159+
159160
if (ComboFly.get().getStaffManager().isStaffEnable()) {
160161
new FreezeCommand();
161162
new StaffModeCommand();
@@ -198,6 +199,7 @@ private void loadManagers() {
198199
this.claimManager = new ClaimManager();
199200
this.spawnManager = new SpawnManager();
200201
this.menuKitManager = new MenuKitManager();
202+
201203
Animation.init();
202204
Profile.init();
203205
KoTH.init();

src/main/java/dev/panda/combofly/utilities/balance/Balance.java renamed to src/main/java/dev/panda/combofly/balance/Balance.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.panda.combofly.utilities.balance;
1+
package dev.panda.combofly.balance;
22

33
import org.bukkit.entity.Player;
44

src/main/java/dev/panda/combofly/utilities/balance/impl/Normal.java renamed to src/main/java/dev/panda/combofly/balance/impl/Normal.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package dev.panda.combofly.utilities.balance.impl;
1+
package dev.panda.combofly.balance.impl;
22

3-
import dev.panda.combofly.ComboFly;
43
import dev.panda.combofly.profile.Profile;
5-
import dev.panda.combofly.utilities.balance.Balance;
4+
import dev.panda.combofly.balance.Balance;
65
import org.bukkit.entity.Player;
76

87
public class Normal implements Balance {

src/main/java/dev/panda/combofly/utilities/balance/impl/Vault.java renamed to src/main/java/dev/panda/combofly/balance/impl/Vault.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package dev.panda.combofly.utilities.balance.impl;
1+
package dev.panda.combofly.balance.impl;
22

33
import dev.panda.combofly.ComboFly;
4-
import dev.panda.combofly.utilities.balance.Balance;
4+
import dev.panda.combofly.balance.Balance;
55
import net.milkbowl.vault.economy.EconomyResponse;
66
import org.bukkit.entity.Player;
77

‎src/main/java/dev/panda/combofly/listeners/KnockBackListener.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
public class KnockBackListener implements Listener {
1414

1515
private final ComboFly plugin = ComboFly.get();
16-
private final boolean maxheight = plugin.getMainConfig().getBoolean("KNOCKBACK.ENABLE-MAXHEIGHT");
16+
private final boolean maxHeight = plugin.getMainConfig().getBoolean("KNOCKBACK.ENABLE-MAXHEIGHT");
1717

1818
public KnockBackListener() {
1919
Bukkit.getServer().getPluginManager().registerEvents(this, plugin);
@@ -48,8 +48,9 @@ public void onDamage(EntityDamageByEntityEvent event) {
4848
double highestKB = attacked.getLocation().getBlockY() - attacker.getLocation().getBlockY();
4949
double heightKB = plugin.getKbManager().getHeightKB();
5050
Vector dir2 = attacker.getLocation().getDirection();
51+
5152
ComboFly.get().getServer().getScheduler().runTaskLaterAsynchronously(ComboFly.get(), () -> {
52-
if (maxheight) {
53+
if (maxHeight) {
5354
if (highestKB == heightKB) {
5455
Vector vec2 = new Vector(dir2.getX() * vecX, 0, dir2.getZ() * vecZ);
5556
attacked.setVelocity(vec2);

‎src/main/java/dev/panda/combofly/utilities/Utils.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,13 @@
22

33
import com.google.common.base.Preconditions;
44
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
5-
import dev.panda.combofly.ComboFly;
65
import org.bukkit.Bukkit;
76
import org.bukkit.Location;
87
import org.bukkit.World;
98
import org.bukkit.block.Block;
109
import org.bukkit.entity.Player;
1110

12-
import java.io.BufferedReader;
13-
import java.io.InputStreamReader;
14-
import java.lang.reflect.InvocationTargetException;
1511
import java.lang.reflect.Method;
16-
import java.net.InetAddress;
17-
import java.net.URL;
1812
import java.util.Collection;
1913

2014
public class Utils {

‎src/main/java/dev/panda/combofly/utilities/hooks/PlaceholderAPIHook.java‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
package dev.panda.combofly.utilities.hooks;
2+
3+
import dev.panda.combofly.ComboFly;
4+
import dev.panda.combofly.profile.Profile;
5+
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
6+
import org.bukkit.entity.Player;
7+
8+
/**
9+
* Created by Risas
10+
* Project: PandaFly
11+
* Date: 08-11-2021 - 13:36
12+
* Twitter: @RisasDev
13+
* GitHub: https://github.com/RisasDev
14+
*/
15+
public class PlaceholderAPIHook extends PlaceholderExpansion {
16+
17+
private final ComboFly plugin;
18+
19+
public PlaceholderAPIHook(ComboFly plugin) {
20+
this.plugin = plugin;
21+
}
22+
23+
@Override
24+
public boolean persist(){
25+
return true;
26+
}
27+
28+
@Override
29+
public boolean canRegister(){
30+
return true;
31+
}
32+
33+
@Override
34+
public String getAuthor(){
35+
return "Aleesk, TulioTriste, Risas";
36+
}
37+
38+
@Override
39+
public String getIdentifier(){
40+
return "PandaFly";
41+
}
42+
43+
@Override
44+
public String getVersion(){
45+
return plugin.getDescription().getVersion();
46+
}
47+
48+
@Override
49+
public String onPlaceholderRequest(Player player, String identifier) {
50+
if (player == null) return "";
51+
52+
switch (identifier) {
53+
case "kills": return String.valueOf(Profile.getProfiles().get(player.getUniqueId()).getKd().getKills());
54+
case "deaths": return String.valueOf(Profile.getProfiles().get(player.getUniqueId()).getKd().getDeaths());
55+
case "balance": return String.valueOf(Profile.getProfiles().get(player.getUniqueId()).getBalance());
56+
default: return null;
57+
}
58+
}
59+
}

‎src/main/resources/config.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# LICENSE CONFIGURATION
2-
LICENSE: "PUT YOUR LICENSE HERE"
3-
41
# Type of Balance
52
# [NORMAL, VAULT]
63
BALANCE-TYPE: NORMAL

0 commit comments

Comments
 (0)