Skip to content

Kotlin conversion #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tajobe wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Kotlin conversion #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6a32f15
Convert most of plugin to kotlin
tajobe Jul 4, 2021
1a7e8fb
Combine Breed and Descriptor classes and simplify fish info factory
tajobe Jul 4, 2021
8010f1c
Replace old config loading and update to spigot 1.17
tajobe Jul 18, 2021
4e5ffb5
Use gradle 7.4
tajobe Mar 14, 2022
cdf60d8
Bump kotlin, ktlint, shadow
tajobe Mar 14, 2022
2edf9a9
Update minimessage
tajobe Mar 14, 2022
54e9673
Update README for change to 1.17+
tajobe Mar 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# InterestingFish

**Compatible with Minecraft 1.13+ (Tested on Minecraft 1.18)**
**Compatible with Minecraft 1.17+ (Tested on Minecraft 1.18)**

This is a continuation / maintained version of the original plugin created by lazertester from Shotbow network.
The original has not been updated since 2013.
Expand Down
39 changes: 27 additions & 12 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id("java")
id("com.github.johnrengelman.shadow") version "7.1.0"
kotlin("jvm") version "1.6.10"
id("org.jlleitschuh.gradle.ktlint") version "10.2.1"
id("com.github.johnrengelman.shadow") version "7.1.2"
}

group = "net.shotbow"
version = "1.18"

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
languageVersion.set(JavaLanguageVersion.of(11))
}
}

Expand All @@ -21,14 +22,21 @@ repositories {
}

dependencies {
compileOnly(group = "org.spigotmc", name = "spigot-api", version = "1.13-R0.1-SNAPSHOT")
implementation(group = "net.kyori", name = "adventure-platform-bukkit", version = "4.0.1")
implementation(group = "net.kyori", name = "adventure-text-minimessage", version = "4.1.0-SNAPSHOT")
compileOnly(group = "org.spigotmc", name = "spigot-api", version = "1.17.1-R0.1-SNAPSHOT")
implementation(group = "net.kyori", name = "adventure-platform-bukkit", version = "4.1.0")
implementation(group = "net.kyori", name = "adventure-text-minimessage", version = "4.10.1")
implementation(group = "com.uchuhimo", name = "konf", version = "1.1.2")
runtimeOnly(kotlin("reflect"))
}

defaultTasks("clean", "build")

tasks {
wrapper {
gradleVersion = "7.4.1"
distributionType = Wrapper.DistributionType.ALL
}

processResources {
val placeholders = mapOf(
"name" to project.name,
Expand All @@ -45,16 +53,23 @@ tasks {
}

shadowJar {
dependencies {
include(dependency("net.kyori:.*"))
}

relocate("net.kyori", "${project.group}.${project.name.toLowerCase()}.libraries.net.kyori")

minimize()
archiveFileName.set("${project.name}.jar")
}

register<ConfigureShadowRelocation>("configureShadowRelocation") {
target = shadowJar.get()
prefix = "${project.group}.${project.name.toLowerCase()}.libraries"
build {
dependsOn(shadowJar)
}

build {
dependsOn(shadowJar).dependsOn("configureShadowRelocation")
withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "11"
}
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
178 changes: 89 additions & 89 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

72 changes: 0 additions & 72 deletions src/main/java/net/shotbow/interestingfish/FishInfoFactory.java
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions src/main/java/net/shotbow/interestingfish/InterestingFish.java
View file
Open in desktop

This file was deleted.

Loading