From af84409f33dd11a8a61664eb82155691cafa6b9d Mon Sep 17 00:00:00 2001 From: overdyn Date: Sat, 21 Nov 2026 16:35:22 +0100 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BD=D0=B0=20pnLibrary=200.1.0-dev.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 17 +++++++++++++++++ .github/workflows/release.yml | 17 +++++++++++++++++ .pnlibrary/changelogs/1.2.0.md | 3 +++ RELEASE-1.2.0.md | 4 ++++ build.gradle | 5 +++-- .../java/ru/privatenull/chat/PnChatCommand.java | 8 ++++---- .../integration/PnLibraryRuntime.java | 6 +++--- .../java/ru/privatenull/integration/Tasks.java | 4 ++-- 8 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 .pnlibrary/changelogs/1.2.0.md create mode 100644 RELEASE-1.2.0.md diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 881af93..ad89629 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,23 @@ jobs: with: distribution: temurin java-version: 21 + - name: Read pnLibrary version + id: pnlibrary + run: echo "version=$(grep -m1 "^def pnLibraryVersion" build.gradle | cut -d"'" -f2)" >> "$GITHUB_OUTPUT" + + - name: Checkout pnLibrary + uses: actions/checkout@v4 + with: + repository: pnFolder/pnLibrary + ref: v${{ steps.pnlibrary.outputs.version }} + path: pnLibrary + + - name: Publish pnLibrary to Maven Local + working-directory: pnLibrary + run: | + chmod +x gradlew + JAVA_HOME="$JAVA_HOME_21_X64" ./gradlew publishToMavenLocal --no-daemon --no-build-cache + - uses: gradle/actions/setup-gradle@v4 - run: chmod +x gradlew - run: ./gradlew build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 202806e..55dbe85 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,6 +15,23 @@ jobs: with: distribution: temurin java-version: 21 + - name: Read pnLibrary version + id: pnlibrary + run: echo "version=$(grep -m1 "^def pnLibraryVersion" build.gradle | cut -d"'" -f2)" >> "$GITHUB_OUTPUT" + + - name: Checkout pnLibrary + uses: actions/checkout@v4 + with: + repository: pnFolder/pnLibrary + ref: v${{ steps.pnlibrary.outputs.version }} + path: pnLibrary + + - name: Publish pnLibrary to Maven Local + working-directory: pnLibrary + run: | + chmod +x gradlew + JAVA_HOME="$JAVA_HOME_21_X64" ./gradlew publishToMavenLocal --no-daemon --no-build-cache + - uses: gradle/actions/setup-gradle@v4 - run: chmod +x gradlew - run: ./gradlew clean build diff --git a/.pnlibrary/changelogs/1.2.0.md b/.pnlibrary/changelogs/1.2.0.md new file mode 100644 index 0000000..597abc7 --- /dev/null +++ b/.pnlibrary/changelogs/1.2.0.md @@ -0,0 +1,3 @@ +# pnChat 1.2.0 + +- Переход на pnLibrary 0.1.0-dev.6 (API 2): нужна новая библиотека. diff --git a/RELEASE-1.2.0.md b/RELEASE-1.2.0.md new file mode 100644 index 0000000..a909394 --- /dev/null +++ b/RELEASE-1.2.0.md @@ -0,0 +1,4 @@ +# v1.2.0 — Переход на pnLibrary 0.1.0-dev.6 + +## Изменено +- Плагин работает с pnLibrary 0.1.0-dev.6 (API 2). Старые версии библиотеки не подойдут, обновите pnLibrary. diff --git a/build.gradle b/build.gradle index 81d05de..5872eb9 100644 --- a/build.gradle +++ b/build.gradle @@ -4,9 +4,10 @@ plugins { } group = 'ru.privatenull' -version = '1.1.0' +version = '1.2.0' repositories { + mavenLocal() mavenCentral() maven { name = 'papermc-repo' @@ -14,7 +15,7 @@ repositories { } } -def pnLibraryVersion = '0.0.1-dev.6' +def pnLibraryVersion = '0.1.0-dev.6' dependencies { compileOnly 'io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT' diff --git a/src/main/java/ru/privatenull/chat/PnChatCommand.java b/src/main/java/ru/privatenull/chat/PnChatCommand.java index 2eff7f8..5be9a78 100644 --- a/src/main/java/ru/privatenull/chat/PnChatCommand.java +++ b/src/main/java/ru/privatenull/chat/PnChatCommand.java @@ -4,11 +4,11 @@ import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import org.pnfolder.pnlibrary.api.commands.BadUsage; +import org.pnfolder.pnlibrary.api.commands.error.BadUsage; import org.pnfolder.pnlibrary.api.commands.CommandContext; -import org.pnfolder.pnlibrary.api.commands.CommandDefinition; -import org.pnfolder.pnlibrary.api.commands.NoPermission; -import org.pnfolder.pnlibrary.api.commands.PlayerOnly; +import org.pnfolder.pnlibrary.api.commands.definition.CommandDefinition; +import org.pnfolder.pnlibrary.api.commands.error.NoPermission; +import org.pnfolder.pnlibrary.api.commands.error.PlayerOnly; import ru.privatenull.pnChatPlugin; import java.util.UUID; diff --git a/src/main/java/ru/privatenull/integration/PnLibraryRuntime.java b/src/main/java/ru/privatenull/integration/PnLibraryRuntime.java index f8770dd..ed33b1e 100644 --- a/src/main/java/ru/privatenull/integration/PnLibraryRuntime.java +++ b/src/main/java/ru/privatenull/integration/PnLibraryRuntime.java @@ -1,9 +1,9 @@ package ru.privatenull.integration; import org.bukkit.plugin.java.JavaPlugin; -import org.pnfolder.pnlibrary.api.commands.CommandDefinition; +import org.pnfolder.pnlibrary.api.commands.definition.CommandDefinition; import org.pnfolder.pnlibrary.api.diagnostics.DiagnosticConfiguration; -import org.pnfolder.pnlibrary.api.diagnostics.DiagnosticContainer; +import org.pnfolder.pnlibrary.api.diagnostics.report.DiagnosticContainer; import org.pnfolder.pnlibrary.api.logging.MessageBox; import org.pnfolder.pnlibrary.api.plugin.ModuleContext; import org.pnfolder.pnlibrary.api.plugin.PluginRegistration; @@ -12,7 +12,7 @@ import org.pnfolder.pnlibrary.api.runtime.PnLibrary; import org.pnfolder.pnlibrary.api.runtime.PnLibraryIdentity; import org.pnfolder.pnlibrary.api.runtime.PnLibraryProvider; -import org.pnfolder.pnlibrary.api.updates.UpdateChannel; +import org.pnfolder.pnlibrary.api.updates.product.UpdateChannel; import java.util.function.Supplier; import java.util.logging.Level; diff --git a/src/main/java/ru/privatenull/integration/Tasks.java b/src/main/java/ru/privatenull/integration/Tasks.java index 1550974..6bcec89 100644 --- a/src/main/java/ru/privatenull/integration/Tasks.java +++ b/src/main/java/ru/privatenull/integration/Tasks.java @@ -1,9 +1,9 @@ package ru.privatenull.integration; import org.pnfolder.pnlibrary.api.plugin.ModuleContext; -import org.pnfolder.pnlibrary.api.tasks.TaskExecution; +import org.pnfolder.pnlibrary.api.tasks.spec.TaskExecution; import org.pnfolder.pnlibrary.api.tasks.TaskHandle; -import org.pnfolder.pnlibrary.api.tasks.TaskSpec; +import org.pnfolder.pnlibrary.api.tasks.spec.TaskSpec; /** * Планировщик плагина поверх задач pnLibrary ({@code ModuleContext.tasks}): задачи выполняются на нужном потоке