Skip to content

Commit d7e1d68

Browse files
BlueTree242BlueTree242
committed
release 1.2.13
2 parents 5a91a96 + e5c5fff commit d7e1d68

File tree

25 files changed

+206
-67
lines changed

25 files changed

+206
-67
lines changed

‎.github/workflows/nondev.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# This workflow is for anything not on develop branch, because jenkins already try to build that.
2+
3+
name: Gradle Build
4+
5+
on:
6+
push:
7+
branches:
8+
- "*"
9+
- "!develop"
10+
pull_request:
11+
types:
12+
- opened
13+
- synchronize
14+
15+
jobs:
16+
build:
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- name: Checkout code
21+
uses: actions/checkout@v2
22+
23+
- name: Set up JDK
24+
uses: actions/setup-java@v2
25+
with:
26+
java-version: "17"
27+
distribution: "zulu"
28+
java-package: jdk
29+
30+
- name: Setup Gradle
31+
uses: gradle/gradle-build-action@v2
32+
- name: Run build with Gradle Wrapper
33+
run: ./gradlew build

‎bukkit/src/main/java/tk/bluetree242/discordsrvutils/bukkit/BukkitDebugger.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,15 @@ public String run(String stacktrace) throws Exception {
128128
int aesBits = 256;
129129
String key = RandomStringUtils.randomAlphanumeric(aesBits == 256 ? 32 : 16);
130130
RequestBody body = new MultipartBody.Builder().setType(MultipartBody.FORM).addFormDataPart("data", Utils.b64Encode(encrypt(key.getBytes(), data.toString()))).build();
131-
Request request = new Request.Builder().post(body).url("https://mcdebug.bluetree242.ml/api/v1/createDebug").build();
131+
Request request = new Request.Builder().post(body).url("https://mcdebug.bluetree242.dev/api/v1/createDebug").build();
132132
Response response = client.newCall(request).execute();
133133

134134
JSONObject bdy = new JSONObject(response.body().string());
135135
response.close();
136136
if (response.code() != 200) {
137137
return "ERROR: INVALID RESPONSE CODE " + response.code();
138138
}
139-
return "https://mcdebug.bluetree242.ml" + "/" + bdy.getString("id") + "#" + key;
139+
return "https://mcdebug.bluetree242.dev" + "/" + bdy.getString("id") + "#" + key;
140140

141141

142142
}

‎bukkit/src/main/java/tk/bluetree242/discordsrvutils/bukkit/BukkitOfflinePlayer.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
import java.util.UUID;
3232

3333
@RequiredArgsConstructor
34-
public class BukkitOfflinePlayer extends PlatformPlayer {
34+
public class BukkitOfflinePlayer extends PlatformPlayer<OfflinePlayer> {
3535
@Getter
36-
private final OfflinePlayer player;
36+
private final OfflinePlayer original;
3737
private final DiscordSRVUtils core;
3838

3939
@Override
4040
public String getName() {
41-
return player.getName();
41+
return original.getName();
4242
}
4343

4444
@Override
@@ -53,11 +53,16 @@ public boolean hasPermission(String node) {
5353

5454
@Override
5555
public UUID getUniqueId() {
56-
return player.getUniqueId();
56+
return original.getUniqueId();
5757
}
5858

5959
@Override
6060
public String placeholders(String s) {
6161
return core.getPlatform().placehold(this, s);
6262
}
63+
64+
@Override
65+
public boolean shouldSendAfk() {
66+
return false;
67+
}
6368
}

‎bukkit/src/main/java/tk/bluetree242/discordsrvutils/bukkit/BukkitPlatformServer.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,13 @@ public PlatformPlayer getPlayer(UUID uuid) {
105105
return new BukkitPlayer(core, player);
106106
}
107107

108+
@Override
109+
public PlatformPlayer getPlayer(String name) {
110+
Player player = Bukkit.getPlayer(name);
111+
if (player == null) return null;
112+
return new BukkitPlayer(core, player);
113+
}
114+
108115
@Override
109116
public void executeConsoleCommands(String... cmds) {
110117
Runnable runnable = () -> {

‎bukkit/src/main/java/tk/bluetree242/discordsrvutils/bukkit/BukkitPlayer.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,43 +25,49 @@
2525
import lombok.Getter;
2626
import org.bukkit.entity.Player;
2727
import tk.bluetree242.discordsrvutils.DiscordSRVUtils;
28+
import tk.bluetree242.discordsrvutils.bukkit.listeners.afk.essentials.EssentialsAFKListener;
2829
import tk.bluetree242.discordsrvutils.platform.PlatformPlayer;
2930
import tk.bluetree242.discordsrvutils.utils.Utils;
3031

3132
import java.util.UUID;
3233

33-
public class BukkitPlayer extends PlatformPlayer {
34+
public class BukkitPlayer extends PlatformPlayer<Player> {
3435
private final DiscordSRVUtils core;
3536
@Getter
36-
private final Player player;
37+
private final Player original;
3738

38-
public BukkitPlayer(DiscordSRVUtils core, Player player) {
39-
this.player = player;
39+
public BukkitPlayer(DiscordSRVUtils core, Player original) {
40+
this.original = original;
4041
this.core = core;
4142
}
4243

4344
@Override
4445
public String getName() {
45-
return player.getName();
46+
return original.getName();
4647
}
4748

4849
@Override
4950
public void sendMessage(String msg) {
50-
player.sendMessage(Utils.colors(msg));
51+
original.sendMessage(Utils.colors(msg));
5152
}
5253

5354
@Override
5455
public boolean hasPermission(String node) {
55-
return player.hasPermission(node);
56+
return original.hasPermission(node);
5657
}
5758

5859
@Override
5960
public UUID getUniqueId() {
60-
return player.getUniqueId();
61+
return original.getUniqueId();
6162
}
6263

6364
@Override
6465
public String placeholders(String s) {
6566
return core.getPlatform().placehold(this, s);
6667
}
68+
69+
@Override
70+
public boolean shouldSendAfk() {
71+
return EssentialsAFKListener.shouldSend(original);
72+
}
6773
}

‎bukkit/src/main/java/tk/bluetree242/discordsrvutils/bukkit/BukkitPlugin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ public void addHooks() {
157157

158158
@Override
159159
public String placehold(PlatformPlayer player, String s) {
160-
if (player instanceof BukkitPlayer) return applyPlaceholders(s, ((BukkitPlayer) player).getPlayer());
160+
if (player instanceof BukkitPlayer) return applyPlaceholders(s, ((BukkitPlayer) player).getOriginal());
161161
else if (player instanceof BukkitOfflinePlayer)
162-
return applyPlaceholders(s, ((BukkitOfflinePlayer) player).getPlayer());
162+
return applyPlaceholders(s, ((BukkitOfflinePlayer) player).getOriginal());
163163
else return applyPlaceholders(s, null);
164164
}
165165
}

‎bukkit/src/main/java/tk/bluetree242/discordsrvutils/bukkit/DiscordSRVUtilsBukkit.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public void onEnable() {
6868
core = new DiscordSRVUtils(new BukkitPlugin(this));
6969
((BukkitPlugin) core.getPlatform()).setDiscordSRVUtils(core);
7070
}
71+
DiscordSRV.api.addSlashCommandProvider(new SlashCommandProvider(this));
7172
core.onEnable();
7273
if (!isEnabled()) return;
7374
//bstats stuff
@@ -82,17 +83,15 @@ public void onEnable() {
8283
if (core.getLevelingConfig().enabled()) valueMap.put("Leveling", 1);
8384
if (core.getSuggestionsConfig().enabled()) valueMap.put("Suggestions", 1);
8485
if (core.getMainConfig().welcomer_enabled()) valueMap.put("Welcomer", 1);
86+
if (core.getMainConfig().track_invites()) valueMap.put("Invite Tracking", 1);
8587
if (core.getBansConfig().isSendPunishmentMsgsToDiscord() && isAnyPunishmentsPluginInstalled())
8688
valueMap.put("Punishment Messages", 1);
87-
if (getServer().getPluginManager().isPluginEnabled("Essentials") && core.getMainConfig().afk_message_enabled())
89+
if (core.getPluginHookManager().isHooked("Essentials") && core.getMainConfig().afk_message_enabled())
8890
valueMap.put("AFK Messages", 1);
8991
return valueMap;
9092
}));
9193
metrics.addCustomChart(new SimplePie("discordsrv_versions", () -> DiscordSRV.getPlugin().getDescription().getVersion()));
92-
metrics.addCustomChart(new SimplePie("admins", () -> core.getJdaManager().getAdminIds().size() + ""));
93-
94-
//discordsrv slash commands api
95-
DiscordSRV.api.addSlashCommandProvider(new SlashCommandProvider(this));
94+
metrics.addCustomChart(new SimplePie("admins", () -> String.valueOf(core.getJdaManager().getAdminIds().size())));
9695
}
9796

9897
public void onDisable() {
@@ -118,9 +117,8 @@ public void disable() {
118117

119118

120119
private boolean isAnyPunishmentsPluginInstalled() {
121-
if (getServer().getPluginManager().isPluginEnabled("AdvancedBan")) return true;
122-
if (getServer().getPluginManager().isPluginEnabled("Litebans")) return true;
123-
if (getServer().getPluginManager().isPluginEnabled("Libertybans")) return true;
124-
return false;
120+
if (core.getPluginHookManager().isHooked("AdvancedBan")) return true;
121+
if (core.getPluginHookManager().isHooked("Litebans")) return true;
122+
return core.getPluginHookManager().isHooked("Libertybans");
125123
}
126124
}

‎bukkit/src/main/java/tk/bluetree242/discordsrvutils/bukkit/PAPIExpansion.java‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,26 @@ public String onPlaceholderRequest(UUID p, String identifier) {
8484
identifier = identifier.toLowerCase();
8585
if (identifier.equalsIgnoreCase("level")) {
8686
if (p == null) return "Unknown";
87-
return core.getLevelingManager().getCachedStats(p).getLevel() + "";
87+
return String.valueOf(core.getLevelingManager().getCachedStats(p).getLevel());
8888
} else if (identifier.equalsIgnoreCase("xp")) {
8989
if (p == null) return "Unknown";
90-
return core.getLevelingManager().getCachedStats(p).getXp() + "";
90+
return String.valueOf(core.getLevelingManager().getCachedStats(p).getXp());
9191
} else if (identifier.equalsIgnoreCase("rank")) {
9292
if (p == null) return "Unknown";
93-
return core.getLevelingManager().getCachedStats(p).getRank() + "";
93+
return String.valueOf(core.getLevelingManager().getCachedStats(p).getRank());
94+
} else if (identifier.equalsIgnoreCase("xp_total_required")) {
95+
if (p == null) return "Unknown";
96+
return String.valueOf(core.getLevelingManager().getCachedStats(p).getTotalXpRequired());
97+
} else if (identifier.equalsIgnoreCase("xp_percentage")) {
98+
if (p == null) return "Unknown";
99+
return core.getLevelingManager().getCachedStats(p).getXpPercentage() + "%";
100+
} else if (identifier.equalsIgnoreCase("xp_left")) {
101+
if (p == null) return "Unknown";
102+
return String.valueOf(core.getLevelingManager().getCachedStats(p).getTotalXpRequired() -
103+
core.getLevelingManager().getCachedStats(p).getXp());
104+
} else if (identifier.equalsIgnoreCase("xp_percentage_left")) {
105+
if (p == null) return "Unknown";
106+
return 100 - core.getLevelingManager().getCachedStats(p).getXpPercentage() + "%";
94107
}
95108
return null;
96109
}
@@ -112,9 +125,7 @@ public String getRequiredPlugin() {
112125
@Override
113126
public void hook() {
114127
//on next tick because of those bukkit sync errors when PAPI fires the registration event
115-
Bukkit.getScheduler().runTask((Plugin) core.getPlatform().getOriginal(), () -> {
116-
(expansion = new PAPIExpansion(core)).register();
117-
});
128+
Bukkit.getScheduler().runTask((Plugin) core.getPlatform().getOriginal(), () -> (expansion = new PAPIExpansion(core)).register());
118129
}
119130

120131
@Override

‎bukkit/src/main/java/tk/bluetree242/discordsrvutils/bukkit/listeners/afk/essentials/EssentialsAFKListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class EssentialsAFKListener implements Listener {
4545

4646
private final DiscordSRVUtils core;
4747

48-
public static boolean shouldSend(Player p) {
48+
public static boolean shouldSend(Player p) {
4949
if (Bukkit.getServer().getPluginManager().isPluginEnabled("Essentials")) {
5050
Essentials plugin = (Essentials) Bukkit.getPluginManager().getPlugin("Essentials");
5151
if (plugin.getUser(p.getUniqueId()).isHidden()) return false;
@@ -55,7 +55,7 @@ public static boolean shouldSend(Player p) {
5555
if (user.isVanished()) return false;
5656
}
5757
if (Bukkit.getServer().getPluginManager().isPluginEnabled("SuperVanish") || Bukkit.getServer().getPluginManager().isPluginEnabled("PremiumVanish")) {
58-
if (VanishAPI.isInvisible(p)) return false;
58+
return !VanishAPI.isInvisible(p);
5959
}
6060
return true;
6161
}

‎bukkit/src/main/java/tk/bluetree242/discordsrvutils/bukkit/listeners/punishments/advancedban/AdvancedBanPunishment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
package tk.bluetree242.discordsrvutils.bukkit.listeners.punishments.advancedban;
2424

2525
import lombok.RequiredArgsConstructor;
26-
import org.bukkit.Bukkit;
26+
import me.leoko.advancedban.manager.UUIDManager;
2727
import tk.bluetree242.discordsrvutils.interfaces.Punishment;
2828
import tk.bluetree242.discordsrvutils.utils.Utils;
2929

@@ -90,6 +90,6 @@ public boolean isIp() {
9090

9191
@Override
9292
public UUID getTargetUUID() {
93-
return Bukkit.getOfflinePlayer(punishment.getName()).getUniqueId();
93+
return UUID.fromString(UUIDManager.get().getUUID(punishment.getName()));
9494
}
9595
}

0 commit comments

Comments
 (0)