Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
Bkm016 committed Sep 19, 2020
1 parent f096de9 commit 7de6c52
Show file tree
Hide file tree
Showing 10 changed files with 74 additions and 98 deletions.
60 changes: 16 additions & 44 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,62 +1,34 @@
plugins {
id 'java'
id 'com.github.johnrengelman.shadow' version '4.0.4'
id 'org.jetbrains.kotlin.jvm' version '1.2.41'
id 'io.izzel.taboolib' version '1.2'
id 'org.jetbrains.kotlin.jvm' version '1.4.0-rc'
}

configurations {
group = 'ink.ptms.zaphkiel'
version = '1.3-SNAPSHOT'
group = 'ink.ptms.zaphkiel'
version = '1.2'

sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 1.8
targetCompatibility = 1.8

tasks.build.dependsOn tasks.shadowJar

tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
}

defaultTasks 'clean', 'build'
taboolib {
tabooLibVersion = '5.36'
loaderVersion = '2.6'
classifier = null
}

repositories {
maven { url "http://ptms.ink:8081/repository/codemc-nms/" }
maven { url "http://ptms.ink:8081/repository/maven-releases/" }
mavenCentral()
mavenCentral()
}

dependencies {
compile 'org.spigotmc:spigot:1.14.4-R0.1-20191211.040645-13'
compile 'io.izzel.taboolib:TabooLib:5.17:all'
compile 'io.izzel.taboolib.loader:TabooLibloader:1.5:all'
compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.41"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.41"
compileOnly fileTree(dir: 'libs', includes: ['*.jar'])
}

shadowJar {
dependencies {
include dependency('io.izzel.taboolib.loader:.*')
}
relocate 'io.izzel.taboolib.loader', project.group
compile 'ink.ptms.core:v11600:11600:all'
compile 'org.jetbrains.kotlin:kotlin-stdlib'
compileOnly fileTree(dir: 'libs', includes: ['*.jar'])
}

processResources {
from(sourceSets.main.resources.srcDirs) {
include 'plugin.yml'
expand 'version': project.version
}
}

compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
}
}

compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
include "plugin.yml"
expand name: rootProject.name, main: project.group + ".boot.PluginBoot", version: project.version, "libVersion": taboolib.tabooLibVersion
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
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-4.10.3-bin.zip
distributionUrl=https://skymc.oss-cn-shanghai.aliyuncs.com/files/gradle-6.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
44 changes: 24 additions & 20 deletions src/main/java/ink/ptms/zaphkiel/Zaphkiel.kt
Original file line number Diff line number Diff line change
@@ -1,34 +1,38 @@
package ink.ptms.zaphkiel;
package ink.ptms.zaphkiel

import io.izzel.taboolib.loader.Plugin;
import io.izzel.taboolib.module.config.TConfig;
import io.izzel.taboolib.module.inject.TInject;
import io.izzel.taboolib.module.inject.TSchedule;
import io.izzel.taboolib.module.locale.logger.TLogger;

import java.io.File;
import ink.ptms.zaphkiel.ZaphkielAPI.folderDisplay
import ink.ptms.zaphkiel.ZaphkielAPI.folderItem
import ink.ptms.zaphkiel.ZaphkielAPI.reloadDisplay
import ink.ptms.zaphkiel.ZaphkielAPI.reloadItem
import io.izzel.taboolib.loader.Plugin
import io.izzel.taboolib.module.config.TConfig
import io.izzel.taboolib.module.inject.TInject
import io.izzel.taboolib.module.inject.TSchedule
import io.izzel.taboolib.module.locale.logger.TLogger

/**
* @Author sky
* @Since 2019-12-15 20:09
*/
@Plugin.Version(5.17)
public class Zaphkiel extends Plugin {
object Zaphkiel : Plugin() {

@TInject
public static final TLogger LOGS = null;
lateinit var conf: TConfig
private set

@TInject
public static final TConfig CONF = null;
lateinit var logger: TLogger
private set

@TSchedule(delay = 20)
public static void reload() {
if (!ZaphkielAPI.INSTANCE.getFolderItem().exists()) {
getPlugin().saveResource("item/def.yml", true);
fun reload() {
if (!folderItem.exists()) {
plugin.saveResource("item/def.yml", true)
}
if (!ZaphkielAPI.INSTANCE.getFolderDisplay().exists()) {
getPlugin().saveResource("display/def.yml", true);
if (!folderDisplay.exists()) {
plugin.saveResource("display/def.yml", true)
}
ZaphkielAPI.INSTANCE.reloadDisplay();
ZaphkielAPI.INSTANCE.reloadItem();
reloadDisplay()
reloadItem()
}
}
}
23 changes: 11 additions & 12 deletions src/main/java/ink/ptms/zaphkiel/ZaphkielAPI.kt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import org.bukkit.inventory.ItemStack
import org.bukkit.potion.PotionEffectType
import org.bukkit.util.io.BukkitObjectInputStream
import org.bukkit.util.io.BukkitObjectOutputStream
import java.awt.Event
import java.io.ByteArrayInputStream
import java.io.ByteArrayOutputStream
import java.io.File
Expand All @@ -40,13 +39,13 @@ object ZaphkielAPI {

val events = Events
val loaded = ArrayList<File>()
val folderItem = File(Zaphkiel.getPlugin().dataFolder, "item")
val folderDisplay = File(Zaphkiel.getPlugin().dataFolder, "display")
val folderItem = File(Zaphkiel.plugin.dataFolder, "item")
val folderDisplay = File(Zaphkiel.plugin.dataFolder, "display")
val registeredItem = Maps.newHashMap<String, Item>()!!
val registeredModel = Maps.newHashMap<String, Model>()!!
val registeredDisplay = Maps.newHashMap<String, Display>()!!
val database by lazy {
if (Zaphkiel.CONF.contains("Database.host")) {
if (Zaphkiel.conf.contains("Database.host")) {
try {
return@lazy DatabaseSQL()
} catch (t: Throwable) {
Expand All @@ -69,7 +68,7 @@ object ZaphkielAPI {
return if (read.isExtension()) {
read.getZaphkielName()
} else {
null;
null
}
}

Expand All @@ -78,7 +77,7 @@ object ZaphkielAPI {
return if (read.isExtension()) {
read.getZaphkielData()
} else {
null;
null
}
}

Expand All @@ -87,7 +86,7 @@ object ZaphkielAPI {
return if (read.isExtension()) {
read.getZaphkielData().getDeep("zaphkiel.${ItemKey.UNIQUE.key}").asCompound()
} else {
null;
null
}
}

Expand All @@ -96,13 +95,13 @@ object ZaphkielAPI {
return if (read.isExtension()) {
read.getZaphkielItem()
} else {
null;
null
}
}

fun read(item: ItemStack): ItemStream {
if (Items.isNull(item)) {
throw RuntimeException("Could not read empty item.");
throw RuntimeException("Could not read empty item.")
}
return ItemStream(item)
}
Expand All @@ -122,7 +121,7 @@ object ZaphkielAPI {

fun rebuild(player: Player?, item: ItemStack): ItemStream {
if (Items.isNull(item)) {
throw RuntimeException("Could not read empty item.");
throw RuntimeException("Could not read empty item.")
}
val itemStream = ItemStream(item)
if (itemStream.isVanilla()) {
Expand All @@ -142,7 +141,7 @@ object ZaphkielAPI {
reloadModel(folderItem)
reloadItem(folderItem)
PluginReloadEvent.Item().call()
Zaphkiel.LOGS.info("Loaded ${registeredItem.size} item(s) and ${registeredModel.size} model(s).")
Zaphkiel.logger.info("Loaded ${registeredItem.size} item(s) and ${registeredModel.size} model(s).")
}

fun reloadItem(file: File) {
Expand Down Expand Up @@ -191,7 +190,7 @@ object ZaphkielAPI {
registeredDisplay.clear()
reloadDisplay(folderDisplay)
PluginReloadEvent.Display().call()
Zaphkiel.LOGS.info("Loaded ${registeredDisplay.size} display plan(s).")
Zaphkiel.logger.info("Loaded ${registeredDisplay.size} display plan(s).")
}

fun reloadDisplay(file: File) {
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/ink/ptms/zaphkiel/ZaphkielCommand.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package ink.ptms.zaphkiel

import ink.ptms.zaphkiel.api.Display
import ink.ptms.zaphkiel.api.ItemStream
import ink.ptms.zaphkiel.api.internal.ItemList
import io.izzel.taboolib.cronus.CronusUtils
Expand Down Expand Up @@ -111,7 +110,7 @@ class ZaphkielCommand : BaseMainCommand() {
override fun getDescription(): String = "重载插件"

override fun onCommand(sender: CommandSender, command: Command?, label: String, args: Array<String>) {
Zaphkiel.CONF.reload()
Zaphkiel.conf.reload()
Zaphkiel.reload()
notify(sender, "插件已重载.")
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ink/ptms/zaphkiel/api/Item.kt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class Item(
if (model != null) {
map.putAll(parseEvent(this, model.config))
} else {
Zaphkiel.LOGS.error("Model ${this.model} not found.")
Zaphkiel.logger.error("Model ${this.model} not found.")
}
}
} else {
Expand Down
7 changes: 2 additions & 5 deletions src/main/java/ink/ptms/zaphkiel/api/data/DatabaseSQL.kt
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package ink.ptms.zaphkiel.api.data

import ink.ptms.zaphkiel.Zaphkiel
import ink.ptms.zaphkiel.ZaphkielAPI
import io.izzel.taboolib.module.db.source.DBSource
import io.izzel.taboolib.module.db.sql.SQLColumn
import io.izzel.taboolib.module.db.sql.SQLHost
import io.izzel.taboolib.module.db.sql.SQLTable
import io.izzel.taboolib.module.db.sql.query.Where
import io.izzel.taboolib.module.inject.PlayerContainer
import org.bukkit.Bukkit
import org.bukkit.configuration.file.FileConfiguration
import org.bukkit.configuration.file.YamlConfiguration
import org.bukkit.entity.Player
Expand All @@ -24,8 +21,8 @@ import javax.sql.DataSource
*/
class DatabaseSQL : Database() {

val host = SQLHost(Zaphkiel.CONF.getConfigurationSection("Database"), Zaphkiel.getPlugin(), true)
val table = SQLTable(Zaphkiel.CONF.getString("Database.table")).column("\$primary_key_id", "text:name", "text:data")!!
val host = SQLHost(Zaphkiel.conf.getConfigurationSection("Database"), Zaphkiel.getPlugin(), true)
val table = SQLTable(Zaphkiel.conf.getString("Database.table")).column("\$primary_key_id", "text:name", "text:data")!!
val dataSource: DataSource = DBSource.create(host)

init {
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/ink/ptms/zaphkiel/module/ItemDurability.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ package ink.ptms.zaphkiel.module
import com.google.common.collect.Lists
import ink.ptms.zaphkiel.Zaphkiel
import ink.ptms.zaphkiel.api.ItemStream
import ink.ptms.zaphkiel.api.event.single.ItemBuildEvent
import ink.ptms.zaphkiel.api.event.single.ItemReleaseEvent
import ink.ptms.zaphkiel.api.event.PluginReloadEvent
import ink.ptms.zaphkiel.api.event.single.Events
import io.izzel.taboolib.module.inject.TListener
import io.izzel.taboolib.module.nms.nbt.NBTBase
import org.bukkit.Bukkit
import org.bukkit.event.EventHandler
import org.bukkit.event.EventPriority
import org.bukkit.event.Listener
Expand Down Expand Up @@ -59,8 +57,8 @@ private class ItemDurability : Listener {

@EventHandler
fun e(e: PluginReloadEvent.Item) {
durability = Zaphkiel.CONF.getString("Durability.display")
durabilitySymbol = Lists.newArrayList<String>(Zaphkiel.CONF.getString("Durability.display-symbol.0"), Zaphkiel.CONF.getString("Durability.display-symbol.1"))
durability = Zaphkiel.conf.getString("Durability.display")
durabilitySymbol = Lists.newArrayList<String>(Zaphkiel.conf.getString("Durability.display-symbol.0"), Zaphkiel.conf.getString("Durability.display-symbol.1"))
}

@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/ink/ptms/zaphkiel/module/ItemInternet.kt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ItemInternet : Listener {

fun reloadItem() {
val folder = File(ZaphkielAPI.folderItem, "__cache__")
val files = Zaphkiel.CONF.getStringList("InternetItem.item").map { host ->
val files = Zaphkiel.conf.getStringList("InternetItem.item").map { host ->
Files.toFile(Files.readFromURL(host, StandardCharsets.UTF_8).toString(), File(folder, Strings.hashKeyForDisk(host)))
}
files.forEach { ZaphkielAPI.reloadModel(it) }
Expand All @@ -35,7 +35,7 @@ class ItemInternet : Listener {

fun reloadDisplay() {
val folder = File(ZaphkielAPI.folderDisplay, "__cache__")
Zaphkiel.CONF.getStringList("InternetItem.display").forEach { host ->
Zaphkiel.conf.getStringList("InternetItem.display").forEach { host ->
ZaphkielAPI.reloadDisplay(Files.toFile(Files.readFromURL(host, StandardCharsets.UTF_8).toString(), File(folder, Strings.hashKeyForDisk(host))))
}
}
Expand All @@ -48,11 +48,11 @@ class ItemInternet : Listener {
val countDisplay = ZaphkielAPI.registeredDisplay.size
reloadItem()
if (countItem < ZaphkielAPI.registeredItem.size || countModel > ZaphkielAPI.registeredModel.size) {
Zaphkiel.LOGS.info("Loaded ${ZaphkielAPI.registeredItem.size - countItem} item(s) and ${ZaphkielAPI.registeredModel.size - countModel} model(s). §6[Internet]")
Zaphkiel.logger.info("Loaded ${ZaphkielAPI.registeredItem.size - countItem} item(s) and ${ZaphkielAPI.registeredModel.size - countModel} model(s). §6[Internet]")
}
reloadDisplay()
if (countDisplay < ZaphkielAPI.registeredDisplay.size) {
Zaphkiel.LOGS.info("Loaded ${ZaphkielAPI.registeredDisplay.size - countDisplay} display plan(s). §6[Internet]")
Zaphkiel.logger.info("Loaded ${ZaphkielAPI.registeredDisplay.size - countDisplay} display plan(s). §6[Internet]")
}
})
}
Expand Down
17 changes: 12 additions & 5 deletions src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
name: Zaphkiel
main: ink.ptms.zaphkiel.Zaphkiel
author: 坏黑
api-version: 1.13

version: ${version}

# Powered by TabooLib 5.0 #


name: ${name}
main: ${main}
version: ${version}
authors:
- Bkm016

lib-version: ${libVersion}
api-version: 1.13

0 comments on commit 7de6c52

Please sign in to comment.