Skip to content

Commit 1613c8d

Browse files
vytskaltvytskalt
committed
testing stuff
1 parent 91d74dd commit 1613c8d

5 files changed

Lines changed: 40 additions & 32 deletions

File tree

‎flake.nix‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
inherit system;
1616
}));
1717
in {
18-
devShells = forAllSystems (pkgs: {
18+
devShells = forAllSystems (pkgs: rec {
19+
default = jdk25;
20+
1921
jdk25 = pkgs.mkShellNoCC {
2022
buildInputs = with pkgs; [
2123
jdk25_headless

‎test-env/init‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ port_cursor=25570
66
create_server() {
77
local name=$1
88
local nixshell=$2
9+
local enable_via=$3
910

1011
local root=$(pwd)
1112

@@ -30,9 +31,11 @@ create_server() {
3031
ln -sf "$plugin_path" plugins/test.jar
3132
ln -sf "$jar_path" server.jar
3233

33-
ln -sf $root/cache/viaversion.jar plugins/viaversion.jar
34-
ln -sf $root/cache/viabackwards.jar plugins/viabackwards.jar
35-
ln -sf $root/cache/viarewind.jar plugins/viarewind.jar
34+
if [ "$enable_via" = "true" ]; then
35+
ln -sf $root/cache/viaversion.jar plugins/viaversion.jar
36+
ln -sf $root/cache/viabackwards.jar plugins/viabackwards.jar
37+
ln -sf $root/cache/viarewind.jar plugins/viarewind.jar
38+
fi
3639

3740
local flags="-DPaper.IgnoreJavaVersion=true -Xms512M -Xmx1024M -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20"
3841

@@ -86,13 +89,13 @@ download_file() {
8689
local path="cache/$name"
8790
mkdir -p cache
8891

89-
if [ ! -f "$path" ]; then
92+
if [ ! -f "$path" ] || [ "$(sha256sum "$path" | cut -f 1 -d ' ')" != "$expected_sha256_hash" ]; then
9093
echo "Downloading $name..."
9194
curl --silent --location --output "$path" "$url"
9295
fi
9396

94-
local actual_hash=$(sha256sum "$path" | cut -f 1 -d ' ')
95-
if [ "$expected_sha256_hash" != "$actual_hash" ]; then
97+
local actual_hash="$(sha256sum "$path" | cut -f 1 -d ' ')"
98+
if [ "$actual_hash" != "$expected_sha256_hash" ]; then
9699
echo "ERROR: hashes for $name do not match! expected: $expected_sha256_hash, but got $actual_hash"
97100
rm "$path"
98101
exit 1
@@ -101,9 +104,9 @@ download_file() {
101104

102105
download_file "buildtools.jar" "https://hub.spigotmc.org/jenkins/job/BuildTools/197/artifact/target/BuildTools.jar" "9a5b059ace22eaef28fb62f96970f0abe1490f06c860229b94627cd72eaf6ea5"
103106

104-
download_file "viaversion.jar" "https://ci.viaversion.com/job/ViaVersion/1328/artifact/build/libs/ViaVersion-5.7.2-SNAPSHOT.jar" "ddb25eb56ddf1f89388ba654f6da09ba4162f55c291f9b5c2249ef1e8330b260"
105-
download_file "viabackwards.jar" "https://ci.viaversion.com/view/ViaBackwards/job/ViaBackwards/707/artifact/build/libs/ViaBackwards-5.7.2-SNAPSHOT.jar" "f59125c704bc3b2b7d0acd2946b2c35024cce2517a3bbb0b38b439c75d65edb0"
106-
download_file "viarewind.jar" "https://ci.viaversion.com/view/ViaRewind/job/ViaRewind/209/artifact/build/libs/ViaRewind-4.0.15-SNAPSHOT.jar" "dd8b0db2e5469a7d8d9754b9a42bb8b81681bbe8805ddd733f2c4931dd86cbab"
107+
download_file "viaversion.jar" "https://ci.viaversion.com/job/ViaVersion-Java8/38/artifact/build/libs/ViaVersion-5.7.1-downgraded.jar" "dcce3d30e195de9a3372616298bac1acd29196e5c3676a0fba745be9e3d91808"
108+
download_file "viabackwards.jar" "https://ci.viaversion.com/view/ViaBackwards/job/ViaBackwards-Java8/31/artifact/build/libs/ViaBackwards-5.7.1-downgraded.jar" "9727fd246d3566bffc3f71e1bda0e6db71bf5814a254e7ab5a2941ca0e94ecd6"
109+
download_file "viarewind.jar" "https://ci.viaversion.com/view/ViaRewind/job/ViaRewind-Java8/28/artifact/build/libs/ViaRewind-4.0.14-downgraded.jar" "e84c7afa696b898a99747edba2458dd9e9f5d7c1ee2f604c409964dd4d4d784d"
107110

108111
# --- 1.7.10 ---
109112
download_file "1.7.10-paper.jar" "https://fill-data.papermc.io/v1/objects/33772078d92e9dbb027602da016524ef29af5b4c12eaddac1fe2465b01108185/paper-1.7.10-2025.jar" "33772078d92e9dbb027602da016524ef29af5b4c12eaddac1fe2465b01108185"
@@ -143,55 +146,55 @@ create_spigot_server "1.12.2" "jdk8"
143146

144147
# --- 1.13 ---
145148
download_file "1.13-paper.jar" "https://fill-data.papermc.io/v1/objects/00db82d214242c9345266d44ff8d11a8e857a1a02edf7cb5fcc2d1d973283129/paper-1.13-173.jar" "00db82d214242c9345266d44ff8d11a8e857a1a02edf7cb5fcc2d1d973283129"
146-
create_server "1.13-paper" "jdk8"
149+
create_server "1.13-paper" "jdk8" "true"
147150

148151
create_spigot_server "1.13" "jdk8"
149152

150153
# --- 1.14.4 ---
151154
download_file "1.14.4-paper.jar" "https://fill-data.papermc.io/v1/objects/bd8ec5cdb22370d37816a6de26798df3d2b0d6f9c7c96c88ca45a1303fea50e8/paper-1.14.4-245.jar" "bd8ec5cdb22370d37816a6de26798df3d2b0d6f9c7c96c88ca45a1303fea50e8"
152155
create_server "1.14.4-paper" "jdk8"
153156

154-
create_spigot_server "1.14.4" "jdk8"
157+
create_spigot_server "1.14.4" "jdk8" "true"
155158

156159
# --- 1.15.2 ---
157160
download_file "1.15.2-paper.jar" "https://fill-data.papermc.io/v1/objects/bd2dd6f2cc489cf9e2bb800cb4fb6d63e9d293945d3ac10b09dd9c6098fa9f34/paper-1.15.2-393.jar" "bd2dd6f2cc489cf9e2bb800cb4fb6d63e9d293945d3ac10b09dd9c6098fa9f34"
158-
create_server "1.15.2-paper" "jdk8"
161+
create_server "1.15.2-paper" "jdk8" "true"
159162

160163
create_spigot_server "1.15.2" "jdk8"
161164

162165
# --- 1.16.5 ---
163166
download_file "1.16.5-paper.jar" "https://fill-data.papermc.io/v1/objects/e67da4851d08cde378ab2b89be58849238c303351ed2482181a99c2c2b489276/paper-1.16.5-794.jar" "e67da4851d08cde378ab2b89be58849238c303351ed2482181a99c2c2b489276"
164167
create_server "1.16.5-paper" "jdk8"
165168

166-
create_spigot_server "1.16.5" "jdk8"
169+
create_spigot_server "1.16.5" "jdk8" "true"
167170

168171
# --- 1.17 ---
169172
download_file "1.17-paper.jar" "https://fill-data.papermc.io/v1/objects/760a93b94a58d619bd647d71af84688617d0444d22b716500bc6b343858dc871/paper-1.17-79.jar" "760a93b94a58d619bd647d71af84688617d0444d22b716500bc6b343858dc871"
170-
create_server "1.17-paper" "jdk17"
173+
create_server "1.17-paper" "jdk17" "true"
171174

172175
create_spigot_server "1.17" "jdk17"
173176

174177
# --- 1.18.2 ---
175178
download_file "1.18.2-paper.jar" "https://fill-data.papermc.io/v1/objects/0578f18f4d632b494b468ec56b3b414b5b56fea087ee7d39cf6dcdf4c9d01f05/paper-1.18.2-388.jar" "0578f18f4d632b494b468ec56b3b414b5b56fea087ee7d39cf6dcdf4c9d01f05"
176179
create_server "1.18.2-paper" "jdk17"
177180

178-
create_spigot_server "1.18.2" "jdk17"
181+
create_spigot_server "1.18.2" "jdk17" "true"
179182

180183
# --- 1.19.4 ---
181184
download_file "1.19.4-paper.jar" "https://fill-data.papermc.io/v1/objects/e587d78cba3e99ef8c4bc24cf20cc3bdbbe89e33b0b572070446af4eb6be5ccf/paper-1.19.4-550.jar" "e587d78cba3e99ef8c4bc24cf20cc3bdbbe89e33b0b572070446af4eb6be5ccf"
182-
create_server "1.19.4-paper" "jdk17"
185+
create_server "1.19.4-paper" "jdk17" "true"
183186

184187
create_spigot_server "1.19.4" "jdk17"
185188

186189
# --- 1.20.2 ---
187190
download_file "1.20.2-paper.jar" "https://fill-data.papermc.io/v1/objects/07f57cdc5948dcf3cb3358e43b9a46fbbe8b595fa30c8749cfc102bf44897b69/paper-1.20.2-318-mojang.jar" "07f57cdc5948dcf3cb3358e43b9a46fbbe8b595fa30c8749cfc102bf44897b69"
188191
create_server "1.20.2-paper" "jdk21"
189192

190-
create_spigot_server "1.20.2" "jdk21"
193+
create_spigot_server "1.20.2" "jdk21" "true"
191194

192195
# --- 1.20.4 ---
193196
download_file "1.20.4-paper.jar" "https://fill-data.papermc.io/v1/objects/e84aa4943cc51d7545b1c9b669bb1e0b143323d248ebb89012182f5554bc13d7/paper-1.20.4-499-mojang.jar" "e84aa4943cc51d7545b1c9b669bb1e0b143323d248ebb89012182f5554bc13d7"
194-
create_server "1.20.4-paper" "jdk21"
197+
create_server "1.20.4-paper" "jdk21" "true"
195198

196199
create_spigot_server "1.20.4" "jdk21"
197200

@@ -200,23 +203,23 @@ download_file "1.20.5-paper.jar" "https://fill-data.papermc.io/v1/objects/3cd7da
200203
create_server "1.20.5-paper" "jdk21"
201204

202205
# spigot doesn't have 1.20.5
203-
create_spigot_server "1.20.6" "jdk21"
206+
create_spigot_server "1.20.6" "jdk21" "true"
204207

205208
# --- 1.21.3 ---
206209
download_file "1.21.3-paper.jar" "https://fill-data.papermc.io/v1/objects/87e973e1d338e869e7fdbc4b8fadc1579d7bb0246a0e0cf6e5700ace6c8bc17e/paper-1.21.3-83.jar" "87e973e1d338e869e7fdbc4b8fadc1579d7bb0246a0e0cf6e5700ace6c8bc17e"
207-
create_server "1.21.3-paper" "jdk21"
210+
create_server "1.21.3-paper" "jdk21" "true"
208211

209212
create_spigot_server "1.21.3" "jdk21"
210213

211214
# --- 1.21.5 ---
212215
download_file "1.21.5-paper.jar" "https://fill-data.papermc.io/v1/objects/2ae6ae22adf417699746e0f89fc2ef6cb6ee050a5f6608cee58f0535d60b509e/paper-1.21.5-114.jar" "2ae6ae22adf417699746e0f89fc2ef6cb6ee050a5f6608cee58f0535d60b509e"
213216
create_server "1.21.5-paper" "jdk21"
214217

215-
create_spigot_server "1.21.5" "jdk21"
218+
create_spigot_server "1.21.5" "jdk21" "true"
216219

217220
# --- 1.21.6 ---
218221
download_file "1.21.6-paper.jar" "https://fill-data.papermc.io/v1/objects/35e2dfa66b3491b9d2f0bb033679fa5aca1e1fdf097e7a06a80ce8afeda5c214/paper-1.21.6-48.jar" "35e2dfa66b3491b9d2f0bb033679fa5aca1e1fdf097e7a06a80ce8afeda5c214"
219-
create_server "1.21.6-paper" "jdk21"
222+
create_server "1.21.6-paper" "jdk21" "true"
220223

221224
create_spigot_server "1.21.6" "jdk21"
222225

@@ -225,11 +228,11 @@ download_file "1.21.9-paper.jar" "https://fill-data.papermc.io/v1/objects/aec002
225228
create_server "1.21.9-paper" "jdk25"
226229

227230
# spigot doesnt have 1.21.9
228-
create_spigot_server "1.21.10" "jdk25"
231+
create_spigot_server "1.21.10" "jdk25" "true"
229232

230233
# --- 1.21.11 ---
231234
download_file "1.21.11-paper.jar" "https://fill-data.papermc.io/v1/objects/4a558a00005d33dafa4c4d5f9e47b3bd47d92311fceccd9c9754ee6b913f8649/paper-1.21.11-100.jar" "4a558a00005d33dafa4c4d5f9e47b3bd47d92311fceccd9c9754ee6b913f8649"
232-
create_server "1.21.11-paper" "jdk25"
235+
create_server "1.21.11-paper" "jdk25" "true"
233236

234237
create_spigot_server "1.21.11" "jdk25"
235238

‎test-plugin/src/main/java/net/megavex/scoreboardlibrary/testplugin/ScoreboardPlugin.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public void onJoin(final PlayerJoinEvent event) {
7878
player.setGameMode(GameMode.CREATIVE);
7979
player.sendMessage("Server software: " + this.getServer().getName());
8080
player.sendMessage("Server version: " + this.getServer().getVersion());
81+
player.sendMessage("ViaVersion enabled: " + this.getServer().getPluginManager().isPluginEnabled("ViaVersion"));
8182

8283
boolean isNativeAdventure = false;
8384
try {

‎test-plugin/src/main/java/net/megavex/scoreboardlibrary/testplugin/module/ObjectivesModule.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ public void onJoin(final PlayerJoinEvent event) {
5353
@EventHandler
5454
public void onQuit(final PlayerQuitEvent event) {
5555
final Player player = event.getPlayer();
56-
this.manager.removePlayer(player);
56+
this.manager.removePlayerFuture(player).whenComplete((v, t) -> {
57+
this.plugin.getLogger().info("Removed player from objective " + this.plugin.getServer().isPrimaryThread());
58+
});
5759
this.objective.removeScore(player.getName());
5860
}
5961
}

‎test-plugin/src/main/java/net/megavex/scoreboardlibrary/testplugin/module/TeamsModule.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
import org.bukkit.event.player.PlayerQuitEvent;
1717
import org.bukkit.scheduler.BukkitTask;
1818

19-
import java.util.ArrayList;
20-
import java.util.List;
21-
import java.util.Random;
19+
import java.util.*;
2220

2321
import static net.kyori.adventure.text.Component.*;
2422
import static net.kyori.adventure.text.format.NamedTextColor.AQUA;
@@ -74,14 +72,16 @@ public void onJoin(final PlayerJoinEvent event) {
7472
this.team.defaultDisplay().addEntry(player.getName());
7573
this.manager.addPlayer(player);
7674
this.team.defaultDisplay().removeEntry(player.getName());
77-
this.team.defaultDisplay().addEntry(player.getName());
75+
this.team.defaultDisplay().addEntries(Collections.singletonList(player.getName()));
7876
}
7977

8078
@EventHandler
8179
public void onQuit(final PlayerQuitEvent event) {
8280
final Player player = event.getPlayer();
83-
this.manager.removePlayer(player);
84-
this.team.defaultDisplay().removeEntry(player.getName());
81+
this.manager.removePlayerFuture(player).whenComplete((v, t) -> {
82+
this.plugin.getLogger().info("Removed player from team " + this.plugin.getServer().isPrimaryThread());
83+
});
84+
this.team.defaultDisplay().removeEntries(Collections.singletonList(player.getName()));
8585
}
8686

8787
private NamedTextColor randomNamedColor() {

0 commit comments

Comments
 (0)