From 8116cbb385a1dc9dd96e239cd9a25f20a8200a94 Mon Sep 17 00:00:00 2001 From: PiggyPiglet Date: Mon, 19 Jan 2026 16:13:15 +0800 Subject: [PATCH] back to one jar pls --- build.gradle.kts | 205 ++++++++++++------ paper/build.gradle.kts | 51 ----- settings.gradle.kts | 4 +- spigot/build.gradle.kts | 56 ----- .../clip/placeholderapi/PlaceholderAPI.java | 0 .../placeholderapi/PlaceholderAPIPlugin.java | 0 .../clip/placeholderapi/PlaceholderHook.java | 0 .../commands/PlaceholderCommand.java | 0 .../commands/PlaceholderCommandRouter.java | 0 .../commands/impl/cloud/CommandECloud.java | 0 .../impl/cloud/CommandECloudClear.java | 0 .../impl/cloud/CommandECloudDownload.java | 0 .../cloud/CommandECloudExpansionInfo.java | 0 .../cloud/CommandECloudExpansionList.java | 0 .../CommandECloudExpansionPlaceholders.java | 0 .../impl/cloud/CommandECloudRefresh.java | 0 .../impl/cloud/CommandECloudStatus.java | 0 .../impl/cloud/CommandECloudUpdate.java | 0 .../commands/impl/local/CommandDump.java | 0 .../impl/local/CommandExpansionRegister.java | 0 .../local/CommandExpansionUnregister.java | 0 .../commands/impl/local/CommandHelp.java | 0 .../commands/impl/local/CommandInfo.java | 0 .../commands/impl/local/CommandList.java | 0 .../commands/impl/local/CommandParse.java | 0 .../commands/impl/local/CommandReload.java | 0 .../commands/impl/local/CommandVersion.java | 0 .../configuration/ExpansionSort.java | 0 .../configuration/PlaceholderAPIConfig.java | 0 .../events/ExpansionRegisterEvent.java | 0 .../events/ExpansionUnregisterEvent.java | 0 .../events/ExpansionsLoadedEvent.java | 0 .../events/PlaceholderHookUnloadEvent.java | 0 .../exceptions/NoDefaultCommandException.java | 0 .../placeholderapi/expansion/Cacheable.java | 0 .../placeholderapi/expansion/Cleanable.java | 0 .../expansion/Configurable.java | 0 .../placeholderapi/expansion/NMSVersion.java | 0 .../expansion/PlaceholderExpansion.java | 0 .../placeholderapi/expansion/Relational.java | 0 .../placeholderapi/expansion/Taskable.java | 0 .../placeholderapi/expansion/Version.java | 0 .../expansion/VersionSpecific.java | 0 .../expansion/cloud/CloudExpansion.java | 0 .../manager/CloudExpansionManager.java | 0 .../manager/LocalExpansionManager.java | 0 .../expansion/manager/MethodSignature.java | 0 .../listeners/ServerLoadEventListener.java | 0 .../replacer/CharsReplacer.java | 0 .../placeholderapi/replacer/Replacer.java | 0 .../scheduler/UniversalRunnable.java | 0 .../scheduler/UniversalScheduler.java | 0 .../scheduler/bukkit/BukkitScheduledTask.java | 0 .../scheduler/bukkit/BukkitScheduler.java | 0 .../scheduler/folia/FoliaScheduledTask.java | 0 .../scheduler/folia/FoliaScheduler.java | 0 .../scheduler/paper/PaperScheduler.java | 0 .../scheduling/schedulers/TaskScheduler.java | 0 .../scheduling/tasks/MyScheduledTask.java | 0 .../scheduler/utils/JavaUtil.java | 0 .../updatechecker/UpdateChecker.java | 0 .../util/ExpansionSafetyCheck.java | 0 .../me/clip/placeholderapi/util/FileUtil.java | 0 .../me/clip/placeholderapi/util/Format.java | 0 .../me/clip/placeholderapi/util/Futures.java | 0 .../java/me/clip/placeholderapi/util/Msg.java | 0 .../clip/placeholderapi/util/TimeFormat.java | 0 .../me/clip/placeholderapi/util/TimeUtil.java | 0 {spigot/src => src}/main/resources/config.yml | 0 {spigot/src => src}/main/resources/plugin.yml | 0 .../clip/placeholderapi/PAPIComponents.java | 2 - .../replacer/ExactReplacer.java | 0 .../replacer/RelationalExactReplacer.java | 0 .../java/me/clip/placeholderapi/Values.java | 0 .../replacer/ReplacerBenchmarks.java | 0 .../replacer/ReplacerUnitTester.java | 0 76 files changed, 144 insertions(+), 174 deletions(-) delete mode 100644 paper/build.gradle.kts delete mode 100644 spigot/build.gradle.kts rename {spigot/src => src}/main/java/me/clip/placeholderapi/PlaceholderAPI.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/PlaceholderHook.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/PlaceholderCommand.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/PlaceholderCommandRouter.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloud.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudClear.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudDownload.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionInfo.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionPlaceholders.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudRefresh.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudStatus.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudUpdate.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/local/CommandDump.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/local/CommandExpansionRegister.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/local/CommandExpansionUnregister.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/local/CommandHelp.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/local/CommandInfo.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/local/CommandList.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/local/CommandParse.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/local/CommandReload.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/commands/impl/local/CommandVersion.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/configuration/ExpansionSort.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/configuration/PlaceholderAPIConfig.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/events/ExpansionRegisterEvent.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/events/ExpansionUnregisterEvent.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/events/PlaceholderHookUnloadEvent.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/exceptions/NoDefaultCommandException.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/expansion/Cacheable.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/expansion/Cleanable.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/expansion/Configurable.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/expansion/NMSVersion.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/expansion/Relational.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/expansion/Taskable.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/expansion/Version.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/expansion/VersionSpecific.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/expansion/manager/MethodSignature.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/listeners/ServerLoadEventListener.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/replacer/CharsReplacer.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/replacer/Replacer.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/scheduler/UniversalRunnable.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/scheduler/UniversalScheduler.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/scheduler/bukkit/BukkitScheduledTask.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/scheduler/bukkit/BukkitScheduler.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/scheduler/folia/FoliaScheduledTask.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/scheduler/folia/FoliaScheduler.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/scheduler/paper/PaperScheduler.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/scheduler/scheduling/schedulers/TaskScheduler.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/scheduler/scheduling/tasks/MyScheduledTask.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/scheduler/utils/JavaUtil.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/updatechecker/UpdateChecker.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/util/ExpansionSafetyCheck.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/util/FileUtil.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/util/Format.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/util/Futures.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/util/Msg.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/util/TimeFormat.java (100%) rename {spigot/src => src}/main/java/me/clip/placeholderapi/util/TimeUtil.java (100%) rename {spigot/src => src}/main/resources/config.yml (100%) rename {spigot/src => src}/main/resources/plugin.yml (100%) rename {paper/src/main => src/paper}/java/me/clip/placeholderapi/PAPIComponents.java (98%) rename {paper/src/main => src/paper}/java/me/clip/placeholderapi/replacer/ExactReplacer.java (100%) rename {paper/src/main => src/paper}/java/me/clip/placeholderapi/replacer/RelationalExactReplacer.java (100%) rename {spigot/src => src}/test/java/me/clip/placeholderapi/Values.java (100%) rename {spigot/src => src}/test/java/me/clip/placeholderapi/replacer/ReplacerBenchmarks.java (100%) rename {spigot/src => src}/test/java/me/clip/placeholderapi/replacer/ReplacerUnitTester.java (100%) diff --git a/build.gradle.kts b/build.gradle.kts index 69a4da2..77912fd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,91 +7,172 @@ plugins { id("io.github.goooler.shadow") version "8.1.7" } -subprojects { - apply(plugin = "java-library") - apply(plugin = "maven-publish") -// apply(plugin = "com.github.hierynomus.license") - apply(plugin = "io.github.goooler.shadow") +group = "me.clip" +version = "2.11.8-DEV-${System.getProperty("BUILD_NUMBER")}" - group = "me.clip" - version = "2.11.8-DEV-${System.getProperty("BUILD_NUMBER")}" +description = "An awesome placeholder provider!" - description = "An awesome placeholder provider!" +val paper by sourceSets.creating { + java.srcDir("src/paper/java") - repositories { - maven("https://oss.sonatype.org/content/repositories/snapshots/") + // paper can see main code + compileClasspath += sourceSets.main.get().output + runtimeClasspath += output + compileClasspath +} - mavenCentral() - mavenLocal() +repositories { + maven("https://oss.sonatype.org/content/repositories/snapshots/") - maven("https://repo.codemc.org/repository/maven-public/") - maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") - maven("https://repo.papermc.io/repository/maven-public/") + mavenCentral() + mavenLocal() + + maven("https://repo.codemc.org/repository/maven-public/") + maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") + maven("https://repo.papermc.io/repository/maven-public/") +} + +dependencies { + implementation("org.bstats:bstats-bukkit:3.0.1") + implementation("net.kyori:adventure-platform-bukkit:4.4.1") + + add(paper.compileOnlyConfigurationName, "net.kyori:adventure-platform-bukkit:4.4.1") + add(paper.compileOnlyConfigurationName, "dev.folia:folia-api:1.21.11-R0.1-SNAPSHOT") + + compileOnly("dev.folia:folia-api:1.21.11-R0.1-SNAPSHOT") + compileOnlyApi("org.jetbrains:annotations:23.0.0") + + testImplementation("org.openjdk.jmh:jmh-core:1.32") + testImplementation("org.openjdk.jmh:jmh-generator-annprocess:1.32") + testImplementation("org.junit.jupiter:junit-jupiter-engine:5.8.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1") +} + + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + + withJavadocJar() + withSourcesJar() + + disableAutoTargetJvm() +} + +val javaComponent: SoftwareComponent = components["java"] + +tasks { + processResources { + eachFile { expand("version" to project.version) } } - dependencies { - compileOnly("dev.folia:folia-api:1.21.11-R0.1-SNAPSHOT") - compileOnlyApi("org.jetbrains:annotations:23.0.0") + build { + dependsOn(named("shadowJar")) } - java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - - withJavadocJar() - withSourcesJar() - - disableAutoTargetJvm() + register("compilePaper") { + source = paper.java + classpath = paper.compileClasspath + destinationDirectory.set(layout.buildDirectory.dir("classes/java/paper")) + options.encoding = "UTF-8" + options.release = 8 } -// license { -// header = rootProject.file("config/headers/main.txt") -// -// include("**/*.java") -// mapping("java", "JAVADOC_STYLE") -// -// exclude("spigot/src/main/java/me/clip/placeholderapi/scheduler") -// -// encoding = "UTF-8" -// -// ext { -// set("year", 2026) -// } -// } + val plainJar by registering(Jar::class) { + archiveClassifier.set("plain") + from(sourceSets.main.get().output) + from(paper.output) + } - tasks { - processResources { - eachFile { expand("version" to project.version) } + val sourcesJar by registering(Jar::class) { + archiveClassifier.set("sources") + from(sourceSets.main.get().allSource) + from(paper.allSource) + } + + withType { + options.encoding = "UTF-8" + options.release = 8 + } + + val javadocJar = withType { + isFailOnError = false + + source = sourceSets.main.get().allJava + paper.allJava + + with(options as StandardJavadocDocletOptions) { + addStringOption("Xdoclint:none", "-quiet") + addStringOption("encoding", "UTF-8") + addStringOption("charSet", "UTF-8") } + } - build { - dependsOn(named("shadowJar")) + withType { + configurations = listOf(project.configurations.runtimeClasspath.get()) + + from(sourceSets.main.get().output) + + archiveClassifier.set("") + + relocate("org.bstats", "me.clip.placeholderapi.metrics") + relocate("net.kyori", "me.clip.placeholderapi.libs.kyori") + + exclude("META-INF/versions/**") + + dependsOn("compilePaper") + + doLast { + val paperDir = layout.buildDirectory.dir("classes/java/paper").get().asFile + val jarFile = archiveFile.get().asFile + + ant.invokeMethod("zip", mapOf( + "destfile" to jarFile, + "update" to "true", + "basedir" to paperDir + )) } + } - withType { - options.encoding = "UTF-8" - options.release = 8 - } + test { + useJUnitPlatform() + } - withType { - isFailOnError = false + publishing { + publications { + create("maven") { + artifactId = "placeholderapi" - with(options as StandardJavadocDocletOptions) { - addStringOption("Xdoclint:none", "-quiet") - addStringOption("encoding", "UTF-8") - addStringOption("charSet", "UTF-8") + artifact(plainJar) { + builtBy(plainJar) + } + + artifacts { + archives(sourcesJar) + archives(javadocJar) + } } } - test { - useJUnitPlatform() + repositories { + maven { + if ("-DEV" in version.toString()) { + url = uri("https://repo.extendedclip.com/snapshots") + } else { + url = uri("https://repo.extendedclip.com/releases") + } + + credentials { + username = System.getenv("JENKINS_USER") + password = System.getenv("JENKINS_PASS") + } + } } } - configurations { - testImplementation { - extendsFrom(compileOnly.get()) - } - } + publish.get().setDependsOn(listOf(build.get())) +} +configurations { + testImplementation { + extendsFrom(compileOnly.get()) + } } \ No newline at end of file diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts deleted file mode 100644 index 0702b56..0000000 --- a/paper/build.gradle.kts +++ /dev/null @@ -1,51 +0,0 @@ -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar - -dependencies { - implementation(project(":spigot")) { - exclude("net.kyori") - } - compileOnly("net.kyori:adventure-platform-bukkit:4.4.1") -} - -val javaComponent: SoftwareComponent = components["java"] - -base { - archivesName.set("PlaceholderAPI-Paper") -} - -tasks { - withType { - archiveClassifier.set("") - archiveBaseName.set("PlaceholderAPI-Paper") - - relocate("org.bstats", "me.clip.placeholderapi.metrics") - - exclude("META-INF/versions/**") - } - - publishing { - publications { - create("maven") { - artifactId = "placeholderapi-paper" - from(javaComponent) - } - } - - repositories { - maven { - if ("-DEV" in version.toString()) { - url = uri("https://repo.extendedclip.com/snapshots") - } else { - url = uri("https://repo.extendedclip.com/releases") - } - - credentials { - username = System.getenv("JENKINS_USER") - password = System.getenv("JENKINS_PASS") - } - } - } - } - - publish.get().setDependsOn(listOf(build.get())) -} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index cbf315b..90db60a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1 @@ -rootProject.name = "PlaceholderAPI" - -include("spigot", "paper") \ No newline at end of file +rootProject.name = "PlaceholderAPI" \ No newline at end of file diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts deleted file mode 100644 index 3f7e4aa..0000000 --- a/spigot/build.gradle.kts +++ /dev/null @@ -1,56 +0,0 @@ -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar - -dependencies { - implementation("org.bstats:bstats-bukkit:3.0.1") - implementation("net.kyori:adventure-platform-bukkit:4.4.1") - - testImplementation("org.openjdk.jmh:jmh-core:1.32") - testImplementation("org.openjdk.jmh:jmh-generator-annprocess:1.32") - - testImplementation("org.junit.jupiter:junit-jupiter-engine:5.8.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1") -} - -val javaComponent: SoftwareComponent = components["java"] - -base { - archivesName.set("PlaceholderAPI-Spigot") -} - -tasks { - withType { - archiveClassifier.set("") - archiveBaseName.set("PlaceholderAPI-Spigot") - - relocate("org.bstats", "me.clip.placeholderapi.metrics") - relocate("net.kyori", "me.clip.placeholderapi.libs.kyori") - - exclude("META-INF/versions/**") - } - - publishing { - publications { - create("maven") { - artifactId = "placeholderapi" - from(javaComponent) - } - } - - repositories { - maven { - if ("-DEV" in version.toString()) { - url = uri("https://repo.extendedclip.com/snapshots") - } else { - url = uri("https://repo.extendedclip.com/releases") - } - - credentials { - username = System.getenv("JENKINS_USER") - password = System.getenv("JENKINS_PASS") - } - } - } - } - - publish.get().setDependsOn(listOf(build.get())) -} \ No newline at end of file diff --git a/spigot/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java b/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java rename to src/main/java/me/clip/placeholderapi/PlaceholderAPI.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java b/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java rename to src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/PlaceholderHook.java b/src/main/java/me/clip/placeholderapi/PlaceholderHook.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/PlaceholderHook.java rename to src/main/java/me/clip/placeholderapi/PlaceholderHook.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/PlaceholderCommand.java b/src/main/java/me/clip/placeholderapi/commands/PlaceholderCommand.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/PlaceholderCommand.java rename to src/main/java/me/clip/placeholderapi/commands/PlaceholderCommand.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/PlaceholderCommandRouter.java b/src/main/java/me/clip/placeholderapi/commands/PlaceholderCommandRouter.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/PlaceholderCommandRouter.java rename to src/main/java/me/clip/placeholderapi/commands/PlaceholderCommandRouter.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloud.java b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloud.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloud.java rename to src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloud.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudClear.java b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudClear.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudClear.java rename to src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudClear.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudDownload.java b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudDownload.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudDownload.java rename to src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudDownload.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionInfo.java b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionInfo.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionInfo.java rename to src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionInfo.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java rename to src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionPlaceholders.java b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionPlaceholders.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionPlaceholders.java rename to src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionPlaceholders.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudRefresh.java b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudRefresh.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudRefresh.java rename to src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudRefresh.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudStatus.java b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudStatus.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudStatus.java rename to src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudStatus.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudUpdate.java b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudUpdate.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudUpdate.java rename to src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudUpdate.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandDump.java b/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandDump.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandDump.java rename to src/main/java/me/clip/placeholderapi/commands/impl/local/CommandDump.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandExpansionRegister.java b/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandExpansionRegister.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandExpansionRegister.java rename to src/main/java/me/clip/placeholderapi/commands/impl/local/CommandExpansionRegister.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandExpansionUnregister.java b/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandExpansionUnregister.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandExpansionUnregister.java rename to src/main/java/me/clip/placeholderapi/commands/impl/local/CommandExpansionUnregister.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandHelp.java b/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandHelp.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandHelp.java rename to src/main/java/me/clip/placeholderapi/commands/impl/local/CommandHelp.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandInfo.java b/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandInfo.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandInfo.java rename to src/main/java/me/clip/placeholderapi/commands/impl/local/CommandInfo.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandList.java b/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandList.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandList.java rename to src/main/java/me/clip/placeholderapi/commands/impl/local/CommandList.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandParse.java b/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandParse.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandParse.java rename to src/main/java/me/clip/placeholderapi/commands/impl/local/CommandParse.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandReload.java b/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandReload.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandReload.java rename to src/main/java/me/clip/placeholderapi/commands/impl/local/CommandReload.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandVersion.java b/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandVersion.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/commands/impl/local/CommandVersion.java rename to src/main/java/me/clip/placeholderapi/commands/impl/local/CommandVersion.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/configuration/ExpansionSort.java b/src/main/java/me/clip/placeholderapi/configuration/ExpansionSort.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/configuration/ExpansionSort.java rename to src/main/java/me/clip/placeholderapi/configuration/ExpansionSort.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/configuration/PlaceholderAPIConfig.java b/src/main/java/me/clip/placeholderapi/configuration/PlaceholderAPIConfig.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/configuration/PlaceholderAPIConfig.java rename to src/main/java/me/clip/placeholderapi/configuration/PlaceholderAPIConfig.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/events/ExpansionRegisterEvent.java b/src/main/java/me/clip/placeholderapi/events/ExpansionRegisterEvent.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/events/ExpansionRegisterEvent.java rename to src/main/java/me/clip/placeholderapi/events/ExpansionRegisterEvent.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/events/ExpansionUnregisterEvent.java b/src/main/java/me/clip/placeholderapi/events/ExpansionUnregisterEvent.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/events/ExpansionUnregisterEvent.java rename to src/main/java/me/clip/placeholderapi/events/ExpansionUnregisterEvent.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java b/src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java rename to src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/events/PlaceholderHookUnloadEvent.java b/src/main/java/me/clip/placeholderapi/events/PlaceholderHookUnloadEvent.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/events/PlaceholderHookUnloadEvent.java rename to src/main/java/me/clip/placeholderapi/events/PlaceholderHookUnloadEvent.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/exceptions/NoDefaultCommandException.java b/src/main/java/me/clip/placeholderapi/exceptions/NoDefaultCommandException.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/exceptions/NoDefaultCommandException.java rename to src/main/java/me/clip/placeholderapi/exceptions/NoDefaultCommandException.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/expansion/Cacheable.java b/src/main/java/me/clip/placeholderapi/expansion/Cacheable.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/expansion/Cacheable.java rename to src/main/java/me/clip/placeholderapi/expansion/Cacheable.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/expansion/Cleanable.java b/src/main/java/me/clip/placeholderapi/expansion/Cleanable.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/expansion/Cleanable.java rename to src/main/java/me/clip/placeholderapi/expansion/Cleanable.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/expansion/Configurable.java b/src/main/java/me/clip/placeholderapi/expansion/Configurable.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/expansion/Configurable.java rename to src/main/java/me/clip/placeholderapi/expansion/Configurable.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java b/src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java rename to src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java b/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java rename to src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/expansion/Relational.java b/src/main/java/me/clip/placeholderapi/expansion/Relational.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/expansion/Relational.java rename to src/main/java/me/clip/placeholderapi/expansion/Relational.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/expansion/Taskable.java b/src/main/java/me/clip/placeholderapi/expansion/Taskable.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/expansion/Taskable.java rename to src/main/java/me/clip/placeholderapi/expansion/Taskable.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/expansion/Version.java b/src/main/java/me/clip/placeholderapi/expansion/Version.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/expansion/Version.java rename to src/main/java/me/clip/placeholderapi/expansion/Version.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/expansion/VersionSpecific.java b/src/main/java/me/clip/placeholderapi/expansion/VersionSpecific.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/expansion/VersionSpecific.java rename to src/main/java/me/clip/placeholderapi/expansion/VersionSpecific.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java b/src/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java rename to src/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java b/src/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java rename to src/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java b/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java rename to src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/expansion/manager/MethodSignature.java b/src/main/java/me/clip/placeholderapi/expansion/manager/MethodSignature.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/expansion/manager/MethodSignature.java rename to src/main/java/me/clip/placeholderapi/expansion/manager/MethodSignature.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/listeners/ServerLoadEventListener.java b/src/main/java/me/clip/placeholderapi/listeners/ServerLoadEventListener.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/listeners/ServerLoadEventListener.java rename to src/main/java/me/clip/placeholderapi/listeners/ServerLoadEventListener.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/replacer/CharsReplacer.java b/src/main/java/me/clip/placeholderapi/replacer/CharsReplacer.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/replacer/CharsReplacer.java rename to src/main/java/me/clip/placeholderapi/replacer/CharsReplacer.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/replacer/Replacer.java b/src/main/java/me/clip/placeholderapi/replacer/Replacer.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/replacer/Replacer.java rename to src/main/java/me/clip/placeholderapi/replacer/Replacer.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/scheduler/UniversalRunnable.java b/src/main/java/me/clip/placeholderapi/scheduler/UniversalRunnable.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/scheduler/UniversalRunnable.java rename to src/main/java/me/clip/placeholderapi/scheduler/UniversalRunnable.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/scheduler/UniversalScheduler.java b/src/main/java/me/clip/placeholderapi/scheduler/UniversalScheduler.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/scheduler/UniversalScheduler.java rename to src/main/java/me/clip/placeholderapi/scheduler/UniversalScheduler.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/scheduler/bukkit/BukkitScheduledTask.java b/src/main/java/me/clip/placeholderapi/scheduler/bukkit/BukkitScheduledTask.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/scheduler/bukkit/BukkitScheduledTask.java rename to src/main/java/me/clip/placeholderapi/scheduler/bukkit/BukkitScheduledTask.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/scheduler/bukkit/BukkitScheduler.java b/src/main/java/me/clip/placeholderapi/scheduler/bukkit/BukkitScheduler.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/scheduler/bukkit/BukkitScheduler.java rename to src/main/java/me/clip/placeholderapi/scheduler/bukkit/BukkitScheduler.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/scheduler/folia/FoliaScheduledTask.java b/src/main/java/me/clip/placeholderapi/scheduler/folia/FoliaScheduledTask.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/scheduler/folia/FoliaScheduledTask.java rename to src/main/java/me/clip/placeholderapi/scheduler/folia/FoliaScheduledTask.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/scheduler/folia/FoliaScheduler.java b/src/main/java/me/clip/placeholderapi/scheduler/folia/FoliaScheduler.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/scheduler/folia/FoliaScheduler.java rename to src/main/java/me/clip/placeholderapi/scheduler/folia/FoliaScheduler.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/scheduler/paper/PaperScheduler.java b/src/main/java/me/clip/placeholderapi/scheduler/paper/PaperScheduler.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/scheduler/paper/PaperScheduler.java rename to src/main/java/me/clip/placeholderapi/scheduler/paper/PaperScheduler.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/scheduler/scheduling/schedulers/TaskScheduler.java b/src/main/java/me/clip/placeholderapi/scheduler/scheduling/schedulers/TaskScheduler.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/scheduler/scheduling/schedulers/TaskScheduler.java rename to src/main/java/me/clip/placeholderapi/scheduler/scheduling/schedulers/TaskScheduler.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/scheduler/scheduling/tasks/MyScheduledTask.java b/src/main/java/me/clip/placeholderapi/scheduler/scheduling/tasks/MyScheduledTask.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/scheduler/scheduling/tasks/MyScheduledTask.java rename to src/main/java/me/clip/placeholderapi/scheduler/scheduling/tasks/MyScheduledTask.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/scheduler/utils/JavaUtil.java b/src/main/java/me/clip/placeholderapi/scheduler/utils/JavaUtil.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/scheduler/utils/JavaUtil.java rename to src/main/java/me/clip/placeholderapi/scheduler/utils/JavaUtil.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/updatechecker/UpdateChecker.java b/src/main/java/me/clip/placeholderapi/updatechecker/UpdateChecker.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/updatechecker/UpdateChecker.java rename to src/main/java/me/clip/placeholderapi/updatechecker/UpdateChecker.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/util/ExpansionSafetyCheck.java b/src/main/java/me/clip/placeholderapi/util/ExpansionSafetyCheck.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/util/ExpansionSafetyCheck.java rename to src/main/java/me/clip/placeholderapi/util/ExpansionSafetyCheck.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/util/FileUtil.java b/src/main/java/me/clip/placeholderapi/util/FileUtil.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/util/FileUtil.java rename to src/main/java/me/clip/placeholderapi/util/FileUtil.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/util/Format.java b/src/main/java/me/clip/placeholderapi/util/Format.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/util/Format.java rename to src/main/java/me/clip/placeholderapi/util/Format.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/util/Futures.java b/src/main/java/me/clip/placeholderapi/util/Futures.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/util/Futures.java rename to src/main/java/me/clip/placeholderapi/util/Futures.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/util/Msg.java b/src/main/java/me/clip/placeholderapi/util/Msg.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/util/Msg.java rename to src/main/java/me/clip/placeholderapi/util/Msg.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/util/TimeFormat.java b/src/main/java/me/clip/placeholderapi/util/TimeFormat.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/util/TimeFormat.java rename to src/main/java/me/clip/placeholderapi/util/TimeFormat.java diff --git a/spigot/src/main/java/me/clip/placeholderapi/util/TimeUtil.java b/src/main/java/me/clip/placeholderapi/util/TimeUtil.java similarity index 100% rename from spigot/src/main/java/me/clip/placeholderapi/util/TimeUtil.java rename to src/main/java/me/clip/placeholderapi/util/TimeUtil.java diff --git a/spigot/src/main/resources/config.yml b/src/main/resources/config.yml similarity index 100% rename from spigot/src/main/resources/config.yml rename to src/main/resources/config.yml diff --git a/spigot/src/main/resources/plugin.yml b/src/main/resources/plugin.yml similarity index 100% rename from spigot/src/main/resources/plugin.yml rename to src/main/resources/plugin.yml diff --git a/paper/src/main/java/me/clip/placeholderapi/PAPIComponents.java b/src/paper/java/me/clip/placeholderapi/PAPIComponents.java similarity index 98% rename from paper/src/main/java/me/clip/placeholderapi/PAPIComponents.java rename to src/paper/java/me/clip/placeholderapi/PAPIComponents.java index 281b31a..d35a78d 100644 --- a/paper/src/main/java/me/clip/placeholderapi/PAPIComponents.java +++ b/src/paper/java/me/clip/placeholderapi/PAPIComponents.java @@ -20,8 +20,6 @@ package me.clip.placeholderapi; -import me.clip.placeholderapi.expansion.PlaceholderExpansion; -import me.clip.placeholderapi.expansion.Relational; import me.clip.placeholderapi.replacer.ExactReplacer; import me.clip.placeholderapi.replacer.RelationalExactReplacer; import me.clip.placeholderapi.replacer.Replacer; diff --git a/paper/src/main/java/me/clip/placeholderapi/replacer/ExactReplacer.java b/src/paper/java/me/clip/placeholderapi/replacer/ExactReplacer.java similarity index 100% rename from paper/src/main/java/me/clip/placeholderapi/replacer/ExactReplacer.java rename to src/paper/java/me/clip/placeholderapi/replacer/ExactReplacer.java diff --git a/paper/src/main/java/me/clip/placeholderapi/replacer/RelationalExactReplacer.java b/src/paper/java/me/clip/placeholderapi/replacer/RelationalExactReplacer.java similarity index 100% rename from paper/src/main/java/me/clip/placeholderapi/replacer/RelationalExactReplacer.java rename to src/paper/java/me/clip/placeholderapi/replacer/RelationalExactReplacer.java diff --git a/spigot/src/test/java/me/clip/placeholderapi/Values.java b/src/test/java/me/clip/placeholderapi/Values.java similarity index 100% rename from spigot/src/test/java/me/clip/placeholderapi/Values.java rename to src/test/java/me/clip/placeholderapi/Values.java diff --git a/spigot/src/test/java/me/clip/placeholderapi/replacer/ReplacerBenchmarks.java b/src/test/java/me/clip/placeholderapi/replacer/ReplacerBenchmarks.java similarity index 100% rename from spigot/src/test/java/me/clip/placeholderapi/replacer/ReplacerBenchmarks.java rename to src/test/java/me/clip/placeholderapi/replacer/ReplacerBenchmarks.java diff --git a/spigot/src/test/java/me/clip/placeholderapi/replacer/ReplacerUnitTester.java b/src/test/java/me/clip/placeholderapi/replacer/ReplacerUnitTester.java similarity index 100% rename from spigot/src/test/java/me/clip/placeholderapi/replacer/ReplacerUnitTester.java rename to src/test/java/me/clip/placeholderapi/replacer/ReplacerUnitTester.java