revert later, move around a ton of projects to the new desired layout

.gitignore

@@ -69,5 +69,5 @@ paperclip.properties
 
 !gradle/wrapper/gradle-wrapper.jar
 
-test-plugin.settings.gradle.kts
+paper-test-plugin.settings.gradle.kts
 paper-api-generator.settings.gradle.kts

Paper-MojangAPI/build.gradle.kts

@@ -1,36 +0,0 @@
-plugins {
-    `java-library`
-    `maven-publish`
-}
-
-java {
-    withSourcesJar()
-    withJavadocJar()
-}
-
-dependencies {
-    implementation(project(":paper-api"))
-    api("com.mojang:brigadier:1.0.18")
-
-    compileOnly("it.unimi.dsi:fastutil:8.5.6")
-    compileOnly("org.jetbrains:annotations:23.0.0")
-
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("org.hamcrest:hamcrest-library:1.3")
-    testImplementation("org.ow2.asm:asm-tree:9.2")
-}
-
-configure<PublishingExtension> {
-    publications.create<MavenPublication>("maven") {
-        from(components["java"])
-    }
-}
-
-val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.ScanJarForBadCalls::class) {
-    badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;")
-    jarToScan.set(tasks.jar.flatMap { it.archiveFile })
-    classpath.from(configurations.compileClasspath)
-}
-tasks.check {
-    dependsOn(scanJar)
-}

build-data/paper.at

@@ -1,18 +1,9 @@
-# You can use this file to change the access modifiers on a member
-# This line would make the field rollAmount public in Bee
-#public net.minecraft.world.entity.animal.Bee rollAmount
-# This line would make the field public and remove the final modifier
-#public-f net.minecraft.network.protocol.game.ClientboundChatPacket sender
-# Leave out the member and it will apply to the class itself
-# More info, see here https://mcforge.readthedocs.io/en/latest/advanced/accesstransformers/#access-modifiers
-
-# Remap/Decompile fix (unclear why this is happening)
-public net.minecraft.server.MinecraftServer doRunTask(Lnet/minecraft/server/TickTask;)V
-
-# AT remap issue? todo 1.18
-public net.minecraft.world.level.dimension.end.EndDragonFight findExitPortal()Lnet/minecraft/world/level/block/state/pattern/BlockPattern$BlockPatternMatch;
 public net.minecraft.nbt.TagParser readArrayTag()Lnet/minecraft/nbt/Tag;
-
-# TODO 1.20 remapSpigotAt.at doesn't remap the return type for this method for some reason
-public net/minecraft/world/entity/Display$TextDisplay getText()Lnet/minecraft/network/chat/Component;
-public net/minecraft/world/entity/Display$BlockDisplay getBlockState()Lnet/minecraft/world/level/block/state/BlockState;
+public net.minecraft.world.entity.Display$BlockDisplay getBlockState()Lnet/minecraft/world/level/block/state/BlockState;
+public net.minecraft.world.level.dimension.end.EndDragonFight findExitPortal()Lnet/minecraft/world/level/block/state/pattern/BlockPattern$BlockPatternMatch;
+public net.minecraft.server.MinecraftServer doRunTask(Lnet/minecraft/server/TickTask;)V
+public+f net.minecraft.CrashReport saveFile
+public+f net.minecraft.CrashReport getDetails()Ljava/lang/String;
+private+f net.minecraft.CrashReport getTitle()Ljava/lang/String;
+public+f net.minecraft.CrashReport getExceptionMessage()Ljava/lang/String;
+public net.minecraft.world.entity.Display$TextDisplay getText()Lnet/minecraft/network/chat/Component;

build.gradle.kts

@@ -80,9 +80,11 @@ dependencies {
 paperweight {
     softSpoon.set(true)
 
+    // todo we shouldn't need this anymore, this should come via mache?
     minecraftVersion.set(providers.gradleProperty("mcVersion"))
     serverProject.set(project(":paper-server"))
 
+
     // only for patch remap
     paramMappingsRepo.set(paperMavenPublicUrl)
     remapRepo.set(paperMavenPublicUrl)
@@ -95,6 +97,9 @@ paperweight {
     paper {
         mappingsPatch.set(layout.projectDirectory.file("build-data/mappings-patch.tiny"))
         reobfMappingsPatch.set(layout.projectDirectory.file("build-data/reobf-mappings-patch.tiny"))
+
+        paperApiDir.set(layout.projectDirectory.dir("paper-api"))
+        paperServerDir.set(layout.projectDirectory.dir("paper-server"))
     }
 }
 

paper-api/build.gradle.kts

@@ -70,6 +70,8 @@ dependencies {
     testCompileOnly(checkerQual)
     // Paper end
 
+    api("com.mojang:brigadier:1.0.18")
+
     testImplementation("org.apache.commons:commons-lang3:3.12.0")
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
     testImplementation("org.hamcrest:hamcrest:2.2")