diff --git a/build.gradle b/build.gradle index 0eccad1..65ef80b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,24 +1,50 @@ plugins { - id 'java' + id "java" + id "org.jetbrains.kotlin.jvm" version "1.9.0" + id "com.github.johnrengelman.shadow" version "7.1.2" } -group = 'dev.mikchan.mcnp' -version = '0.0.1' +if (hasProperty("buildScan")) { + buildScan { + termsOfServiceUrl = "https://gradle.com/terms-of-service" + termsOfServiceAgree = "yes" + } +} + +static def determineVersion(String defaultVersion) { + def envVersion = System.getenv("VERSION") + return envVersion == null ? defaultVersion : envVersion +} + +group = "dev.mikchan.mcnp" +version = determineVersion("0.0.1") repositories { mavenCentral() + maven { name = "spigotmc-repo" url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" } + maven { name = "sonatype" url = "https://oss.sonatype.org/content/groups/public/" } + + maven { + name = "aikar" + url = "https://repo.aikar.co/content/groups/aikar/" + } } dependencies { -compileOnly "org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT" + compileOnly "org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT" + + implementation "org.jetbrains.kotlin:kotlin-stdlib:1.9.0" + + implementation "co.aikar:acf-paper:0.5.1-SNAPSHOT" + shadow "co.aikar:acf-paper:0.5.1-SNAPSHOT" } def targetJavaVersion = 17 @@ -40,8 +66,29 @@ tasks.withType(JavaCompile).configureEach { processResources { def props = [version: version] inputs.properties props - filteringCharset 'UTF-8' - filesMatching('plugin.yml') { + filteringCharset "UTF-8" + filesMatching("plugin.yml") { expand props } } +compileKotlin { + kotlinOptions { + jvmTarget = "1.8" + } +} +compileTestKotlin { + kotlinOptions { + jvmTarget = "1.8" + } +} + +shadowJar { + archiveClassifier.set(null) + + dependencies { + include(dependency("co.aikar:acf-paper")) + } + + relocate "co.aikar.commands", "dev.mikchan.mcns.utility.shadow.co.aikar.commands" + relocate "co.aikar.locales", "dev.mikchan.mcns.utility.shadow.co.aikar.locales" +} diff --git a/encoder/.gitignore b/encoder/.gitignore new file mode 100644 index 0000000..2eea525 --- /dev/null +++ b/encoder/.gitignore @@ -0,0 +1 @@ +.env \ No newline at end of file diff --git a/encoder/bad_apple.py b/encoder/bad_apple.py index 60701ae..f73829c 100644 --- a/encoder/bad_apple.py +++ b/encoder/bad_apple.py @@ -3,7 +3,7 @@ import numpy as np # ffmpeg -i [input] -filter:v fps=fps=20 %0d.bmp -DATA_PATH = "D:\\BadApple" +DATA_PATH = "" IDEAL_HEIGHT = 20 IDEAL_WIDTH = round(20 / 1080 * 1440) diff --git a/encoder/requirements.txt b/encoder/requirements.txt new file mode 100644 index 0000000..8bb7f83 --- /dev/null +++ b/encoder/requirements.txt @@ -0,0 +1,2 @@ +numpy==1.25.1 +opencv-python==4.8.0.74 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 02f683e..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/main/java/dev/mikchan/mcnp/badapple/MikChanNoBadApple.java b/src/main/java/dev/mikchan/mcnp/badapple/MikChanNoBadApple.java deleted file mode 100644 index 8b52650..0000000 --- a/src/main/java/dev/mikchan/mcnp/badapple/MikChanNoBadApple.java +++ /dev/null @@ -1,17 +0,0 @@ -package dev.mikchan.mcnp.badapple; - -import org.bukkit.plugin.java.JavaPlugin; - -public final class MikChanNoBadApple extends JavaPlugin { - - @Override - public void onEnable() { - // Plugin startup logic - - } - - @Override - public void onDisable() { - // Plugin shutdown logic - } -} diff --git a/src/main/java/dev/mikchan/mcnp/badapple/MikChanNoBadApple.kt b/src/main/java/dev/mikchan/mcnp/badapple/MikChanNoBadApple.kt new file mode 100644 index 0000000..a70c1ab --- /dev/null +++ b/src/main/java/dev/mikchan/mcnp/badapple/MikChanNoBadApple.kt @@ -0,0 +1,14 @@ +package dev.mikchan.mcnp.badapple + +import org.bukkit.plugin.java.JavaPlugin + +@Suppress("unused") +class MikChanNoBadApple : JavaPlugin() { + override fun onEnable() { + logger.info("Plugin has started") + } + + override fun onDisable() { + logger.info("Bye!") + } +} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 0609d93..d16e062 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,4 +1,13 @@ name: MikChanNoBadApple version: '${version}' + +authors: [ 'George Endo (MikChan / wtlgo)' ] +description: Plays Bad Apple animation in the chat +website: https://github.com/BadApple + +prefix: MCnBadApple main: dev.mikchan.mcnp.badapple.MikChanNoBadApple api-version: '1.20' + +libraries: + - org.jetbrains.kotlin:kotlin-stdlib:1.9.0