From ac65b222b779390b4dbfc52541fa68949315bdd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 13:14:37 +0000 Subject: [PATCH 1/5] Bump the versions group across 1 directory with 41 updates Bumps the versions group with 41 updates in the / directory: | Package | From | To | | --- | --- | --- | | [com.palmergames.bukkit.towny:towny](https://github.com/TownyAdvanced/Towny) | `0.100.1.0` | `0.100.2.11` | | [org.jetbrains.kotlinx:kotlinx-coroutines-core](https://github.com/Kotlin/kotlinx.coroutines) | `1.8.0` | `1.8.1` | | [org.jetbrains.kotlinx:kotlinx-coroutines-test](https://github.com/Kotlin/kotlinx.coroutines) | `1.8.0` | `1.8.1` | | [org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm](https://github.com/Kotlin/kotlinx.coroutines) | `1.8.0` | `1.8.1` | | [com.charleskorn.kaml:kaml](https://github.com/charleskorn/kaml) | `0.58.0` | `0.59.0` | | gradle.plugin.com.github.johnrengelman:shadow | `7.1.2` | `8.0.0` | | com.github.johnrengelman.shadow | `7.1.2` | `8.0.0` | | [org.xerial:sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) | `3.45.3.0` | `3.46.0.0` | | [org.mockito:mockito-core](https://github.com/mockito/mockito) | `5.11.0` | `5.12.0` | | [org.jetbrains.exposed:exposed-java-time](https://github.com/JetBrains/Exposed) | `0.44.0` | `0.50.1` | | [org.jetbrains.exposed:exposed-jdbc](https://github.com/JetBrains/Exposed) | `0.44.0` | `0.50.1` | | [org.jetbrains.exposed:exposed-dao](https://github.com/JetBrains/Exposed) | `0.44.0` | `0.50.1` | | [org.jetbrains.exposed:exposed-core](https://github.com/JetBrains/Exposed) | `0.44.0` | `0.50.1` | | io.papermc.paper:paper-api | `1.20.4-R0.1-SNAPSHOT` | `1.20.6-R0.1-SNAPSHOT` | | org.spigotmc:spigot-api | `1.20.4-R0.1-SNAPSHOT` | `1.20.6-R0.1-SNAPSHOT` | | org.spigotmc:spigot | `1.20.4-R0.1-SNAPSHOT` | `1.20.6-R0.1-SNAPSHOT` | | com.velocitypowered:velocity-api | `3.3.0-SNAPSHOT` | `4.0.0-SNAPSHOT` | | com.comphenix.protocol:ProtocolLib | `4.8.0` | `5.1.0` | | me.clip:placeholderapi | `2.11.5` | `2.11.6` | | [com.github.MilkBowl:VaultAPI](https://github.com/MilkBowl/VaultAPI) | `1.7` | `1.7.1` | | [org.bstats:bstats-bukkit](https://github.com/Bastian/bStats-Metrics) | `3.0.0` | `3.0.2` | | [com.github.MockBukkit:MockBukkit](https://github.com/MockBukkit/MockBukkit) | `v1.19-SNAPSHOT` | `3.86.1` | | [ru.astrainteractive.klibs:mikro-core](https://github.com/makeevrserg/MiKro) | `1.6.0-beta` | `1.7.0` | | [ru.astrainteractive.klibs:kstorage](https://github.com/makeevrserg/KStorage) | `1.3.0` | `1.4.0` | | [ru.astrainteractive.astralibs:orm](https://github.com/Astra-Interactive/AstraLibs) | `3.4.0-alpha` | `3.6.0` | | [ru.astrainteractive.astralibs:core](https://github.com/Astra-Interactive/AstraLibs) | `3.4.0-alpha` | `3.6.0` | | [ru.astrainteractive.astralibs:menu-bukkit](https://github.com/Astra-Interactive/AstraLibs) | `3.4.0-alpha` | `3.6.0` | | [ru.astrainteractive.astralibs:core-bukkit](https://github.com/Astra-Interactive/AstraLibs) | `3.4.0-alpha` | `3.6.0` | | [ru.astrainteractive.astralibs:command](https://github.com/Astra-Interactive/AstraLibs) | `3.4.0-alpha` | `3.6.0` | | [ru.astrainteractive.astralibs:command-bukkit](https://github.com/Astra-Interactive/AstraLibs) | `3.4.0-alpha` | `3.6.0` | | com.github.gmazzo.buildconfig | `3.1.0` | `5.3.5` | | [ru.astrainteractive.gradleplugin.detekt](https://github.com/makeevrserg/gradle-plugin) | `1.0.0-alpha01` | `1.1.2` | | [ru.astrainteractive.gradleplugin.detekt.compose](https://github.com/makeevrserg/gradle-plugin) | `1.0.0-alpha01` | `1.1.2` | | [ru.astrainteractive.gradleplugin.dokka.root](https://github.com/makeevrserg/gradle-plugin) | `1.0.0-alpha01` | `1.1.2` | | [ru.astrainteractive.gradleplugin.dokka.module](https://github.com/makeevrserg/gradle-plugin) | `1.0.0-alpha01` | `1.1.2` | | [ru.astrainteractive.gradleplugin.java.core](https://github.com/makeevrserg/gradle-plugin) | `1.0.0-alpha01` | `1.1.2` | | [ru.astrainteractive.gradleplugin.stub.javadoc](https://github.com/makeevrserg/gradle-plugin) | `1.0.0-alpha01` | `1.1.2` | | [ru.astrainteractive.gradleplugin.publication](https://github.com/makeevrserg/gradle-plugin) | `1.0.0-alpha01` | `1.1.2` | | [ru.astrainteractive.gradleplugin.root.info](https://github.com/makeevrserg/gradle-plugin) | `1.0.0-alpha01` | `1.1.2` | | [ru.astrainteractive.gradleplugin.minecraft.empty](https://github.com/makeevrserg/gradle-plugin) | `1.0.0-alpha01` | `1.1.2` | | [ru.astrainteractive.gradleplugin.minecraft.multiplatform](https://github.com/makeevrserg/gradle-plugin) | `1.0.0-alpha01` | `1.1.2` | Updates `com.palmergames.bukkit.towny:towny` from 0.100.1.0 to 0.100.2.11 - [Release notes](https://github.com/TownyAdvanced/Towny/releases) - [Commits](https://github.com/TownyAdvanced/Towny/compare/0.100.1.0...0.100.2.11) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-core` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.8.0...1.8.1) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-test` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.8.0...1.8.1) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.8.0...1.8.1) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-test` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.8.0...1.8.1) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.8.0...1.8.1) Updates `com.charleskorn.kaml:kaml` from 0.58.0 to 0.59.0 - [Release notes](https://github.com/charleskorn/kaml/releases) - [Commits](https://github.com/charleskorn/kaml/compare/0.58.0...0.59.0) Updates `gradle.plugin.com.github.johnrengelman:shadow` from 7.1.2 to 8.0.0 Updates `com.github.johnrengelman.shadow` from 7.1.2 to 8.0.0 Updates `org.xerial:sqlite-jdbc` from 3.45.3.0 to 3.46.0.0 - [Release notes](https://github.com/xerial/sqlite-jdbc/releases) - [Changelog](https://github.com/xerial/sqlite-jdbc/blob/master/CHANGELOG) - [Commits](https://github.com/xerial/sqlite-jdbc/compare/3.45.3.0...3.46.0.0) Updates `org.mockito:mockito-core` from 5.11.0 to 5.12.0 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.11.0...v5.12.0) Updates `org.jetbrains.exposed:exposed-java-time` from 0.44.0 to 0.50.1 - [Release notes](https://github.com/JetBrains/Exposed/releases) - [Changelog](https://github.com/JetBrains/Exposed/blob/main/CHANGELOG.md) - [Commits](https://github.com/JetBrains/Exposed/compare/0.44.0...0.50.1) Updates `org.jetbrains.exposed:exposed-jdbc` from 0.44.0 to 0.50.1 - [Release notes](https://github.com/JetBrains/Exposed/releases) - [Changelog](https://github.com/JetBrains/Exposed/blob/main/CHANGELOG.md) - [Commits](https://github.com/JetBrains/Exposed/compare/0.44.0...0.50.1) Updates `org.jetbrains.exposed:exposed-dao` from 0.44.0 to 0.50.1 - [Release notes](https://github.com/JetBrains/Exposed/releases) - [Changelog](https://github.com/JetBrains/Exposed/blob/main/CHANGELOG.md) - [Commits](https://github.com/JetBrains/Exposed/compare/0.44.0...0.50.1) Updates `org.jetbrains.exposed:exposed-core` from 0.44.0 to 0.50.1 - [Release notes](https://github.com/JetBrains/Exposed/releases) - [Changelog](https://github.com/JetBrains/Exposed/blob/main/CHANGELOG.md) - [Commits](https://github.com/JetBrains/Exposed/compare/0.44.0...0.50.1) Updates `org.jetbrains.exposed:exposed-jdbc` from 0.44.0 to 0.50.1 - [Release notes](https://github.com/JetBrains/Exposed/releases) - [Changelog](https://github.com/JetBrains/Exposed/blob/main/CHANGELOG.md) - [Commits](https://github.com/JetBrains/Exposed/compare/0.44.0...0.50.1) Updates `org.jetbrains.exposed:exposed-dao` from 0.44.0 to 0.50.1 - [Release notes](https://github.com/JetBrains/Exposed/releases) - [Changelog](https://github.com/JetBrains/Exposed/blob/main/CHANGELOG.md) - [Commits](https://github.com/JetBrains/Exposed/compare/0.44.0...0.50.1) Updates `org.jetbrains.exposed:exposed-core` from 0.44.0 to 0.50.1 - [Release notes](https://github.com/JetBrains/Exposed/releases) - [Changelog](https://github.com/JetBrains/Exposed/blob/main/CHANGELOG.md) - [Commits](https://github.com/JetBrains/Exposed/compare/0.44.0...0.50.1) Updates `io.papermc.paper:paper-api` from 1.20.4-R0.1-SNAPSHOT to 1.20.6-R0.1-SNAPSHOT Updates `org.spigotmc:spigot-api` from 1.20.4-R0.1-SNAPSHOT to 1.20.6-R0.1-SNAPSHOT Updates `org.spigotmc:spigot` from 1.20.4-R0.1-SNAPSHOT to 1.20.6-R0.1-SNAPSHOT Updates `org.spigotmc:spigot-api` from 1.20.4-R0.1-SNAPSHOT to 1.20.6-R0.1-SNAPSHOT Updates `org.spigotmc:spigot` from 1.20.4-R0.1-SNAPSHOT to 1.20.6-R0.1-SNAPSHOT Updates `com.velocitypowered:velocity-api` from 3.3.0-SNAPSHOT to 4.0.0-SNAPSHOT Updates `com.comphenix.protocol:ProtocolLib` from 4.8.0 to 5.1.0 Updates `me.clip:placeholderapi` from 2.11.5 to 2.11.6 Updates `com.github.MilkBowl:VaultAPI` from 1.7 to 1.7.1 - [Release notes](https://github.com/MilkBowl/VaultAPI/releases) - [Commits](https://github.com/MilkBowl/VaultAPI/compare/1.7...1.7.1) Updates `org.bstats:bstats-bukkit` from 3.0.0 to 3.0.2 - [Release notes](https://github.com/Bastian/bStats-Metrics/releases) - [Commits](https://github.com/Bastian/bStats-Metrics/compare/v3.0.0...v3.0.2) Updates `com.github.MockBukkit:MockBukkit` from v1.19-SNAPSHOT to 3.86.1 - [Commits](https://github.com/MockBukkit/MockBukkit/commits/v3.86.1) Updates `ru.astrainteractive.klibs:mikro-core` from 1.6.0-beta to 1.7.0 - [Commits](https://github.com/makeevrserg/MiKro/commits) Updates `ru.astrainteractive.klibs:kstorage` from 1.3.0 to 1.4.0 - [Release notes](https://github.com/makeevrserg/KStorage/releases) - [Commits](https://github.com/makeevrserg/KStorage/compare/1.3.0...1.4.0) Updates `ru.astrainteractive.astralibs:orm` from 3.4.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.4.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:core` from 3.4.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.4.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:menu-bukkit` from 3.4.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.4.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:core-bukkit` from 3.4.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.4.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:command` from 3.4.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.4.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:command-bukkit` from 3.4.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.4.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:core` from 3.4.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.4.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:menu-bukkit` from 3.4.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.4.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:core-bukkit` from 3.4.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.4.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:command` from 3.4.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.4.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:command-bukkit` from 3.4.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.4.0-alpha...3.6.0) Updates `com.github.johnrengelman.shadow` from 7.1.2 to 8.0.0 Updates `com.github.gmazzo.buildconfig` from 3.1.0 to 5.3.5 Updates `ru.astrainteractive.gradleplugin.detekt` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.detekt.compose` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.dokka.root` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.dokka.module` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.java.core` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.stub.javadoc` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.publication` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.root.info` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.minecraft.empty` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.minecraft.multiplatform` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.detekt.compose` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.dokka.root` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.dokka.module` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.java.core` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.stub.javadoc` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.publication` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.root.info` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.minecraft.empty` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) Updates `ru.astrainteractive.gradleplugin.minecraft.multiplatform` from 1.0.0-alpha01 to 1.1.2 - [Release notes](https://github.com/makeevrserg/gradle-plugin/releases) - [Commits](https://github.com/makeevrserg/gradle-plugin/compare/1.0.0-alpha01...1.1.2) --- updated-dependencies: - dependency-name: com.palmergames.bukkit.towny:towny dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: com.charleskorn.kaml:kaml dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: gradle.plugin.com.github.johnrengelman:shadow dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: com.github.johnrengelman.shadow dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: org.xerial:sqlite-jdbc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.jetbrains.exposed:exposed-java-time dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.jetbrains.exposed:exposed-jdbc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.jetbrains.exposed:exposed-dao dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.jetbrains.exposed:exposed-core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.jetbrains.exposed:exposed-jdbc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.jetbrains.exposed:exposed-dao dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.jetbrains.exposed:exposed-core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: io.papermc.paper:paper-api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.spigotmc:spigot-api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.spigotmc:spigot dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.spigotmc:spigot-api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.spigotmc:spigot dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: com.velocitypowered:velocity-api dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: com.comphenix.protocol:ProtocolLib dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: me.clip:placeholderapi dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: com.github.MilkBowl:VaultAPI dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.bstats:bstats-bukkit dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: com.github.MockBukkit:MockBukkit dependency-type: direct:production dependency-group: versions - dependency-name: ru.astrainteractive.klibs:mikro-core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.klibs:kstorage dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:orm dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:menu-bukkit dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:core-bukkit dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:command dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:command-bukkit dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:menu-bukkit dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:core-bukkit dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:command dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:command-bukkit dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: com.github.johnrengelman.shadow dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: com.github.gmazzo.buildconfig dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.detekt dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.detekt.compose dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.dokka.root dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.dokka.module dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.java.core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.stub.javadoc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.publication dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.root.info dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.minecraft.empty dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.minecraft.multiplatform dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.detekt.compose dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.dokka.root dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.dokka.module dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.java.core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.stub.javadoc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.publication dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.root.info dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.minecraft.empty dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.gradleplugin.minecraft.multiplatform dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 36 +++++++++++++------------- modules/towny-discord/build.gradle.kts | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5b4972c..5e896d0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,44 +2,44 @@ # Kotlin kotlin-version = "1.9.23" # https://github.com/JetBrains/kotlin kotlin-benchmark = "0.4.10" # https://github.com/Kotlin/kotlinx-benchmark -kotlin-coroutines = "1.8.0" # https://github.com/Kotlin/kotlinx.coroutines +kotlin-coroutines = "1.8.1" # https://github.com/Kotlin/kotlinx.coroutines kotlin-json = "1.6.3" # https://github.com/Kotlin/kotlinx.serialization -kotlin-kaml = "0.58.0" # https://github.com/charleskorn/kaml +kotlin-kaml = "0.59.0" # https://github.com/charleskorn/kaml # Drivers -driver-jdbc = "3.45.3.0" # https://github.com/xerial/sqlite-jdbc +driver-jdbc = "3.46.0.0" # https://github.com/xerial/sqlite-jdbc driver-mysql = "8.0.33" # https://github.com/mysql/mysql-connector-j # klibs -klibs-gradleplugin = "1.0.0-alpha01" # https://github.com/makeevrserg/gradle-plugin -klibs-mikro = "1.6.0-beta" # https://github.com/makeevrserg/klibs.mikro +klibs-gradleplugin = "1.1.2" # https://github.com/makeevrserg/gradle-plugin +klibs-mikro = "1.7.0" # https://github.com/makeevrserg/klibs.mikro klibs-kdi = "1.3.2" # https://github.com/makeevrserg/klibs.kdi -klibs-kstorage = "1.3.0" # https://github.com/makeevrserg/klibs.kstorage +klibs-kstorage = "1.4.0" # https://github.com/makeevrserg/klibs.kstorage # Minecraft -minecraft-velocity = "3.3.0-SNAPSHOT" # https://github.com/PaperMC/Velocity -minecraft-spigot = "1.20.4-R0.1-SNAPSHOT" # https://github.com/PaperMC/Paper -minecraft-papi = "2.11.5" # https://github.com/PlaceholderAPI/PlaceholderAPI -minecraft-protocollib = "4.8.0" # https://github.com/dmulloy2/ProtocolLib -minecraft-vault = "1.7" # https://github.com/MilkBowl/VaultAPI -minecraft-astralibs = "3.4.0-alpha" # https://github.com/Astra-Interactive/AstraLibs -minecraft-bstats = "3.0.0" # https://github.com/Bastian/bStats -minecraft-mockbukkit = "v1.19-SNAPSHOT" #https://github.com/MockBukkit/MockBukkit +minecraft-velocity = "4.0.0-SNAPSHOT" # https://github.com/PaperMC/Velocity +minecraft-spigot = "1.20.6-R0.1-SNAPSHOT" # https://github.com/PaperMC/Paper +minecraft-papi = "2.11.6" # https://github.com/PlaceholderAPI/PlaceholderAPI +minecraft-protocollib = "5.1.0" # https://github.com/dmulloy2/ProtocolLib +minecraft-vault = "1.7.1" # https://github.com/MilkBowl/VaultAPI +minecraft-astralibs = "3.6.0" # https://github.com/Astra-Interactive/AstraLibs +minecraft-bstats = "3.0.2" # https://github.com/Bastian/bStats +minecraft-mockbukkit = "3.86.1" #https://github.com/MockBukkit/MockBukkit # Shadow -gradle-shadow = "7.1.2" # https://github.com/johnrengelman/shadow +gradle-shadow = "8.0.0" # https://github.com/johnrengelman/shadow # BuildConfig -gradle-buildconfig = "3.1.0" # https://github.com/gmazzo/gradle-buildconfig-plugin +gradle-buildconfig = "5.3.5" # https://github.com/gmazzo/gradle-buildconfig-plugin # Exposed -exposed = "0.44.0" # https://github.com/JetBrains/Exposed +exposed = "0.50.1" # https://github.com/JetBrains/Exposed # DisordSrv discordsrv = "1.27.0" # https://github.com/DiscordSRV/DiscordSRV # Mockito -mockito = "5.11.0" # https://github.com/mockito/mockito +mockito = "5.12.0" # https://github.com/mockito/mockito [libraries] # Kotlin diff --git a/modules/towny-discord/build.gradle.kts b/modules/towny-discord/build.gradle.kts index a439e17..e88cc15 100644 --- a/modules/towny-discord/build.gradle.kts +++ b/modules/towny-discord/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { compileOnly("net.luckperms:api:5.4") compileOnly(libs.minecraft.discordsrv) compileOnly("net.essentialsx:EssentialsX:2.20.1") - compileOnly("com.palmergames.bukkit.towny:towny:0.100.1.0") + compileOnly("com.palmergames.bukkit.towny:towny:0.100.2.11") // Test testImplementation(libs.bundles.testing.kotlin) testImplementation(libs.tests.kotlin.test) From c27cb4baf34abaa1966cb91a89e87ad480263f47 Mon Sep 17 00:00:00 2001 From: makeevrserg Date: Mon, 27 May 2024 16:57:41 +0300 Subject: [PATCH 2/5] up version --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..48c0a02 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From da8b746d3a39d9ed94f65d0e630c1edc4ba29ff2 Mon Sep 17 00:00:00 2001 From: makeevrserg Date: Mon, 27 May 2024 17:05:33 +0300 Subject: [PATCH 3/5] fix new version issues --- .github/workflows/build-project.yml | 4 +- .github/workflows/create-artifacts.yml | 4 +- .github/workflows/detekt-validation.yml | 4 +- .github/workflows/tests-validation.yml | 4 +- gradle.properties | 4 +- .../module/antiswear/data/AntiSwearKrate.kt | 10 +++-- .../antiswear/data/SwearRepositoryImpl.kt | 1 + .../module/antiswear/util/SwearRuRegex.kt | 2 +- .../module/antiswear/util/SwearRuRegexTest.kt | 1 + .../newbee/event/NewBeeEventListener.kt | 4 +- .../aspekt/event/sort/Sort.kt | 2 +- .../aspekt/event/tc/TCEvent.kt | 2 +- .../aspekt/gui/entities/util/ext.kt | 40 ++++++++++--------- .../ru/astrainteractive/aspekt/AspeKt.kt | 2 +- 14 files changed, 46 insertions(+), 38 deletions(-) diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index be42353..d4822a1 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -8,11 +8,11 @@ jobs: steps: - name: Checkout Git repo uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'adopt' - java-version: 17 + java-version: 21 - name: Give gradle permission run: chmod +x gradlew - name: Build with Gradle diff --git a/.github/workflows/create-artifacts.yml b/.github/workflows/create-artifacts.yml index 9af4bad..1c0973f 100644 --- a/.github/workflows/create-artifacts.yml +++ b/.github/workflows/create-artifacts.yml @@ -16,11 +16,11 @@ jobs: with: path: './gradle.properties' properties: 'makeevrserg.project.name makeevrserg.project.version.string' - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'adopt' - java-version: 17 + java-version: 21 - name: Give gradle permission run: chmod +x gradlew - name: Build with Gradle diff --git a/.github/workflows/detekt-validation.yml b/.github/workflows/detekt-validation.yml index 3424e84..a4c6a43 100644 --- a/.github/workflows/detekt-validation.yml +++ b/.github/workflows/detekt-validation.yml @@ -7,11 +7,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK 1.17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Give gradle permission run: chmod +x gradlew - name: detekt diff --git a/.github/workflows/tests-validation.yml b/.github/workflows/tests-validation.yml index 431ba20..89abf86 100644 --- a/.github/workflows/tests-validation.yml +++ b/.github/workflows/tests-validation.yml @@ -8,11 +8,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'adopt' - java-version: '17' + java-version: '21' - name: Give gradle permission run: chmod +x gradlew - name: Run tests diff --git a/gradle.properties b/gradle.properties index 987bc81..98f5088 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ kotlin.code.style=official testTask.ignoreFailures=true # Java makeevrserg.java.source=8 -makeevrserg.java.target=17 -makeevrserg.java.ktarget=17 +makeevrserg.java.target=21 +makeevrserg.java.ktarget=21 # Project makeevrserg.project.name=AspeKt makeevrserg.project.group=ru.astrainteractive.aspekt diff --git a/modules/antiswear/src/main/kotlin/ru/astrainteractive/aspekt/module/antiswear/data/AntiSwearKrate.kt b/modules/antiswear/src/main/kotlin/ru/astrainteractive/aspekt/module/antiswear/data/AntiSwearKrate.kt index a8cf30e..bdea5b9 100644 --- a/modules/antiswear/src/main/kotlin/ru/astrainteractive/aspekt/module/antiswear/data/AntiSwearKrate.kt +++ b/modules/antiswear/src/main/kotlin/ru/astrainteractive/aspekt/module/antiswear/data/AntiSwearKrate.kt @@ -11,10 +11,12 @@ internal class AntiSwearKrate( player: Player, stringFormat: StringFormat, ) : FileKrate by StringFormatKrate( - default = AntiSwearStorage( - playerName = player.name, - uuid = player.uniqueId.toString() - ), + factory = { + AntiSwearStorage( + playerName = player.name, + uuid = player.uniqueId.toString() + ) + }, fileName = "${player.uniqueId}.json", stringFormat = stringFormat, kSerializer = AntiSwearStorage.serializer(), diff --git a/modules/antiswear/src/main/kotlin/ru/astrainteractive/aspekt/module/antiswear/data/SwearRepositoryImpl.kt b/modules/antiswear/src/main/kotlin/ru/astrainteractive/aspekt/module/antiswear/data/SwearRepositoryImpl.kt index 6e5fc59..cec19a0 100644 --- a/modules/antiswear/src/main/kotlin/ru/astrainteractive/aspekt/module/antiswear/data/SwearRepositoryImpl.kt +++ b/modules/antiswear/src/main/kotlin/ru/astrainteractive/aspekt/module/antiswear/data/SwearRepositoryImpl.kt @@ -5,6 +5,7 @@ import kotlinx.serialization.StringFormat import org.bukkit.entity.Player import ru.astrainteractive.aspekt.module.antiswear.model.AntiSwearStorage import ru.astrainteractive.klibs.kstorage.api.MutableStorageValue +import ru.astrainteractive.klibs.kstorage.update import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers import java.util.UUID diff --git a/modules/antiswear/src/main/kotlin/ru/astrainteractive/aspekt/module/antiswear/util/SwearRuRegex.kt b/modules/antiswear/src/main/kotlin/ru/astrainteractive/aspekt/module/antiswear/util/SwearRuRegex.kt index 0673bf0..8c5d67a 100644 --- a/modules/antiswear/src/main/kotlin/ru/astrainteractive/aspekt/module/antiswear/util/SwearRuRegex.kt +++ b/modules/antiswear/src/main/kotlin/ru/astrainteractive/aspekt/module/antiswear/util/SwearRuRegex.kt @@ -5,7 +5,7 @@ import net.kyori.adventure.text.TextReplacementConfig internal object SwearRuRegex { val SWEAR_REGEX by lazy { """ - (?iu)\b(?:(?:(?:у|[нз]а|(?:хитро|не)?вз?[ыьъ]|с[ьъ]|(?:и|ра)[зс]ъ?|(?:о[тб]|п[оа]д)[ьъ]?|(?:.\B)+?[оаеи-])-?)?(?:[её](?:б(?!о[рй]|рач)|п[уа](?:ц|тс))|и[пб][ае][тцд][ьъ]).*?|(?:(?:н[иеа]|ра[зс]|[зд]?[ао](?:т|дн[оа])?|с(?:м[еи])?|а[пб]ч)-?)?ху(?:[яйиеёю]|л+и(?!ган)).*?|бл(?:[эя]|еа?)(?:[дт][ьъ]?)?|\S*?(?:п(?:[иеё]зд|ид[аое]?р|ед(?:р(?!о)|[аое]р|ик)|охую)|бля(?:[дбц]|тс)|[ое]ху[яйиеё]|хуйн).*?|(?:о[тб]?|про|на|вы)?м(?:анд(?:[ауеыи](?:л(?:и[сзщ])?[ауеиы])?|ой|[ао]в.*?|юк(?:ов|[ауи])?|е[нт]ь|ища)|уд(?:[яаиое].+?|е?н(?:[ьюия]|ей))|[ао]л[ао]ф[ьъ](?:[яиюе]|[еёо]й))|елд[ауые].*?|ля[тд]ь|(?:[нз]а|по)х)\b + (? Material.DIRT EntityType.EXPERIENCE_ORB -> Material.EXPERIENCE_BOTTLE EntityType.AREA_EFFECT_CLOUD -> Material.DIRT EntityType.ELDER_GUARDIAN -> Material.ELDER_GUARDIAN_SPAWN_EGG EntityType.WITHER_SKELETON -> Material.WITHER_SKELETON_SPAWN_EGG EntityType.STRAY -> Material.STRAY_SPAWN_EGG EntityType.EGG -> Material.EGG - EntityType.LEASH_HITCH -> Material.LEAD EntityType.PAINTING -> Material.PAINTING EntityType.ARROW -> Material.ARROW EntityType.SNOWBALL -> Material.SNOWBALL EntityType.FIREBALL -> Material.FIRE_CHARGE EntityType.SMALL_FIREBALL -> Material.FIRE_CHARGE EntityType.ENDER_PEARL -> Material.ENDER_PEARL - EntityType.ENDER_SIGNAL -> Material.BARRIER - EntityType.SPLASH_POTION -> Material.SPLASH_POTION - EntityType.THROWN_EXP_BOTTLE -> Material.EXPERIENCE_BOTTLE EntityType.ITEM_FRAME -> Material.ITEM_FRAME EntityType.WITHER_SKULL -> Material.WITHER_SKELETON_SKULL - EntityType.PRIMED_TNT -> Material.TNT EntityType.FALLING_BLOCK -> Material.SAND - EntityType.FIREWORK -> Material.FIREWORK_ROCKET EntityType.HUSK -> Material.HUSK_SPAWN_EGG EntityType.SPECTRAL_ARROW -> Material.SPECTRAL_ARROW EntityType.SHULKER_BULLET -> Material.SHULKER_BOX @@ -44,14 +37,8 @@ fun EntityType.toMaterial() = when (this) { EntityType.VEX -> Material.VEX_SPAWN_EGG EntityType.VINDICATOR -> Material.VINDICATOR_SPAWN_EGG EntityType.ILLUSIONER -> Material.BARRIER - EntityType.MINECART_COMMAND -> Material.COMMAND_BLOCK_MINECART EntityType.BOAT -> Material.BIRCH_BOAT EntityType.MINECART -> Material.MINECART - EntityType.MINECART_CHEST -> Material.CHEST_MINECART - EntityType.MINECART_FURNACE -> Material.FURNACE_MINECART - EntityType.MINECART_TNT -> Material.TNT - EntityType.MINECART_HOPPER -> Material.HOPPER_MINECART - EntityType.MINECART_MOB_SPAWNER -> Material.SPAWNER EntityType.CREEPER -> Material.CREEPER_SPAWN_EGG EntityType.SKELETON -> Material.SKELETON_SPAWN_EGG EntityType.SPIDER -> Material.SPIDER_SPAWN_EGG @@ -78,8 +65,6 @@ fun EntityType.toMaterial() = when (this) { EntityType.CHICKEN -> Material.CHICKEN_SPAWN_EGG EntityType.SQUID -> Material.SQUID_SPAWN_EGG EntityType.WOLF -> Material.WOLF_SPAWN_EGG - EntityType.MUSHROOM_COW -> Material.COW_SPAWN_EGG - EntityType.SNOWMAN -> Material.BARRIER EntityType.OCELOT -> Material.OCELOT_SPAWN_EGG EntityType.IRON_GOLEM -> Material.IRON_BLOCK EntityType.HORSE -> Material.HORSE_SPAWN_EGG @@ -89,7 +74,6 @@ fun EntityType.toMaterial() = when (this) { EntityType.LLAMA_SPIT -> Material.BARRIER EntityType.PARROT -> Material.PARROT_SPAWN_EGG EntityType.VILLAGER -> Material.VILLAGER_SPAWN_EGG - EntityType.ENDER_CRYSTAL -> Material.END_CRYSTAL EntityType.TURTLE -> Material.TURTLE_SPAWN_EGG EntityType.PHANTOM -> Material.PHANTOM_SPAWN_EGG EntityType.TRIDENT -> Material.TRIDENT @@ -122,8 +106,6 @@ fun EntityType.toMaterial() = when (this) { EntityType.FROG -> Material.FROG_SPAWN_EGG EntityType.TADPOLE -> Material.TADPOLE_SPAWN_EGG EntityType.WARDEN -> Material.WARDEN_SPAWN_EGG - EntityType.FISHING_HOOK -> Material.FISHING_ROD - EntityType.LIGHTNING -> Material.BARRIER EntityType.PLAYER -> Material.PLAYER_HEAD EntityType.UNKNOWN -> Material.BARRIER EntityType.CAMEL -> Material.CAMEL_SPAWN_EGG @@ -134,4 +116,26 @@ fun EntityType.toMaterial() = when (this) { EntityType.TEXT_DISPLAY -> Material.BARRIER EntityType.BREEZE -> Material.BARRIER EntityType.WIND_CHARGE -> Material.BARRIER + EntityType.ITEM -> Material.BARRIER + EntityType.LEASH_KNOT -> Material.BIG_DRIPLEAF_STEM + EntityType.EYE_OF_ENDER -> Material.ENDER_EYE + EntityType.POTION -> Material.POTION + EntityType.EXPERIENCE_BOTTLE -> Material.EXPERIENCE_BOTTLE + EntityType.TNT -> Material.TNT + EntityType.FIREWORK_ROCKET -> Material.FIREWORK_ROCKET + EntityType.COMMAND_BLOCK_MINECART -> Material.COMMAND_BLOCK_MINECART + EntityType.CHEST_MINECART -> Material.CHEST_MINECART + EntityType.FURNACE_MINECART -> Material.FURNACE_MINECART + EntityType.TNT_MINECART -> Material.TNT_MINECART + EntityType.HOPPER_MINECART -> Material.HOPPER_MINECART + EntityType.SPAWNER_MINECART -> Material.SPAWNER + EntityType.MOOSHROOM -> Material.MOOSHROOM_SPAWN_EGG + EntityType.SNOW_GOLEM -> Material.SNOW_GOLEM_SPAWN_EGG + EntityType.END_CRYSTAL -> Material.END_CRYSTAL + EntityType.BREEZE_WIND_CHARGE -> Material.BREEZE_SPAWN_EGG + EntityType.ARMADILLO -> Material.ARMADILLO_SPAWN_EGG + EntityType.BOGGED -> Material.BOGGED_SPAWN_EGG + EntityType.OMINOUS_ITEM_SPAWNER -> Material.OMINOUS_BOTTLE + EntityType.FISHING_BOBBER -> Material.BARRIER + EntityType.LIGHTNING_BOLT -> Material.BARRIER } diff --git a/velocity/src/main/kotlin/ru/astrainteractive/aspekt/AspeKt.kt b/velocity/src/main/kotlin/ru/astrainteractive/aspekt/AspeKt.kt index 81e0c1b..6c03515 100644 --- a/velocity/src/main/kotlin/ru/astrainteractive/aspekt/AspeKt.kt +++ b/velocity/src/main/kotlin/ru/astrainteractive/aspekt/AspeKt.kt @@ -3,7 +3,7 @@ package ru.astrainteractive.aspekt import com.google.inject.Inject import com.google.inject.Injector import com.velocitypowered.api.event.Subscribe -import com.velocitypowered.api.event.proxy.ProxyInitializeEvent +import com.velocitypowered.api.event.lifecycle.ProxyInitializeEvent import com.velocitypowered.api.plugin.Plugin import com.velocitypowered.api.plugin.annotation.DataDirectory import com.velocitypowered.api.proxy.ProxyServer From ce4064cece9dc62212950abb6f67c3d177c0bcac Mon Sep 17 00:00:00 2001 From: makeevrserg Date: Mon, 27 May 2024 17:08:17 +0300 Subject: [PATCH 4/5] update ci --- .../{build-project.yml => call-build-project.yml} | 0 .../{create-artifacts.yml => call-create-artifacts.yml} | 4 ++-- .../{detekt-validation.yml => call-detekt-validation.yml} | 0 ...-validation.yml => call-gradle-wrapper-validation.yml} | 0 .../{tests-validation.yml => call-tests-validation.yml} | 0 .github/workflows/check-develop.yml | 8 ++++---- .github/workflows/pr.yml | 8 ++++---- .github/workflows/release-master.yml | 8 ++++---- 8 files changed, 14 insertions(+), 14 deletions(-) rename .github/workflows/{build-project.yml => call-build-project.yml} (100%) rename .github/workflows/{create-artifacts.yml => call-create-artifacts.yml} (86%) rename .github/workflows/{detekt-validation.yml => call-detekt-validation.yml} (100%) rename .github/workflows/{gradle-wrapper-validation.yml => call-gradle-wrapper-validation.yml} (100%) rename .github/workflows/{tests-validation.yml => call-tests-validation.yml} (100%) diff --git a/.github/workflows/build-project.yml b/.github/workflows/call-build-project.yml similarity index 100% rename from .github/workflows/build-project.yml rename to .github/workflows/call-build-project.yml diff --git a/.github/workflows/create-artifacts.yml b/.github/workflows/call-create-artifacts.yml similarity index 86% rename from .github/workflows/create-artifacts.yml rename to .github/workflows/call-create-artifacts.yml index 1c0973f..10c5d41 100644 --- a/.github/workflows/create-artifacts.yml +++ b/.github/workflows/call-create-artifacts.yml @@ -26,7 +26,7 @@ jobs: - name: Build with Gradle uses: gradle/gradle-build-action@v3 with: - arguments: shadowJar --stacktrace + arguments: :plugin:shadowJar --stacktrace - name: Create release id: create_internal_release uses: softprops/action-gh-release@v2 @@ -34,7 +34,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }} with: files: | - ./jars/${{ steps.properties.outputs.makeevrserg-project-name }}-${{ steps.properties.outputs.makeevrserg-project-version-string }}.jar + ./jars/*.jar tag_name: ${{ steps.properties.outputs.makeevrserg-project-version-string }} name: ${{ steps.properties.outputs.makeevrserg-project-name }} - ${{ steps.properties.outputs.makeevrserg-project-version-string }} draft: false diff --git a/.github/workflows/detekt-validation.yml b/.github/workflows/call-detekt-validation.yml similarity index 100% rename from .github/workflows/detekt-validation.yml rename to .github/workflows/call-detekt-validation.yml diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/call-gradle-wrapper-validation.yml similarity index 100% rename from .github/workflows/gradle-wrapper-validation.yml rename to .github/workflows/call-gradle-wrapper-validation.yml diff --git a/.github/workflows/tests-validation.yml b/.github/workflows/call-tests-validation.yml similarity index 100% rename from .github/workflows/tests-validation.yml rename to .github/workflows/call-tests-validation.yml diff --git a/.github/workflows/check-develop.yml b/.github/workflows/check-develop.yml index 861b638..3b9512a 100644 --- a/.github/workflows/check-develop.yml +++ b/.github/workflows/check-develop.yml @@ -6,15 +6,15 @@ on: jobs: gradle_validation: name: Validate gradle wrapper - uses: ./.github/workflows/gradle-wrapper-validation.yml + uses: ./.github/workflows/call-gradle-wrapper-validation.yml detekt_validation: name: Check by detekt needs: gradle_validation - uses: ./.github/workflows/detekt-validation.yml + uses: ./.github/workflows/call-detekt-validation.yml tests_validation: needs: gradle_validation - uses: ./.github/workflows/tests-validation.yml + uses: ./.github/workflows/call-tests-validation.yml build: name: Build project needs: [ gradle_validation, detekt_validation,tests_validation ] - uses: ./.github/workflows/build-project.yml \ No newline at end of file + uses: ./.github/workflows/call-build-project.yml \ No newline at end of file diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 65acec4..03dfcad 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -21,15 +21,15 @@ concurrency: jobs: gradle_validation: name: Validate gradle wrapper - uses: ./.github/workflows/gradle-wrapper-validation.yml + uses: ./.github/workflows/call-gradle-wrapper-validation.yml detekt_validation: name: Check by detekt needs: gradle_validation - uses: ./.github/workflows/detekt-validation.yml + uses: ./.github/workflows/call-detekt-validation.yml tests_validation: needs: gradle_validation - uses: ./.github/workflows/tests-validation.yml + uses: ./.github/workflows/call-tests-validation.yml build: name: Build project needs: [ gradle_validation, detekt_validation, tests_validation ] - uses: ./.github/workflows/build-project.yml \ No newline at end of file + uses: ./.github/workflows/call-build-project.yml \ No newline at end of file diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml index a13fd7c..3d20ea5 100644 --- a/.github/workflows/release-master.yml +++ b/.github/workflows/release-master.yml @@ -5,15 +5,15 @@ on: - master jobs: gradle_validation: - uses: ./.github/workflows/gradle-wrapper-validation.yml + uses: ./.github/workflows/call-gradle-wrapper-validation.yml detekt_validation: needs: gradle_validation - uses: ./.github/workflows/detekt-validation.yml + uses: ./.github/workflows/call-detekt-validation.yml tests_validation: needs: gradle_validation - uses: ./.github/workflows/tests-validation.yml + uses: ./.github/workflows/call-tests-validation.yml create_artifact: needs: [ gradle_validation, detekt_validation, tests_validation ] - uses: ./.github/workflows/create-artifacts.yml + uses: ./.github/workflows/call-create-artifacts.yml secrets: ACTIONS_TOKEN: ${{ secrets.ACTIONS_TOKEN }} From 448cbb632374b5e58c73410fae3cb7a2d70c07cd Mon Sep 17 00:00:00 2001 From: makeevrserg Date: Mon, 27 May 2024 17:08:53 +0300 Subject: [PATCH 5/5] up version 2.20.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 98f5088..a754178 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ makeevrserg.java.ktarget=21 # Project makeevrserg.project.name=AspeKt makeevrserg.project.group=ru.astrainteractive.aspekt -makeevrserg.project.version.string=2.19.11 +makeevrserg.project.version.string=2.20.0 makeevrserg.project.description=Essentials plugin for EmpireProjekt makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com makeevrserg.project.url=https://empireprojekt.ru