Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions .pnlibrary/changelogs/1.1.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# pnRtp 1.1.0

- Переход на pnLibrary 0.1.0-dev.6 (API 2): нужна новая библиотека.
4 changes: 4 additions & 0 deletions RELEASE-1.1.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# v1.1.0 — Переход на pnLibrary 0.1.0-dev.6

## Изменено
- Плагин работает с pnLibrary 0.1.0-dev.6 (API 2). Старые версии библиотеки не подойдут, обновите pnLibrary.
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@ plugins {
}

group = 'ru.privatenull'
version = '1.0.2'
version = '1.1.0'

repositories {
mavenLocal()
mavenCentral()
maven {
name = 'papermc-repo'
url = 'https://repo.papermc.io/repository/maven-public/'
}
}

def pnLibraryVersion = '0.0.1-dev.6'
def pnLibraryVersion = '0.1.0-dev.6'

dependencies {
// Общий рантайм ставит bootstrap, зашейденный в jar; для компиляции нужен только публичный API.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/ru/privatenull/rtp/RTPCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ru/privatenull/rtp/RTPManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading