diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..58ad8b1 --- /dev/null +++ b/.classpath @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/.kotlin/sessions/kotlin-compiler-17222474266913412287.salive b/.kotlin/sessions/kotlin-compiler-17222474266913412287.salive deleted file mode 100644 index e69de29..0000000 diff --git a/.project b/.project new file mode 100644 index 0000000..765ab9b --- /dev/null +++ b/.project @@ -0,0 +1,34 @@ + + + civil-core-civilcore + Project civilcore created by Buildship. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + + + 1745013535336 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000..8fc1399 --- /dev/null +++ b/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,13 @@ +arguments=--init-script /home/hex/.cache/jdtls/config/org.eclipse.osgi/248/0/.cp/gradle/init/init.gradle +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) +connection.project.dir= +eclipse.preferences.version=1 +gradle.user.home= +java.home=/opt/openjdk-bin-21.0.6_p7 +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true diff --git a/bin/main/paper-plugin.yml b/bin/main/paper-plugin.yml new file mode 100644 index 0000000..3f63ddd --- /dev/null +++ b/bin/main/paper-plugin.yml @@ -0,0 +1,7 @@ +api-version: "1.21" +name: civil-core +version: 0.1.0 +main: rip.iwakura.civil.Core +authors: + - hex + - grng diff --git a/bin/main/rip/iwakura/civil/Core.class b/bin/main/rip/iwakura/civil/Core.class new file mode 100644 index 0000000..98b6222 Binary files /dev/null and b/bin/main/rip/iwakura/civil/Core.class differ diff --git a/build.gradle.kts b/build.gradle.kts index 59b73a7..59ec723 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,6 @@ version = "0.1.0" plugins { java - kotlin("jvm") version "2.1.10" id("com.github.johnrengelman.shadow") version "7.1.2" id("de.eldoria.plugin-yml.paper") version "0.7.1" } @@ -22,13 +21,18 @@ paper { apiVersion = "1.21" } +tasks.withType { + val isDebug = providers.gradleProperty("isDebug") + if (isDebug.isPresent()) { + destinationDirectory.set(file(isDebug)) + } +} dependencies { compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT") library("com.google.code.gson", "gson", "2.10.1") // All platform plugins - shadow("org.jetbrains.kotlin:kotlin-stdlib:2.1.10") } -kotlin { - jvmToolchain(21) +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(21)) } diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..5e2b430 --- /dev/null +++ b/build.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +catch () { + echo "An error occured: see above." + exit 1 +} + +./gradlew build -PisDebug=./server/plugins || catch + +cd server && java -jar server.jar -nogui && cd .. diff --git a/kls_database.db b/kls_database.db index 34efb92..4fd9015 100644 Binary files a/kls_database.db and b/kls_database.db differ diff --git a/src/main/java/rip/iwakura/civil/Core.java b/src/main/java/rip/iwakura/civil/Core.java new file mode 100644 index 0000000..b5cdd84 --- /dev/null +++ b/src/main/java/rip/iwakura/civil/Core.java @@ -0,0 +1,10 @@ +package rip.iwakura.civil; + +import org.bukkit.plugin.java.JavaPlugin; + +public class Core extends JavaPlugin { + @Override + public void onEnable() { + getLogger().info("Hello world! We are booting up..."); + } +} diff --git a/src/main/kotlin/rip/iwakura/civil/Core.kt b/src/main/kotlin/rip/iwakura/civil/Core.kt deleted file mode 100644 index 73b8775..0000000 --- a/src/main/kotlin/rip/iwakura/civil/Core.kt +++ /dev/null @@ -1,9 +0,0 @@ -package rip.iwakura.civil - -import org.bukkit.plugin.java.JavaPlugin - -class Core: JavaPlugin() { - override fun onEnable() { - logger.info { "Hello there! We are booting up..." } - } -}