Skip to content

Commit ed93790

Browse files
committed
3.15.1
1 parent 347b323 commit ed93790

18 files changed

+42
-38
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ pitest {
1313
}
1414

1515
group 'sh.okx'
16-
version '3.15'
16+
version '3.15.1'
1717

1818
java {
19-
sourceCompatibility = JavaVersion.VERSION_21
20-
targetCompatibility = JavaVersion.VERSION_21
19+
sourceCompatibility = JavaVersion.VERSION_1_8
20+
targetCompatibility = JavaVersion.VERSION_1_8
2121
}
2222

2323
repositories {
@@ -45,13 +45,13 @@ repositories {
4545
dependencies {
4646
testImplementation 'org.junit.platform:junit-platform-launcher:1.8.2'
4747
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
48-
testImplementation 'com.github.MockBukkit:MockBukkit:v4.31.1'
48+
testImplementation 'com.github.MockBukkit:MockBukkit:04889261630cd6f5aaebd86a576bbcd12c442ea7'
4949

5050
implementation group: 'org.slf4j', name: 'slf4j-nop', version: '1.7.30'
5151
implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'
5252

5353
compileOnly 'org.jetbrains:annotations:22.0.0'
54-
compileOnly 'org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT'
54+
compileOnly 'org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT'
5555
compileOnly('com.github.Realizedd:TokenManager:3.2.4') {
5656
transitive = false
5757
}

src/main/java/sh/okx/rankup/RankupPlugin.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
import org.bukkit.entity.Player;
1212
import org.bukkit.event.inventory.InventoryType;
1313
import org.bukkit.inventory.InventoryView;
14+
import org.bukkit.plugin.PluginDescriptionFile;
1415
import org.bukkit.plugin.PluginManager;
1516
import org.bukkit.plugin.java.JavaPlugin;
17+
import org.bukkit.plugin.java.JavaPluginLoader;
1618
import sh.okx.rankup.commands.InfoCommand;
1719
import sh.okx.rankup.commands.MaxRankupCommand;
1820
import sh.okx.rankup.commands.PrestigeCommand;
@@ -122,7 +124,8 @@ public RankupPlugin() {
122124
super();
123125
}
124126

125-
protected RankupPlugin(PermissionManager permissionManager, EconomyProvider economyProvider) {
127+
protected RankupPlugin(JavaPluginLoader loader, PluginDescriptionFile description, File dataFolder, File file, PermissionManager permissionManager, EconomyProvider economyProvider) {
128+
super(loader, description, dataFolder, file);
126129
this.permissionManager = permissionManager;
127130
this.economyProvider = economyProvider;
128131
}
@@ -136,7 +139,7 @@ public void onEnable() {
136139
if (System.getProperty("RANKUP_TEST") == null) {
137140
Metrics metrics = new Metrics(this);
138141
metrics.addCustomChart(new Metrics.SimplePie("confirmation",
139-
() -> config.getString("confirmation-type", "unknown")));
142+
() -> config.getString("confirmation-type", "unknown")));
140143
metrics.addCustomChart(new Metrics.AdvancedPie("requirements", () -> {
141144
Map<String, Integer> map = new HashMap<>();
142145
addAllRequirements(map, rankups);
@@ -146,11 +149,11 @@ public void onEnable() {
146149
return map;
147150
}));
148151
metrics.addCustomChart(new Metrics.SimplePie("prestige",
149-
() -> config.getBoolean("prestige") ? "enabled" : "disabled"));
152+
() -> config.getBoolean("prestige") ? "enabled" : "disabled"));
150153
metrics.addCustomChart(new Metrics.SimplePie("permission-rankup",
151-
() -> config.getBoolean("permission-rankup") ? "enabled" : "disabled"));
154+
() -> config.getBoolean("permission-rankup") ? "enabled" : "disabled"));
152155
metrics.addCustomChart(new Metrics.SimplePie("notify-update",
153-
() -> config.getBoolean("notify-update") ? "enabled" : "disabled"));
156+
() -> config.getBoolean("notify-update") ? "enabled" : "disabled"));
154157
}
155158

156159
if (config.getBoolean("ranks")) {
@@ -324,7 +327,6 @@ public void refreshRanks() {
324327
// rankups.getOrderedList();
325328

326329

327-
328330
} catch (RuntimeException e) {
329331
this.errorMessage = e.getClass().getName() + ": " + e.getMessage();
330332
e.printStackTrace();
@@ -433,6 +435,7 @@ private void registerRequirements() {
433435
requirements.addRequirements(new SuperbVoteVotesRequirement(this));
434436
}
435437
}
438+
436439
private void setupEconomy() {
437440
economy = economyProvider.getEconomy();
438441
}

src/test/java/sh/okx/rankup/RankupBasicsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package sh.okx.rankup;
22

33

4-
import org.mockbukkit.mockbukkit.entity.PlayerMock;
4+
import be.seeseemelk.mockbukkit.entity.PlayerMock;
55
import org.junit.jupiter.api.Test;
66
import sh.okx.rankup.messages.Message;
77
import sh.okx.rankup.ranks.Rank;

src/test/java/sh/okx/rankup/RankupPlaceholderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package sh.okx.rankup;
22

33

4-
import org.mockbukkit.mockbukkit.entity.PlayerMock;
4+
import be.seeseemelk.mockbukkit.entity.PlayerMock;
55
import org.junit.jupiter.api.Test;
66
import sh.okx.rankup.placeholders.RankupExpansion;
77

src/test/java/sh/okx/rankup/RankupTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
package sh.okx.rankup;
22

3-
import org.mockbukkit.mockbukkit.MockBukkit;
4-
import org.mockbukkit.mockbukkit.ServerMock;
3+
import be.seeseemelk.mockbukkit.MockBukkit;
4+
import be.seeseemelk.mockbukkit.ServerMock;
5+
import org.junit.jupiter.api.AfterEach;
6+
import org.junit.jupiter.api.BeforeEach;
7+
import sh.okx.rankup.hook.GroupProvider;
8+
import sh.okx.rankup.providers.TestEconomyProvider;
9+
import sh.okx.rankup.providers.TestGroupProvider;
10+
import sh.okx.rankup.providers.TestPermissionManager;
11+
512
import java.io.File;
613
import java.io.IOException;
714
import java.net.URL;
@@ -10,12 +17,6 @@
1017
import java.nio.file.Path;
1118
import java.nio.file.SimpleFileVisitor;
1219
import java.nio.file.attribute.BasicFileAttributes;
13-
import org.junit.jupiter.api.AfterEach;
14-
import org.junit.jupiter.api.BeforeEach;
15-
import sh.okx.rankup.providers.TestEconomyProvider;
16-
import sh.okx.rankup.hook.GroupProvider;
17-
import sh.okx.rankup.providers.TestGroupProvider;
18-
import sh.okx.rankup.providers.TestPermissionManager;
1920

2021
public abstract class RankupTest {
2122
private final File testResourceFolder;

src/test/java/sh/okx/rankup/WorldRequirementTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package sh.okx.rankup;
22

33

4-
import org.mockbukkit.mockbukkit.entity.PlayerMock;
4+
import be.seeseemelk.mockbukkit.entity.PlayerMock;
55
import org.bukkit.Location;
66
import org.junit.jupiter.api.Test;
77
import sh.okx.rankup.placeholders.RankupExpansion;

src/test/java/sh/okx/rankup/commands/ComandPlaytimeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static org.junit.jupiter.api.Assertions.*;
44

5-
import org.mockbukkit.mockbukkit.entity.PlayerMock;
5+
import be.seeseemelk.mockbukkit.entity.PlayerMock;
66
import org.bukkit.ChatColor;
77
import org.bukkit.Statistic;
88
import org.junit.jupiter.api.Test;

src/test/java/sh/okx/rankup/commands/CommandInfoTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package sh.okx.rankup.commands;
22

33

4-
import org.mockbukkit.mockbukkit.entity.PlayerMock;
4+
import be.seeseemelk.mockbukkit.entity.PlayerMock;
55
import org.junit.jupiter.api.Test;
66
import sh.okx.rankup.RankupTest;
77

src/test/java/sh/okx/rankup/commands/DisabledNoConfirmCommandTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package sh.okx.rankup.commands;
22

3-
import org.mockbukkit.mockbukkit.entity.PlayerMock;
3+
import be.seeseemelk.mockbukkit.entity.PlayerMock;
44
import org.junit.jupiter.api.Test;
55
import sh.okx.rankup.RankupTest;
66

src/test/java/sh/okx/rankup/commands/EnabledNoConfirmCommandTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package sh.okx.rankup.commands;
22

3-
import org.mockbukkit.mockbukkit.entity.PlayerMock;
3+
import be.seeseemelk.mockbukkit.entity.PlayerMock;
44
import org.junit.jupiter.api.Test;
55
import sh.okx.rankup.RankupTest;
66

0 commit comments

Comments
 (0)