Reverted publication changes

.github/workflows/test-publish.yml

@@ -0,0 +1,42 @@
+name: Publish API (Dev)
+
+on: [push]
+
+jobs:
+  publish-release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout latest code
+        uses: actions/checkout@v2
+
+      - name: Set outputs
+        id: vars
+        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 17
+
+      - name: Setup build cache
+        uses: actions/cache@v2.1.6
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+
+      - name: Publish artifact
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+        # The GITHUB_REF tag comes in the format 'refs/tags/xxx'.
+        # So if we split on '/' and take the 3rd value, we can get the release name.
+        run: |
+          NEW_VERSION=$(echo "${GITHUB_REF}" | cut -d "/" -f3)
+          echo "New version: ${{ steps.vars.outputs.sha_short }}"
+          echo "Github username: ${GITHUB_ACTOR}"
+          ./gradlew -Pversion=${{ steps.vars.outputs.sha_short }} publish

eco-api/build.gradle

@@ -1,11 +1,19 @@
-plugins {
+buildscript {
-    id 'com.github.johnrengelman.shadow'
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0"
+    }
 }
 
-group 'com.willfp'
+apply plugin: 'kotlin'
-version rootProject.version
 
 dependencies {
+    // Kotlin
+    compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.6.0'
+
     // Adventure
     compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
     compileOnly 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
@@ -17,10 +25,20 @@ dependencies {
     compileOnly 'com.google.code.gson:gson:2.8.8'
 }
 
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_17
+}
+
 java {
     withJavadocJar()
 }
 
+group 'com.willfp'
+version rootProject.version
 
 build.dependsOn publishToMavenLocal
 

eco-api/src/main/kotlin/com/willfp/eco/core/data/Profiles.kt

@@ -0,0 +1,18 @@
+@file:JvmName("ProfileExtensions")
+
+package com.willfp.eco.core.data
+
+import org.bukkit.OfflinePlayer
+import org.bukkit.Server
+
+/**
+ * @see PlayerProfile.load
+ */
+val OfflinePlayer.profile: PlayerProfile
+    get() = PlayerProfile.load(this)
+
+/**
+ * @see ServerProfile.load
+ */
+val Server.profile: ServerProfile
+    get() = ServerProfile.load()

eco-api/src/main/kotlin/com/willfp/eco/core/fast/FastItemStack.kt

@@ -0,0 +1,11 @@
+@file:JvmName("FastItemStackExtensions")
+
+package com.willfp.eco.core.fast
+
+import org.bukkit.inventory.ItemStack
+
+/**
+ * @see FastItemStack.wrap
+ */
+fun ItemStack.fast(): FastItemStack =
+    FastItemStack.wrap(this)

eco-api/src/main/kotlin/com/willfp/eco/core/gui/GUIHelpers.kt

@@ -0,0 +1,96 @@
+@file:JvmName("GUIHelperExtensions")
+
+package com.willfp.eco.core.gui
+
+import com.willfp.eco.core.gui.menu.Menu
+import com.willfp.eco.core.gui.menu.MenuBuilder
+import com.willfp.eco.core.gui.slot.Slot
+import com.willfp.eco.core.gui.slot.SlotBuilder
+import org.bukkit.entity.Player
+import org.bukkit.event.inventory.InventoryClickEvent
+import org.bukkit.event.inventory.InventoryCloseEvent
+import org.bukkit.inventory.ItemStack
+
+/**
+ * @see SlotBuilder.onLeftClick
+ */
+fun SlotBuilder.onLeftClick(action: (InventoryClickEvent, Slot, Menu) -> Unit): SlotBuilder =
+    this.onLeftClick { a, b, c -> action(a, b, c) }
+
+/**
+ * @see SlotBuilder.onRightClick
+ */
+fun SlotBuilder.onRightClick(action: (InventoryClickEvent, Slot, Menu) -> Unit): SlotBuilder =
+    this.onRightClick { a, b, c -> action(a, b, c) }
+
+/**
+ * @see SlotBuilder.onShiftLeftClick
+ */
+fun SlotBuilder.onShiftLeftClick(action: (InventoryClickEvent, Slot, Menu) -> Unit): SlotBuilder =
+    this.onShiftLeftClick { a, b, c -> action(a, b, c) }
+
+/**
+ * @see SlotBuilder.onShiftRightClick
+ */
+fun SlotBuilder.onShiftRightClick(action: (InventoryClickEvent, Slot, Menu) -> Unit): SlotBuilder =
+    this.onShiftRightClick { a, b, c -> action(a, b, c) }
+
+/**
+ * @see SlotBuilder.onShiftRightClick
+ */
+fun SlotBuilder.onMiddleClick(action: (InventoryClickEvent, Slot, Menu) -> Unit): SlotBuilder =
+    this.onMiddleClick { a, b, c -> action(a, b, c) }
+
+/**
+ * @see SlotBuilder.setModifier
+ */
+fun SlotBuilder.setModifier(action: (Player, Menu, ItemStack) -> Unit): SlotBuilder =
+    this.setModifier { a, b, c -> action(a, b, c) }
+
+/**
+ * Kotlin builder for slots.
+ */
+fun slot(
+    item: ItemStack,
+    init: SlotBuilder.() -> Unit
+): Slot {
+    val builder = Slot.builder(item)
+    init(builder)
+    return builder.build()
+}
+
+/**
+ * Kotlin builder for slots.
+ */
+fun slot(
+    provider: (Player, Menu) -> ItemStack,
+    init: SlotBuilder.() -> Unit
+): Slot {
+    val builder = Slot.builder { a, b -> provider(a, b) }
+    init(builder)
+    return builder.build()
+}
+
+/**
+ * @see MenuBuilder.onClose
+ */
+fun MenuBuilder.onClose(action: (InventoryCloseEvent, Menu) -> Unit): MenuBuilder =
+    this.onClose { a, b -> action(a, b) }
+
+/**
+ * @see MenuBuilder.modify
+ */
+fun MenuBuilder.modify(modifier: (MenuBuilder) -> Unit): MenuBuilder =
+    this.modfiy { modifier(it) }
+
+/**
+ * Kotlin builder for menus.
+ */
+fun menu(
+    rows: Int,
+    init: MenuBuilder.() -> Unit
+): Menu {
+    val builder = Menu.builder(rows)
+    init(builder)
+    return builder.build()
+}

eco-api/src/main/kotlin/com/willfp/eco/util/ArrowUtils.kt

@@ -0,0 +1,12 @@
+@file:JvmName("ArrowUtilsExtensions")
+
+package com.willfp.eco.util
+
+import org.bukkit.entity.Arrow
+import org.bukkit.inventory.ItemStack
+
+/**
+ * @see ArrowUtils.getBow
+ */
+val Arrow.bow: ItemStack?
+    get() = ArrowUtils.getBow(this)

eco-api/src/main/kotlin/com/willfp/eco/util/BlockUtils.kt

@@ -0,0 +1,11 @@
+@file:JvmName("BlockUtilsExtensions")
+
+package com.willfp.eco.util
+
+import org.bukkit.block.Block
+
+/**
+ * @see ArrowUtils.getBow
+ */
+val Block.isPlayerPlaced: Boolean
+    get() = BlockUtils.isPlayerPlaced(this)

eco-api/src/main/kotlin/com/willfp/eco/util/ListUtils.kt

@@ -0,0 +1,15 @@
+@file:JvmName("ListUtilsExtensions")
+
+package com.willfp.eco.util
+
+/**
+ * @see ListUtils.listToFrequencyMap
+ */
+fun <T> List<T>.toFrequencyMap(): Map<T, Int> =
+    ListUtils.listToFrequencyMap(this)
+
+/**
+ * @see ListUtils.containsIgnoreCase
+ */
+fun Iterable<String>.containsIgnoreCase(element: String): Boolean =
+    ListUtils.containsIgnoreCase(this, element)

eco-api/src/main/kotlin/com/willfp/eco/util/PlayerUtils.kt

@@ -0,0 +1,26 @@
+@file:JvmName("PlayerUtilsExtensions")
+
+package com.willfp.eco.util
+
+import net.kyori.adventure.audience.Audience
+import org.bukkit.OfflinePlayer
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+
+/**
+ * @see PlayerUtils.getSavedDisplayName
+ */
+val OfflinePlayer.savedDisplayName: String
+    get() = PlayerUtils.getSavedDisplayName(this)
+
+/**
+ * @see PlayerUtils.getAudience
+ */
+fun Player.asAudience(): Audience =
+    PlayerUtils.getAudience(this)
+
+/**
+ * @see PlayerUtils.getAudience
+ */
+fun CommandSender.asAudience(): Audience =
+    PlayerUtils.getAudience(this)

eco-api/src/main/kotlin/com/willfp/eco/util/PotionUtils.kt

@@ -0,0 +1,11 @@
+@file:JvmName("PotionUtilsExtensions")
+
+package com.willfp.eco.util
+
+import org.bukkit.potion.PotionData
+
+/**
+ * @see PotionData.duration
+ */
+val PotionData.duration: Int
+    get() = PotionUtils.getDuration(this)

eco-api/src/main/kotlin/com/willfp/eco/util/ServerUtils.kt

@@ -0,0 +1,11 @@
+@file:JvmName("ServerUtilsExtensions")
+
+package com.willfp.eco.util
+
+import org.bukkit.Server
+
+/**
+ * @see ServerUtils.getTps
+ */
+val Server.tps: Double
+    get() = ServerUtils.getTps()

eco-api/src/main/kotlin/com/willfp/eco/util/SkullUtils.kt

@@ -0,0 +1,17 @@
+@file:JvmName("SkullUtilsExtensions")
+
+package com.willfp.eco.util
+
+import org.bukkit.inventory.meta.SkullMeta
+
+/**
+ * @see SkullUtils.getSkullTexture
+ * @see SkullUtils.setSkullTexture
+ */
+var SkullMeta.texture: String?
+    get() = SkullUtils.getSkullTexture(this)
+    set(value) {
+        if (value != null) {
+            SkullUtils.setSkullTexture(this, value)
+        }
+    }

eco-api/src/main/kotlin/com/willfp/eco/util/StringUtils.kt

@@ -0,0 +1,42 @@
+@file:JvmName("StringUtilsExtensions")
+
+package com.willfp.eco.util
+
+import net.kyori.adventure.text.Component
+import org.bukkit.entity.Player
+
+/**
+ * @see StringUtils.toComponent
+ */
+fun String.toComponent(): Component =
+    StringUtils.toComponent(this)
+
+/**
+ * @see StringUtils.toLegacy
+ */
+fun Component.toLegacy(): String =
+    StringUtils.toLegacy(this)
+
+/**
+ * @see StringUtils.format
+ */
+fun String.formatEco(
+    player: Player? = null,
+    formatPlaceholders: Boolean = false
+) = StringUtils.format(
+    this,
+    player,
+    if (formatPlaceholders) StringUtils.FormatOption.WITH_PLACEHOLDERS else StringUtils.FormatOption.WITHOUT_PLACEHOLDERS
+)
+
+/**
+ * @see StringUtils.formatList
+ */
+fun List<String>.formatEco(
+    player: Player? = null,
+    formatPlaceholders: Boolean = false
+) = StringUtils.formatList(
+    this,
+    player,
+    if (formatPlaceholders) StringUtils.FormatOption.WITH_PLACEHOLDERS else StringUtils.FormatOption.WITHOUT_PLACEHOLDERS
+)

eco-api/src/main/kotlin/com/willfp/eco/util/VectorUtils.kt

@@ -0,0 +1,17 @@
+@file:JvmName("VectorUtilsExtensions")
+
+package com.willfp.eco.util
+
+import org.bukkit.util.Vector
+
+/**
+ * @see VectorUtils.isFinite
+ */
+val Vector.isFinite: Boolean
+    get() = VectorUtils.isFinite(this)
+
+/**
+ * @see VectorUtils.simplifyVector
+ */
+fun Vector.simplify(): Vector =
+    VectorUtils.simplifyVector(this)

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/extensions/EcoExtensionLoader.kt

@@ -1,6 +1,7 @@
 package com.willfp.eco.internal.extensions
 
 import com.google.common.collect.ImmutableSet
+import com.willfp.eco.core.Eco
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.config.TransientConfig
 import com.willfp.eco.core.extensions.Extension
@@ -32,6 +33,9 @@ class EcoExtensionLoader(
 
             runCatching { loadExtension(extensionJar) }.onFailure {
                 this.plugin.logger.warning(extensionJar.name + " caused an error!")
+                if (Eco.getHandler().ecoPlugin.configYml.getBool("log-full-extension-errors")) {
+                    it.printStackTrace()
+                }
             }
         }
     }

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/slot/EcoSlotBuilder.kt

@@ -8,7 +8,7 @@ import com.willfp.eco.core.gui.slot.functional.SlotProvider
 
 class EcoSlotBuilder(private val provider: SlotProvider) : SlotBuilder {
     private var captive = false
-    private var modifier: SlotModifier = SlotModifier{ player, menu, _ -> provider.provide(player, menu)}
+    private var modifier: SlotModifier = SlotModifier { player, menu, _ -> provider.provide(player, menu) }
 
     private var onLeftClick =
         SlotHandler { _, _, _ -> run { } }

eco-core/core-nms/v1_17_R1/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("io.papermc.paperweight.userdev") version "1.3.3"
+    id("io.papermc.paperweight.userdev") version "1.3.4"
 }
 
 group = "com.willfp"

eco-core/core-nms/v1_18_R1/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("io.papermc.paperweight.userdev") version "1.3.3"
+    id("io.papermc.paperweight.userdev") version "1.3.4"
 }
 
 group = "com.willfp"

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoProfileHandler.kt

@@ -39,7 +39,7 @@ class EcoProfileHandler(
     }
 
     override fun saveKeysFor(uuid: UUID, keys: Set<PersistentDataKey<*>>) {
-        val profile = PlayerProfile.load(uuid)
+        val profile = loadGenericProfile(uuid)
 
         for (key in keys) {
             handler.write(uuid, key.key, profile.read(key))

eco-core/core-plugin/src/main/resources/config.yml

@@ -48,6 +48,10 @@ display-frame-ttl: 17
 # at a performance penalty.
 use-safer-namespacedkey-creation: false
 
+# If the stack traces of extensions that failed to load should be logged. Disabled by
+# default to prevent users from reporting bugs. Enable if you're a developer.
+log-full-extension-errors: false
+
 # Window items packets have the option to be run asynchronously. This may cause
 # some bugs and is considered experimental, however it has been tested without
 # any apparent issues. Enable this if performance is absolutely crucial or if you

gradle.properties

@@ -1,3 +1,3 @@
-version = 6.22.2
+version = 6.23.0
 plugin-name = eco
 kotlin.code.style = official