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
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up JDK 21
- name: Set up JDK 25
uses: actions/setup-java@v4
with:
java-version: '21'
java-version: '25'
distribution: 'temurin'
cache: maven
- name: Build with Maven
Expand Down
8 changes: 4 additions & 4 deletions API/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<name>API</name>

<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<maven.compiler.source>25</maven.compiler.source>
<maven.compiler.target>25</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand All @@ -36,13 +36,13 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.42</version>
<version>1.18.46</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.21.11-R0.1-SNAPSHOT</version>
<version>[26.2.build,)</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
26 changes: 16 additions & 10 deletions Plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
<name>Plugin</name>

<properties>
<java.version>21</java.version>
<java.version>25</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<mc.version>1.21.11</mc.version>
<mc.version>26.2</mc.version>
</properties>

<repositories>
Expand Down Expand Up @@ -74,28 +73,35 @@
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>${mc.version}-R0.1-SNAPSHOT</version>
<version>[${mc.version}.build,)</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>5.2.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.42</version>
<version>1.18.46</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.12.1</version>
<version>2.12.3</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.github.retrooper</groupId>
<artifactId>packetevents-spigot</artifactId>
<version>2.12.1</version>
<version>2.13.0</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -160,13 +166,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>21</source>
<target>21</target>
<source>25</source>
<target>25</target>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.42</version>
<version>1.18.46</version>
</path>
</annotationProcessorPaths>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions Plugin/src/main/java/dev/lrxh/neptune/Neptune.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
import fr.mrmicky.fastboard.FastManager;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.Bukkit;
import org.bukkit.Difficulty;
import org.bukkit.GameRules;
import org.bukkit.World;
Expand Down Expand Up @@ -137,8 +138,7 @@ private void loadManager() {
return;

ArenaService.get().load();
duplicatesEnabled = ArenaDuplicator.isAvailable();
if (duplicatesEnabled) {
if (Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit") != null) {
Settings.settings().CLIPBOARD.USE_DISK = false;
ArenaService.get().setupDuplicatesWorld();
ArenaService.get().loadDuplicates();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ public final class ArenaDuplicator {
// since each duplicate operates on a non-overlapping region with fastMode + changeSetNull.
private static final Object COLD_LOCK = new Object();

public static boolean isAvailable() {
return Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit") != null;
}

public static void copyPaste(World sourceWorld, Location min, Location max, World targetWorld, int tx, int ty, int tz) {
CuboidRegion region = new CuboidRegion(BukkitAdapter.adapt(sourceWorld),
BlockVector3.at(min.getBlockX(), min.getBlockY(), min.getBlockZ()),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package dev.lrxh.neptune.game.arena.menu;

import dev.lrxh.neptune.game.arena.Arena;
import dev.lrxh.neptune.game.arena.ArenaDuplicator;
import dev.lrxh.neptune.game.arena.ArenaService;
import dev.lrxh.neptune.utils.CC;
import dev.lrxh.neptune.utils.ItemBuilder;
Expand All @@ -11,13 +10,13 @@
import dev.lrxh.neptune.utils.menu.impl.DisplayButton;
import dev.lrxh.neptune.utils.menu.impl.ReturnButton;
import dev.lrxh.neptune.utils.sign.SignInputMenu;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CompletableFuture;

Expand Down Expand Up @@ -97,7 +96,7 @@ public void onClick(ClickType type, Player player) {
}));

buttons.add(new DisplayButton(getSize() - 6, Material.EMERALD, "&aRecopy Duplicates", List.of("&7Click to repaste all duplicate copies of this arena"), p -> {
if (!ArenaDuplicator.isAvailable()) {
if (Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit") == null) {
p.sendMessage(CC.error("FastAsyncWorldEdit is not installed."));
return;
}
Expand Down
Loading
Loading