diff --git a/.run/release.run.xml b/.run/release.run.xml new file mode 100644 index 00000000..1357c53c --- /dev/null +++ b/.run/release.run.xml @@ -0,0 +1,26 @@ + + + + + + + true + true + false + false + + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index b3c359a1..27b95f2b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,70 +1,59 @@ -import task.WebhookExtension -import java.awt.Color - plugins { - id("crazyenvoys.root-plugin") + id("paper-plugin") + id("library-plugin") - id("featherpatcher") version "0.0.0.2" + id("xyz.jpenilla.run-paper") version "2.0.1" } -val releaseUpdate = Color(27, 217, 106) -val betaUpdate = Color(255, 163, 71) -val changeLogs = Color(37, 137, 204) +dependencies { + compileOnly(libs.placeholder.api) + compileOnly(libs.itemsadder.api) -val beta = settings.versions.beta.get().toBoolean() -val extension = settings.versions.extension.get() + compileOnly(libs.cmi.api) + compileOnly(libs.cmi.lib) -val color = if (beta) betaUpdate else releaseUpdate -val repo = if (beta) "beta" else "releases" + compileOnly(libs.holographic.displays) + compileOnly(libs.decent.holograms) -val msg = "New version of ${rootProject.name} is ready! <@&929463450214735912>" + compileOnly(libs.worldguard.api) -rootProject.version = "1.4.20.5" + implementation(libs.bstats.bukkit) -val download = "https://modrinth.com/$extension/${rootProject.name.lowercase()}/version/${rootProject.version}" + implementation(libs.triumph.cmds) -webhook { - this.avatar("https://en.gravatar.com/avatar/${WebhookExtension.Gravatar().md5Hex("no-reply@ryderbelserion.com")}.jpeg") + implementation(libs.nbt.api) +} - this.username("Ryder Belserion") +tasks { + reobfJar { + val file = File("$rootDir/jars") - this.content(msg) + if (!file.exists()) file.mkdirs() - this.embeds { - this.embed { - this.color(color) + outputJar.set(layout.buildDirectory.file("$file/${rootProject.name}-${rootProject.version}.jar")) + } - this.fields { - this.field( - "Download: ", - download - ) + shadowJar { + listOf( + "de.tr7zw.changeme.nbtapi", + "dev.triumphteam", + "org.bstats" + ).forEach { pack -> relocate(pack, "${rootProject.group}.$pack") } + } - this.field( - "API: ", - "https://repo.crazycrew.us/#/$repo/${rootProject.group.toString().replace(".", "/")}/${rootProject.name.lowercase()}-api/${rootProject.version}" - ) - } + runServer { + minecraftVersion("1.19.4") + } - this.author( - "${rootProject.name} | Version ${rootProject.version}", - download, - "https://raw.githubusercontent.com/RyderBelserion/assets/main/crazycrew/png/${rootProject.name}Website.png" + processResources { + filesMatching("plugin.yml") { + expand( + "name" to rootProject.name, + "group" to rootProject.group, + "version" to rootProject.version, + "description" to rootProject.description, + "website" to "https://modrinth.com/plugin/${rootProject.name.lowercase()}" ) } - - this.embed { - this.color(changeLogs) - - this.title("What changed?") - - this.description(""" - > - - Full Changelog -> $download - """.trimIndent()) - } } - - this.url("DISCORD_WEBHOOK") } \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 7876b319..ebe6bbe6 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -4,20 +4,18 @@ plugins { repositories { gradlePluginPortal() + + maven("https://repo.crazycrew.us/api/") } dependencies { - implementation(libs.kotlin) - implementation(libs.shadow) - implementation(libs.paperweight) + implementation(libs.featherweight) - implementation(libs.ktor.core) - implementation(libs.ktor.cio) - implementation(libs.ktor.content) - implementation(libs.ktor.gson) + implementation(libs.minotaur) + //implementation(libs.hangar) - implementation(libs.kotlin.coroutines) + implementation(libs.shadow) implementation(libs.turtle) } \ No newline at end of file diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index 3b3e0b7b..579f4aab 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -5,5 +5,9 @@ dependencyResolutionManagement { } } - repositories.gradlePluginPortal() + repositories { + gradlePluginPortal() + + maven("https://repo.crazycrew.us/api/") + } } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/crazyenvoys.paper-plugin.gradle.kts b/buildSrc/src/main/kotlin/crazyenvoys.paper-plugin.gradle.kts deleted file mode 100644 index c0ec081e..00000000 --- a/buildSrc/src/main/kotlin/crazyenvoys.paper-plugin.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -plugins { - id("crazyenvoys.root-plugin") - - id("io.papermc.paperweight.userdev") -} - -repositories { - /** - * Paper Team - */ - maven("https://repo.papermc.io/repository/maven-public/") - - /** - * NBT API - */ - maven("https://repo.codemc.io/repository/maven-public/") -} - -dependencies { - paperweight.paperDevBundle("1.19.4-R0.1-SNAPSHOT") -} - -tasks { - assemble { - dependsOn(reobfJar) - } - - reobfJar { - val file = File("$rootDir/jars") - - if (!file.exists()) file.mkdirs() - - outputJar.set(layout.buildDirectory.file("$file/${rootProject.name}-Paper-${rootProject.version}.jar")) - } -} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/crazyenvoys.root-plugin.gradle.kts b/buildSrc/src/main/kotlin/crazyenvoys.root-plugin.gradle.kts deleted file mode 100644 index 712fc0e3..00000000 --- a/buildSrc/src/main/kotlin/crazyenvoys.root-plugin.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -plugins { - `java-library` - `maven-publish` - - id("com.github.johnrengelman.shadow") -} - -repositories { - maven("https://repo.triumphteam.dev/snapshots") - - maven("https://repo.crazycrew.us/api") - - maven("https://jitpack.io") - - mavenCentral() -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of("17")) -} - -tasks { - compileJava { - options.encoding = Charsets.UTF_8.name() - options.release.set(17) - } - - javadoc { - options.encoding = Charsets.UTF_8.name() - } - - processResources { - filteringCharset = Charsets.UTF_8.name() - } -} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/library-plugin.gradle.kts b/buildSrc/src/main/kotlin/library-plugin.gradle.kts new file mode 100644 index 00000000..65b35ba1 --- /dev/null +++ b/buildSrc/src/main/kotlin/library-plugin.gradle.kts @@ -0,0 +1,123 @@ +import java.awt.Color +import java.io.ByteArrayOutputStream +import java.io.File + +plugins { + id("root-plugin") + + id("featherpatcher") + id("com.modrinth.minotaur") +} + +val isBeta = false +val repo = if (isBeta) "beta" else "releases" + +val type = if (isBeta) "beta" else "release" +val otherType = if (isBeta) "Beta" else "Release" + +val msg = "New version of ${rootProject.name} is ready! <@&929463452232192063>" + +val downloads = """ + https://modrinth.com/plugin/${rootProject.name.lowercase()}/version/${rootProject.version} +""".trimIndent() + +// The commit id for the "main" branch prior to merging a pull request. +//val start = "7684e1a" + +// The commit id AFTER merging the pull request so the last commit before you release. +//val end = "ddd1fb9" + +//val commitLog = getGitHistory().joinToString(separator = "") { formatGitLog(it) } + +val desc = """ + # Release ${rootProject.version} + ### Changes + * WorldGuard no longer stops you from claiming envoys. + + ### Commits + +
+ + Other + + + +
+ + As always, report any bugs @ https://github.com/Crazy-Crew/${rootProject.name}/issues +""".trimIndent() + +val versions = listOf( + "1.19.4" +) + +/*fun getGitHistory(): List { + val output: String = ByteArrayOutputStream().use { outputStream -> + project.exec { + executable("git") + args("log", "$start..$end", "--format=format:%h %s") + standardOutput = outputStream + } + + outputStream.toString() + } + + return output.split("\n") +} + +fun formatGitLog(commitLog: String): String { + val hash = commitLog.take(7) + val message = commitLog.substring(8) // Get message after commit hash + space between + return "[$hash](https://github.com/Crazy-Crew/${rootProject.name}/commit/$hash) $message
" +} + */ + +tasks { + modrinth { + token.set(System.getenv("MODRINTH_TOKEN")) + projectId.set(rootProject.name.lowercase()) + + versionName.set("${rootProject.name} ${rootProject.version}") + versionNumber.set(rootProject.version.toString()) + + versionType.set(type) + + val file = File("$rootDir/jars") + if (!file.exists()) file.mkdirs() + + uploadFile.set(layout.buildDirectory.file("$file/${rootProject.name}-${rootProject.version}.jar")) + + autoAddDependsOn.set(true) + + gameVersions.addAll(versions) + + loaders.addAll(listOf("paper", "purpur")) + + changelog.set(desc) + } +} + +publishing { + repositories { + val repo = if (isBeta) "beta" else "releases" + maven("https://repo.crazycrew.us/$repo") { + name = "crazycrew" + //credentials(PasswordCredentials::class) + + credentials { + username = System.getenv("REPOSITORY_USERNAME") + password = System.getenv("REPOSITORY_PASSWORD") + } + } + } + + publications { + create("maven") { + groupId = rootProject.group.toString() + artifactId = "${rootProject.name.lowercase()}-api" + version = rootProject.version.toString() + + from(components["java"]) + } + } +} diff --git a/buildSrc/src/main/kotlin/paper-plugin.gradle.kts b/buildSrc/src/main/kotlin/paper-plugin.gradle.kts new file mode 100644 index 00000000..648285c0 --- /dev/null +++ b/buildSrc/src/main/kotlin/paper-plugin.gradle.kts @@ -0,0 +1,21 @@ +plugins { + id("root-plugin") + + id("com.github.johnrengelman.shadow") + + id("io.papermc.paperweight.userdev") +} + +repositories { + maven("https://repo.papermc.io/repository/maven-public/") +} + +dependencies { + paperweight.paperDevBundle("1.19.4-R0.1-SNAPSHOT") +} + +tasks { + assemble { + dependsOn(reobfJar) + } +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/root-plugin.gradle.kts b/buildSrc/src/main/kotlin/root-plugin.gradle.kts new file mode 100644 index 00000000..335ffc40 --- /dev/null +++ b/buildSrc/src/main/kotlin/root-plugin.gradle.kts @@ -0,0 +1,37 @@ +import org.gradle.kotlin.dsl.maven + +plugins { + `java-library` + `maven-publish` +} + +repositories { + maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") + + maven("https://repo.codemc.org/repository/maven-public/") + + maven("https://repo.aikar.co/content/groups/aikar/") + + maven("https://repo.triumphteam.dev/snapshots/") + + maven("https://maven.enginehub.org/repo/") + + maven("https://repo.crazycrew.us/api/") + + maven("https://jitpack.io/") + + mavenCentral() +} + +java { + toolchain.languageVersion.set(JavaLanguageVersion.of("17")) +} + +tasks { + compileJava { + options.encoding = Charsets.UTF_8.name() + options.release.set(17) + + options.compilerArgs = listOf("-parameters") + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 07e6b99b..1e713e84 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,5 @@ org.gradle.warning.mode = all name = CrazyEnvoys group = com.badbones69.crazyenvoys +version = 1.4.20.5 description = Drop custom envoys with any prize you want all over spawn for players to fight over. \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 483198ed..f8cf2822 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,27 +1,16 @@ -[versions] - -# Minecraft -paper = "1.19.4-R0.1-SNAPSHOT" - -# Adventure -kyori = "4.13.0" - -ktor = "2.2.4" -kotlin = "1.8.20" - [libraries] # Minecraft -papermc = { module = "io.papermc.paper:paper-api", version.ref = "paper" } -paperlib = { module = "io.papermc:paperlib", version = "1.0.8-SNAPSHOT" } -paperweight = { module = "io.papermc.paperweight:paperweight-userdev", version = "1.5.4" } +papermc = { module = "io.papermc.paper:paper-api", version = "1.19.4-R0.1-SNAPSHOT" } +hangar = { module = "io.papermc:hangar-publish-plugin", version = "0.0.5" } + +minotaur = { module = "com.modrinth.minotaur:Minotaur", version = "2.7.2" } +paperweight = { module = "io.papermc.paperweight:paperweight-userdev", version = "1.5.3" } +featherweight = { module = "com.ryderbelserion.feather:feather-plugin", version = "0.0.0.2" } -# Gson -gson = { module = "com.google.code.gson:gson", version = "2.10.1" } +shadow = { module = "com.github.johnrengelman:shadow", version = "8.1.1" } -# Adventure -kyori = { module = "net.kyori:adventure-api", version.ref = "kyori" } -kyori-mm = { module = "net.kyori:adventure-text-minimessage", version.ref = "kyori" } +turtle = { module = "com.lordcodes.turtle:turtle", version = "0.8.0" } # Triumph Team triumph_cmds = { module = "dev.triumphteam:triumph-cmd-bukkit", version = "2.0.0-SNAPSHOT" } @@ -34,31 +23,16 @@ vault_api = { module = "com.github.MilkBowl:VaultAPI", version = "1.7" } # Holograms holographic_displays = { module = "me.filoghost.holographicdisplays:holographicdisplays-api", version = "3.0.1" } decent_holograms = { module = "com.github.decentsoftware-eu:decentholograms", version = "2.8.1" } +fancy_holograms = { module = "de.oliver:FancyHolograms", version = "1.0.6" } -cmi_api = { module = "com.Zrips.CMI:CMI-API", version = "9.3.1.5" } -cmi_lib = { module = "net.zrips.CMILib:cmi-lib-api", version = "1.2.5.3" } +cmi_api = { module = "com.Zrips.CMI:CMI-API", version = "9.5.0.8" } +cmi_lib = { module = "net.zrips.CMILib:cmi-api", version = "1.2.5.5" } # Placeholders placeholder_api = { module = "me.clip:placeholderapi", version = "2.11.3" } # Item Plugins -itemsadder_api = { module = "dev.lone:api-itemsadder", version = "3.2.5" } +itemsadder_api = { module = "com.github.LoneDev6:api-itemsadder", version = "3.0.0" } # World Guard -worldguard_api = { module = "com.sk89q.worldguard:worldguard-bukkit", version = "7.1.0-SNAPSHOT" } - -# Kotlin -ktor-core = { module = "io.ktor:ktor-client-core-jvm", version.ref = "ktor" } -ktor-cio = { module = "io.ktor:ktor-client-cio-jvm", version.ref = "ktor" } -ktor-content = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" } -ktor-gson = { module = "io.ktor:ktor-serialization-gson", version.ref = "ktor" } - -kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } -kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin"} -kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.4" } - -minotaur = { module = "com.modrinth.minotaur:Minotaur", version = "2.7.5" } - -shadow = { module = "com.github.johnrengelman:shadow", version = "8.1.1" } - -turtle = { module = "com.lordcodes.turtle:turtle", version = "0.8.0" } \ No newline at end of file +worldguard_api = { module = "com.sk89q.worldguard:worldguard-bukkit", version = "7.1.0-SNAPSHOT" } \ No newline at end of file diff --git a/gradle/settings.versions.toml b/gradle/settings.versions.toml deleted file mode 100644 index e61fcc17..00000000 --- a/gradle/settings.versions.toml +++ /dev/null @@ -1,11 +0,0 @@ -[versions] - -# Project Settings -github = "https://github.com/Crazy-Crew/CrazyEnchantments" -beta = "true" -extension = "plugin" - -[plugins] - -minotaur = { id = "com.modrinth.minotaur", version = "2.7.5" } -run-paper = { id = "xyz.jpenilla.run-paper", version = "2.0.1" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 761b8f08..bdc9a83b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/platforms/paper/build.gradle.kts b/platforms/paper/build.gradle.kts deleted file mode 100644 index e62f270b..00000000 --- a/platforms/paper/build.gradle.kts +++ /dev/null @@ -1,142 +0,0 @@ -@Suppress("DSL_SCOPE_VIOLATION") - -plugins { - id("crazyenvoys.paper-plugin") - - alias(settings.plugins.minotaur) - alias(settings.plugins.run.paper) -} - -repositories { - /** - * PAPI Team - */ - maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") - - /** - * EngineHub Team - */ - maven("https://maven.enginehub.org/repo/") -} - -dependencies { - implementation(libs.nbt.api) - implementation(libs.bstats.bukkit) - - compileOnly(libs.papermc) - - compileOnly(libs.placeholder.api) - - compileOnly(libs.holographic.displays) - compileOnly(libs.decent.holograms) - - compileOnly(libs.worldguard.api) - - compileOnly(libs.cmi.api) - compileOnly(libs.cmi.lib) - - compileOnly(libs.placeholder.api) - - compileOnly(libs.vault.api) -} - -val github = settings.versions.github.get() -val extension = settings.versions.extension.get() - -val beta = settings.versions.beta.get().toBoolean() - -val type = if (beta) "beta" else "release" - -tasks { - shadowJar { - listOf( - "de.tr7zw.changeme.nbtapi", - "org.bstats" - ).forEach { pack -> relocate(pack, "${rootProject.group}.$pack") } - } - - runServer { - minecraftVersion("1.19.4") - } - - modrinth { - token.set(System.getenv("MODRINTH_TOKEN")) - projectId.set(rootProject.name.lowercase()) - - versionName.set("${rootProject.name} ${rootProject.version}") - versionNumber.set(rootProject.version.toString()) - - versionType.set(type) - - val file = File("$rootDir/jars") - - if (!file.exists()) file.mkdirs() - - uploadFile.set(layout.buildDirectory.file("$file/${rootProject.name}-Paper-${rootProject.version}.jar")) - - autoAddDependsOn.set(true) - - gameVersions.addAll( - listOf( - "1.19", - "1.19.1", - "1.19.2", - "1.19.3", - "1.19.4" - ) - ) - - loaders.addAll(listOf("paper", "purpur")) - - //

The first release for CrazyVouchers on Modrinth! 🎉🎉🎉🎉🎉


If we want a header. - changelog.set( - """ -

Changes:

-

Added 1.19.4 support

-

Removed 1.18.2 and below support

-

Load chunks async with fallback for spigot

-

Under the hood changes

-

Simplified build script

-

Bug Fixes:

-

N/A

- """.trimIndent() - ) - } - - processResources { - filesMatching("plugin.yml") { - expand( - "name" to rootProject.name, - "group" to rootProject.group, - "version" to rootProject.version, - "description" to rootProject.description, - "website" to "https://modrinth.com/$extension/${rootProject.name.lowercase()}" - ) - } - } -} - -publishing { - repositories { - val repo = if (beta) "beta" else "releases" - maven("https://repo.crazycrew.us/$repo") { - name = "crazycrew" - //credentials(PasswordCredentials::class) - - credentials { - username = System.getenv("REPOSITORY_USERNAME") - password = System.getenv("REPOSITORY_PASSWORD") - } - } - } - - publications { - create("maven") { - groupId = rootProject.group.toString() - artifactId = "${rootProject.name.lowercase()}-api" - version = rootProject.version.toString() - - from(components["java"]) - } - } -} \ No newline at end of file diff --git a/platforms/paper/run/bukkit.yml b/platforms/paper/run/bukkit.yml deleted file mode 100644 index b2cf2b17..00000000 --- a/platforms/paper/run/bukkit.yml +++ /dev/null @@ -1,32 +0,0 @@ -settings: - allow-end: false - warn-on-overload: true - permissions-file: permissions.yml - update-folder: update - plugin-profiling: false - connection-throttle: 4000 - query-plugins: true - deprecated-verbose: default - shutdown-message: Server closed - minimum-api: none - use-map-color-cache: true -spawn-limits: - monsters: 70 - animals: 10 - water-animals: 5 - water-ambient: 20 - water-underground-creature: 5 - axolotls: 5 - ambient: 15 -chunk-gc: - period-in-ticks: 600 -ticks-per: - animal-spawns: 400 - monster-spawns: 1 - water-spawns: 1 - water-ambient-spawns: 1 - water-underground-creature-spawns: 1 - axolotl-spawns: 1 - ambient-spawns: 1 - autosave: 6000 -aliases: now-in-commands.yml diff --git a/platforms/paper/run/config/paper-global.yml b/platforms/paper/run/config/paper-global.yml deleted file mode 100644 index 694b3f52..00000000 --- a/platforms/paper/run/config/paper-global.yml +++ /dev/null @@ -1,128 +0,0 @@ -# This is the global configuration file for Paper. -# As you can see, there's a lot to configure. Some options may impact gameplay, so use -# with caution, and make sure you know what each option does before configuring. -# -# If you need help with the configuration or have any questions related to Paper, -# join us in our Discord or check the docs page. -# -# The world configuration options have been moved inside -# their respective world folder. The files are named paper-world.yml -# -# Docs: https://docs.papermc.io/ -# Discord: https://discord.gg/papermc -# Website: https://papermc.io/ - -_version: 28 -chunk-loading: - autoconfig-send-distance: true - enable-frustum-priority: false - global-max-chunk-load-rate: -1.0 - global-max-chunk-send-rate: -1.0 - global-max-concurrent-loads: 500.0 - max-concurrent-sends: 2 - min-load-radius: 2 - player-max-chunk-load-rate: -1.0 - player-max-concurrent-loads: 20.0 - target-player-chunk-send-rate: 100.0 -chunk-system: - gen-parallelism: default - io-threads: -1 - worker-threads: -1 -collisions: - enable-player-collisions: true - send-full-pos-for-hard-colliding-entities: true -commands: - fix-target-selector-tag-completion: true - suggest-player-names-when-null-tab-completions: true - time-command-affects-all-worlds: false -console: - enable-brigadier-completions: true - enable-brigadier-highlighting: true - has-all-permissions: false -item-validation: - book: - author: 8192 - page: 16384 - title: 8192 - book-size: - page-max: 2560 - total-multiplier: 0.98 - display-name: 8192 - lore-line: 8192 - resolve-selectors-in-books: false -logging: - deobfuscate-stacktraces: true - log-player-ip-addresses: true - use-rgb-for-named-text-colors: true -messages: - kick: - authentication-servers-down: - connection-throttle: Connection throttled! Please wait before reconnecting. - flying-player: - flying-vehicle: - no-permission: I'm sorry, but you do not have permission to perform this command. - Please contact the server administrators if you believe that this is in error. - use-display-name-in-quit-message: false -misc: - chat-threads: - chat-executor-core-size: -1 - chat-executor-max-size: -1 - fix-entity-position-desync: true - lag-compensate-block-breaking: true - load-permissions-yml-before-plugins: true - max-joins-per-tick: 5 - region-file-cache-size: 256 - strict-advancement-dimension-check: false - use-alternative-luck-formula: false - use-dimension-type-for-custom-spawners: false -packet-limiter: - all-packets: - action: KICK - interval: 7.0 - max-packet-rate: 500.0 - kick-message: - overrides: - ServerboundPlaceRecipePacket: - action: DROP - interval: 4.0 - max-packet-rate: 5.0 -player-auto-save: - max-per-tick: -1 - rate: -1 -proxies: - bungee-cord: - online-mode: true - proxy-protocol: false - velocity: - enabled: false - online-mode: false - secret: '' -scoreboards: - save-empty-scoreboard-teams: false - track-plugin-scoreboards: false -spam-limiter: - incoming-packet-threshold: 300 - recipe-spam-increment: 1 - recipe-spam-limit: 20 - tab-spam-increment: 1 - tab-spam-limit: 500 -timings: - enabled: true - hidden-config-entries: - - database - - proxies.velocity.secret - history-interval: 300 - history-length: 3600 - server-name: Unknown Server - server-name-privacy: false - url: https://timings.aikar.co/ - verbose: true -unsupported-settings: - allow-grindstone-overstacking: false - allow-headless-pistons: false - allow-permanent-block-break-exploits: false - allow-piston-duplication: false - perform-username-validation: true -watchdog: - early-warning-delay: 10000 - early-warning-every: 5000 diff --git a/platforms/paper/run/config/paper-world-defaults.yml b/platforms/paper/run/config/paper-world-defaults.yml deleted file mode 100644 index a0f7a3a2..00000000 --- a/platforms/paper/run/config/paper-world-defaults.yml +++ /dev/null @@ -1,286 +0,0 @@ -# This is the world defaults configuration file for Paper. -# As you can see, there's a lot to configure. Some options may impact gameplay, so use -# with caution, and make sure you know what each option does before configuring. -# -# If you need help with the configuration or have any questions related to Paper, -# join us in our Discord or check the docs page. -# -# Configuration options here apply to all worlds, unless you specify overrides inside -# the world-specific config file inside each world folder. -# -# Docs: https://docs.papermc.io/ -# Discord: https://discord.gg/papermc -# Website: https://papermc.io/ - -_version: 30 -anticheat: - anti-xray: - enabled: false - engine-mode: 1 - hidden-blocks: - - copper_ore - - deepslate_copper_ore - - gold_ore - - deepslate_gold_ore - - iron_ore - - deepslate_iron_ore - - coal_ore - - deepslate_coal_ore - - lapis_ore - - deepslate_lapis_ore - - mossy_cobblestone - - obsidian - - chest - - diamond_ore - - deepslate_diamond_ore - - redstone_ore - - deepslate_redstone_ore - - clay - - emerald_ore - - deepslate_emerald_ore - - ender_chest - lava-obscures: false - max-block-height: 64 - replacement-blocks: - - stone - - oak_planks - - deepslate - update-radius: 2 - use-permission: false - obfuscation: - items: - hide-durability: false - hide-itemmeta: false - hide-itemmeta-with-visual-effects: false -chunks: - auto-save-interval: default - delay-chunk-unloads-by: 10s - entity-per-chunk-save-limit: - arrow: -1 - ender_pearl: -1 - experience_orb: -1 - fireball: -1 - small_fireball: -1 - snowball: -1 - fixed-chunk-inhabited-time: -1 - max-auto-save-chunks-per-tick: 24 - prevent-moving-into-unloaded-chunks: false -collisions: - allow-player-cramming-damage: false - allow-vehicle-collisions: true - fix-climbing-bypassing-cramming-rule: false - max-entity-collisions: 8 - only-players-collide: false -entities: - armor-stands: - do-collision-entity-lookups: true - tick: true - behavior: - allow-spider-world-border-climbing: true - baby-zombie-movement-modifier: 0.5 - disable-chest-cat-detection: false - disable-creeper-lingering-effect: false - disable-player-crits: false - door-breaking-difficulty: - husk: - - HARD - vindicator: - - NORMAL - - HARD - zombie: - - HARD - zombie_villager: - - HARD - zombified_piglin: - - HARD - ender-dragons-death-always-places-dragon-egg: false - experience-merge-max-value: -1 - mobs-can-always-pick-up-loot: - skeletons: false - zombies: false - nerf-pigmen-from-nether-portals: false - parrots-are-unaffected-by-player-movement: false - phantoms-do-not-spawn-on-creative-players: true - phantoms-only-attack-insomniacs: true - phantoms-spawn-attempt-max-seconds: 119 - phantoms-spawn-attempt-min-seconds: 60 - piglins-guard-chests: true - pillager-patrols: - disable: false - spawn-chance: 0.2 - spawn-delay: - per-player: false - ticks: 12000 - start: - day: 5 - per-player: false - player-insomnia-start-ticks: 72000 - should-remove-dragon: false - spawner-nerfed-mobs-should-jump: false - zombie-villager-infection-chance: -1.0 - zombies-target-turtle-eggs: true - entities-target-with-follow-range: false - mob-effects: - immune-to-wither-effect: - wither: true - wither-skeleton: true - spiders-immune-to-poison-effect: true - undead-immune-to-certain-effects: true - spawning: - all-chunks-are-slime-chunks: false - alt-item-despawn-rate: - enabled: false - items: - cobblestone: 300 - count-all-mobs-for-spawning: false - creative-arrow-despawn-rate: default - despawn-ranges: - ambient: - hard: 128 - soft: 32 - axolotls: - hard: 128 - soft: 32 - creature: - hard: 128 - soft: 32 - misc: - hard: 128 - soft: 32 - monster: - hard: 128 - soft: 32 - underground_water_creature: - hard: 128 - soft: 32 - water_ambient: - hard: 64 - soft: 32 - water_creature: - hard: 128 - soft: 32 - disable-mob-spawner-spawn-egg-transformation: false - duplicate-uuid: - mode: SAFE_REGEN - safe-regen-delete-range: 32 - filter-bad-tile-entity-nbt-from-falling-blocks: true - filtered-entity-tag-nbt-paths: - - Pos - - Motion - - SleepingX - - SleepingY - - SleepingZ - iron-golems-can-spawn-in-air: false - monster-spawn-max-light-level: -1 - non-player-arrow-despawn-rate: default - per-player-mob-spawns: true - scan-for-legacy-ender-dragon: true - skeleton-horse-thunder-spawn-chance: default - slime-spawn-height: - slime-chunk: - maximum: 40.0 - surface-biome: - maximum: 70.0 - minimum: 50.0 - spawn-limits: - ambient: -1 - axolotls: -1 - creature: -1 - monster: -1 - underground_water_creature: -1 - water_ambient: -1 - water_creature: -1 - wandering-trader: - spawn-chance-failure-increment: 25 - spawn-chance-max: 75 - spawn-chance-min: 25 - spawn-day-length: 24000 - spawn-minute-length: 1200 - wateranimal-spawn-height: - maximum: default - minimum: default -environment: - disable-explosion-knockback: false - disable-ice-and-snow: false - disable-teleportation-suffocation-check: false - disable-thunder: false - fire-tick-delay: 30 - frosted-ice: - delay: - max: 40 - min: 20 - enabled: true - generate-flat-bedrock: false - nether-ceiling-void-damage-height: disabled - optimize-explosions: false - portal-create-radius: 16 - portal-search-radius: 128 - portal-search-vanilla-dimension-scaling: true - treasure-maps: - enabled: true - find-already-discovered: - loot-tables: default - villager-trade: false - water-over-lava-flow-speed: 5 -feature-seeds: - generate-random-seeds-for-all: false -fishing-time-range: - maximum: 600 - minimum: 100 -fixes: - disable-unloaded-chunk-enderpearl-exploit: true - falling-block-height-nerf: disabled - fix-curing-zombie-villager-discount-exploit: true - fix-items-merging-through-walls: false - prevent-tnt-from-moving-in-water: false - split-overstacked-loot: true - tnt-entity-height-nerf: disabled -hopper: - cooldown-when-full: true - disable-move-event: false - ignore-occluding-blocks: false -lootables: - auto-replenish: false - max-refills: -1 - refresh-max: 2d - refresh-min: 12h - reset-seed-on-fill: true - restrict-player-reloot: true -maps: - item-frame-cursor-limit: 128 - item-frame-cursor-update-interval: 10 -max-growth-height: - bamboo: - max: 16 - min: 11 - cactus: 3 - reeds: 3 -misc: - disable-end-credits: false - disable-relative-projectile-velocity: false - disable-sprint-interruption-on-attack: false - light-queue-size: 20 - max-leash-distance: 10.0 - redstone-implementation: VANILLA - shield-blocking-delay: 5 - show-sign-click-command-failure-msgs-to-player: false - update-pathfinding-on-block-update: true -scoreboards: - allow-non-player-entities-on-scoreboards: false - use-vanilla-world-scoreboard-name-coloring: false -spawn: - allow-using-signs-inside-spawn-protection: false - keep-spawn-loaded: true - keep-spawn-loaded-range: 10 -tick-rates: - behavior: - villager: - validatenearbypoi: -1 - container-update: 1 - grass-spread: 1 - mob-spawner: 1 - sensor: - villager: - secondarypoisensor: 40 -unsupported-settings: - fix-invulnerable-end-crystal-exploit: true diff --git a/platforms/paper/run/eula.txt b/platforms/paper/run/eula.txt deleted file mode 100644 index f508944b..00000000 --- a/platforms/paper/run/eula.txt +++ /dev/null @@ -1,3 +0,0 @@ -#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://aka.ms/MinecraftEULA). -#Wed Jan 11 20:45:49 EST 2023 -eula=true diff --git a/platforms/paper/run/server.properties b/platforms/paper/run/server.properties deleted file mode 100644 index 2f31a50c..00000000 --- a/platforms/paper/run/server.properties +++ /dev/null @@ -1,59 +0,0 @@ -#Minecraft server properties -#Thu Jan 19 18:20:50 EST 2023 -enable-jmx-monitoring=false -rcon.port=25575 -level-seed= -gamemode=survival -enable-command-block=false -enable-query=false -generator-settings={} -enforce-secure-profile=true -level-name=world -motd=A Minecraft Server -query.port=25565 -pvp=true -generate-structures=true -max-chained-neighbor-updates=1000000 -difficulty=peaceful -network-compression-threshold=256 -max-tick-time=60000 -require-resource-pack=false -use-native-transport=true -max-players=20 -online-mode=true -enable-status=true -allow-flight=false -initial-disabled-packs= -broadcast-rcon-to-ops=true -view-distance=10 -server-ip= -resource-pack-prompt= -allow-nether=false -server-port=25565 -enable-rcon=false -sync-chunk-writes=false -op-permission-level=4 -prevent-proxy-connections=false -hide-online-players=false -resource-pack= -entity-broadcast-range-percentage=100 -simulation-distance=10 -rcon.password= -player-idle-timeout=0 -debug=false -force-gamemode=false -rate-limit=0 -hardcore=false -white-list=false -broadcast-console-to-ops=true -spawn-npcs=true -spawn-animals=true -function-permission-level=2 -initial-enabled-packs=vanilla -level-type=minecraft\:normal -text-filtering-config= -spawn-monsters=true -enforce-whitelist=false -spawn-protection=0 -resource-pack-sha1= -max-world-size=29999984 \ No newline at end of file diff --git a/platforms/paper/run/spigot.yml b/platforms/paper/run/spigot.yml deleted file mode 100644 index 8dbb7059..00000000 --- a/platforms/paper/run/spigot.yml +++ /dev/null @@ -1,173 +0,0 @@ -# This is the main configuration file for Spigot. -# As you can see, there's tons to configure. Some options may impact gameplay, so use -# with caution, and make sure you know what each option does before configuring. -# For a reference for any variable inside this file, check out the Spigot wiki at -# http://www.spigotmc.org/wiki/spigot-configuration/ -# -# If you need help with the configuration or have any questions related to Spigot, -# join us at the Discord or drop by our forums and leave a post. -# -# Discord: https://www.spigotmc.org/go/discord -# Forums: http://www.spigotmc.org/ - -settings: - debug: false - moved-wrongly-threshold: 0.0625 - save-user-cache-on-stop-only: false - moved-too-quickly-multiplier: 10.0 - timeout-time: 60 - restart-on-crash: false - restart-script: ./start.sh - user-cache-size: 1000 - player-shuffle: 0 - sample-count: 12 - bungeecord: false - netty-threads: 4 - log-villager-deaths: true - log-named-deaths: true - attribute: - maxHealth: - max: 2048.0 - movementSpeed: - max: 2048.0 - attackDamage: - max: 2048.0 -messages: - whitelist: You are not whitelisted on this server! - unknown-command: Unknown command. Type "/help" for help. - server-full: The server is full! - outdated-client: Outdated client! Please use {0} - outdated-server: Outdated server! I'm still on {0} - restart: Server is restarting -advancements: - disable-saving: false - disabled: - - minecraft:story/disabled -world-settings: - default: - below-zero-generation-in-existing-chunks: true - arrow-despawn-rate: 1200 - trident-despawn-rate: 1200 - enable-zombie-pigmen-portal-spawns: true - dragon-death-sound-radius: 0 - wither-spawn-sound-radius: 0 - simulation-distance: default - view-distance: default - thunder-chance: 100000 - merge-radius: - item: 2.5 - exp: 3.0 - item-despawn-rate: 6000 - hanging-tick-frequency: 100 - end-portal-sound-radius: 0 - nerf-spawner-mobs: false - mob-spawn-range: 8 - growth: - cactus-modifier: 100 - cane-modifier: 100 - melon-modifier: 100 - mushroom-modifier: 100 - pumpkin-modifier: 100 - sapling-modifier: 100 - beetroot-modifier: 100 - carrot-modifier: 100 - potato-modifier: 100 - wheat-modifier: 100 - netherwart-modifier: 100 - vine-modifier: 100 - cocoa-modifier: 100 - bamboo-modifier: 100 - sweetberry-modifier: 100 - kelp-modifier: 100 - twistingvines-modifier: 100 - weepingvines-modifier: 100 - cavevines-modifier: 100 - glowberry-modifier: 100 - entity-activation-range: - animals: 32 - monsters: 32 - raiders: 48 - misc: 16 - water: 16 - villagers: 32 - flying-monsters: 32 - wake-up-inactive: - animals-max-per-tick: 4 - animals-every: 1200 - animals-for: 100 - monsters-max-per-tick: 8 - monsters-every: 400 - monsters-for: 100 - villagers-max-per-tick: 4 - villagers-every: 600 - villagers-for: 100 - flying-monsters-max-per-tick: 8 - flying-monsters-every: 200 - flying-monsters-for: 100 - villagers-work-immunity-after: 100 - villagers-work-immunity-for: 20 - villagers-active-for-panic: true - tick-inactive-villagers: true - ignore-spectators: false - seed-village: 10387312 - seed-desert: 14357617 - seed-igloo: 14357618 - seed-jungle: 14357619 - seed-swamp: 14357620 - seed-monument: 10387313 - seed-shipwreck: 165745295 - seed-ocean: 14357621 - seed-outpost: 165745296 - seed-endcity: 10387313 - seed-slime: 987234911 - seed-nether: 30084232 - seed-mansion: 10387319 - seed-fossil: 14357921 - seed-portal: 34222645 - seed-ancientcity: 20083232 - seed-buriedtreasure: 10387320 - seed-mineshaft: default - seed-stronghold: default - entity-tracking-range: - players: 48 - animals: 48 - monsters: 48 - misc: 32 - other: 64 - ticks-per: - hopper-transfer: 8 - hopper-check: 1 - hopper-amount: 1 - hopper-can-load-chunks: false - hunger: - jump-walk-exhaustion: 0.05 - jump-sprint-exhaustion: 0.2 - combat-exhaustion: 0.1 - regen-exhaustion: 6.0 - swim-multiplier: 0.01 - sprint-multiplier: 0.1 - other-multiplier: 0.0 - max-tnt-per-tick: 100 - max-tick-time: - tile: 50 - entity: 50 - zombie-aggressive-towards-villager: true - verbose: false -commands: - silent-commandblock-console: false - tab-complete: 0 - send-namespaced: true - log: true - spam-exclusions: - - /skill - replace-commands: - - setblock - - summon - - testforblock - - tellraw -players: - disable-saving: false -config-version: 12 -stats: - disable-saving: false - forced-stats: {} diff --git a/settings.gradle.kts b/settings.gradle.kts index 77a45dc7..90b8df10 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,10 +1,4 @@ dependencyResolutionManagement { - versionCatalogs { - create("settings") { - from(files("gradle/settings.versions.toml")) - } - } - repositories.gradlePluginPortal() } @@ -22,7 +16,7 @@ rootProject.name = "CrazyEnvoys" val lowerCase = rootProject.name.lowercase() -listOf("paper").forEach(::includePlatform) +listOf("api").forEach(::includeProject) fun includeProject(name: String) { include(name) { @@ -30,27 +24,6 @@ fun includeProject(name: String) { } } -fun includeModule(name: String) { - include(name) { - this.name = "$lowerCase-module-$name" - this.projectDir = file("modules/$name") - } -} - -fun includePlatform(name: String) { - include(name) { - this.name = "$lowerCase-$name" - this.projectDir = file("platforms/$name") - } -} - -fun includePlatformModule(name: String, platform: String) { - include(name) { - this.name = "$lowerCase-module-$platform-$name" - this.projectDir = file("modules/$platform/$name") - } -} - fun include(name: String, block: ProjectDescriptor.() -> Unit) { include(name) project(":$name").apply(block) diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/CrazyEnvoys.java b/src/main/java/com/badbones69/crazyenvoys/CrazyEnvoys.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/CrazyEnvoys.java rename to src/main/java/com/badbones69/crazyenvoys/CrazyEnvoys.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/Methods.java b/src/main/java/com/badbones69/crazyenvoys/Methods.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/Methods.java rename to src/main/java/com/badbones69/crazyenvoys/Methods.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/CrazyManager.java b/src/main/java/com/badbones69/crazyenvoys/api/CrazyManager.java similarity index 99% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/CrazyManager.java rename to src/main/java/com/badbones69/crazyenvoys/api/CrazyManager.java index 86fec30c..3ebc9396 100644 --- a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/CrazyManager.java +++ b/src/main/java/com/badbones69/crazyenvoys/api/CrazyManager.java @@ -238,19 +238,15 @@ private void getEnvoyTime(Calendar cal) { String time = envoySettings.getEnvoyClockTime(); int hour = Integer.parseInt(time.split(" ")[0].split(":")[0]); int min = Integer.parseInt(time.split(" ")[0].split(":")[1]); - int c = Calendar.AM; + int calender = Calendar.AM; - if (time.split(" ")[1].equalsIgnoreCase("AM")) { - c = Calendar.AM; - } else if (time.split(" ")[1].equalsIgnoreCase("PM")) { - c = Calendar.PM; - } + if (time.split(" ")[1].equalsIgnoreCase("PM")) calender = Calendar.PM; cal.set(Calendar.HOUR_OF_DAY, hour); cal.getTime(); // Without this makes the hours not change for some reason. cal.set(Calendar.MINUTE, min); cal.set(Calendar.SECOND, 0); - cal.set(Calendar.AM_PM, c); + cal.set(Calendar.AM_PM, calender); if (cal.before(Calendar.getInstance())) cal.set(Calendar.DAY_OF_MONTH, cal.get(Calendar.DAY_OF_MONTH) + 1); } diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/FileManager.java b/src/main/java/com/badbones69/crazyenvoys/api/FileManager.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/FileManager.java rename to src/main/java/com/badbones69/crazyenvoys/api/FileManager.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/enums/Messages.java b/src/main/java/com/badbones69/crazyenvoys/api/enums/Messages.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/enums/Messages.java rename to src/main/java/com/badbones69/crazyenvoys/api/enums/Messages.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/events/EnvoyEndEvent.java b/src/main/java/com/badbones69/crazyenvoys/api/events/EnvoyEndEvent.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/events/EnvoyEndEvent.java rename to src/main/java/com/badbones69/crazyenvoys/api/events/EnvoyEndEvent.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/events/EnvoyOpenEvent.java b/src/main/java/com/badbones69/crazyenvoys/api/events/EnvoyOpenEvent.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/events/EnvoyOpenEvent.java rename to src/main/java/com/badbones69/crazyenvoys/api/events/EnvoyOpenEvent.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/events/EnvoyStartEvent.java b/src/main/java/com/badbones69/crazyenvoys/api/events/EnvoyStartEvent.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/events/EnvoyStartEvent.java rename to src/main/java/com/badbones69/crazyenvoys/api/events/EnvoyStartEvent.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/events/FlareUseEvent.java b/src/main/java/com/badbones69/crazyenvoys/api/events/FlareUseEvent.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/events/FlareUseEvent.java rename to src/main/java/com/badbones69/crazyenvoys/api/events/FlareUseEvent.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/events/NewDropLocationEvent.java b/src/main/java/com/badbones69/crazyenvoys/api/events/NewDropLocationEvent.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/events/NewDropLocationEvent.java rename to src/main/java/com/badbones69/crazyenvoys/api/events/NewDropLocationEvent.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/interfaces/HologramController.java b/src/main/java/com/badbones69/crazyenvoys/api/interfaces/HologramController.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/interfaces/HologramController.java rename to src/main/java/com/badbones69/crazyenvoys/api/interfaces/HologramController.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/objects/CoolDownSettings.java b/src/main/java/com/badbones69/crazyenvoys/api/objects/CoolDownSettings.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/objects/CoolDownSettings.java rename to src/main/java/com/badbones69/crazyenvoys/api/objects/CoolDownSettings.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/objects/EditorSettings.java b/src/main/java/com/badbones69/crazyenvoys/api/objects/EditorSettings.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/objects/EditorSettings.java rename to src/main/java/com/badbones69/crazyenvoys/api/objects/EditorSettings.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/objects/EnvoySettings.java b/src/main/java/com/badbones69/crazyenvoys/api/objects/EnvoySettings.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/objects/EnvoySettings.java rename to src/main/java/com/badbones69/crazyenvoys/api/objects/EnvoySettings.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/objects/FlareSettings.java b/src/main/java/com/badbones69/crazyenvoys/api/objects/FlareSettings.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/objects/FlareSettings.java rename to src/main/java/com/badbones69/crazyenvoys/api/objects/FlareSettings.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/objects/ItemBuilder.java b/src/main/java/com/badbones69/crazyenvoys/api/objects/ItemBuilder.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/objects/ItemBuilder.java rename to src/main/java/com/badbones69/crazyenvoys/api/objects/ItemBuilder.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/objects/LocationSettings.java b/src/main/java/com/badbones69/crazyenvoys/api/objects/LocationSettings.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/objects/LocationSettings.java rename to src/main/java/com/badbones69/crazyenvoys/api/objects/LocationSettings.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/objects/misc/Prize.java b/src/main/java/com/badbones69/crazyenvoys/api/objects/misc/Prize.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/objects/misc/Prize.java rename to src/main/java/com/badbones69/crazyenvoys/api/objects/misc/Prize.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/objects/misc/Tier.java b/src/main/java/com/badbones69/crazyenvoys/api/objects/misc/Tier.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/api/objects/misc/Tier.java rename to src/main/java/com/badbones69/crazyenvoys/api/objects/misc/Tier.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/commands/EnvoyCommand.java b/src/main/java/com/badbones69/crazyenvoys/commands/EnvoyCommand.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/commands/EnvoyCommand.java rename to src/main/java/com/badbones69/crazyenvoys/commands/EnvoyCommand.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/commands/EnvoyTab.java b/src/main/java/com/badbones69/crazyenvoys/commands/EnvoyTab.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/commands/EnvoyTab.java rename to src/main/java/com/badbones69/crazyenvoys/commands/EnvoyTab.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/controllers/CountdownTimer.java b/src/main/java/com/badbones69/crazyenvoys/controllers/CountdownTimer.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/controllers/CountdownTimer.java rename to src/main/java/com/badbones69/crazyenvoys/controllers/CountdownTimer.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/controllers/EditControl.java b/src/main/java/com/badbones69/crazyenvoys/controllers/EditControl.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/controllers/EditControl.java rename to src/main/java/com/badbones69/crazyenvoys/controllers/EditControl.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/controllers/EnvoyControl.java b/src/main/java/com/badbones69/crazyenvoys/controllers/EnvoyControl.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/controllers/EnvoyControl.java rename to src/main/java/com/badbones69/crazyenvoys/controllers/EnvoyControl.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/controllers/FireworkDamageAPI.java b/src/main/java/com/badbones69/crazyenvoys/controllers/FireworkDamageAPI.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/controllers/FireworkDamageAPI.java rename to src/main/java/com/badbones69/crazyenvoys/controllers/FireworkDamageAPI.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/controllers/FlareControl.java b/src/main/java/com/badbones69/crazyenvoys/controllers/FlareControl.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/controllers/FlareControl.java rename to src/main/java/com/badbones69/crazyenvoys/controllers/FlareControl.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/MetricsHandler.java b/src/main/java/com/badbones69/crazyenvoys/support/MetricsHandler.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/MetricsHandler.java rename to src/main/java/com/badbones69/crazyenvoys/support/MetricsHandler.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/SkullCreator.java b/src/main/java/com/badbones69/crazyenvoys/support/SkullCreator.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/SkullCreator.java rename to src/main/java/com/badbones69/crazyenvoys/support/SkullCreator.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/claims/WorldGuardSupport.java b/src/main/java/com/badbones69/crazyenvoys/support/claims/WorldGuardSupport.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/claims/WorldGuardSupport.java rename to src/main/java/com/badbones69/crazyenvoys/support/claims/WorldGuardSupport.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/holograms/CMIHologramsSupport.java b/src/main/java/com/badbones69/crazyenvoys/support/holograms/CMIHologramsSupport.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/holograms/CMIHologramsSupport.java rename to src/main/java/com/badbones69/crazyenvoys/support/holograms/CMIHologramsSupport.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/holograms/DecentHologramsSupport.java b/src/main/java/com/badbones69/crazyenvoys/support/holograms/DecentHologramsSupport.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/holograms/DecentHologramsSupport.java rename to src/main/java/com/badbones69/crazyenvoys/support/holograms/DecentHologramsSupport.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/holograms/HolographicDisplaysSupport.java b/src/main/java/com/badbones69/crazyenvoys/support/holograms/HolographicDisplaysSupport.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/holograms/HolographicDisplaysSupport.java rename to src/main/java/com/badbones69/crazyenvoys/support/holograms/HolographicDisplaysSupport.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/interfaces/WorldGuardVersion.java b/src/main/java/com/badbones69/crazyenvoys/support/interfaces/WorldGuardVersion.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/interfaces/WorldGuardVersion.java rename to src/main/java/com/badbones69/crazyenvoys/support/interfaces/WorldGuardVersion.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/libraries/PluginSupport.java b/src/main/java/com/badbones69/crazyenvoys/support/libraries/PluginSupport.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/libraries/PluginSupport.java rename to src/main/java/com/badbones69/crazyenvoys/support/libraries/PluginSupport.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/libraries/UpdateChecker.java b/src/main/java/com/badbones69/crazyenvoys/support/libraries/UpdateChecker.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/libraries/UpdateChecker.java rename to src/main/java/com/badbones69/crazyenvoys/support/libraries/UpdateChecker.java diff --git a/platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/placeholders/PlaceholderAPISupport.java b/src/main/java/com/badbones69/crazyenvoys/support/placeholders/PlaceholderAPISupport.java similarity index 100% rename from platforms/paper/src/main/java/com/badbones69/crazyenvoys/support/placeholders/PlaceholderAPISupport.java rename to src/main/java/com/badbones69/crazyenvoys/support/placeholders/PlaceholderAPISupport.java diff --git a/platforms/paper/src/main/resources/config.yml b/src/main/resources/config.yml similarity index 100% rename from platforms/paper/src/main/resources/config.yml rename to src/main/resources/config.yml diff --git a/platforms/paper/src/main/resources/data.yml b/src/main/resources/data.yml similarity index 100% rename from platforms/paper/src/main/resources/data.yml rename to src/main/resources/data.yml diff --git a/platforms/paper/src/main/resources/messages.yml b/src/main/resources/messages.yml similarity index 100% rename from platforms/paper/src/main/resources/messages.yml rename to src/main/resources/messages.yml diff --git a/platforms/paper/src/main/resources/plugin.yml b/src/main/resources/plugin.yml similarity index 100% rename from platforms/paper/src/main/resources/plugin.yml rename to src/main/resources/plugin.yml diff --git a/platforms/paper/src/main/resources/tiers/Basic.yml b/src/main/resources/tiers/Basic.yml similarity index 100% rename from platforms/paper/src/main/resources/tiers/Basic.yml rename to src/main/resources/tiers/Basic.yml diff --git a/platforms/paper/src/main/resources/tiers/Lucky.yml b/src/main/resources/tiers/Lucky.yml similarity index 100% rename from platforms/paper/src/main/resources/tiers/Lucky.yml rename to src/main/resources/tiers/Lucky.yml diff --git a/platforms/paper/src/main/resources/tiers/Titan.yml b/src/main/resources/tiers/Titan.yml similarity index 100% rename from platforms/paper/src/main/resources/tiers/Titan.yml rename to src/main/resources/tiers/Titan.yml