Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions .github/workflows/server-smoke-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Server Smoke Test

on: [push, pull_request]

permissions: {}

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
lfs: 'true'
- uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
- name: Gradlew build
run: ./gradlew build -x test
- uses: actions/upload-artifact@v4
with:
name: plugin
path: build/libs/VaroPlugin-*[0-9].jar

smoke-test:
needs: build
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include:
- { project: folia, version: 1.19.4, java: 17 }
- { project: folia, version: 1.20.1, java: 17 }
- { project: folia, version: 1.20.4, java: 17 }
- { project: folia, version: 1.21.8, java: 21 }
- { project: folia, version: 26.1.2, java: 25 }
- { project: paper, version: 1.21.8, java: 21 }
- { project: paper, version: 26.1.2, java: 25 }
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'
- uses: actions/download-artifact@v4
with:
name: plugin
path: build/libs
- name: Start ${{ matrix.project }} ${{ matrix.version }}
run: scripts/smoke-test.sh ${{ matrix.project }} ${{ matrix.version }} java
44 changes: 44 additions & 0 deletions scripts/smoke-test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
#!/bin/bash
# Starts a Paper/Folia server with the built plugin and checks that the plugin loads and enables without errors.
# usage: scripts/smoke-test.sh <paper|folia> <minecraft version> [java binary] [plugin jar]
set -euo pipefail

project="$1"
version="$2"
java="${3:-java}"
jar="${4:-$(ls "$(pwd)"/build/libs/VaroPlugin-*.jar | grep -vE "sources|javadoc" | head -1)}"

dir="$(mktemp -d)"
trap 'rm -rf "$dir"' EXIT
cd "$dir"

url="$(curl -fsS "https://fill.papermc.io/v3/projects/$project/versions/$version/builds" | python3 -c "import sys,json; print(json.load(sys.stdin)[0]['downloads']['server:default']['url'])")"
curl -fsS -o server.jar "$url"
mkdir plugins && cp "$jar" plugins/
echo "eula=true" > eula.txt
printf 'online-mode=false\nlevel-type=flat\ngenerate-structures=false\nview-distance=4\n' > server.properties

mkfifo input
"$java" -Xmx1G -jar server.jar nogui < input > log.txt 2>&1 &
server=$!
exec 3> input

for i in $(seq 1 180); do
grep -q 'Done (' log.txt && break
kill -0 "$server" 2>/dev/null || break
sleep 1
done

# Give scheduled tasks of the plugin a moment to run
sleep 10
echo "stop" >&3
wait "$server" || true

cat log.txt | tail -n 40
grep -q 'Done (' log.txt || { echo "Server did not start"; exit 1; }
grep -q 'Enabling VaroPlugin' log.txt || { echo "Plugin was not enabled"; exit 1; }
if grep -E 'Could not load|Error occurred while enabling|Exception' log.txt | grep -vE 'authenticate'; then
echo "Errors in server log"
exit 1
fi
echo "OK: $project $version"
17 changes: 13 additions & 4 deletions varo-paper/src/main/java/de/varoplugin/varo/VaroBootstrap.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import io.github.almightysatan.jaskl.ValidationException;
import io.papermc.paper.plugin.bootstrap.BootstrapContext;
import io.papermc.paper.plugin.bootstrap.PluginBootstrap;
import io.papermc.paper.plugin.bootstrap.PluginProviderContext;
import io.papermc.paper.registry.keys.EnchantmentKeys;
import org.jetbrains.annotations.NotNull;

Expand All @@ -33,9 +34,7 @@ public class VaroBootstrap implements PluginBootstrap {

@Override
public void bootstrap(@NotNull BootstrapContext context) {
context.getLogger().info("Running Varo bootstrap");

Main.setPaper(true);
this.bootstrap((PluginProviderContext) context);

if (supportsEnchantmentKeys()) {
try {
Expand All @@ -49,11 +48,21 @@ public void bootstrap(@NotNull BootstrapContext context) {
}
}

/**
* Paper 1.19.x declares this method instead of {@link #bootstrap(BootstrapContext)}
*/
public void bootstrap(@NotNull PluginProviderContext context) {
context.getLogger().info("Running Varo bootstrap");

Main.setPaper(true);
}

private static boolean supportsEnchantmentKeys() {
try {
EnchantmentKeys.class.getName();
Class.forName("io.papermc.paper.registry.event.RegistryEvents");
return true;
} catch (NoClassDefFoundError e) {
} catch (NoClassDefFoundError | ClassNotFoundException e) {
return false;
}
}
Expand Down
41 changes: 21 additions & 20 deletions varo-paper/src/main/resources/paper-plugin.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
name: VaroPlugin
authors: [Cuuky, Korne127, LeStegii, Almighty-Satan]
version: ${version}
# List format is understood by all Paper versions since 1.19.4 (the map format is not)
dependencies:
server:
PlaceholderAPI:
load: BEFORE
required: false
LuckPerms:
load: BEFORE
required: false
PermissionsEx:
load: BEFORE
required: false
Multiverse-Core:
load: BEFORE
required: false
WorldEdit:
load: BEFORE
required: false
floodgate:
load: BEFORE
required: false
- name: PlaceholderAPI
load: BEFORE
required: false
- name: LuckPerms
load: BEFORE
required: false
- name: PermissionsEx
load: BEFORE
required: false
- name: Multiverse-Core
load: BEFORE
required: false
- name: WorldEdit
load: BEFORE
required: false
- name: floodgate
load: BEFORE
required: false
api-version: "1.19"
main: de.varoplugin.varo.Main
bootstrapper: de.varoplugin.varo.VaroBootstrap
loader: de.varoplugin.varo.VaroPluginLoader
website: VaroPlugin.de
website: VaroPlugin.de
folia-supported: true
21 changes: 18 additions & 3 deletions varo-spigot/src/main/java/de/varoplugin/varo/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

import com.google.common.io.BaseEncoding;

import de.varoplugin.cfw.player.hud.ScoreboardInstance;
import de.varoplugin.cfw.scheduler.TaskScheduler;
import de.varoplugin.cfw.utils.PlayerProfileUtils;
import de.varoplugin.cfw.utils.PlayerProfileUtils.PlayerLookup;
import de.varoplugin.cfw.utils.PlayerProfileUtils.Result;
Expand All @@ -35,6 +37,7 @@
import de.varoplugin.varo.data.Dependencies;
import de.varoplugin.varo.game.VaroGame;
import de.varoplugin.varo.gui.VaroInventoryManager;
import de.varoplugin.varo.player.VaroPlayer;
import de.varoplugin.varo.spigot.VaroUpdater;

public class Main extends JavaPlugin {
Expand All @@ -48,6 +51,7 @@ public class Main extends JavaPlugin {
public static final String DISCORD_INVITE = "https://discord.varoplugin.de/";

private static Main instance;
private TaskScheduler scheduler;
private static boolean paper;

private static VaroInventoryManager inventoryManager;
Expand All @@ -62,6 +66,7 @@ public class Main extends JavaPlugin {
public void onLoad() {
this.failed = false;
instance = this;
this.scheduler = TaskScheduler.of(this);

super.onLoad();
}
Expand Down Expand Up @@ -168,8 +173,11 @@ public void onDisable() {
}

if (!this.failed) {
VersionUtils.getVersionAdapter().getOnlinePlayers()
.forEach(pl -> pl.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard()));
if (ScoreboardInstance.isPacketBased())
VaroPlayer.getOnlinePlayer().forEach(VaroPlayer::destroyScoreboard);
else
VersionUtils.getVersionAdapter().getOnlinePlayers()
.forEach(pl -> pl.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard()));
dataManager.cleanUp();
} else {
File bugReport = BugReport.createBugReport();
Expand All @@ -178,7 +186,7 @@ public void onDisable() {
else
this.getLogger().log(Level.SEVERE, "Unable to create crash-report");
}
Bukkit.getScheduler().cancelTasks(this);
this.scheduler.cancelTasks();

this.getLogger().log(Level.INFO, "Disabled! (" + (System.currentTimeMillis() - timestamp) + "ms)");
this.getLogger().log(Level.INFO, " ");
Expand Down Expand Up @@ -303,6 +311,13 @@ public static boolean isBootedUp() {
return enabled;
}

/**
* @return The scheduler of this plugin. All tasks must be scheduled through it, as the Bukkit scheduler is not available on Folia.
*/
public static TaskScheduler scheduler() {
return instance.scheduler;
}

public static Main getInstance() {
return instance;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
import de.varoplugin.varo.Main;
import de.varoplugin.varo.serialize.identifier.VaroSerializeField;
import de.varoplugin.varo.serialize.identifier.VaroSerializeable;
import de.varoplugin.varo.utils.SynchronizedArrayList;

public class Alert implements VaroSerializeable {

private static ArrayList<Alert> alerts;

static {
alerts = new ArrayList<Alert>();
alerts = new SynchronizedArrayList<>();
}

@VaroSerializeField(path = "created")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;

import de.varoplugin.cfw.configuration.YamlConfigurationUtil;
import de.varoplugin.cfw.scheduler.TaskRunnable;
import de.varoplugin.varo.Main;
import de.varoplugin.varo.config.language.Messages;
import de.varoplugin.varo.configuration.configurations.config.ConfigSetting;
import de.varoplugin.varo.utils.VaroUtils;
import io.github.almightysatan.slams.Placeholder;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member;
Expand Down Expand Up @@ -59,7 +60,7 @@ public BotRegister(String uuid, boolean start) {

public void delete() {
if (getPlayer() != null)
getPlayer().kickPlayer("§cBotRegister §7unregistered");
VaroUtils.kickPlayer(getPlayer(), "§cBotRegister §7unregistered");

register.remove(this);
}
Expand Down Expand Up @@ -136,10 +137,10 @@ private static void kickPlayerLater(Player player, String message) {
if (ConfigSetting.DISCORDBOT_VERIFYSYSTEM_OPTIONAL.getValueAsBoolean())
return;

new BukkitRunnable() {
new TaskRunnable() {
@Override
public void run() {
player.kickPlayer(message);
VaroUtils.kickPlayer(player, message);
}
}.runTask(Main.getInstance());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.scheduler.BukkitRunnable;

import de.varoplugin.cfw.scheduler.TaskRunnable;
import de.varoplugin.varo.Main;
import de.varoplugin.varo.bot.discord.BotRegister;
import de.varoplugin.varo.bot.discord.DiscordBotCommand;
Expand Down Expand Up @@ -42,7 +42,7 @@ public void onExecute(SlashCommandInteraction event) {
}

getDiscordBot().reply("Shutting down", "Success", Color.GREEN, event);
new BukkitRunnable() {
new TaskRunnable() {
@Override
public void run() {
getDiscordBot().disconnect();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public Broadcaster() {

private void startSchedule() {
int interval = ConfigSetting.BROADCAST_INTERVAL_IN_SECONDS.getValueAsInt() * 20;
Bukkit.getScheduler().runTaskTimer(Main.getInstance(), () -> {
Main.scheduler().runTimer(() -> {
for (VaroPlayer player : VaroPlayer.getOnlinePlayer()) {
int size = Messages.BROADCAST.size(player);
player.sendMessage(Messages.BROADCAST.value((int) (this.count % size), player));
Expand All @@ -37,7 +37,7 @@ private void startSchedule() {

private void startPluginAd() {
int delay = (Main.getVaroGame().getPlayTime() * 60) > 0 ? (((Main.getVaroGame().getPlayTime() * 60) - 30) > 0 ? ((Main.getVaroGame().getPlayTime() * 60) - 30) * 20 : 900 * 20) : 900 * 20;
Bukkit.getScheduler().runTaskTimer(Main.getInstance(), () -> {
Main.scheduler().runTimer(() -> {
if (VersionUtils.getVersionAdapter().getOnlinePlayers().size() == 0)
return;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package de.varoplugin.varo.combatlog;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;

import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.scheduler.BukkitTask;

import de.varoplugin.cfw.scheduler.Task;
import de.varoplugin.cfw.scheduler.TaskRunnable;
import de.varoplugin.cfw.utils.EventUtils;
import de.varoplugin.varo.Main;
import de.varoplugin.varo.config.language.Messages;
Expand Down Expand Up @@ -54,9 +54,9 @@ public void onHit(EntityDamageByEntityEvent event) {
}
}

private static final List<PlayerHit> hits = new ArrayList<>();
private static final List<PlayerHit> hits = new CopyOnWriteArrayList<>();

private BukkitTask task;
private Task task;
private final Player player, opponent;

public PlayerHit(Player player, Player opponent) {
Expand All @@ -72,7 +72,7 @@ public PlayerHit(Player player, Player opponent) {
}

private void scheduleOvertime() {
task = new BukkitRunnable() {
task = new TaskRunnable() {
@Override
public void run() {
over();
Expand Down
Loading
Loading