From fdc124276bd69c24a7679e6f30c05309d61f5e63 Mon Sep 17 00:00:00 2001 From: Alex Zenla Date: Tue, 24 Jan 2023 20:00:50 -0800 Subject: [PATCH] Migration to Gay Pizza --- .github/workflows/publish.yml | 20 ++++++++ LICENSE | 2 +- README.md | 2 +- build.gradle.kts | 49 +++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- samples/mixed/bukkit-plugins/build.gradle.kts | 2 +- .../common-library/build.gradle.kts | 2 +- .../sample/common/CommonExtensions.kt | 2 +- .../goodbye-world/build.gradle.kts | 2 +- .../sample/goodbyeworld/GoodbyeWorldPlugin.kt | 6 +-- .../src/main/resources/plugin.yml | 2 +- .../hello-world/build.gradle.kts | 2 +- .../sample/helloworld/HelloWorldPlugin.kt | 16 ++++++ .../sample/helloworld/HelloWorldPlugin.kt | 16 ------ .../hello-world/src/main/resources/plugin.yml | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/mixed/other-library/build.gradle.kts | 2 +- .../concrete/other/OtherLibrary.java | 2 +- samples/shared/build.gradle.kts | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../sample/helloworld/HelloWorldPlugin.kt | 2 +- samples/shared/src/main/resources/plugin.yml | 2 +- samples/simple/build.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/simple/hello-world/build.gradle.kts | 2 +- .../sample/helloworld/HelloWorldPlugin.kt | 2 +- .../hello-world/src/main/resources/plugin.yml | 2 +- .../concrete/ConcreteBaseBukkitPlugin.kt | 2 +- .../foundation/concrete/ConcreteBasePlugin.kt | 2 +- .../foundation/concrete/ConcreteExtension.kt | 2 +- .../concrete/ConcreteLibraryPlugin.kt | 2 +- .../concrete/ConcretePluginPlugin.kt | 2 +- .../foundation/concrete/ConcreteRootPlugin.kt | 2 +- .../pizza}/foundation/concrete/Globals.kt | 2 +- .../foundation/concrete/PaperVersionClient.kt | 2 +- .../foundation/concrete/RunPaperServer.kt | 2 +- .../foundation/concrete/SetupPaperServer.kt | 2 +- .../foundation/concrete/SmartDownloader.kt | 2 +- .../foundation/concrete/UpdateManifestTask.kt | 2 +- .../pizza}/foundation/concrete/extensions.kt | 2 +- 40 files changed, 93 insertions(+), 86 deletions(-) create mode 100644 .github/workflows/publish.yml rename samples/mixed/bukkit-plugins/common-library/src/main/kotlin/{lgbt/mystic => gay/pizza}/foundation/concrete/sample/common/CommonExtensions.kt (78%) rename samples/mixed/bukkit-plugins/goodbye-world/src/main/kotlin/{lgbt/mystic => gay/pizza}/foundation/concrete/sample/goodbyeworld/GoodbyeWorldPlugin.kt (53%) create mode 100644 samples/mixed/bukkit-plugins/hello-world/src/main/kotlin/gay/pizza/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt delete mode 100644 samples/mixed/bukkit-plugins/hello-world/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt rename samples/mixed/other-library/src/main/java/{lgbt/mystic => gay/pizza}/foundation/concrete/other/OtherLibrary.java (65%) rename samples/{simple/hello-world/src/main/kotlin/lgbt/mystic => shared/src/main/kotlin/gay/pizza}/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt (80%) rename samples/{shared/src/main/kotlin/lgbt/mystic => simple/hello-world/src/main/kotlin/gay/pizza}/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt (80%) rename src/main/kotlin/{lgbt/mystic => gay/pizza}/foundation/concrete/ConcreteBaseBukkitPlugin.kt (93%) rename src/main/kotlin/{lgbt/mystic => gay/pizza}/foundation/concrete/ConcreteBasePlugin.kt (96%) rename src/main/kotlin/{lgbt/mystic => gay/pizza}/foundation/concrete/ConcreteExtension.kt (85%) rename src/main/kotlin/{lgbt/mystic => gay/pizza}/foundation/concrete/ConcreteLibraryPlugin.kt (59%) rename src/main/kotlin/{lgbt/mystic => gay/pizza}/foundation/concrete/ConcretePluginPlugin.kt (95%) rename src/main/kotlin/{lgbt/mystic => gay/pizza}/foundation/concrete/ConcreteRootPlugin.kt (94%) rename src/main/kotlin/{lgbt/mystic => gay/pizza}/foundation/concrete/Globals.kt (63%) rename src/main/kotlin/{lgbt/mystic => gay/pizza}/foundation/concrete/PaperVersionClient.kt (96%) rename src/main/kotlin/{lgbt/mystic => gay/pizza}/foundation/concrete/RunPaperServer.kt (96%) rename src/main/kotlin/{lgbt/mystic => gay/pizza}/foundation/concrete/SetupPaperServer.kt (98%) rename src/main/kotlin/{lgbt/mystic => gay/pizza}/foundation/concrete/SmartDownloader.kt (98%) rename src/main/kotlin/{lgbt/mystic => gay/pizza}/foundation/concrete/UpdateManifestTask.kt (96%) rename src/main/kotlin/{lgbt/mystic => gay/pizza}/foundation/concrete/extensions.kt (98%) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..2d39af9 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,20 @@ +name: Publish +on: + push: + branches: + - main +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + - name: Publish with Gradle + uses: gradle/gradle-build-action@v2 + with: + arguments: publishToGitHubPackages diff --git a/LICENSE b/LICENSE index a6b3526..e906025 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 Mystic +Copyright (c) 2023 Gay Pizza Specifications Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 9e24189..5390cf1 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,4 @@ Concrete is a Gradle plugin for Bukkit projects. Originally spawned out of the G ## Contributors - [@azenla](https://github.com/azenla) -- [@lgorence](https://github.com/lgorence) +- [@kubeliv](https://github.com/kubeliv) diff --git a/build.gradle.kts b/build.gradle.kts index 2e4a472..ec1822f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,13 +1,13 @@ plugins { `kotlin-dsl` - kotlin("plugin.serialization") version "1.6.21" + kotlin("plugin.serialization") version "1.7.10" id("maven-publish") id("java-gradle-plugin") } -group = "lgbt.mystic.foundation" -version = "0.5.0" +group = "gay.pizza.foundation" +version = "0.6.0-SNAPSHOT" repositories { mavenCentral() @@ -15,10 +15,10 @@ repositories { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21") - implementation("org.jetbrains.kotlin:kotlin-serialization:1.6.21") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10") + implementation("org.jetbrains.kotlin:kotlin-serialization:1.7.10") implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2") - implementation("com.google.code.gson:gson:2.10") + implementation("com.google.code.gson:gson:2.10.1") // Implementation of crypto used in smart downloader. implementation("org.bouncycastle:bcprov-jdk15on:1.70") @@ -27,23 +27,23 @@ dependencies { gradlePlugin { plugins { create("concrete-root") { - id = "lgbt.mystic.foundation.concrete-root" - implementationClass = "lgbt.mystic.foundation.concrete.ConcreteRootPlugin" + id = "gay.pizza.foundation.concrete-root" + implementationClass = "gay.pizza.foundation.concrete.ConcreteRootPlugin" } create("concrete-base") { - id = "lgbt.mystic.foundation.concrete-base" - implementationClass = "lgbt.mystic.foundation.concrete.ConcreteBasePlugin" + id = "gay.pizza.foundation.concrete-base" + implementationClass = "gay.pizza.foundation.concrete.ConcreteBasePlugin" } create("concrete-library") { - id = "lgbt.mystic.foundation.concrete-library" - implementationClass = "lgbt.mystic.foundation.concrete.ConcreteLibraryPlugin" + id = "gay.pizza.foundation.concrete-library" + implementationClass = "gay.pizza.foundation.concrete.ConcreteLibraryPlugin" } create("concrete-plugin") { - id = "lgbt.mystic.foundation.concrete-plugin" - implementationClass = "lgbt.mystic.foundation.concrete.ConcretePluginPlugin" + id = "gay.pizza.foundation.concrete-plugin" + implementationClass = "gay.pizza.foundation.concrete.ConcretePluginPlugin" } } } @@ -66,29 +66,16 @@ publishing { maven { name = "github-packages" - url = uri("https://maven.pkg.github.com/mysticlgbt/concrete") + url = uri("https://maven.pkg.github.com/gaypizzaspecifications/concrete") credentials { - username = project.findProperty("github.username") as String? - password = project.findProperty("github.token") as String? - } - } - - maven { - name = "gitlab" - url = uri("https://gitlab.com/api/v4/projects/37752100/packages/maven") - credentials(HttpHeaderCredentials::class.java) { - name = "Private-Token" - value = project.findProperty("gitlab.com.accessToken") as String? - } - - authentication { - create("header") + username = project.findProperty("github.username") as String? ?: "unknown" + password = project.findProperty("github.token") as String? ?: System.getenv("GITHUB_TOKEN") } } } } tasks.withType { - gradleVersion = "7.5.1" + gradleVersion = "7.6" distributionType = Wrapper.DistributionType.ALL } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8fad3f5..f42e62f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/samples/mixed/bukkit-plugins/build.gradle.kts b/samples/mixed/bukkit-plugins/build.gradle.kts index a805738..2c9fac4 100644 --- a/samples/mixed/bukkit-plugins/build.gradle.kts +++ b/samples/mixed/bukkit-plugins/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("lgbt.mystic.foundation.concrete-root") + id("gay.pizza.foundation.concrete-root") } concrete { diff --git a/samples/mixed/bukkit-plugins/common-library/build.gradle.kts b/samples/mixed/bukkit-plugins/common-library/build.gradle.kts index 10925e6..36dc4fa 100644 --- a/samples/mixed/bukkit-plugins/common-library/build.gradle.kts +++ b/samples/mixed/bukkit-plugins/common-library/build.gradle.kts @@ -1,3 +1,3 @@ plugins { - id("lgbt.mystic.foundation.concrete-library") + id("gay.pizza.foundation.concrete-library") } diff --git a/samples/mixed/bukkit-plugins/common-library/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/common/CommonExtensions.kt b/samples/mixed/bukkit-plugins/common-library/src/main/kotlin/gay/pizza/foundation/concrete/sample/common/CommonExtensions.kt similarity index 78% rename from samples/mixed/bukkit-plugins/common-library/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/common/CommonExtensions.kt rename to samples/mixed/bukkit-plugins/common-library/src/main/kotlin/gay/pizza/foundation/concrete/sample/common/CommonExtensions.kt index befb662..fada0f1 100644 --- a/samples/mixed/bukkit-plugins/common-library/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/common/CommonExtensions.kt +++ b/samples/mixed/bukkit-plugins/common-library/src/main/kotlin/gay/pizza/foundation/concrete/sample/common/CommonExtensions.kt @@ -1,4 +1,4 @@ -package lgbt.mystic.foundation.concrete.sample.common +package gay.pizza.foundation.concrete.sample.common import org.bukkit.plugin.java.JavaPlugin diff --git a/samples/mixed/bukkit-plugins/goodbye-world/build.gradle.kts b/samples/mixed/bukkit-plugins/goodbye-world/build.gradle.kts index e545dd3..ed0108c 100644 --- a/samples/mixed/bukkit-plugins/goodbye-world/build.gradle.kts +++ b/samples/mixed/bukkit-plugins/goodbye-world/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("lgbt.mystic.foundation.concrete-plugin") + id("gay.pizza.foundation.concrete-plugin") } dependencies { diff --git a/samples/mixed/bukkit-plugins/goodbye-world/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/goodbyeworld/GoodbyeWorldPlugin.kt b/samples/mixed/bukkit-plugins/goodbye-world/src/main/kotlin/gay/pizza/foundation/concrete/sample/goodbyeworld/GoodbyeWorldPlugin.kt similarity index 53% rename from samples/mixed/bukkit-plugins/goodbye-world/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/goodbyeworld/GoodbyeWorldPlugin.kt rename to samples/mixed/bukkit-plugins/goodbye-world/src/main/kotlin/gay/pizza/foundation/concrete/sample/goodbyeworld/GoodbyeWorldPlugin.kt index d0cd43f..5fa3e57 100644 --- a/samples/mixed/bukkit-plugins/goodbye-world/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/goodbyeworld/GoodbyeWorldPlugin.kt +++ b/samples/mixed/bukkit-plugins/goodbye-world/src/main/kotlin/gay/pizza/foundation/concrete/sample/goodbyeworld/GoodbyeWorldPlugin.kt @@ -1,7 +1,7 @@ -package lgbt.mystic.foundation.concrete.sample.goodbyeworld +package gay.pizza.foundation.concrete.sample.goodbyeworld -import lgbt.mystic.foundation.concrete.sample.common.logOnDisable -import lgbt.mystic.foundation.concrete.sample.common.logOnEnable +import gay.pizza.foundation.concrete.sample.common.logOnDisable +import gay.pizza.foundation.concrete.sample.common.logOnEnable import org.bukkit.plugin.java.JavaPlugin class GoodbyeWorldPlugin : JavaPlugin() { diff --git a/samples/mixed/bukkit-plugins/goodbye-world/src/main/resources/plugin.yml b/samples/mixed/bukkit-plugins/goodbye-world/src/main/resources/plugin.yml index d108f04..9813819 100644 --- a/samples/mixed/bukkit-plugins/goodbye-world/src/main/resources/plugin.yml +++ b/samples/mixed/bukkit-plugins/goodbye-world/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: GoodbyeWorld version: '${version}' -main: lgbt.mystic.foundation.concrete.sample.goodbyeworld.GoodbyeWorldPlugin +main: gay.pizza.foundation.concrete.sample.goodbyeworld.GoodbyeWorldPlugin api-version: 1.18 prefix: GoodbyeWorld load: STARTUP diff --git a/samples/mixed/bukkit-plugins/hello-world/build.gradle.kts b/samples/mixed/bukkit-plugins/hello-world/build.gradle.kts index faa219d..ff05ffb 100644 --- a/samples/mixed/bukkit-plugins/hello-world/build.gradle.kts +++ b/samples/mixed/bukkit-plugins/hello-world/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("lgbt.mystic.foundation.concrete-plugin") + id("gay.pizza.foundation.concrete-plugin") } dependencies { diff --git a/samples/mixed/bukkit-plugins/hello-world/src/main/kotlin/gay/pizza/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt b/samples/mixed/bukkit-plugins/hello-world/src/main/kotlin/gay/pizza/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt new file mode 100644 index 0000000..ebdccaa --- /dev/null +++ b/samples/mixed/bukkit-plugins/hello-world/src/main/kotlin/gay/pizza/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt @@ -0,0 +1,16 @@ +package gay.pizza.foundation.concrete.sample.helloworld + +import gay.pizza.foundation.concrete.other.OtherLibrary +import gay.pizza.foundation.concrete.sample.common.logOnDisable +import gay.pizza.foundation.concrete.sample.common.logOnEnable +import org.bukkit.plugin.java.JavaPlugin + +class HelloWorldPlugin : JavaPlugin() { + override fun onEnable() { + logOnEnable(OtherLibrary.HELLO_WORLD) + } + + override fun onDisable() { + logOnDisable(OtherLibrary.HELLO_WORLD) + } +} diff --git a/samples/mixed/bukkit-plugins/hello-world/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt b/samples/mixed/bukkit-plugins/hello-world/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt deleted file mode 100644 index f071e08..0000000 --- a/samples/mixed/bukkit-plugins/hello-world/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt +++ /dev/null @@ -1,16 +0,0 @@ -package lgbt.mystic.foundation.concrete.sample.helloworld - -import lgbt.mystic.foundation.concrete.other.OtherLibrary -import lgbt.mystic.foundation.concrete.sample.common.logOnDisable -import lgbt.mystic.foundation.concrete.sample.common.logOnEnable -import org.bukkit.plugin.java.JavaPlugin - -class HelloWorldPlugin : JavaPlugin() { - override fun onEnable() { - logOnEnable(OtherLibrary.HELLO_WORLD) - } - - override fun onDisable() { - logOnDisable(OtherLibrary.HELLO_WORLD) - } -} diff --git a/samples/mixed/bukkit-plugins/hello-world/src/main/resources/plugin.yml b/samples/mixed/bukkit-plugins/hello-world/src/main/resources/plugin.yml index 3eadd8a..def2bbc 100644 --- a/samples/mixed/bukkit-plugins/hello-world/src/main/resources/plugin.yml +++ b/samples/mixed/bukkit-plugins/hello-world/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: HelloWorld version: '${version}' -main: lgbt.mystic.foundation.concrete.sample.helloworld.HelloWorldPlugin +main: gay.pizza.foundation.concrete.sample.helloworld.HelloWorldPlugin api-version: 1.18 prefix: HelloWorld load: STARTUP diff --git a/samples/mixed/gradle/wrapper/gradle-wrapper.properties b/samples/mixed/gradle/wrapper/gradle-wrapper.properties index ae04661..f42e62f 100644 --- a/samples/mixed/gradle/wrapper/gradle-wrapper.properties +++ b/samples/mixed/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/samples/mixed/other-library/build.gradle.kts b/samples/mixed/other-library/build.gradle.kts index 9944a7a..0cc335a 100644 --- a/samples/mixed/other-library/build.gradle.kts +++ b/samples/mixed/other-library/build.gradle.kts @@ -1,3 +1,3 @@ plugins { - id("lgbt.mystic.foundation.concrete-base") + id("gay.pizza.foundation.concrete-base") } diff --git a/samples/mixed/other-library/src/main/java/lgbt/mystic/foundation/concrete/other/OtherLibrary.java b/samples/mixed/other-library/src/main/java/gay/pizza/foundation/concrete/other/OtherLibrary.java similarity index 65% rename from samples/mixed/other-library/src/main/java/lgbt/mystic/foundation/concrete/other/OtherLibrary.java rename to samples/mixed/other-library/src/main/java/gay/pizza/foundation/concrete/other/OtherLibrary.java index 1327d68..8b560b5 100644 --- a/samples/mixed/other-library/src/main/java/lgbt/mystic/foundation/concrete/other/OtherLibrary.java +++ b/samples/mixed/other-library/src/main/java/gay/pizza/foundation/concrete/other/OtherLibrary.java @@ -1,4 +1,4 @@ -package lgbt.mystic.foundation.concrete.other; +package gay.pizza.foundation.concrete.other; public class OtherLibrary { public static final String HELLO_WORLD = "Hello World"; diff --git a/samples/shared/build.gradle.kts b/samples/shared/build.gradle.kts index 92042b1..861459a 100644 --- a/samples/shared/build.gradle.kts +++ b/samples/shared/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("lgbt.mystic.foundation.concrete-root") - id("lgbt.mystic.foundation.concrete-plugin") + id("gay.pizza.foundation.concrete-root") + id("gay.pizza.foundation.concrete-plugin") } concrete { diff --git a/samples/shared/gradle/wrapper/gradle-wrapper.properties b/samples/shared/gradle/wrapper/gradle-wrapper.properties index ae04661..f42e62f 100644 --- a/samples/shared/gradle/wrapper/gradle-wrapper.properties +++ b/samples/shared/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/samples/simple/hello-world/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt b/samples/shared/src/main/kotlin/gay/pizza/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt similarity index 80% rename from samples/simple/hello-world/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt rename to samples/shared/src/main/kotlin/gay/pizza/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt index 83f7164..d048638 100644 --- a/samples/simple/hello-world/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt +++ b/samples/shared/src/main/kotlin/gay/pizza/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt @@ -1,4 +1,4 @@ -package lgbt.mystic.foundation.concrete.sample.helloworld +package gay.pizza.foundation.concrete.sample.helloworld import org.bukkit.plugin.java.JavaPlugin diff --git a/samples/shared/src/main/resources/plugin.yml b/samples/shared/src/main/resources/plugin.yml index 3eadd8a..def2bbc 100644 --- a/samples/shared/src/main/resources/plugin.yml +++ b/samples/shared/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: HelloWorld version: '${version}' -main: lgbt.mystic.foundation.concrete.sample.helloworld.HelloWorldPlugin +main: gay.pizza.foundation.concrete.sample.helloworld.HelloWorldPlugin api-version: 1.18 prefix: HelloWorld load: STARTUP diff --git a/samples/simple/build.gradle.kts b/samples/simple/build.gradle.kts index a805738..2c9fac4 100644 --- a/samples/simple/build.gradle.kts +++ b/samples/simple/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("lgbt.mystic.foundation.concrete-root") + id("gay.pizza.foundation.concrete-root") } concrete { diff --git a/samples/simple/gradle/wrapper/gradle-wrapper.properties b/samples/simple/gradle/wrapper/gradle-wrapper.properties index ae04661..f42e62f 100644 --- a/samples/simple/gradle/wrapper/gradle-wrapper.properties +++ b/samples/simple/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/samples/simple/hello-world/build.gradle.kts b/samples/simple/hello-world/build.gradle.kts index af92cdf..74694ce 100644 --- a/samples/simple/hello-world/build.gradle.kts +++ b/samples/simple/hello-world/build.gradle.kts @@ -1,3 +1,3 @@ plugins { - id("lgbt.mystic.foundation.concrete-plugin") + id("gay.pizza.foundation.concrete-plugin") } diff --git a/samples/shared/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt b/samples/simple/hello-world/src/main/kotlin/gay/pizza/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt similarity index 80% rename from samples/shared/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt rename to samples/simple/hello-world/src/main/kotlin/gay/pizza/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt index 83f7164..d048638 100644 --- a/samples/shared/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt +++ b/samples/simple/hello-world/src/main/kotlin/gay/pizza/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt @@ -1,4 +1,4 @@ -package lgbt.mystic.foundation.concrete.sample.helloworld +package gay.pizza.foundation.concrete.sample.helloworld import org.bukkit.plugin.java.JavaPlugin diff --git a/samples/simple/hello-world/src/main/resources/plugin.yml b/samples/simple/hello-world/src/main/resources/plugin.yml index 3eadd8a..def2bbc 100644 --- a/samples/simple/hello-world/src/main/resources/plugin.yml +++ b/samples/simple/hello-world/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: HelloWorld version: '${version}' -main: lgbt.mystic.foundation.concrete.sample.helloworld.HelloWorldPlugin +main: gay.pizza.foundation.concrete.sample.helloworld.HelloWorldPlugin api-version: 1.18 prefix: HelloWorld load: STARTUP diff --git a/src/main/kotlin/lgbt/mystic/foundation/concrete/ConcreteBaseBukkitPlugin.kt b/src/main/kotlin/gay/pizza/foundation/concrete/ConcreteBaseBukkitPlugin.kt similarity index 93% rename from src/main/kotlin/lgbt/mystic/foundation/concrete/ConcreteBaseBukkitPlugin.kt rename to src/main/kotlin/gay/pizza/foundation/concrete/ConcreteBaseBukkitPlugin.kt index 849cbb5..600c818 100644 --- a/src/main/kotlin/lgbt/mystic/foundation/concrete/ConcreteBaseBukkitPlugin.kt +++ b/src/main/kotlin/gay/pizza/foundation/concrete/ConcreteBaseBukkitPlugin.kt @@ -1,4 +1,4 @@ -package lgbt.mystic.foundation.concrete +package gay.pizza.foundation.concrete import org.gradle.api.Project import org.gradle.kotlin.dsl.repositories diff --git a/src/main/kotlin/lgbt/mystic/foundation/concrete/ConcreteBasePlugin.kt b/src/main/kotlin/gay/pizza/foundation/concrete/ConcreteBasePlugin.kt similarity index 96% rename from src/main/kotlin/lgbt/mystic/foundation/concrete/ConcreteBasePlugin.kt rename to src/main/kotlin/gay/pizza/foundation/concrete/ConcreteBasePlugin.kt index ab32cdc..bfeaa6e 100644 --- a/src/main/kotlin/lgbt/mystic/foundation/concrete/ConcreteBasePlugin.kt +++ b/src/main/kotlin/gay/pizza/foundation/concrete/ConcreteBasePlugin.kt @@ -1,4 +1,4 @@ -package lgbt.mystic.foundation.concrete +package gay.pizza.foundation.concrete import org.gradle.api.JavaVersion import org.gradle.api.Plugin diff --git a/src/main/kotlin/lgbt/mystic/foundation/concrete/ConcreteExtension.kt b/src/main/kotlin/gay/pizza/foundation/concrete/ConcreteExtension.kt similarity index 85% rename from src/main/kotlin/lgbt/mystic/foundation/concrete/ConcreteExtension.kt rename to src/main/kotlin/gay/pizza/foundation/concrete/ConcreteExtension.kt index 8cee80a..929a517 100644 --- a/src/main/kotlin/lgbt/mystic/foundation/concrete/ConcreteExtension.kt +++ b/src/main/kotlin/gay/pizza/foundation/concrete/ConcreteExtension.kt @@ -1,4 +1,4 @@ -package lgbt.mystic.foundation.concrete +package gay.pizza.foundation.concrete import org.gradle.api.provider.Property diff --git a/src/main/kotlin/lgbt/mystic/foundation/concrete/ConcreteLibraryPlugin.kt b/src/main/kotlin/gay/pizza/foundation/concrete/ConcreteLibraryPlugin.kt similarity index 59% rename from src/main/kotlin/lgbt/mystic/foundation/concrete/ConcreteLibraryPlugin.kt rename to src/main/kotlin/gay/pizza/foundation/concrete/ConcreteLibraryPlugin.kt index fb41b76..faf8e8f 100644 --- a/src/main/kotlin/lgbt/mystic/foundation/concrete/ConcreteLibraryPlugin.kt +++ b/src/main/kotlin/gay/pizza/foundation/concrete/ConcreteLibraryPlugin.kt @@ -1,3 +1,3 @@ -package lgbt.mystic.foundation.concrete +package gay.pizza.foundation.concrete class ConcreteLibraryPlugin : ConcreteBaseBukkitPlugin() diff --git a/src/main/kotlin/lgbt/mystic/foundation/concrete/ConcretePluginPlugin.kt b/src/main/kotlin/gay/pizza/foundation/concrete/ConcretePluginPlugin.kt similarity index 95% rename from src/main/kotlin/lgbt/mystic/foundation/concrete/ConcretePluginPlugin.kt rename to src/main/kotlin/gay/pizza/foundation/concrete/ConcretePluginPlugin.kt index 1de4234..22bd89f 100644 --- a/src/main/kotlin/lgbt/mystic/foundation/concrete/ConcretePluginPlugin.kt +++ b/src/main/kotlin/gay/pizza/foundation/concrete/ConcretePluginPlugin.kt @@ -1,4 +1,4 @@ -package lgbt.mystic.foundation.concrete +package gay.pizza.foundation.concrete import org.gradle.api.Project import org.gradle.kotlin.dsl.get diff --git a/src/main/kotlin/lgbt/mystic/foundation/concrete/ConcreteRootPlugin.kt b/src/main/kotlin/gay/pizza/foundation/concrete/ConcreteRootPlugin.kt similarity index 94% rename from src/main/kotlin/lgbt/mystic/foundation/concrete/ConcreteRootPlugin.kt rename to src/main/kotlin/gay/pizza/foundation/concrete/ConcreteRootPlugin.kt index e17518d..74fe2dc 100644 --- a/src/main/kotlin/lgbt/mystic/foundation/concrete/ConcreteRootPlugin.kt +++ b/src/main/kotlin/gay/pizza/foundation/concrete/ConcreteRootPlugin.kt @@ -1,4 +1,4 @@ -package lgbt.mystic.foundation.concrete +package gay.pizza.foundation.concrete import org.gradle.api.Plugin import org.gradle.api.Project diff --git a/src/main/kotlin/lgbt/mystic/foundation/concrete/Globals.kt b/src/main/kotlin/gay/pizza/foundation/concrete/Globals.kt similarity index 63% rename from src/main/kotlin/lgbt/mystic/foundation/concrete/Globals.kt rename to src/main/kotlin/gay/pizza/foundation/concrete/Globals.kt index b952fb8..683fd8c 100644 --- a/src/main/kotlin/lgbt/mystic/foundation/concrete/Globals.kt +++ b/src/main/kotlin/gay/pizza/foundation/concrete/Globals.kt @@ -1,4 +1,4 @@ -package lgbt.mystic.foundation.concrete +package gay.pizza.foundation.concrete import com.google.gson.Gson diff --git a/src/main/kotlin/lgbt/mystic/foundation/concrete/PaperVersionClient.kt b/src/main/kotlin/gay/pizza/foundation/concrete/PaperVersionClient.kt similarity index 96% rename from src/main/kotlin/lgbt/mystic/foundation/concrete/PaperVersionClient.kt rename to src/main/kotlin/gay/pizza/foundation/concrete/PaperVersionClient.kt index d2ea7c8..167e521 100644 --- a/src/main/kotlin/lgbt/mystic/foundation/concrete/PaperVersionClient.kt +++ b/src/main/kotlin/gay/pizza/foundation/concrete/PaperVersionClient.kt @@ -1,4 +1,4 @@ -package lgbt.mystic.foundation.concrete +package gay.pizza.foundation.concrete import com.google.gson.Gson import java.net.URI diff --git a/src/main/kotlin/lgbt/mystic/foundation/concrete/RunPaperServer.kt b/src/main/kotlin/gay/pizza/foundation/concrete/RunPaperServer.kt similarity index 96% rename from src/main/kotlin/lgbt/mystic/foundation/concrete/RunPaperServer.kt rename to src/main/kotlin/gay/pizza/foundation/concrete/RunPaperServer.kt index c0dbfad..7cd3ab4 100644 --- a/src/main/kotlin/lgbt/mystic/foundation/concrete/RunPaperServer.kt +++ b/src/main/kotlin/gay/pizza/foundation/concrete/RunPaperServer.kt @@ -1,4 +1,4 @@ -package lgbt.mystic.foundation.concrete +package gay.pizza.foundation.concrete import org.gradle.api.DefaultTask import org.gradle.api.tasks.Input diff --git a/src/main/kotlin/lgbt/mystic/foundation/concrete/SetupPaperServer.kt b/src/main/kotlin/gay/pizza/foundation/concrete/SetupPaperServer.kt similarity index 98% rename from src/main/kotlin/lgbt/mystic/foundation/concrete/SetupPaperServer.kt rename to src/main/kotlin/gay/pizza/foundation/concrete/SetupPaperServer.kt index b0742fa..09176db 100644 --- a/src/main/kotlin/lgbt/mystic/foundation/concrete/SetupPaperServer.kt +++ b/src/main/kotlin/gay/pizza/foundation/concrete/SetupPaperServer.kt @@ -1,4 +1,4 @@ -package lgbt.mystic.foundation.concrete +package gay.pizza.foundation.concrete import org.gradle.api.DefaultTask import org.gradle.api.tasks.Input diff --git a/src/main/kotlin/lgbt/mystic/foundation/concrete/SmartDownloader.kt b/src/main/kotlin/gay/pizza/foundation/concrete/SmartDownloader.kt similarity index 98% rename from src/main/kotlin/lgbt/mystic/foundation/concrete/SmartDownloader.kt rename to src/main/kotlin/gay/pizza/foundation/concrete/SmartDownloader.kt index 6116338..8875d58 100644 --- a/src/main/kotlin/lgbt/mystic/foundation/concrete/SmartDownloader.kt +++ b/src/main/kotlin/gay/pizza/foundation/concrete/SmartDownloader.kt @@ -1,4 +1,4 @@ -package lgbt.mystic.foundation.concrete +package gay.pizza.foundation.concrete import java.net.URI import java.nio.file.Files diff --git a/src/main/kotlin/lgbt/mystic/foundation/concrete/UpdateManifestTask.kt b/src/main/kotlin/gay/pizza/foundation/concrete/UpdateManifestTask.kt similarity index 96% rename from src/main/kotlin/lgbt/mystic/foundation/concrete/UpdateManifestTask.kt rename to src/main/kotlin/gay/pizza/foundation/concrete/UpdateManifestTask.kt index eaebf7b..7cf41cb 100644 --- a/src/main/kotlin/lgbt/mystic/foundation/concrete/UpdateManifestTask.kt +++ b/src/main/kotlin/gay/pizza/foundation/concrete/UpdateManifestTask.kt @@ -1,4 +1,4 @@ -package lgbt.mystic.foundation.concrete +package gay.pizza.foundation.concrete import org.gradle.api.DefaultTask import org.gradle.api.tasks.TaskAction diff --git a/src/main/kotlin/lgbt/mystic/foundation/concrete/extensions.kt b/src/main/kotlin/gay/pizza/foundation/concrete/extensions.kt similarity index 98% rename from src/main/kotlin/lgbt/mystic/foundation/concrete/extensions.kt rename to src/main/kotlin/gay/pizza/foundation/concrete/extensions.kt index 0448c93..1f951b8 100644 --- a/src/main/kotlin/lgbt/mystic/foundation/concrete/extensions.kt +++ b/src/main/kotlin/gay/pizza/foundation/concrete/extensions.kt @@ -1,4 +1,4 @@ -package lgbt.mystic.foundation.concrete +package gay.pizza.foundation.concrete import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.api.Project