diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b404a7..275bfb8 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.1.0.md b/.pnlibrary/changelogs/1.1.0.md new file mode 100644 index 0000000..4636f84 --- /dev/null +++ b/.pnlibrary/changelogs/1.1.0.md @@ -0,0 +1,3 @@ +# pnRtp 1.1.0 + +- Переход на pnLibrary 0.1.0-dev.6 (API 2): нужна новая библиотека. diff --git a/RELEASE-1.1.0.md b/RELEASE-1.1.0.md new file mode 100644 index 0000000..8a52a88 --- /dev/null +++ b/RELEASE-1.1.0.md @@ -0,0 +1,4 @@ +# v1.1.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 4f4c72c..7fe0752 100644 --- a/build.gradle +++ b/build.gradle @@ -4,9 +4,10 @@ plugins { } group = 'ru.privatenull' -version = '1.0.2' +version = '1.1.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 { // Общий рантайм ставит bootstrap, зашейденный в jar; для компиляции нужен только публичный API. diff --git a/src/main/java/ru/privatenull/integration/PnLibraryRuntime.java b/src/main/java/ru/privatenull/integration/PnLibraryRuntime.java index 797e2a1..ba6cf39 100644 --- a/src/main/java/ru/privatenull/integration/PnLibraryRuntime.java +++ b/src/main/java/ru/privatenull/integration/PnLibraryRuntime.java @@ -2,7 +2,7 @@ import org.bukkit.plugin.java.JavaPlugin; 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.logging.PnLogger; import org.pnfolder.pnlibrary.api.plugin.ModuleContext; @@ -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 ru.privatenull.log.Log; import java.util.LinkedHashMap; diff --git a/src/main/java/ru/privatenull/rtp/RTPCommand.java b/src/main/java/ru/privatenull/rtp/RTPCommand.java index 052c37c..2c211d8 100644 --- a/src/main/java/ru/privatenull/rtp/RTPCommand.java +++ b/src/main/java/ru/privatenull/rtp/RTPCommand.java @@ -3,12 +3,12 @@ import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import org.pnfolder.pnlibrary.api.commands.ArgumentType; -import org.pnfolder.pnlibrary.api.commands.BadUsage; +import org.pnfolder.pnlibrary.api.commands.definition.ArgumentType; +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.pnrtpPlugin; import java.util.List; @@ -71,7 +71,7 @@ public CommandDefinition definition() { .build(); } - private void mode(org.pnfolder.pnlibrary.api.commands.CommandNodeBuilder node, String mode) { + private void mode(org.pnfolder.pnlibrary.api.commands.definition.CommandNodeBuilder node, String mode) { node.permission("pnrtp." + mode).executes(context -> { Player player = player(context); if (player == null) return; diff --git a/src/main/java/ru/privatenull/rtp/RTPManager.java b/src/main/java/ru/privatenull/rtp/RTPManager.java index 14a75af..3c98b82 100644 --- a/src/main/java/ru/privatenull/rtp/RTPManager.java +++ b/src/main/java/ru/privatenull/rtp/RTPManager.java @@ -8,7 +8,7 @@ import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; -import org.pnfolder.pnlibrary.api.tasks.TaskSpec; +import org.pnfolder.pnlibrary.api.tasks.spec.TaskSpec; import ru.privatenull.pnrtpPlugin; import java.time.Duration;