[ci-skip] Update for Toothpick changes

build.gradle.kts

@@ -34,17 +34,12 @@ toothpick {
 
 subprojects {
     repositories {
-        mavenCentral()
-        maven("https://repo.aikar.co/content/groups/aikar/")
         maven("https://nexus.velocitypowered.com/repository/velocity-artifacts-snapshots/")
-        maven("https://libraries.minecraft.net")
-        mavenLocal()
     }
 
     java {
-        sourceCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.toVersion(8)
-        targetCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.toVersion(8)
-        withSourcesJar()
     }
 
     publishing.repositories.maven {

patches/server/0003-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/pom.xml b/pom.xml
-index fc2c3714b6c772d67e258be269aa92dda80cdb12..cf6e53e9f483d21b17e2782816be4403fa5be717 100644
+index fc2c3714b6c772d67e258be269aa92dda80cdb12..3719e044d0e02c306723e680677e7dbed1b0f242 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -27,8 +27,10 @@
@@ -21,6 +21,28 @@ index fc2c3714b6c772d67e258be269aa92dda80cdb12..cf6e53e9f483d21b17e2782816be4403
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
+@@ -353,8 +355,20 @@
+                     <dependency>
+                         <groupId>org.eclipse.jdt</groupId>
+                         <artifactId>ecj</artifactId>
+-                        <version>3.24.0</version>
++                        <!-- Purpur start -->
++                        <version>3.25.0</version>
+                     </dependency>
++                    <dependency>
++                        <groupId>org.jetbrains.kotlin</groupId>
++                        <artifactId>kotlin-stdlib</artifactId>
++                        <version>1.4.32</version>
++                    </dependency>
++                    <dependency>
++                        <groupId>org.jetbrains.kotlin</groupId>
++                        <artifactId>kotlin-reflect</artifactId>
++                        <version>1.4.32</version>
++                    </dependency>
++                    <!-- Purpur end -->
+                 </dependencies>
+             </plugin>
+             <plugin>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 index 89eeb9d202405747409e65fcf226d95379987e29..4d9e685c691a37078ff7452e50ab8c13999dbe10 100644
 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java

settings.gradle.kts

@@ -14,11 +14,11 @@ val forkNameLowercase = forkName.toLowerCase(Locale.ENGLISH)
 rootProject.name = forkNameLowercase
 
 setupSubproject("$forkNameLowercase-api") {
-    projectDir = File("$forkName-API")
+    projectDir = file("$forkName-API")
     buildFileName = "../subprojects/api.gradle.kts"
 }
 setupSubproject("$forkNameLowercase-server") {
-    projectDir = File("$forkName-Server")
+    projectDir = file("$forkName-Server")
     buildFileName = "../subprojects/server.gradle.kts"
 }
 

subprojects/api.gradle.kts

@@ -1,14 +0,0 @@
-import xyz.jpenilla.toothpick.loadDependencies
-import xyz.jpenilla.toothpick.loadRepositories
-
-repositories {
-    loadRepositories(project)
-}
-
-dependencies {
-    loadDependencies(project)
-}
-
-java {
-    withJavadocJar()
-}

subprojects/server.gradle.kts

@@ -1,11 +1,3 @@
-import xyz.jpenilla.toothpick.loadDependencies
-import xyz.jpenilla.toothpick.loadRepositories
-
-repositories {
-    loadRepositories(project)
-}
-
 dependencies {
-    loadDependencies(project)
     implementation("cat.inspiracio", "rhino-js-engine", "1.7.7.1")
 }