diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml index 653d9ab2..e37b6c71 100644 --- a/.github/workflows/dependency-submission.yml +++ b/.github/workflows/dependency-submission.yml @@ -1,4 +1,4 @@ -name: Dependency Submission +name: Nookure Staff Dependency Submission on: push: diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml index 35aab742..08c436ec 100644 --- a/.github/workflows/javadoc.yml +++ b/.github/workflows/javadoc.yml @@ -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: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8902812e..79a32415 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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: @@ -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 \ No newline at end of file diff --git a/NookureStaff-Common/src/main/java/com/nookure/staff/service/UserNoteServiceImpl.java b/NookureStaff-Common/src/main/java/com/nookure/staff/service/UserNoteServiceImpl.java index fb737486..36b6c098 100644 --- a/NookureStaff-Common/src/main/java/com/nookure/staff/service/UserNoteServiceImpl.java +++ b/NookureStaff-Common/src/main/java/com/nookure/staff/service/UserNoteServiceImpl.java @@ -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; } diff --git a/NookureStaff-Paper/src/main/java/com/nookure/staff/paper/bootstrap/StaffBootstrapper.java b/NookureStaff-Paper/src/main/java/com/nookure/staff/paper/bootstrap/StaffBootstrapper.java index 3981b98b..78296a81 100644 --- a/NookureStaff-Paper/src/main/java/com/nookure/staff/paper/bootstrap/StaffBootstrapper.java +++ b/NookureStaff-Paper/src/main/java/com/nookure/staff/paper/bootstrap/StaffBootstrapper.java @@ -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); } diff --git a/commit.sh b/commit.sh deleted file mode 100644 index 69060bc5..00000000 --- a/commit.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# Obtén una lista de archivos modificados -modified_files=$(git diff --name-only HEAD~1 HEAD) - -for file in $modified_files; do - # Obtén el mensaje del commit anterior para el archivo - previous_message=$(git log -1 --pretty=%B -- $file) - - # Reconvertir el archivo para que use LF - dos2unix $file - - # Agrega el archivo al índice - git add $file - - # Haz un commit con el mensaje anterior - git commit -m "$previous_message" -done