diff --git a/.gitignore b/.gitignore index e569c07..af1d27c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ # log file *.log -# package files # +# package files *.jar *.war *.nar @@ -24,3 +24,6 @@ gradle-app.setting # intellij .idea/ + +# server +run/ diff --git a/build.gradle b/build.gradle deleted file mode 100644 index f1bf408..0000000 --- a/build.gradle +++ /dev/null @@ -1,52 +0,0 @@ -plugins { - id("java") - id("org.jetbrains.gradle.plugin.idea-ext") version "1.3" - id("xyz.jpenilla.run-velocity") version "3.0.0" -} - -group = 'com.uravgcode' -version = '1.0' - -repositories { - mavenCentral() - maven { - name = "papermc-repo" - url = "https://repo.papermc.io/repository/maven-public/" - } -} - -dependencies { - compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT") - annotationProcessor("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT") -} - -tasks { - runVelocity { - velocityVersion("3.4.0-SNAPSHOT") - } -} - -def targetJavaVersion = 21 -java { - toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) -} - -tasks.withType(JavaCompile).configureEach { - options.encoding = 'UTF-8' - options.release.set(targetJavaVersion) -} - -def templateSource = file('src/main/templates') -def templateDest = layout.buildDirectory.dir('generated/sources/templates') -def generateTemplates = tasks.register('generateTemplates', Copy) { task -> - def props = ['version': project.version] - task.inputs.properties props - - task.from templateSource - task.into templateDest - task.expand props -} - -sourceSets.main.java.srcDir(generateTemplates.map { it.outputs }) - -project.idea.project.settings.taskTriggers.afterSync generateTemplates diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..755edcd --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,45 @@ +plugins { + java + alias(libs.plugins.run.velocity) +} + +group = "com.uravgcode" +version = "1.0" + +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(21)) +} + +dependencies { + compileOnly(libs.velocity.api) + annotationProcessor(libs.velocity.api) +} + +tasks { + withType().configureEach { + options.encoding = "UTF-8" + options.release.set(21) + } + + runVelocity { + velocityVersion("3.4.0-SNAPSHOT") + } +} + +val templateSource = file("src/main/templates") +val templateDest = layout.buildDirectory.dir("generated/sources/templates") + +val generateTemplates by tasks.registering(Copy::class) { + val props = mapOf("version" to project.version) + inputs.properties(props) + + from(templateSource) + into(templateDest) + expand(props) +} + +sourceSets { + named("main") { + java.srcDir(generateTemplates.map { it.outputs }) + } +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..a1a5cb7 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,9 @@ +[versions] +velocity-api = "3.4.0-SNAPSHOT" +run-task = "3.0.2" + +[libraries] +velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "velocity-api" } + +[plugins] +run-velocity = { id = "xyz.jpenilla.run-velocity", version.ref = "run-task" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8bdaf60..f8e1ee3 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6a38a8c..49ab6fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index e42eb8c..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'global-whitelist' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..e1ce6fd --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,17 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + } +} + +@Suppress("UnstableApiUsage") +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + mavenCentral() + maven(uri("https://repo.papermc.io/repository/maven-public/")) + } +} + +rootProject.name = "global-whitelist"