Restructure ASPaper for paper hardfork

.gitignore

@@ -1,18 +1,17 @@
-*.iml
-*.ipr
-*.iws
 .idea/
-.classpath
-.project
-.settings/
-slimeworldmanager-test/
-.DS_Store/
-release.properties
-libs/
-.gradle/
+.vscode/
+
+**/.gradle/
+.DS_Store
 build/
-slimeworldmanager-api
-slimeworldmanager-server
-run
-*.hprof
-paper-api-generator
+**/run/
+
+**/*.iml
+
+impl/aspaper-server/build.gradle.kts
+impl/aspaper-server/src/minecraft/
+impl/paper-server/
+impl/aspaper-api/build.gradle.kts
+impl/paper-api/
+impl/paper-api-generator/
+/impl/aspaper-server/.gradle/

api/build.gradle.kts

@@ -1,96 +1,16 @@
 plugins {
-    `java-library`
-     `maven-publish`
-    signing
+    id("asp.base-conventions")
+    id("asp.publishing-conventions")
 }
 
 dependencies {
-    api("com.flowpowered:flow-nbt:2.0.2")
-    api("org.jetbrains:annotations:23.0.0")
+    api(libs.annotations)
+    api(libs.adventure.nbt)
 
-    compileOnly("io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT")
+    compileOnly(paperApi())
 }
 
-version = "3.0.0-SNAPSHOT"
-
-java {
-    withSourcesJar()
-    withJavadocJar()
-}
-
-profiles {
-    profile("publish") {
-        activation {
-            property {
-                setKey("publish")
-                setValue("true")
-            }
-        }
-        action {
-            publishing {
-                publications {
-                    create<MavenPublication>("maven") {
-                        groupId = "${project.group}"
-                        artifactId = project.name
-                        version = "${project.version}"
-
-                        from(components["java"])
-
-                        pom {
-                            name.set("Advanced Slime Paper API")
-                            description.set("API for ASP")
-                            url.set("https://github.com/InfernalSuite/AdvancedSlimePaper")
-                            licenses {
-                                license {
-                                    name.set("GNU General Public License, Version 3.0")
-                                    url.set("https://www.gnu.org/licenses/gpl-3.0.txt")
-                                }
-                            }
-                            developers {
-                                developer {
-                                    id.set("InfernalSuite")
-                                    name.set("The InfernalSuite Team")
-                                    url.set("https://github.com/InfernalSuite")
-                                    email.set("[email protected]")
-                                }
-                            }
-                            scm {
-                                connection.set("scm:git:https://github.com:InfernalSuite/AdvancedSlimePaper.git")
-                                developerConnection.set("scm:git:ssh://github.com:InfernalSuite/AdvancedSlimePaper.git")
-                                url.set("https://github.com/InfernalSuite/AdvancedSlimePaper/")
-                            }
-                            issueManagement {
-                                system.set("Github")
-                                url.set("https://github.com/InfernalSuite/AdvancedSlimePaper/issues")
-                            }
-                        }
-
-                        versionMapping {
-                            usage("java-api") {
-                                fromResolutionOf("runtimeClasspath")
-                            }
-                            usage("java-runtime") {
-                                fromResolutionResult()
-                            }
-                        }
-                    }
-                }
-                repositories {
-                    maven {
-                        name = "infernalsuite"
-                        url = uri("https://repo.infernalsuite.com/repository/maven-snapshots/")
-                        credentials {
-                            username = project.property("ISUsername") as String?
-                            password = project.property("ISPassword") as String?
-                        }
-                    }
-                }
-            }
-
-            signing {
-                useGpgCmd()
-                sign(publishing.publications["maven"])
-            }
-        }
-    }
+publishConfiguration {
+    name = "Advanced Slime Paper API"
+    description = "API for Advanced Slime Paper"
 }

api/src/main/java/com/infernalsuite/aswm/api/AdvancedSlimePaperAPI.java → api/src/main/java/com/infernalsuite/asp/api/AdvancedSlimePaperAPI.java

@@ -1,9 +1,15 @@
-package com.infernalsuite.aswm.api;
+package com.infernalsuite.asp.api;
 
-import com.infernalsuite.aswm.api.exceptions.*;
-import com.infernalsuite.aswm.api.world.SlimeWorld;
-import com.infernalsuite.aswm.api.world.properties.SlimePropertyMap;
-import com.infernalsuite.aswm.api.loaders.SlimeLoader;
+import com.infernalsuite.asp.api.exceptions.CorruptedWorldException;
+import com.infernalsuite.asp.api.exceptions.InvalidWorldException;
+import com.infernalsuite.asp.api.exceptions.NewerFormatException;
+import com.infernalsuite.asp.api.exceptions.UnknownWorldException;
+import com.infernalsuite.asp.api.exceptions.WorldAlreadyExistsException;
+import com.infernalsuite.asp.api.exceptions.WorldLoadedException;
+import com.infernalsuite.asp.api.exceptions.WorldTooBigException;
+import com.infernalsuite.asp.api.world.SlimeWorld;
+import com.infernalsuite.asp.api.world.properties.SlimePropertyMap;
+import com.infernalsuite.asp.api.loaders.SlimeLoader;
 import net.kyori.adventure.util.Services;
 import org.bukkit.World;
 import org.jetbrains.annotations.ApiStatus;

api/src/main/java/com/infernalsuite/aswm/api/SlimeNMSBridge.java → api/src/main/java/com/infernalsuite/asp/api/SlimeNMSBridge.java

@@ -1,9 +1,8 @@
-package com.infernalsuite.aswm.api;
+package com.infernalsuite.asp.api;
 
-import com.flowpowered.nbt.CompoundMap;
-import com.flowpowered.nbt.CompoundTag;
-import com.infernalsuite.aswm.api.world.SlimeWorld;
-import com.infernalsuite.aswm.api.world.SlimeWorldInstance;
+import com.infernalsuite.asp.api.world.SlimeWorld;
+import com.infernalsuite.asp.api.world.SlimeWorldInstance;
+import net.kyori.adventure.nbt.CompoundBinaryTag;
 import net.kyori.adventure.util.Services;
 import org.bukkit.World;
 import org.bukkit.persistence.PersistentDataContainer;
@@ -36,15 +35,15 @@ static SlimeNMSBridge instance() {
         return Holder.INSTANCE;
     }
 
-    void extractCraftPDC(PersistentDataContainer source, CompoundMap target);
+    void extractCraftPDC(PersistentDataContainer source, CompoundBinaryTag.Builder builder);
 
-    PersistentDataContainer extractCompoundMapIntoCraftPDC(CompoundMap source);
+    PersistentDataContainer extractCompoundMapIntoCraftPDC(CompoundBinaryTag source);
 
     @ApiStatus.Internal
     class Holder {
         private static final SlimeNMSBridge INSTANCE = Services.service(SlimeNMSBridge.class).orElseThrow();
     }
 
-    CompoundTag convertChunkTo1_13(CompoundTag tag);
+    CompoundBinaryTag convertChunkTo1_13(CompoundBinaryTag tag);
 
 }

api/src/main/java/com/infernalsuite/aswm/api/events/AsyncPostCreateEmptyWorldEvent.java → api/src/main/java/com/infernalsuite/asp/api/events/AsyncPostCreateEmptyWorldEvent.java

@@ -1,6 +1,5 @@
-package com.infernalsuite.aswm.api.events;
+package com.infernalsuite.asp.api.events;
 
-import com.infernalsuite.aswm.api.world.SlimeWorld;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
@@ -10,9 +9,9 @@
 public class AsyncPostCreateEmptyWorldEvent extends Event {
 
   private static final HandlerList handlers = new HandlerList();
-  private final SlimeWorld slimeWorld;
+  private final com.infernalsuite.asp.api.world.SlimeWorld slimeWorld;
 
-  public AsyncPostCreateEmptyWorldEvent(SlimeWorld slimeWorld) {
+  public AsyncPostCreateEmptyWorldEvent(com.infernalsuite.asp.api.world.SlimeWorld slimeWorld) {
     super(true);
     this.slimeWorld = Objects.requireNonNull(slimeWorld, "slimeWorld cannot be null");
   }
@@ -26,7 +25,7 @@ public static HandlerList getHandlerList() {
     return handlers;
   }
 
-  public SlimeWorld getSlimeWorld() {
+  public com.infernalsuite.asp.api.world.SlimeWorld getSlimeWorld() {
     return slimeWorld;
   }
 }

api/src/main/java/com/infernalsuite/aswm/api/events/AsyncPostGetWorldEvent.java → api/src/main/java/com/infernalsuite/asp/api/events/AsyncPostGetWorldEvent.java

@@ -1,6 +1,5 @@
-package com.infernalsuite.aswm.api.events;
+package com.infernalsuite.asp.api.events;
 
-import com.infernalsuite.aswm.api.world.SlimeWorld;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
@@ -10,9 +9,9 @@
 public class AsyncPostGetWorldEvent extends Event {
 
   private static final HandlerList handlers = new HandlerList();
-  private final SlimeWorld slimeWorld;
+  private final com.infernalsuite.asp.api.world.SlimeWorld slimeWorld;
 
-  public AsyncPostGetWorldEvent(SlimeWorld slimeWorld) {
+  public AsyncPostGetWorldEvent(com.infernalsuite.asp.api.world.SlimeWorld slimeWorld) {
     super(true);
     this.slimeWorld = Objects.requireNonNull(slimeWorld, "slimeWorld cannot be null");
   }
@@ -26,7 +25,7 @@ public static HandlerList getHandlerList() {
     return handlers;
   }
 
-  public SlimeWorld getSlimeWorld() {
+  public com.infernalsuite.asp.api.world.SlimeWorld getSlimeWorld() {
     return slimeWorld;
   }
 }

api/src/main/java/com/infernalsuite/aswm/api/events/AsyncPostImportWorldEvent.java → api/src/main/java/com/infernalsuite/asp/api/events/AsyncPostImportWorldEvent.java

@@ -1,6 +1,6 @@
-package com.infernalsuite.aswm.api.events;
+package com.infernalsuite.asp.api.events;
 
-import com.infernalsuite.aswm.api.loaders.SlimeLoader;
+import com.infernalsuite.asp.api.loaders.SlimeLoader;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;

api/src/main/java/com/infernalsuite/aswm/api/events/AsyncPostLoadWorldEvent.java → api/src/main/java/com/infernalsuite/asp/api/events/AsyncPostLoadWorldEvent.java

@@ -1,6 +1,5 @@
-package com.infernalsuite.aswm.api.events;
+package com.infernalsuite.asp.api.events;
 
-import com.infernalsuite.aswm.api.world.SlimeWorld;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
@@ -10,9 +9,9 @@
 public class AsyncPostLoadWorldEvent extends Event {
 
   private static final HandlerList handlers = new HandlerList();
-  private final SlimeWorld slimeWorld;
+  private final com.infernalsuite.asp.api.world.SlimeWorld slimeWorld;
 
-  public AsyncPostLoadWorldEvent(SlimeWorld slimeWorld) {
+  public AsyncPostLoadWorldEvent(com.infernalsuite.asp.api.world.SlimeWorld slimeWorld) {
     super(true);
     this.slimeWorld = Objects.requireNonNull(slimeWorld, "slimeWorld cannot be null");
   }
@@ -26,7 +25,7 @@ public static HandlerList getHandlerList() {
     return handlers;
   }
 
-  public SlimeWorld getSlimeWorld() {
+  public com.infernalsuite.asp.api.world.SlimeWorld getSlimeWorld() {
     return this.slimeWorld;
   }
 }

api/src/main/java/com/infernalsuite/aswm/api/events/AsyncPostMigrateWorldEvent.java → api/src/main/java/com/infernalsuite/asp/api/events/AsyncPostMigrateWorldEvent.java

@@ -1,6 +1,6 @@
-package com.infernalsuite.aswm.api.events;
+package com.infernalsuite.asp.api.events;
 
-import com.infernalsuite.aswm.api.loaders.SlimeLoader;
+import com.infernalsuite.asp.api.loaders.SlimeLoader;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;

api/src/main/java/com/infernalsuite/aswm/api/events/AsyncPreCreateEmptyWorldEvent.java → api/src/main/java/com/infernalsuite/asp/api/events/AsyncPreCreateEmptyWorldEvent.java

@@ -1,7 +1,6 @@
-package com.infernalsuite.aswm.api.events;
+package com.infernalsuite.asp.api.events;
 
-import com.infernalsuite.aswm.api.loaders.SlimeLoader;
-import com.infernalsuite.aswm.api.world.properties.SlimePropertyMap;
+import com.infernalsuite.asp.api.loaders.SlimeLoader;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
@@ -16,9 +15,9 @@ public class AsyncPreCreateEmptyWorldEvent extends Event implements Cancellable
   private SlimeLoader slimeLoader;
   private String worldName;
   private boolean readOnly;
-  private SlimePropertyMap slimePropertyMap;
+  private com.infernalsuite.asp.api.world.properties.SlimePropertyMap slimePropertyMap;
 
-  public AsyncPreCreateEmptyWorldEvent(SlimeLoader slimeLoader, String worldName, boolean readOnly, SlimePropertyMap slimePropertyMap) {
+  public AsyncPreCreateEmptyWorldEvent(SlimeLoader slimeLoader, String worldName, boolean readOnly, com.infernalsuite.asp.api.world.properties.SlimePropertyMap slimePropertyMap) {
     super(true);
     this.slimeLoader = Objects.requireNonNull(slimeLoader, "slimeLoader cannot be null");
     this.worldName = Objects.requireNonNull(worldName, "worldName cannot be null");
@@ -69,11 +68,11 @@ public void setReadOnly(boolean readOnly) {
     this.readOnly = readOnly;
   }
 
-  public SlimePropertyMap getSlimePropertyMap() {
+  public com.infernalsuite.asp.api.world.properties.SlimePropertyMap getSlimePropertyMap() {
     return this.slimePropertyMap;
   }
 
-  public void setSlimePropertyMap(SlimePropertyMap slimePropertyMap) {
+  public void setSlimePropertyMap(com.infernalsuite.asp.api.world.properties.SlimePropertyMap slimePropertyMap) {
     this.slimePropertyMap = Objects.requireNonNull(slimePropertyMap, "slimePropertyMap cannot be null");
   }
 }

api/src/main/java/com/infernalsuite/aswm/api/events/AsyncPreGetWorldEvent.java → api/src/main/java/com/infernalsuite/asp/api/events/AsyncPreGetWorldEvent.java

@@ -1,4 +1,4 @@
-package com.infernalsuite.aswm.api.events;
+package com.infernalsuite.asp.api.events;
 
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;

api/src/main/java/com/infernalsuite/aswm/api/events/AsyncPreImportWorldEvent.java → api/src/main/java/com/infernalsuite/asp/api/events/AsyncPreImportWorldEvent.java

@@ -1,6 +1,6 @@
-package com.infernalsuite.aswm.api.events;
+package com.infernalsuite.asp.api.events;
 
-import com.infernalsuite.aswm.api.loaders.SlimeLoader;
+import com.infernalsuite.asp.api.loaders.SlimeLoader;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;

api/src/main/java/com/infernalsuite/aswm/api/events/AsyncPreLoadWorldEvent.java → api/src/main/java/com/infernalsuite/asp/api/events/AsyncPreLoadWorldEvent.java

@@ -1,7 +1,6 @@
-package com.infernalsuite.aswm.api.events;
+package com.infernalsuite.asp.api.events;
 
-import com.infernalsuite.aswm.api.loaders.SlimeLoader;
-import com.infernalsuite.aswm.api.world.properties.SlimePropertyMap;
+import com.infernalsuite.asp.api.loaders.SlimeLoader;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
@@ -16,9 +15,9 @@ public class AsyncPreLoadWorldEvent extends Event implements Cancellable {
   private SlimeLoader slimeLoader;
   private String worldName;
   private boolean readOnly;
-  private SlimePropertyMap slimePropertyMap;
+  private com.infernalsuite.asp.api.world.properties.SlimePropertyMap slimePropertyMap;
 
-  public AsyncPreLoadWorldEvent(SlimeLoader slimeLoader, String worldName, boolean readOnly, SlimePropertyMap slimePropertyMap) {
+  public AsyncPreLoadWorldEvent(SlimeLoader slimeLoader, String worldName, boolean readOnly, com.infernalsuite.asp.api.world.properties.SlimePropertyMap slimePropertyMap) {
     super(true);
     this.slimeLoader = Objects.requireNonNull(slimeLoader, "slimeLoader cannot be null");
     this.worldName = Objects.requireNonNull(worldName, "worldName cannot be null");
@@ -69,11 +68,11 @@ public void setReadOnly(boolean readOnly) {
     this.readOnly = readOnly;
   }
 
-  public SlimePropertyMap getSlimePropertyMap() {
+  public com.infernalsuite.asp.api.world.properties.SlimePropertyMap getSlimePropertyMap() {
     return this.slimePropertyMap;
   }
 
-  public void setSlimePropertyMap(SlimePropertyMap slimePropertyMap) {
+  public void setSlimePropertyMap(com.infernalsuite.asp.api.world.properties.SlimePropertyMap slimePropertyMap) {
     this.slimePropertyMap = Objects.requireNonNull(slimePropertyMap, "slimePropertyMap cannot be null");
   }
 }