Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release #106

Merged
merged 7 commits into from
Jun 14, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/dependency-submission.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Dependency Submission
name: Nookure Staff Dependency Submission

on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/javadoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle

name: Update Javadoc
name: NookureStaff Update Javadoc

on:
push:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: NookureStaff build
name: NookureStaff Publish API

on:
push:
Expand All @@ -27,7 +27,7 @@ jobs:
- name: Execute Gradle build
env:
GRGIT_USER: "Angelillo15"
GRGIT_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
GRGIT_PASS: ${{ secrets.TOKEN }}
run: |
chmod +x gradlew
./gradlew NookureStaff-API:publish NookureStaff-API:gitPublishPushAll
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void displayNotesChat(@NotNull CommandSender staff, @NotNull PlayerModel
.findPagedList();

if (notes.getTotalCount() == 0) {
staff.sendMiniMessage(noteMessages.get().userWithoutNotes(), "player", player.getName());
staff.sendMiniMessage(Object2Text.replaceText(noteMessages.get().userWithoutNotes(), player));
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,19 @@ private void loadDependencies() {
LibraryManager manager;

try {
Class.forName("com.nookure.staff.paper.bootstrap.PaperPluginModule");
manager = new PaperLibraryManager(this);
Class.forName("io.papermc.paper.plugin.entrypoint.classloader.PaperPluginClassLoader");
try {
manager = new PaperLibraryManager(this);
} catch (Exception e) {
manager = new BukkitLibraryManager(this);
logger.severe(e);
logger.warning("------------------------------------------------------------------");
logger.warning("DONT IGNORE THIS MESSAGE, IT'S IMPORTANT!");
logger.warning("There was several issues while trying to load some paper-plugin related stuff.");
logger.warning("If you are using Paper >= 1.8 <= 1.19.4, you might experience some issues.");
logger.warning("Please, report this in the discord server.");
logger.warning("------------------------------------------------------------------");
}
} catch (ClassNotFoundException e) {
manager = new BukkitLibraryManager(this);
}
Expand Down
18 changes: 0 additions & 18 deletions commit.sh

This file was deleted.

Loading