Skip to content

GH-188 Add support for folia-based servers. #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+61 −17
Open

GH-188 Add support for folia-based servers. #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
952551b
Release v2.3.0-SNAPSHOT
vLuckyyy Aug 30, 2025
6a07b94
Merge remote-tracking branch 'origin/master' into folia-cooking
vLuckyyy Sep 15, 2025
ec8208a
Update eternalcombat-plugin/src/main/java/com/eternalcode/combat/Comb…
vLuckyyy Sep 15, 2025
e252c7f
Make `CombatSchedulerAdapter` uninstantiable.
vLuckyyy Sep 15, 2025
d349352
Merge branch 'master' into folia-cooking
vLuckyyy Sep 15, 2025
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
5 changes: 3 additions & 2 deletions buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ plugins {
}

repositories {
maven("https://repo.eternalcode.pl/releases")
maven("https://repo.eternalcode.pl/snapshots")

mavenCentral()
maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
maven("https://repo.papermc.io/repository/maven-public/")
maven("https://repo.eternalcode.pl/releases")
maven("https://repo.eternalcode.pl/snapshots")
maven("https://storehouse.okaeri.eu/repository/maven-public/")
maven("https://repo.panda-lang.org/releases")
maven("https://maven.enginehub.org/repo/")
Expand Down
9 changes: 7 additions & 2 deletions eternalcombat-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ dependencies {

// litecommands
implementation("dev.rollczi:litecommands-bukkit:${Versions.LITE_COMMANDS}")
implementation("dev.rollczi:litecommands-folia:${Versions.LITE_COMMANDS}")

// Okaeri configs
implementation("eu.okaeri:okaeri-configs-serdes-commons:${Versions.OKAERI_CONFIGS_SERDES_COMMONS}")
Expand All @@ -37,8 +38,10 @@ dependencies {
// caffeine
implementation("com.github.ben-manes.caffeine:caffeine:${Versions.CAFFEINE}")

implementation("com.eternalcode:eternalcode-commons-bukkit:${Versions.ETERNALCODE_COMMONS}")
implementation("com.eternalcode:eternalcode-commons-adventure:${Versions.ETERNALCODE_COMMONS}")
implementation("com.eternalcode:eternalcode-commons-bukkit:${Versions.ETERNALCODE_COMMONS}")
implementation("com.eternalcode:eternalcode-commons-shared:${Versions.ETERNALCODE_COMMONS}")
implementation("com.eternalcode:eternalcode-commons-folia:${Versions.ETERNALCODE_COMMONS}")

// worldguard
compileOnly("com.sk89q.worldguard:worldguard-bukkit:${Versions.WORLD_GUARD_BUKKIT}")
Expand Down Expand Up @@ -70,6 +73,8 @@ bukkit {
"packetevents",
)
version = "${project.version}"

foliaSupported = true
}

tasks {
Expand Down Expand Up @@ -104,7 +109,7 @@ tasks.shadowJar {
"com.github.benmanes.caffeine",
"com.eternalcode.commons",
"com.eternalcode.multification",
"io.papermc"
"io.papermc.lib"
).forEach { pack ->
relocate(pack, "$prefix.$pack")
}
Expand Down
12 changes: 8 additions & 4 deletions eternalcombat-plugin/src/main/java/com/eternalcode/combat/CombatPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,15 @@
import com.eternalcode.combat.updater.UpdaterService;
import com.eternalcode.commons.adventure.AdventureLegacyColorPostProcessor;
import com.eternalcode.commons.adventure.AdventureLegacyColorPreProcessor;
import com.eternalcode.commons.bukkit.scheduler.BukkitSchedulerImpl;
import com.eternalcode.commons.bukkit.scheduler.MinecraftScheduler;
import com.eternalcode.commons.scheduler.Scheduler;
import com.eternalcode.multification.notice.Notice;
import com.google.common.base.Stopwatch;
import dev.rollczi.litecommands.LiteCommands;
import dev.rollczi.litecommands.bukkit.LiteBukkitFactory;
import dev.rollczi.litecommands.bukkit.LiteBukkitMessages;
import dev.rollczi.litecommands.folia.FoliaExtension;
import java.time.Duration;
import net.kyori.adventure.platform.AudienceProvider;
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
import net.kyori.adventure.text.minimessage.MiniMessage;
Expand Down Expand Up @@ -99,10 +101,10 @@ public void onEnable() {
ConfigService configService = new ConfigService();

EventManager eventManager = new EventManager(this);
Scheduler scheduler = new BukkitSchedulerImpl(this);

PluginConfig pluginConfig = configService.create(PluginConfig.class, new File(dataFolder, "config.yml"));

MinecraftScheduler scheduler = CombatSchedulerAdapter.getAdaptiveScheduler(this);

this.fightManager = new FightManagerImpl(eventManager);
this.fightPearlService = new FightPearlServiceImpl(pluginConfig.pearl);
this.fightTagOutService = new FightTagOutServiceImpl();
Expand Down Expand Up @@ -149,6 +151,8 @@ public void onEnable() {
new EternalCombatReloadCommand(configService, noticeService)
)

.extension(new FoliaExtension(this))

.result(Notice.class, (invocation, result, chain) -> noticeService.create()
.viewer(invocation.sender())
.notice(result)
Expand All @@ -157,7 +161,7 @@ public void onEnable() {
.build();

FightTask fightTask = new FightTask(server, pluginConfig, this.fightManager, noticeService);
this.getServer().getScheduler().runTaskTimer(this, fightTask, 20L, 20L);
scheduler.timer(fightTask, Duration.ofSeconds(1), Duration.ofSeconds(1));

new Metrics(this, BSTATS_METRICS_ID);

Expand Down
30 changes: 30 additions & 0 deletions eternalcombat-plugin/src/main/java/com/eternalcode/combat/CombatSchedulerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.eternalcode.combat;

import com.eternalcode.commons.bukkit.scheduler.BukkitSchedulerImpl;
import com.eternalcode.commons.bukkit.scheduler.MinecraftScheduler;
import com.eternalcode.commons.folia.scheduler.FoliaSchedulerImpl;
import java.util.logging.Logger;
import org.bukkit.plugin.Plugin;

public final class CombatSchedulerAdapter {

private static final String FOLIA_CLASS = "io.papermc.paper.threadedregions.RegionizedServer";

private CombatSchedulerAdapter() {
throw new IllegalStateException("You can't instantiate this class");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
throw new IllegalStateException("You can't instantiate this class");
throw new UnsupportedOperationException("This is an utility class and cannot be instantiated");

nitpick, but it's a standard in our utility classes

}

public static MinecraftScheduler getAdaptiveScheduler(Plugin plugin) {
Logger logger = plugin.getLogger();

try {
Class.forName(FOLIA_CLASS);
logger.info("» Detected Folia environment. Using FoliaScheduler.");
return new FoliaSchedulerImpl(plugin);
}
catch (ClassNotFoundException exception) {
logger.info("» Detected Bukkit/Paper environment. Using BukkitScheduler.");
return new BukkitSchedulerImpl(plugin);
}
}
}
5 changes: 3 additions & 2 deletions eternalcombat-plugin/src/main/java/com/eternalcode/combat/border/BorderServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.eternalcode.combat.border.event.BorderShowAsyncEvent;
import com.eternalcode.combat.event.EventManager;
import com.eternalcode.combat.region.RegionProvider;
import com.eternalcode.commons.bukkit.scheduler.MinecraftScheduler;
import com.eternalcode.commons.scheduler.Scheduler;
import dev.rollczi.litecommands.shared.Lazy;
import java.util.ArrayList;
Expand All @@ -19,15 +20,15 @@

public class BorderServiceImpl implements BorderService {

private final Scheduler scheduler;
private final MinecraftScheduler scheduler;
private final EventManager eventManager;

private final Supplier<BorderSettings> settings;

private final BorderTriggerIndex borderIndexes;
private final BorderActivePointsIndex activeBorderIndex = new BorderActivePointsIndex();

public BorderServiceImpl(Scheduler scheduler, Server server, RegionProvider provider, EventManager eventManager, Supplier<BorderSettings> settings) {
public BorderServiceImpl(MinecraftScheduler scheduler, Server server, RegionProvider provider, EventManager eventManager, Supplier<BorderSettings> settings) {
this.scheduler = scheduler;
this.eventManager = eventManager;
this.settings = settings;
Expand Down
7 changes: 4 additions & 3 deletions eternalcombat-plugin/src/main/java/com/eternalcode/combat/border/BorderTriggerIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.eternalcode.combat.region.Region;
import com.eternalcode.combat.region.RegionProvider;
import com.eternalcode.commons.bukkit.scheduler.MinecraftScheduler;
import com.eternalcode.commons.scheduler.Scheduler;
import java.time.Duration;
import java.util.ArrayList;
Expand All @@ -17,13 +18,13 @@
class BorderTriggerIndex {

private final Server server;
private final Scheduler scheduler;
private final MinecraftScheduler scheduler;
private final RegionProvider provider;
private final Supplier<BorderSettings> settings;

private final Map<String, BorderTriggerIndexBucket> borderIndexes = new HashMap<>();

private BorderTriggerIndex(Server server, Scheduler scheduler, RegionProvider provider, Supplier<BorderSettings> settings) {
private BorderTriggerIndex(Server server, MinecraftScheduler scheduler, RegionProvider provider, Supplier<BorderSettings> settings) {
this.server = server;
this.scheduler = scheduler;
this.provider = provider;
Expand Down Expand Up @@ -56,7 +57,7 @@ private void updateWorld(String world, Collection<Region> regions) {
});
}

static BorderTriggerIndex started(Server server, Scheduler scheduler, RegionProvider provider, Supplier<BorderSettings> settings) {
static BorderTriggerIndex started(Server server, MinecraftScheduler scheduler, RegionProvider provider, Supplier<BorderSettings> settings) {
BorderTriggerIndex index = new BorderTriggerIndex(server, scheduler, provider, settings);
scheduler.timerAsync(() -> index.updateWorlds(), Duration.ZERO, settings.get().indexRefreshDelay());
return index;
Expand Down
8 changes: 5 additions & 3 deletions ...lcombat-plugin/src/main/java/com/eternalcode/combat/fight/knockback/KnockbackService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.eternalcode.combat.region.Point;
import com.eternalcode.combat.region.Region;
import com.eternalcode.combat.region.RegionProvider;
import com.eternalcode.commons.bukkit.scheduler.MinecraftScheduler;
import com.eternalcode.commons.scheduler.Scheduler;
import java.time.Duration;
import java.util.HashMap;
Expand All @@ -18,12 +19,12 @@
public final class KnockbackService {

private final PluginConfig config;
private final Scheduler scheduler;
private final MinecraftScheduler scheduler;
private final RegionProvider regionProvider;

private final Map<UUID, Region> insideRegion = new HashMap<>();

public KnockbackService(PluginConfig config, Scheduler scheduler, RegionProvider regionProvider) {
public KnockbackService(PluginConfig config, MinecraftScheduler scheduler, RegionProvider regionProvider) {
this.config = config;
this.scheduler = scheduler;
this.regionProvider = regionProvider;
Expand All @@ -39,7 +40,8 @@ public void forceKnockbackLater(Player player, Region region) {
}

insideRegion.put(player.getUniqueId(), region);
scheduler.runLater(() -> {

scheduler.runLater(player.getLocation(), () -> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if this player.getLocation() is here, can it be removed in the next line?

insideRegion.remove(player.getUniqueId());
Location playerLocation = player.getLocation();
if (!region.contains(playerLocation) && !regionProvider.isInRegion(playerLocation)) {
Expand Down
2 changes: 1 addition & 1 deletion eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/knockback/Point2D.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ record Point2D(int x, int z) {

Location toLocation(Location location) {
World world = location.getWorld();
int y = world.getHighestBlockYAt(x, z) + 1;
double y = location.getY();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

By preserving the player's Y-coordinate, you risk teleporting them inside blocks or terrain if the new X/Z coordinates are inside a wall or mountain. The previous implementation using world.getHighestBlockYAt(x, z) was safer in the vertical axis. While getHighestBlockYAt is a synchronous call and problematic on Folia, simply using the existing Y-coordinate is dangerous and can lead to players getting stuck or taking suffocation damage. Consider finding a safe location to teleport the player to, which might involve checking for solid blocks at the target location or using an async-safe method to find the highest block.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will do research on this


return new Location(world, x, y, z, location.getYaw(), location.getPitch());
}
Expand Down
Loading