From 7735f287917312fcbeda687321e0e6dbcc9344ad Mon Sep 17 00:00:00 2001
From: YufiriaMazenta <2199098065@qq.com>
Date: Sat, 17 Feb 2024 19:38:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E5=BC=83=E5=A4=9A=E6=A8=A1=E5=9D=97?=
=?UTF-8?q?=E4=BA=86,=E7=B1=BB=E5=85=B3=E7=B3=BB=E6=9C=89=E7=82=B9?=
=?UTF-8?q?=E9=9A=BE=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/build.gradle.kts | 0
build.gradle.kts | 87 ++++++++-----------
plugin/build.gradle.kts | 55 ------------
settings.gradle.kts | 4 +-
.../yufiria/craftorithm/Craftorithm.java | 0
.../yufiria/craftorithm/bstat/Metrics.java | 0
.../yufiria/craftorithm/item/ItemManager.java | 6 +-
.../craftorithm/item/ItemProvider.java | 0
.../item/impl/CraftorithmItemProvider.java | 0
.../item/impl/ItemsAdderItemProvider.java | 0
.../item/impl/MMOItemsItemProvider.java | 0
.../item/impl/MythicMobsItemProvider.java | 0
.../item/impl/NeigeItemsItemProvider.java | 0
.../item/impl/OraxenItemProvider.java | 0
.../craftorithm/util/CollectionsUtil.java | 0
.../yufiria/craftorithm/util/ItemUtils.java | 0
.../craftorithm/util/ScriptValueUtil.java | 0
.../yufiria/craftorithm/util/UpdateUtil.java | 0
{plugin/src => src}/main/resources/config.yml | 0
.../main/resources/data/custom_fuels.yml | 0
.../main/resources/data/disable_recipes.yml | 0
.../main/resources/data/example.yml | 0
.../resources/data/items/example_item.yml | 0
.../src => src}/main/resources/lang/de_de.yml | 0
.../src => src}/main/resources/lang/en_us.yml | 0
.../src => src}/main/resources/lang/fr_fr.yml | 0
.../src => src}/main/resources/lang/ja_jp.yml | 0
.../src => src}/main/resources/lang/ru_ru.yml | 0
.../src => src}/main/resources/lang/tr_tr.yml | 0
.../src => src}/main/resources/lang/zh_cn.yml | 0
.../src => src}/main/resources/lang/zh_hk.yml | 0
.../src => src}/main/resources/lang/zh_tw.yml | 0
{plugin/src => src}/main/resources/plugin.yml | 7 +-
33 files changed, 41 insertions(+), 118 deletions(-)
delete mode 100644 api/build.gradle.kts
delete mode 100644 plugin/build.gradle.kts
rename {plugin/src => src}/main/java/com/github/yufiria/craftorithm/Craftorithm.java (100%)
rename {plugin/src => src}/main/java/com/github/yufiria/craftorithm/bstat/Metrics.java (100%)
rename {plugin/src => src}/main/java/com/github/yufiria/craftorithm/item/ItemManager.java (98%)
rename {api/src => src}/main/java/com/github/yufiria/craftorithm/item/ItemProvider.java (100%)
rename {plugin/src => src}/main/java/com/github/yufiria/craftorithm/item/impl/CraftorithmItemProvider.java (100%)
rename {plugin/src => src}/main/java/com/github/yufiria/craftorithm/item/impl/ItemsAdderItemProvider.java (100%)
rename {plugin/src => src}/main/java/com/github/yufiria/craftorithm/item/impl/MMOItemsItemProvider.java (100%)
rename {plugin/src => src}/main/java/com/github/yufiria/craftorithm/item/impl/MythicMobsItemProvider.java (100%)
rename {plugin/src => src}/main/java/com/github/yufiria/craftorithm/item/impl/NeigeItemsItemProvider.java (100%)
rename {plugin/src => src}/main/java/com/github/yufiria/craftorithm/item/impl/OraxenItemProvider.java (100%)
rename {plugin/src => src}/main/java/com/github/yufiria/craftorithm/util/CollectionsUtil.java (100%)
rename {plugin/src => src}/main/java/com/github/yufiria/craftorithm/util/ItemUtils.java (100%)
rename {plugin/src => src}/main/java/com/github/yufiria/craftorithm/util/ScriptValueUtil.java (100%)
rename {plugin/src => src}/main/java/com/github/yufiria/craftorithm/util/UpdateUtil.java (100%)
rename {plugin/src => src}/main/resources/config.yml (100%)
rename {plugin/src => src}/main/resources/data/custom_fuels.yml (100%)
rename {plugin/src => src}/main/resources/data/disable_recipes.yml (100%)
rename {plugin/src => src}/main/resources/data/example.yml (100%)
rename {plugin/src => src}/main/resources/data/items/example_item.yml (100%)
rename {plugin/src => src}/main/resources/lang/de_de.yml (100%)
rename {plugin/src => src}/main/resources/lang/en_us.yml (100%)
rename {plugin/src => src}/main/resources/lang/fr_fr.yml (100%)
rename {plugin/src => src}/main/resources/lang/ja_jp.yml (100%)
rename {plugin/src => src}/main/resources/lang/ru_ru.yml (100%)
rename {plugin/src => src}/main/resources/lang/tr_tr.yml (100%)
rename {plugin/src => src}/main/resources/lang/zh_cn.yml (100%)
rename {plugin/src => src}/main/resources/lang/zh_hk.yml (100%)
rename {plugin/src => src}/main/resources/lang/zh_tw.yml (100%)
rename {plugin/src => src}/main/resources/plugin.yml (65%)
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
deleted file mode 100644
index e69de29b..00000000
diff --git a/build.gradle.kts b/build.gradle.kts
index f49b85e2..5cb546a3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,8 @@
+import java.text.SimpleDateFormat
+
version = "2.0.0-dev1"
-group = "com.github.yufiria.craftorithm"
+group = "com.github.yufiria"
+val crypticlibVersion = "0.16.0"
java.sourceCompatibility = JavaVersion.VERSION_1_8
java.targetCompatibility = JavaVersion.VERSION_1_8
var repositoryUrl = "http://repo.crypticlib.com:8081/repository/"
@@ -17,16 +20,36 @@ plugins {
repositories {
mavenLocal()
+ maven("https://oss.sonatype.org/content/groups/public/")
maven("http://repo.crypticlib.com:8081/repository/maven-public/") {
isAllowInsecureProtocol = true
}
+ maven("https://jitpack.io")
+ maven("https://repo.rosewooddev.io/repository/public/")
+ maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
+ maven("https://repo.maven.apache.org/maven2/")
+ maven("https://mvn.lumine.io/repository/maven-public/")
+ maven("https://r.irepo.space/maven/")
+ maven("https://repo.papermc.io/repository/maven-public/")
+ maven("https://nexus.phoenixdevt.fr/repository/maven-public/")
mavenCentral()
}
dependencies {
- implementation("com.crypticlib:CrypticLib:0.16.0")
- implementation(project(":api"))
- implementation(project(":plugin"))
+ implementation("com.crypticlib:CrypticLib:$crypticlibVersion")
+ compileOnly("org.jetbrains:annotations:24.0.1")
+ compileOnly("pers.neige.neigeitems:NeigeItems:1.15.113")
+ compileOnly("net.kyori:adventure-api:4.14.0")
+ compileOnly("com.github.MilkBowl:VaultAPI:1.7")
+ compileOnly("org.black_ixx:playerpoints:3.2.5")
+ compileOnly("net.luckperms:api:5.4")
+ compileOnly("me.clip:placeholderapi:2.11.1")
+ compileOnly("com.github.LoneDev6:API-ItemsAdder:3.5.0b")
+ compileOnly("com.github.oraxen:oraxen:1.160.0")
+ compileOnly("io.lumine:Mythic-Dist:5.3.5")
+ compileOnly("io.lumine:MythicLib-dist:1.6.2-SNAPSHOT")
+ compileOnly("net.Indyuce:MMOItems-API:6.9.5-SNAPSHOT")
+// compileOnly("io.papermc.paper:paper-api:1.20.4")
}
tasks {
@@ -40,6 +63,16 @@ tasks {
archiveFileName.set("Craftorithm-$version.jar")
relocate("crypticlib", "com.github.yufiria.craftorithm.crypticlib")
}
+ val props = HashMap<String, String>()
+ props["version"] = version.toString() + "-" + SimpleDateFormat("yyyyMMdd").format(System.currentTimeMillis())
+ processResources {
+ filesMatching("plugin.yml") {
+ expand(props)
+ }
+ filesMatching("config.yml") {
+ expand(props)
+ }
+ }
}
publishing {
@@ -59,50 +92,4 @@ publishing {
}
}
}
-}
-
-subprojects {
- apply(plugin = "java")
- apply(plugin = "maven-publish")
-
- repositories {
- mavenLocal()
- maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
- mavenCentral()
- }
-
- dependencies {
- compileOnly("org.jetbrains:annotations:24.0.1")
- compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT")
-
- }
-
- java.sourceCompatibility = JavaVersion.VERSION_1_8
- java.targetCompatibility = JavaVersion.VERSION_1_8
- version = rootProject.version
-
- tasks {
- compileJava {
- options.encoding = "UTF-8"
- }
- }
-
- publishing {
- publishing {
- publications.create<MavenPublication>("maven") {
- from(components["java"])
- groupId = rootProject.group as String?
- }
- repositories {
- maven {
- url = uri(repositoryUrl)
- isAllowInsecureProtocol = true
- credentials {
- username = project.findProperty("maven_username").toString()
- password = project.findProperty("maven_password").toString()
- }
- }
- }
- }
- }
}
\ No newline at end of file
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
deleted file mode 100644
index efb46266..00000000
--- a/plugin/build.gradle.kts
+++ /dev/null
@@ -1,55 +0,0 @@
-import java.text.SimpleDateFormat
-
-plugins {
- id("com.github.johnrengelman.shadow").version("7.1.2")
-}
-
-repositories {
- maven("https://oss.sonatype.org/content/groups/public/")
- maven("http://repo.crypticlib.com:8081/repository/maven-public/") {
- isAllowInsecureProtocol = true
- }
- maven("https://jitpack.io")
- maven("https://repo.rosewooddev.io/repository/public/")
- maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
- maven("https://repo.maven.apache.org/maven2/")
- maven("https://mvn.lumine.io/repository/maven-public/")
- maven("https://r.irepo.space/maven/")
- maven("https://repo.papermc.io/repository/maven-public/")
- maven("https://nexus.phoenixdevt.fr/repository/maven-public/")
-}
-
-dependencies {
-// compileOnly("io.papermc.paper:paper-api:1.20.4")
- compileOnly("pers.neige.neigeitems:NeigeItems:1.15.113")
- compileOnly("net.kyori:adventure-api:4.14.0")
- compileOnly("com.github.MilkBowl:VaultAPI:1.7")
- compileOnly("org.black_ixx:playerpoints:3.2.5")
- compileOnly("net.luckperms:api:5.4")
- compileOnly("me.clip:placeholderapi:2.11.1")
- compileOnly("com.github.LoneDev6:API-ItemsAdder:3.5.0b")
- compileOnly("com.github.oraxen:oraxen:1.160.0")
- compileOnly("io.lumine:Mythic-Dist:5.3.5")
- compileOnly("io.lumine:MythicLib-dist:1.6.2-SNAPSHOT")
- compileOnly("net.Indyuce:MMOItems-API:6.9.5-SNAPSHOT")
- compileOnly("com.crypticlib:CrypticLib:0.16.0")
- compileOnly(project(":api"))
-}
-
-tasks {
- val props = HashMap<String, String>()
- props["version"] = version.toString() + "-" + SimpleDateFormat("yyyyMMdd").format(System.currentTimeMillis())
- processResources {
- filesMatching("plugin.yml") {
- expand(props)
- }
- filesMatching("config.yml") {
- expand(props)
- }
- }
- shadowJar {
- archiveFileName.set("Craftorithm-$version.jar")
- relocate("crypticlib", "com.github.yufiria.craftorithm.crypticlib")
- }
-}
-
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 415d2a36..eb222386 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,3 +1 @@
-rootProject.name = "Craftorithm"
-include("api")
-include("plugin")
+rootProject.name = "Craftorithm"
\ No newline at end of file
diff --git a/plugin/src/main/java/com/github/yufiria/craftorithm/Craftorithm.java b/src/main/java/com/github/yufiria/craftorithm/Craftorithm.java
similarity index 100%
rename from plugin/src/main/java/com/github/yufiria/craftorithm/Craftorithm.java
rename to src/main/java/com/github/yufiria/craftorithm/Craftorithm.java
diff --git a/plugin/src/main/java/com/github/yufiria/craftorithm/bstat/Metrics.java b/src/main/java/com/github/yufiria/craftorithm/bstat/Metrics.java
similarity index 100%
rename from plugin/src/main/java/com/github/yufiria/craftorithm/bstat/Metrics.java
rename to src/main/java/com/github/yufiria/craftorithm/bstat/Metrics.java
diff --git a/plugin/src/main/java/com/github/yufiria/craftorithm/item/ItemManager.java b/src/main/java/com/github/yufiria/craftorithm/item/ItemManager.java
similarity index 98%
rename from plugin/src/main/java/com/github/yufiria/craftorithm/item/ItemManager.java
rename to src/main/java/com/github/yufiria/craftorithm/item/ItemManager.java
index 97ae44b6..c3cb3c6f 100644
--- a/plugin/src/main/java/com/github/yufiria/craftorithm/item/ItemManager.java
+++ b/src/main/java/com/github/yufiria/craftorithm/item/ItemManager.java
@@ -6,6 +6,7 @@
import crypticlib.config.ConfigWrapper;
import crypticlib.util.ItemUtil;
import crypticlib.util.MaterialUtil;
+import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.configuration.ConfigurationSection;
@@ -14,10 +15,7 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
public enum ItemManager {
diff --git a/api/src/main/java/com/github/yufiria/craftorithm/item/ItemProvider.java b/src/main/java/com/github/yufiria/craftorithm/item/ItemProvider.java
similarity index 100%
rename from api/src/main/java/com/github/yufiria/craftorithm/item/ItemProvider.java
rename to src/main/java/com/github/yufiria/craftorithm/item/ItemProvider.java
diff --git a/plugin/src/main/java/com/github/yufiria/craftorithm/item/impl/CraftorithmItemProvider.java b/src/main/java/com/github/yufiria/craftorithm/item/impl/CraftorithmItemProvider.java
similarity index 100%
rename from plugin/src/main/java/com/github/yufiria/craftorithm/item/impl/CraftorithmItemProvider.java
rename to src/main/java/com/github/yufiria/craftorithm/item/impl/CraftorithmItemProvider.java
diff --git a/plugin/src/main/java/com/github/yufiria/craftorithm/item/impl/ItemsAdderItemProvider.java b/src/main/java/com/github/yufiria/craftorithm/item/impl/ItemsAdderItemProvider.java
similarity index 100%
rename from plugin/src/main/java/com/github/yufiria/craftorithm/item/impl/ItemsAdderItemProvider.java
rename to src/main/java/com/github/yufiria/craftorithm/item/impl/ItemsAdderItemProvider.java
diff --git a/plugin/src/main/java/com/github/yufiria/craftorithm/item/impl/MMOItemsItemProvider.java b/src/main/java/com/github/yufiria/craftorithm/item/impl/MMOItemsItemProvider.java
similarity index 100%
rename from plugin/src/main/java/com/github/yufiria/craftorithm/item/impl/MMOItemsItemProvider.java
rename to src/main/java/com/github/yufiria/craftorithm/item/impl/MMOItemsItemProvider.java
diff --git a/plugin/src/main/java/com/github/yufiria/craftorithm/item/impl/MythicMobsItemProvider.java b/src/main/java/com/github/yufiria/craftorithm/item/impl/MythicMobsItemProvider.java
similarity index 100%
rename from plugin/src/main/java/com/github/yufiria/craftorithm/item/impl/MythicMobsItemProvider.java
rename to src/main/java/com/github/yufiria/craftorithm/item/impl/MythicMobsItemProvider.java
diff --git a/plugin/src/main/java/com/github/yufiria/craftorithm/item/impl/NeigeItemsItemProvider.java b/src/main/java/com/github/yufiria/craftorithm/item/impl/NeigeItemsItemProvider.java
similarity index 100%
rename from plugin/src/main/java/com/github/yufiria/craftorithm/item/impl/NeigeItemsItemProvider.java
rename to src/main/java/com/github/yufiria/craftorithm/item/impl/NeigeItemsItemProvider.java
diff --git a/plugin/src/main/java/com/github/yufiria/craftorithm/item/impl/OraxenItemProvider.java b/src/main/java/com/github/yufiria/craftorithm/item/impl/OraxenItemProvider.java
similarity index 100%
rename from plugin/src/main/java/com/github/yufiria/craftorithm/item/impl/OraxenItemProvider.java
rename to src/main/java/com/github/yufiria/craftorithm/item/impl/OraxenItemProvider.java
diff --git a/plugin/src/main/java/com/github/yufiria/craftorithm/util/CollectionsUtil.java b/src/main/java/com/github/yufiria/craftorithm/util/CollectionsUtil.java
similarity index 100%
rename from plugin/src/main/java/com/github/yufiria/craftorithm/util/CollectionsUtil.java
rename to src/main/java/com/github/yufiria/craftorithm/util/CollectionsUtil.java
diff --git a/plugin/src/main/java/com/github/yufiria/craftorithm/util/ItemUtils.java b/src/main/java/com/github/yufiria/craftorithm/util/ItemUtils.java
similarity index 100%
rename from plugin/src/main/java/com/github/yufiria/craftorithm/util/ItemUtils.java
rename to src/main/java/com/github/yufiria/craftorithm/util/ItemUtils.java
diff --git a/plugin/src/main/java/com/github/yufiria/craftorithm/util/ScriptValueUtil.java b/src/main/java/com/github/yufiria/craftorithm/util/ScriptValueUtil.java
similarity index 100%
rename from plugin/src/main/java/com/github/yufiria/craftorithm/util/ScriptValueUtil.java
rename to src/main/java/com/github/yufiria/craftorithm/util/ScriptValueUtil.java
diff --git a/plugin/src/main/java/com/github/yufiria/craftorithm/util/UpdateUtil.java b/src/main/java/com/github/yufiria/craftorithm/util/UpdateUtil.java
similarity index 100%
rename from plugin/src/main/java/com/github/yufiria/craftorithm/util/UpdateUtil.java
rename to src/main/java/com/github/yufiria/craftorithm/util/UpdateUtil.java
diff --git a/plugin/src/main/resources/config.yml b/src/main/resources/config.yml
similarity index 100%
rename from plugin/src/main/resources/config.yml
rename to src/main/resources/config.yml
diff --git a/plugin/src/main/resources/data/custom_fuels.yml b/src/main/resources/data/custom_fuels.yml
similarity index 100%
rename from plugin/src/main/resources/data/custom_fuels.yml
rename to src/main/resources/data/custom_fuels.yml
diff --git a/plugin/src/main/resources/data/disable_recipes.yml b/src/main/resources/data/disable_recipes.yml
similarity index 100%
rename from plugin/src/main/resources/data/disable_recipes.yml
rename to src/main/resources/data/disable_recipes.yml
diff --git a/plugin/src/main/resources/data/example.yml b/src/main/resources/data/example.yml
similarity index 100%
rename from plugin/src/main/resources/data/example.yml
rename to src/main/resources/data/example.yml
diff --git a/plugin/src/main/resources/data/items/example_item.yml b/src/main/resources/data/items/example_item.yml
similarity index 100%
rename from plugin/src/main/resources/data/items/example_item.yml
rename to src/main/resources/data/items/example_item.yml
diff --git a/plugin/src/main/resources/lang/de_de.yml b/src/main/resources/lang/de_de.yml
similarity index 100%
rename from plugin/src/main/resources/lang/de_de.yml
rename to src/main/resources/lang/de_de.yml
diff --git a/plugin/src/main/resources/lang/en_us.yml b/src/main/resources/lang/en_us.yml
similarity index 100%
rename from plugin/src/main/resources/lang/en_us.yml
rename to src/main/resources/lang/en_us.yml
diff --git a/plugin/src/main/resources/lang/fr_fr.yml b/src/main/resources/lang/fr_fr.yml
similarity index 100%
rename from plugin/src/main/resources/lang/fr_fr.yml
rename to src/main/resources/lang/fr_fr.yml
diff --git a/plugin/src/main/resources/lang/ja_jp.yml b/src/main/resources/lang/ja_jp.yml
similarity index 100%
rename from plugin/src/main/resources/lang/ja_jp.yml
rename to src/main/resources/lang/ja_jp.yml
diff --git a/plugin/src/main/resources/lang/ru_ru.yml b/src/main/resources/lang/ru_ru.yml
similarity index 100%
rename from plugin/src/main/resources/lang/ru_ru.yml
rename to src/main/resources/lang/ru_ru.yml
diff --git a/plugin/src/main/resources/lang/tr_tr.yml b/src/main/resources/lang/tr_tr.yml
similarity index 100%
rename from plugin/src/main/resources/lang/tr_tr.yml
rename to src/main/resources/lang/tr_tr.yml
diff --git a/plugin/src/main/resources/lang/zh_cn.yml b/src/main/resources/lang/zh_cn.yml
similarity index 100%
rename from plugin/src/main/resources/lang/zh_cn.yml
rename to src/main/resources/lang/zh_cn.yml
diff --git a/plugin/src/main/resources/lang/zh_hk.yml b/src/main/resources/lang/zh_hk.yml
similarity index 100%
rename from plugin/src/main/resources/lang/zh_hk.yml
rename to src/main/resources/lang/zh_hk.yml
diff --git a/plugin/src/main/resources/lang/zh_tw.yml b/src/main/resources/lang/zh_tw.yml
similarity index 100%
rename from plugin/src/main/resources/lang/zh_tw.yml
rename to src/main/resources/lang/zh_tw.yml
diff --git a/plugin/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
similarity index 65%
rename from plugin/src/main/resources/plugin.yml
rename to src/main/resources/plugin.yml
index 90c69e0b..f8f1ca67 100644
--- a/plugin/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,15 +1,10 @@
name: Craftorithm
version: '${version}'
description: Craft recipes management system
-main: com.github.yufiria.craftorithm.Craftorithm
+main: com.github.yufiriamazenta.craftorithm.Craftorithm
api-version: 1.13
load: POSTWORLD
softdepend: [ Vault, LuckPerms, PlayerPoints, PlaceholderAPI, ItemsAdder, Oraxen, MythicMobs, NeigeItems, MMOItems ]
authors: [ YufiriaMazenta ]
folia-supported: true
website: https://github.com/YufiriaMazenta/Craftorithm
-permissions:
- craftorithm.command:
- description: Plugin command main permissions
- craftorithm.edit_recipe:
- default: op