refactor: kotlin rewrite (#63)

Author: ybw0014

.editorconfig

@@ -15,8 +15,5 @@ trim_trailing_whitespace = false
 [{*.yml,*.json}]
 indent_size = 2
 
-[*.java]
-# Intellij IDEA settings
-ij_java_class_count_to_use_import_on_demand = 9999
-ij_java_imports_layout = |,java.**,|,javax.**,|,com.**,|,org.bukkit.**,|,io.**,|,me.**,|,net.**,|,*,|,$*
-ij_java_names_count_to_use_import_on_demand = 9999
+[*.json]
+indent_style = tab

.github/workflows/blob-build.yml

@@ -7,20 +7,33 @@ on:
 
 jobs:
   build:
-    if: startsWith(github.event.head_commit.message, '[CI skip]') == false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 21
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK ${{ vars.BUILDS_JAVA_VERSION }}
         uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: ${{ vars.BUILDS_JAVA_VERSION }}
           distribution: temurin
-      - name: Build with Maven
-        run: mvn package --file pom.xml
+
+      - name: Validate Gradle wrapper
+        uses: gradle/actions/wrapper-validation@v4
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Build with Gradle
+        run: ./gradlew clean shadowJar
+
+      - name: Rename jar file
+        run: mv build/libs/FastMachines-*.jar build/libs/FastMachines.jar
+
       - name: Upload to Blob Builds
         uses: WalshyDev/blob-builds/gh-action@main
         with:
           project: FastMachines
+          file: ./build/libs/FastMachines.jar
           apiToken: ${{ secrets.BLOB_BUILDS_API_TOKEN }}
           releaseNotes: ${{ github.event.head_commit.message }}

.github/workflows/ci.yml

@@ -0,0 +1,40 @@
+name: Java CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+
+      - name: Validate Gradle wrapper
+        uses: gradle/actions/wrapper-validation@v4
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Build with Gradle
+        run: ./gradlew clean shadowJar
+
+      - name: Get build artifact ready
+        run: mkdir staging && cp build/libs/*.jar staging
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: Preview Build (Do not report bugs for this build)
+          path: staging

.github/workflows/maven.yml

@@ -7,6 +7,11 @@
 
 # IntelliJ
 out/
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
 
 # Compiled class file
 *.class
@@ -95,19 +100,19 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-target/
+.gradle
+build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
 
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
+# Cache of project
+.gradletasknamecache
 
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-.mvn/wrapper/maven-wrapper.jar
-.flattened-pom.xml
+**/build/
 
 # Common working directory
 run/
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar

.gitignore

@@ -3,35 +3,23 @@
 [English](README.md) | [中文](README.zh_CN.md)
 
 This Slimefun addon extracts the manual machines from FinalTECH and made some changes to put them into a separate addon.  
-Fast machines are manual crafters that cost energy to run and can craft items without recipe to be in order. Also supports bulk crafting.
+Fast machines are manual crafters that cost energy to run and can craft items with all shapeless recipes and support bulk crafting.
 
 Credit: Final_Root
 
 ## Download
 
-Download from:
+Download from (either one is fine):
 
 - [Blob builds](https://blob.build/project/FastMachines)
 - [Guizhan Builds![Build Status](https://builds.guizhanss.com/ybw0014/FastMachines/master/badge.svg)](https://builds.guizhanss.com/ybw0014/FastMachines/master)
 
-This plugin supports [SlimefunTranslation](https://github.com/ybw0014/SlimefunTranslation) for per-player localization.
+## Supported plugins
 
-## Configuration
-
-### General Config (config.yml)
-
-- `auto-update`: Whether to enable auto update from builds page. (default: `true`)
-- `lang`: The language of the addon, check available languages [here](LOCALES.md). (default: `en-US`)
-- `enable-researches`: Whether to enable researches for fast machines. (default: `true`)
-- `debug`: Whether to enable debug mode. (default: `false`)
-- `fast-machines.use-energy`: Whether to enable energy cost of Fast Machines' crafting. (default: `true`)
-
-### Item-specific config (/plugins/Slimefun/Items.yml)
-
-The following settings are available for each individual Fast Machines (default settings may vary due to the original crafter's energy consumption):
-
-- `energy-per-use`: The energy cost of each crafting operation. (default: `8`, range: `0` - `2,147,483,647` (2^31-1))
-- `energy-capacity`: The energy capacity of the machine. (default: `1024`, range: `0` - `2,147,483,647` (2^31-1))
+- [SlimefunTranslation](https://github.com/ybw0014/SlimefunTranslation): per player localization.
+- [InfinityExpansion](https://github.com/Mooy1/InfinityExpansion): extra fast machines for Infinity Expansion.
+- [SlimeFrame](https://github.com/VoperAD/SlimeFrame): extra fast machines for SlimeFrame.
+- [InfinityExpansion2](https://github.com/ybw0014/InfinityExpansion2): extra fast machines for Infinity Expansion 2.
 
 ## Thanks
 

README.md

@@ -3,30 +3,20 @@
 [English](README.md) | [中文](README.zh_CN.md)
 
 该粘液科技附属将快速机器的玩法从[乱序技艺](https://github.com/ecro-fun/FinalTECH)中提取出来，并进行了一些改动，使其作为一个单独的附属。
-快捷机器是手动的消耗电力来进行合成的机器，无需将配方按顺序摆放，支持批量合成。
+快捷机器是手动的消耗电力来进行合成的机器，所有配方皆为无序配方，支持批量合成。
 
 鸣谢：Final_Root
 
 ## 下载
 
 [![Build Status](https://builds.guizhanss.com/ybw0014/FastMachines/master/badge.svg)](https://builds.guizhanss.com/ybw0014/FastMachines/master)
 
-## 配置
+## 支持的插件
 
-### 通用配置 (config.yml)
-
-- `auto-update`: 是否启用自动更新（默认值：`true`）
-- `lang`: 插件的语言，可在[此处](LOCALES.md)查看可用语言（默认值：`en-US`）
-- `enable-researches`: 是否启用快速机器的研究（默认值：`true`）
-- `debug`: 是否启用调试模式（默认值：`false`）
-- `fast-machines.use-energy`: 是否启用快捷机器的能量消耗（默认值：`true`）
-
-### 物品特定配置（/plugins/Slimefun/Items.yml）
-
-以下设置适用于每个独立的快捷机器（默认值可能因原合成机器的电力消耗而改变）：
-
-- `energy-per-use`：每次制作操作的电力消耗（默认值：`8`，范围：`0` - `2,147,483,647` (2^31-1)）
-- `energy-capacity`：机器可存储的电力（默认值：`8`，范围：`0` - `2,147,483,647` (2^31-1)）
+- [SlimefunTranslation](https://github.com/ybw0014/SlimefunTranslation): 为每位玩家显示不同的语言。
+- [InfinityExpansion](https://github.com/Mooy1/InfinityExpansion): 为无尽贪婪提供额外的快捷机器。
+- [SlimeFrame](https://github.com/VoperAD/SlimeFrame): 为粘液战甲提供额外的快捷机器。
+- [InfinityExpansion2](https://github.com/ybw0014/InfinityExpansion2): 为无尽贪婪2提供额外的快捷机器。
 
 ## 感谢
 

README.zh_CN.md

@@ -0,0 +1,109 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    kotlin("jvm") version "2.1.10"
+    id("com.gradleup.shadow") version "8.3.5"
+    id("net.minecrell.plugin-yml.bukkit") version "0.6.0"
+    id("xyz.jpenilla.run-paper") version "2.3.1"
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven("https://s01.oss.sonatype.org/content/groups/public/")
+    maven("https://repo.papermc.io/repository/maven-public/")
+    maven("https://repo.alessiodp.com/releases/")
+    maven("https://jitpack.io")
+}
+
+dependencies {
+    fun compileOnlyAndTestImpl(dependencyNotation: Any) {
+        compileOnly(dependencyNotation)
+        testImplementation(dependencyNotation)
+    }
+
+    compileOnly(kotlin("stdlib")) // loaded through library loader
+    compileOnly(kotlin("reflect")) // loaded through library loader
+    compileOnlyAndTestImpl("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT")
+    compileOnlyAndTestImpl("com.github.Slimefun:Slimefun4:3ea21da4fe")
+    compileOnly("net.guizhanss:SlimefunTranslation:e03b01a7b7")
+    compileOnly("com.github.schntgaispock:SlimeHUD:1.3.0")
+    compileOnly("com.github.SlimefunGuguProject:InfinityExpansion:bebf0bd0f9")
+    compileOnly("com.github.VoperAD:SlimeFrame:8af2379a01")
+    implementation("org.bstats:bstats-bukkit:3.1.0")
+    implementation("net.guizhanss:guizhanlib-all:2.3.0-SNAPSHOT")
+    implementation("net.guizhanss:guizhanlib-kt-all:0.1.0-SNAPSHOT")
+
+    testImplementation(kotlin("test"))
+    testImplementation("org.mockbukkit.mockbukkit:mockbukkit-v1.21:4.10.0")
+}
+
+group = "net.guizhanss"
+description = "FastMachines"
+
+val mainPackage = "net.guizhanss.fastmachines"
+
+java {
+    disableAutoTargetJvm()
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+kotlin {
+    compilerOptions {
+        javaParameters = true
+        jvmTarget = JvmTarget.JVM_17
+    }
+}
+
+tasks.shadowJar {
+    fun doRelocate(from: String, to: String? = null) {
+        val last = to ?: from.split(".").last()
+        relocate(from, "$mainPackage.libs.$last")
+    }
+
+    doRelocate("net.byteflux.libby")
+    doRelocate("net.guizhanss.guizhanlib")
+    doRelocate("org.bstats")
+    doRelocate("io.papermc.lib", "paperlib")
+    minimize()
+    archiveClassifier = ""
+}
+
+bukkit {
+    main = "$mainPackage.FastMachines"
+    apiVersion = "1.18"
+    authors = listOf("ybw0014")
+    description = "More Slimefun machines that bulk craft items with all shapeless recipes"
+    depend = listOf("Slimefun")
+    softDepend = listOf(
+        "GuizhanLibPlugin",
+        "SlimefunTranslation",
+        "InfinityExpansion",
+        "SlimeFrame",
+        "SlimeHUD",
+        "InfinityExpansion2",
+    )
+    loadBefore = listOf(
+        "SlimeCustomizer",
+        "RykenSlimeCustomizer",
+        "SlimeFunRecipe"
+    )
+}
+
+tasks.runServer {
+    downloadPlugins {
+        // Slimefun
+        url("https://blob.build/dl/Slimefun4/Dev/latest")
+        // SlimeHUD
+        url("https://blob.build/dl/SlimeHUD/Dev/latest")
+        // GuizhanCraft for testing convenient
+        url("https://builds.guizhanss.com/api/download/ybw0014/GuizhanCraft/master/latest")
+    }
+    jvmArgs("-Dcom.mojang.eula.agree=true")
+    minecraftVersion("1.20.6")
+}
+
+tasks.test {
+    useJUnitPlatform()
+}

build.gradle.kts

@@ -0,0 +1 @@
+version=UNOFFICIAL