NotAlexNoyle/scoreboard-library
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

final touches

Browse Source
This commit is contained in:
vytskalt committed 2026-02-06 21:59:34 +02:00
1 parent c15e8c2b9d
commit 59dbad8311
5 files changed
+58 -54
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test-env/clean.sh → test-env/clean
View File
File renamed without changes.
test-env/init.sh → test-env/init
+21 -21
View File
@@ -21,10 +21,10 @@ create_server() {
ln -sf "$plugin_path" plugins/test.jar
ln -sf "$jar_path" server.jar
local flags="-DPaper.IgnoreJavaVersion=true -Xms512M -Xmx512M -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"
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"
printf "#!/bin/sh\nnix develop .#$nixshell -c sh -c 'java $flags -jar server.jar nogui'" > start.sh
chmod +x start.sh
printf "#!/bin/sh\nnix develop .#$nixshell -c sh -c 'java $flags -jar server.jar nogui'" > start
chmod +x start
popd &> /dev/null
}
@@ -92,56 +92,56 @@ download_file "buildtools.jar" "https://hub.spigotmc.org/jenkins/job/BuildTools/
# --- 1.21.11 ---
download_file "paper-1.21.11.jar" "https://fill-data.papermc.io/v1/objects/4a558a00005d33dafa4c4d5f9e47b3bd47d92311fceccd9c9754ee6b913f8649/paper-1.21.11-100.jar" "4a558a00005d33dafa4c4d5f9e47b3bd47d92311fceccd9c9754ee6b913f8649"
create_server "paper-1.21.11" "25560" "jdk25"
create_server "paper-1.21.11" "25587" "jdk25"
create_spigot_server "1.21.11" "25561" "jdk25"
create_spigot_server "1.21.11" "25586" "jdk25"
# --- 1.21.9 ---
download_file "paper-1.21.9.jar" "https://fill-data.papermc.io/v1/objects/aec002e77c7566e49494fdf05430b96078ffd1d7430e652d4f338fef951e7a10/paper-1.21.9-59.jar" "aec002e77c7566e49494fdf05430b96078ffd1d7430e652d4f338fef951e7a10"
create_server "paper-1.21.9" "25562" "jdk25"
create_server "paper-1.21.9" "25585" "jdk25"
# spigot doesnt have 1.21.9
create_spigot_server "1.21.10" "25563" "jdk25"
create_spigot_server "1.21.10" "25584" "jdk25"
# --- 1.21.6 ---
download_file "paper-1.21.6.jar" "https://fill-data.papermc.io/v1/objects/35e2dfa66b3491b9d2f0bb033679fa5aca1e1fdf097e7a06a80ce8afeda5c214/paper-1.21.6-48.jar" "35e2dfa66b3491b9d2f0bb033679fa5aca1e1fdf097e7a06a80ce8afeda5c214"
create_server "paper-1.21.6" "25564" "jdk25"
create_server "paper-1.21.6" "25583" "jdk25"
create_spigot_server "1.21.6" "25565" "jdk21"
create_spigot_server "1.21.6" "25582" "jdk21"
# --- 1.21.5 ---
download_file "paper-1.21.5.jar" "https://fill-data.papermc.io/v1/objects/2ae6ae22adf417699746e0f89fc2ef6cb6ee050a5f6608cee58f0535d60b509e/paper-1.21.5-114.jar" "2ae6ae22adf417699746e0f89fc2ef6cb6ee050a5f6608cee58f0535d60b509e"
create_server "paper-1.21.5" "25566" "jdk25"
create_server "paper-1.21.5" "25581" "jdk25"
create_spigot_server "1.21.5" "25567" "jdk21"
create_spigot_server "1.21.5" "25580" "jdk21"
# --- 1.21.3 ---
download_file "paper-1.21.3.jar" "https://fill-data.papermc.io/v1/objects/87e973e1d338e869e7fdbc4b8fadc1579d7bb0246a0e0cf6e5700ace6c8bc17e/paper-1.21.3-83.jar" "87e973e1d338e869e7fdbc4b8fadc1579d7bb0246a0e0cf6e5700ace6c8bc17e"
create_server "paper-1.21.3" "25568" "jdk25"
create_server "paper-1.21.3" "25579" "jdk25"
create_spigot_server "1.21.3" "25569" "jdk21"
create_spigot_server "1.21.3" "25578" "jdk21"
# --- 1.20.5 ---
download_file "paper-1.20.5.jar" "https://fill-data.papermc.io/v1/objects/3cd7da2f8df92e082a501a39c674aab3c0343edd179b86f5baccaebfc9974132/paper-1.20.5-22.jar" "3cd7da2f8df92e082a501a39c674aab3c0343edd179b86f5baccaebfc9974132"
create_server "paper-1.20.5" "25570" "jdk25"
create_server "paper-1.20.5" "25577" "jdk25"
# spigot doesn't have 1.20.5
create_spigot_server "1.20.6" "25571" "jdk21"
create_spigot_server "1.20.6" "25576" "jdk21"
# --- 1.20.4 ---
download_file "paper-1.20.4.jar" "https://fill-data.papermc.io/v1/objects/e84aa4943cc51d7545b1c9b669bb1e0b143323d248ebb89012182f5554bc13d7/paper-1.20.4-499-mojang.jar" "e84aa4943cc51d7545b1c9b669bb1e0b143323d248ebb89012182f5554bc13d7"
create_server "paper-1.20.4" "25572" "jdk25"
create_server "paper-1.20.4" "25575" "jdk25"
create_spigot_server "1.20.4" "25573" "jdk21"
create_spigot_server "1.20.4" "25574" "jdk21"
# --- 1.20.2 ---
download_file "paper-1.20.2.jar" "https://fill-data.papermc.io/v1/objects/07f57cdc5948dcf3cb3358e43b9a46fbbe8b595fa30c8749cfc102bf44897b69/paper-1.20.2-318-mojang.jar" "07f57cdc5948dcf3cb3358e43b9a46fbbe8b595fa30c8749cfc102bf44897b69"
create_server "paper-1.20.2" "25574" "jdk25"
create_server "paper-1.20.2" "25573" "jdk25"
create_spigot_server "1.20.2" "25575" "jdk21"
create_spigot_server "1.20.2" "25572" "jdk21"
# --- 1.17 ---
download_file "paper-1.17.jar" "https://fill-data.papermc.io/v1/objects/760a93b94a58d619bd647d71af84688617d0444d22b716500bc6b343858dc871/paper-1.17-79.jar" "760a93b94a58d619bd647d71af84688617d0444d22b716500bc6b343858dc871"
create_server "paper-1.17" "25576" "jdk25"
create_server "paper-1.17" "25571" "jdk25"
create_spigot_server "1.17" "25577" "jdk17"
create_spigot_server "1.17" "25570" "jdk17"
test-env/start
Executable
+30
View File
@@ -0,0 +1,30 @@
#!/usr/bin/env bash
if ! command -v tmux >/dev/null 2>&1; then
echo ERROR: tmux not found, install it >&2
exit 67
fi
sesh="sl"
if tmux has-session -t "$sesh" 2>/dev/null; then
echo already exists
#tmux a -t "$sesh"
exit 0
fi
tmux new-session -d -s "$sesh" -n "shell"
for dir in servers/*; do
window=$(basename $dir | tr '.' '-')
pushd "$dir" &> /dev/null
tmux new-window -t "$sesh" -n "$window"
popd &> /dev/null
flags="-Xms512M -Xmx512M --add-modules=jdk.incubator.vector -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"
tmux send-keys -t "$sesh:$window" "./start" C-m
done
tmux a -t "$sesh"
test-env/start.sh
-29
View File
@@ -1,29 +0,0 @@
#!/usr/bin/env bash
if ! command -v tmux >/dev/null 2>&1; then
echo ERROR: tmux not found, install it >&2
exit 67
fi
sesh="sl"
if tmux has-session -t "$sesh" 2>/dev/null; then
echo already exists
#tmux a -t "$sesh"
exit 0
fi
tmux new-session -d -s "$sesh" -n "shell"
for dir in servers/*; do
local base=$(basename $dir)
echo $dir
(cd "$dir"; tmux new-window -t "$sesh" -n "$base")
local flags="-Xms512M -Xmx512M --add-modules=jdk.incubator.vector -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"
tmux send-keys -t "$sesh:$base" "./start.sh" C-m
done
tmux a -t "$sesh"
versions/modern/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/modern/util/ModernComponentProvider.java
+7 -4
View File
@@ -36,7 +36,7 @@ public final class ModernComponentProvider {
// The native adventure optimisations only work when the adventure library isn't relocated
IS_NATIVE_ADVENTURE = PacketAccessors.ADVENTURE_COMPONENT_CLASS != null && Component.class.getPackage().getName().equals(notRelocatedPackage);
if (PacketAccessors.IS_1_21_6_OR_ABOVE) {
if (PacketAccessors.IS_1_20_5_OR_ABOVE) {
Class<?> craftRegistry;
try {
craftRegistry = Class.forName(MinecraftClasses.craftBukkit("CraftRegistry"));
@@ -47,11 +47,15 @@ public final class ModernComponentProvider {
try {
Method method = craftRegistry.getMethod("getMinecraftRegistry");
MINECRAFT_REGISTRY = method.invoke(null);
CODEC = ReflectUtil.findFieldUnchecked(PacketAccessors.COMPONENT_SERIALIZATION_CLASS, 0, PacketAccessors.CODEC_CLASS, true).get(null);
} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
throw new RuntimeException(e);
}
} else {
MINECRAFT_REGISTRY = null;
}
if (PacketAccessors.IS_1_21_6_OR_ABOVE) {
CODEC = ReflectUtil.findFieldUnchecked(PacketAccessors.COMPONENT_SERIALIZATION_CLASS, 0, PacketAccessors.CODEC_CLASS, true).get(null);
FROM_JSON_METHOD = null;
} else {
Class<?> serializerClass = ReflectUtil.getClassOrThrow("net.minecraft.network.chat.Component$Serializer", "net.minecraft.network.chat.IChatBaseComponent$ChatSerializer");
@@ -76,7 +80,6 @@ public final class ModernComponentProvider {
}
FROM_JSON_METHOD = handle;
MINECRAFT_REGISTRY = null;
CODEC = null;
}
}
@@ -100,7 +103,7 @@ public final class ModernComponentProvider {
}
Object[] args;
if (PacketAccessors.IS_1_20_5_OR_ABOVE) {
if (MINECRAFT_REGISTRY != null) {
args = new Object[]{json, MINECRAFT_REGISTRY};
} else {
args = new Object[]{json};