Merge f4fc92eb93 into 44f89d1021

.github/workflows/build.yml

@@ -0,0 +1,30 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - '**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Repository
+      # See https://github.com/actions/checkout/releases
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+    - name: Set up JDK 21
+      # See https://github.com/actions/setup-java/releases
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
+      with:
+        java-version: 21
+        distribution: temurin
+    - name: Build with Maven
+      run: mvn clean package
+    - name: Archive Artifacts
+      # See https://github.com/actions/upload-artifact/releases
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
+      if: success()
+      with:
+        name: Limbo
+        path: target/Limbo-*.jar
+        if-no-files-found: error

pom.xml

@@ -34,8 +34,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.number></project.build.number>
 		<project.fullVersion>${project.version}</project.fullVersion>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
 	</properties>
 	
 	<build>
@@ -91,17 +91,17 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.0</version>
+				<version>3.14.0</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>21</source>
+					<target>21</target>
 					<encoding>ISO-8859-1</encoding>
 				</configuration>
 			</plugin>
 
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.11.2</version>
 				<configuration>
 					<failOnError>false</failOnError>
 					<encoding>ISO-8859-1</encoding>
@@ -124,7 +124,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.3.1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -170,7 +170,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-source-plugin</artifactId>
-						<version>3.2.1</version>
+						<version>3.3.1</version>
 						<configuration>
 							<encoding>${project.build.sourceEncoding}</encoding>
 						</configuration>
@@ -187,7 +187,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.2.0</version>
+						<version>3.11.2</version>
 						<configuration>
 							<encoding>${project.build.sourceEncoding}</encoding>
 						</configuration>
@@ -206,47 +206,39 @@
 	</profiles>
 
 	<repositories>
-		<repository>
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
-		</repository>
-		<repository>
-			<id>sonatype-oss-snapshots1</id>
-			<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
-		</repository>
-		<repository>
-			<id>bungeecord-repo</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-		</repository>
 		<repository>
 			<id>maven_central</id>
 			<name>Maven Central</name>
 			<url>https://repo.maven.apache.org/maven2/</url>
 		</repository>
+		<repository>
+			<id>jitpack.io</id>
+			<url>https://jitpack.io</url>
+		</repository>
 	</repositories>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.14.0</version>
+			<version>3.18.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.Querz</groupId>
 			<artifactId>NBT</artifactId>
-			<version>5.5</version>
+			<version>6.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.10.1</version>
+			<version>2.13.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>
-			<version>2.3</version>
+			<version>2.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -258,7 +250,14 @@
 		<dependency>
 			<groupId>net.md-5</groupId>
 			<artifactId>bungeecord-chat</artifactId>
-			<version>1.18-R0.1-SNAPSHOT</version>
+			<version>1.21-R0.3</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>net.md-5</groupId>
+			<artifactId>bungeecord-serializer</artifactId>
+			<version>1.21-R0.3</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -295,21 +294,20 @@
 		<dependency>
 			<groupId>org.fusesource.jansi</groupId>
 			<artifactId>jansi</artifactId>
-			<version>1.18</version>
+			<version>2.4.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jline</groupId>
 			<artifactId>jline</artifactId>
-			<version>3.16.0</version>
+			<version>3.30.5</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>jline</groupId>
 			<artifactId>jline</artifactId>
-			<version>2.11</version>
+			<version>2.14.6</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>
-
 </project>

src/main/java/com/loohp/limbo/Console.java

@@ -118,7 +118,7 @@ public class Console implements CommandSender {
 		reader.setExpandEvents(false);
 		reader.setHandleUserInterrupt(false);
 		
-		terminal = TerminalBuilder.builder().streams(in, out).system(true).jansi(true).build();
+		terminal = TerminalBuilder.builder().streams(in, out).jansi(true).build();
 		tabReader = LineReaderBuilder.builder().terminal(terminal).completer(new Completer() {
 			@Override
 			public void complete(LineReader reader, ParsedLine line, List<Candidate> candidates) {

src/main/java/com/loohp/limbo/network/ClientConnection.java

@@ -151,15 +151,18 @@ import java.util.TimerTask;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 
-public class ClientConnection extends Thread {
+public class ClientConnection implements Runnable {
 
     private static final Key DEFAULT_HANDLER_NAMESPACE = Key.key("default");
     private static final String BRAND_ANNOUNCE_CHANNEL = Key.key("brand").toString();
 
     private final Random random = new Random();
     private final Socket clientSocket;
+    private final Lock packetSendLock = new ReentrantLock();
     protected Channel channel;
     private boolean running;
     private volatile ClientState state;
@@ -234,9 +237,14 @@ public class ClientConnection extends Thread {
         sendPacket(packet);
     }
 
-    public synchronized void sendPacket(PacketOut packet) throws IOException {
-        if (channel.writePacket(packet)) {
-            setLastPacketTimestamp(System.currentTimeMillis());
+    public void sendPacket(PacketOut packet) throws IOException {
+        packetSendLock.lock();
+        try {
+            if (channel.writePacket(packet)) {
+                setLastPacketTimestamp(System.currentTimeMillis());
+            }
+        } finally {
+            packetSendLock.unlock();
         }
     }
 

src/main/java/com/loohp/limbo/network/ServerConnection.java

@@ -27,12 +27,15 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public class ServerConnection extends Thread {
 
 	private final String ip;
 	private final int port;
 	private final boolean silent;
+    private final ExecutorService virtualThreadExecutor = Executors.newVirtualThreadPerTaskExecutor();
 	private ServerSocket serverSocket;
 	private List<ClientConnection> clients;
 
@@ -53,9 +56,9 @@ public class ServerConnection extends Thread {
 			}
 	        while (true) {
 	            Socket connection = serverSocket.accept();
-	            ClientConnection sc = new ClientConnection(connection);
-	            clients.add(sc);
-	            sc.start();
+	            ClientConnection clientTask  = new ClientConnection(connection);
+	            clients.add(clientTask);
+	            virtualThreadExecutor.submit(clientTask);
 	        }
 	    } catch(IOException e) {
 	        e.printStackTrace();

src/main/java/com/loohp/limbo/scheduler/Tick.java

@@ -26,8 +26,8 @@ import com.loohp.limbo.scheduler.LimboScheduler.LimboSchedulerTask;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -37,7 +37,7 @@ public class Tick {
 	private AtomicLong tick = new AtomicLong(0);
 	
 	private List<Thread> threads = new ArrayList<>();
-	private Queue<LimboSchedulerTask> asyncTasksQueue = new ConcurrentLinkedQueue<>();
+	private BlockingQueue<LimboSchedulerTask> asyncTasksQueue = new LinkedBlockingQueue<>();
 	
 	public Tick(Limbo instance) {
 		new Thread(() -> {
@@ -46,22 +46,19 @@ public class Tick {
 			for (int i = 0; i < 4; i++) {
 				Thread thread = new Thread(() -> {
 					while (instance.isRunning()) {
-						LimboSchedulerTask task = asyncTasksQueue.poll();
-						if (task == null) {
-							try {
-								TimeUnit.NANOSECONDS.sleep(10000);
-							} catch (InterruptedException e) {
-								e.printStackTrace();
-							}
-						} else {
-							LimboTask limboTask = task.getTask();
-							try {
-								limboTask.run();
-							} catch (Throwable e) {
-								System.err.println("Task " + task.getTaskId() + " threw an exception: " + e.getLocalizedMessage());
-								e.printStackTrace();
-							}
-						}
+                        try {
+                            LimboSchedulerTask task = asyncTasksQueue.take();
+                            LimboTask limboTask = task.getTask();
+                            try {
+                                limboTask.run();
+                            } catch (Throwable e) {
+                                System.err.println("Task " + task.getTaskId() + " threw an exception: " + e.getLocalizedMessage());
+                                e.printStackTrace();
+                            }
+                        } catch (InterruptedException e) {
+                            Thread.currentThread().interrupt();
+                            e.printStackTrace();
+                        }
 					}
 				});
 				thread.start();
@@ -124,7 +121,6 @@ public class Tick {
 		return tick.get();
 	}
 	
-	@SuppressWarnings("deprecation")
 	public void waitAndKillThreads(long waitTime) {
 		long end = System.currentTimeMillis() + waitTime;
 		for (Thread thread : threads) {
@@ -133,9 +129,6 @@ public class Tick {
 			} catch (InterruptedException e) {
 				e.printStackTrace();
 			}
-			if (thread.isAlive()) {
-				thread.stop();
-			}
 		}
 	}
 	

src/main/java/com/loohp/limbo/world/Schematic.java

@@ -97,7 +97,7 @@ public class Schematic {
 					CompoundTag heightMap = new CompoundTag();
 					heightMap.putLongArray("MOTION_BLOCKING", new long[] {1371773531765642314L,1389823183635651148L,1371738278539598925L,1389823183635388492L,1353688558756731469L,1389823114781694027L,1317765589597723213L,1371773531899860042L,1389823183635651149L,1371773462911685197L,1389823183635650636L,1353688626805119565L,1371773531900123211L,1335639250618849869L,1371738278674077258L,1389823114781694028L,1353723811310638154L,1371738278674077259L,1335674228429068364L,1335674228429067338L,1335674228698027594L,1317624576693539402L,1335709481520370249L,1299610178184057417L,1335638906349064264L,1299574993811968586L,1299574924958011464L,1299610178184056904L,1299574924958011464L,1299610109330100296L,1299574924958011464L,1299574924823793736L,1299574924958011465L,1281525273222484040L,1299574924958011464L,1281525273222484040L,9548107335L});
 					chunk.setHeightMaps(heightMap);
-					chunk.setBiomes(new int[256]);
+					chunk.setBiomes(new int[1024]);
 					chunk.cleanupPalettesAndBlockStates();
 				}
 			}

src/main/java/com/loohp/limbo/world/World.java

@@ -64,7 +64,7 @@ public class World {
 		
 		EMPTY_CHUNK.cleanupPalettesAndBlockStates();
 		EMPTY_CHUNK.setHeightMaps(HEIGHT_MAP.clone());
-		EMPTY_CHUNK.setBiomes(new int[256]);
+		EMPTY_CHUNK.setBiomes(new int[1024]);
 		EMPTY_CHUNK.setTileEntities(new ListTag<>(CompoundTag.class));
 	}
 	
@@ -90,7 +90,7 @@ public class World {
 				Chunk chunk = chunks[x][z];
 				chunk.cleanupPalettesAndBlockStates();
 				chunk.setHeightMaps(HEIGHT_MAP.clone());
-				chunk.setBiomes(new int[256]);
+				chunk.setBiomes(new int[1024]);
 				chunk.setTileEntities(new ListTag<>(CompoundTag.class));
 			}
 		}