Merge pull request #60 from PhantazmNetwork/dev

Dev
PhantazmNetwork · Oct 21, 2023 · dc13752 · dc13752
2 parents c4ce21f + c07319f
commit dc13752
Show file tree

Hide file tree

Showing 919 changed files with 24,992 additions and 19,142 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.run/Run Velocity.run.xml b/.run/Run Velocity.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="Run Velocity" type="JarApplication">
     <option name="JAR_PATH" value="$PROJECT_DIR$/run/velocity/velocity.jar" />
     <option name="VM_PARAMETERS" value="-Xms512M -Xmx512M -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -Dfile.encoding=UTF-8" />
-    <option name="WORKING_DIRECTORY" value="$ProjectFileDir$/run/velocity" />
+    <option name="WORKING_DIRECTORY" value="run/velocity" />
     <option name="ALTERNATIVE_JRE_PATH" />
     <method v="2">
       <option name="Gradle.BeforeRunTask" enabled="false" tasks="setupServer" externalProjectPath="$PROJECT_DIR$/server" vmOptions="" scriptParameters="" />

diff --git a/.run/Run server.run.xml b/.run/Run server.run.xml
@@ -3,7 +3,7 @@
     <option name="JAR_PATH" value="$PROJECT_DIR$/run/server-1/server.jar" />
     <option name="VM_PARAMETERS" value="-Dfile.encoding=UTF-8 -Dminestom.packet-queue-size=-1 -Dminestom.keep-alive-kick=-1" />
     <option name="PROGRAM_PARAMETERS" value="unsafe" />
-    <option name="WORKING_DIRECTORY" value="$ProjectFileDir$/run/server-1" />
+    <option name="WORKING_DIRECTORY" value="run/server-1" />
     <option name="ALTERNATIVE_JRE_PATH" />
     <method v="2">
       <option name="Gradle.BeforeRunTask" enabled="false" tasks="setupServer copyJar" externalProjectPath="$PROJECT_DIR$/server" vmOptions="" scriptParameters="-PskipBuild=zombies-mapeditor,zombies-timer" />

diff --git a/buildSrc/src/main/kotlin/org/phantazm/gradle/task/CopyLibs.kt b/buildSrc/src/main/kotlin/org/phantazm/gradle/task/CopyLibs.kt
@@ -30,7 +30,7 @@ abstract class CopyLibs : DefaultTask() {
     val artifactOutputs: FileCollection
         @OutputFiles get() = project.files(libraryDirectory?.let {
             getArtifacts(
-                it, targetConfiguration.resolvedConfiguration.resolvedArtifacts
+                    it, targetConfiguration.resolvedConfiguration.resolvedArtifacts
             ).map {
                 it.second
             }
@@ -83,9 +83,9 @@ abstract class CopyLibs : DefaultTask() {
                     val artifactFileName = relative.nameWithoutExtension
 
                     if (resolvedArtifacts.none { artifact ->
-                            artifact.moduleVersion.id.group.equals(artifactFileGroup, true) &&
-                                    artifact.file.nameWithoutExtension.equals(artifactFileName, true)
-                        }) {
+                                artifact.moduleVersion.id.group.equals(artifactFileGroup, true) &&
+                                        artifact.file.nameWithoutExtension.equals(artifactFileName, true)
+                            }) {
                         logger.info("Deleting $it because it does not match any known artifacts.")
                         it.delete()
                     }

diff --git a/buildSrc/src/main/kotlin/org/phantazm/gradle/task/SetupServer.kt b/buildSrc/src/main/kotlin/org/phantazm/gradle/task/SetupServer.kt
@@ -16,16 +16,16 @@ abstract class SetupServer : DefaultTask() {
         if (runFolder.exists() && !runFolder.listFiles().isNullOrEmpty()) {
             if (!project.hasProperty("forceSetup")) {
                 logger.lifecycle(
-                    "No action was taken because the run folder already exists. To force the setup task " +
-                            "to run, use -PforceSetup."
+                        "No action was taken because the run folder already exists. To force the setup task " +
+                                "to run, use -PforceSetup."
                 )
                 return
             }
 
             logger.lifecycle(
-                "You are forcing server setup. This will delete EVERYTHING in the run folder. Type \"Y\"" +
-                        " without quotation marks (case-sensitive) and hit enter if you wish to proceed; otherwise, type " +
-                        "any other character to cancel."
+                    "You are forcing server setup. This will delete EVERYTHING in the run folder. Type \"Y\"" +
+                            " without quotation marks (case-sensitive) and hit enter if you wish to proceed; otherwise, type " +
+                            "any other character to cancel."
             )
             if (readLine() != "Y") {
                 logger.lifecycle("Cancelled server setup; no files have been changed.")

diff --git a/buildSrc/src/main/kotlin/phantazm.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/phantazm.java-conventions.gradle.kts
@@ -79,9 +79,9 @@ tasks.getByName<Test>("test") {
 
 tasks.getByName<Javadoc>("javadoc") {
     (options as StandardJavadocDocletOptions).tags(
-        "apiNote:a:API Note:",
-        "implSpec:a:Implementation Requirements:",
-        "implNote:a:Implementation Note:"
+            "apiNote:a:API Note:",
+            "implSpec:a:Implementation Requirements:",
+            "implNote:a:Implementation Note:"
     )
 }
 

diff --git a/commons/build.gradle.kts b/commons/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 dependencies {
     api(libs.fastutil)
     api(libs.ethylene.core)
+    api(libs.ethylene.mapper)
     api(libs.adventure.text.minimessage)
     api(libs.vector.core)
 }
diff --git a/commons/src/main/java/org/phantazm/commons/CancellableState.java b/commons/src/main/java/org/phantazm/commons/CancellableState.java
diff --git a/commons/src/main/java/org/phantazm/commons/ConfigProcessors.java b/commons/src/main/java/org/phantazm/commons/ConfigProcessors.java
diff --git a/commons/src/main/java/org/phantazm/commons/DualComponent.java b/commons/src/main/java/org/phantazm/commons/DualComponent.java
@@ -0,0 +1,8 @@
+package org.phantazm.commons;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.BiFunction;
+
+public interface DualComponent<T, R> extends BiFunction<@NotNull InjectionStore, @NotNull T, @NotNull R> {
+}