From f0a9267534d3b41b01f608f92363a369b4c99422 Mon Sep 17 00:00:00 2001 From: Badbird-5907 <50347938+Badbird-5907@users.noreply.github.com> Date: Thu, 11 Aug 2022 21:33:51 -0400 Subject: [PATCH 1/5] move analyze under --- .github/workflows/dev-analysis.yml | 71 +++++++++++++++--------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/.github/workflows/dev-analysis.yml b/.github/workflows/dev-analysis.yml index 8d11f31..4f4045d 100644 --- a/.github/workflows/dev-analysis.yml +++ b/.github/workflows/dev-analysis.yml @@ -3,42 +3,6 @@ name: "CodeQL" on: [push, pull_request] jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'java' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Cache local repo - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 - gradle: strategy: matrix: @@ -66,3 +30,38 @@ jobs: with: name: TerminatorPlus path: build/libs/ + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'java' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] + # Learn more: + # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Cache local repo + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 From 74bd4b5d0092f9e79b6f065ae86dcf5def4bcefc Mon Sep 17 00:00:00 2001 From: Badbird-5907 <50347938+Badbird-5907@users.noreply.github.com> Date: Thu, 11 Aug 2022 21:36:18 -0400 Subject: [PATCH 2/5] fix? --- .github/workflows/dev-analysis.yml | 35 +++++++----------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/.github/workflows/dev-analysis.yml b/.github/workflows/dev-analysis.yml index 4f4045d..99203bd 100644 --- a/.github/workflows/dev-analysis.yml +++ b/.github/workflows/dev-analysis.yml @@ -4,9 +4,16 @@ on: [push, pull_request] jobs: gradle: + permissions: + actions: read + contents: read + security-events: write strategy: matrix: os: [ ubuntu-latest ] + fail-fast: false + matrix: + language: [ 'java' ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -30,33 +37,6 @@ jobs: with: name: TerminatorPlus path: build/libs/ - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'java' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Cache local repo - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Initialize CodeQL uses: github/codeql-action/init@v1 @@ -65,3 +45,4 @@ jobs: - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v1 + From 63b85d3a016dd4249c4ea628edcbcba43a8083cf Mon Sep 17 00:00:00 2001 From: Badbird5907 <50347938+Badbird5907@users.noreply.github.com> Date: Thu, 5 Jan 2023 19:41:00 -0500 Subject: [PATCH 3/5] update build script (add buildSrc) --- TerminatorPlus-API/build.gradle.kts | 2 +- TerminatorPlus-Plugin/build.gradle.kts | 2 +- build.gradle.kts | 4 +--- buildSrc/build.gradle.kts | 11 +++++++++++ .../kotlin/net.nuggetmc.java-conventions.gradle.kts | 6 ++++++ settings.gradle.kts | 2 ++ 6 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts diff --git a/TerminatorPlus-API/build.gradle.kts b/TerminatorPlus-API/build.gradle.kts index 6e3eb1d..003c001 100644 --- a/TerminatorPlus-API/build.gradle.kts +++ b/TerminatorPlus-API/build.gradle.kts @@ -1,9 +1,9 @@ plugins { id("java") + id("net.nuggetmc.java-conventions") } group = "net.nuggetmc" -version = "3.3.1-BETA" repositories { mavenCentral() diff --git a/TerminatorPlus-Plugin/build.gradle.kts b/TerminatorPlus-Plugin/build.gradle.kts index c30389a..9d71604 100644 --- a/TerminatorPlus-Plugin/build.gradle.kts +++ b/TerminatorPlus-Plugin/build.gradle.kts @@ -1,10 +1,10 @@ plugins { `java-library` id("io.papermc.paperweight.userdev") version "1.3.7" + id("net.nuggetmc.java-conventions") } group = "net.nuggetmc" -version = "3.3.1-BETA" description = "TerminatorPlus" java { diff --git a/build.gradle.kts b/build.gradle.kts index f3fb69c..ce722f8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,8 @@ plugins { id("java") + id("net.nuggetmc.java-conventions") } -group = "net.nuggetmc" -version = "3.3.1-BETA" - val jarName = "TerminatorPlus-" + version; repositories { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 0000000..e9b9926 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + // Support convention plugins written in Kotlin. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. + `kotlin-dsl` +} + +repositories { + // Use the plugin portal to apply community plugins in convention plugins. + gradlePluginPortal() +} +dependencies { +} diff --git a/buildSrc/src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts new file mode 100644 index 0000000..334d4af --- /dev/null +++ b/buildSrc/src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts @@ -0,0 +1,6 @@ +plugins { + `java-library` +} + +group = "net.nuggetmc" +version = "3.3.1-BETA" diff --git a/settings.gradle.kts b/settings.gradle.kts index 480e09f..1a494a1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,3 +8,5 @@ pluginManagement { rootProject.name = "TerminatorPlus" include("TerminatorPlus-Plugin") include("TerminatorPlus-API") + +// set the version From 7d83b1f8f228da573306a493d4f514596209d75d Mon Sep 17 00:00:00 2001 From: Badbird5907 <50347938+Badbird5907@users.noreply.github.com> Date: Thu, 5 Jan 2023 19:41:55 -0500 Subject: [PATCH 4/5] bump ver to 4.0.0-BETA --- .../src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts index 334d4af..9b58428 100644 --- a/buildSrc/src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts @@ -3,4 +3,4 @@ plugins { } group = "net.nuggetmc" -version = "3.3.1-BETA" +version = "4.0.0-BETA" From f68a728f85ee59dd9ddd33a9b63c57f5d44ab188 Mon Sep 17 00:00:00 2001 From: Badbird5907 <50347938+Badbird5907@users.noreply.github.com> Date: Thu, 5 Jan 2023 19:44:41 -0500 Subject: [PATCH 5/5] Add list alias --- .../tplus/command/commands/BotCommand.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java index b553648..4ee7060 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java @@ -233,18 +233,21 @@ public class BotCommand extends CommandInstance { public List infoAutofill(CommandSender sender, String[] args) { return args.length == 2 ? manager.fetchNames() : null; } - + @Command( - name = "count", - desc = "Counts the amount of bots on screen by name." + name = "count", + desc = "Counts the amount of bots on screen by name.", + aliases = { + "list" + } ) public void count(CommandSender sender) { List names = manager.fetchNames(); Map freqMap = names.stream().collect(Collectors.toMap(s -> s, s -> 1, Integer::sum)); List> entries = freqMap.entrySet().stream() .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder())).collect(Collectors.toList()); - - sender.sendMessage(ChatUtils.LINE); + + sender.sendMessage(ChatUtils.LINE); entries.forEach(en -> sender.sendMessage(ChatColor.GREEN + en.getKey() + ChatColor.RESET + " - " + ChatColor.BLUE + en.getValue().toString() + ChatColor.RESET)); sender.sendMessage("Total bots: " + ChatColor.BLUE + freqMap.values().stream().reduce(0, Integer::sum) + ChatColor.RESET); @@ -519,7 +522,7 @@ public class BotCommand extends CommandInstance { public void debug(CommandSender sender, @Arg("expression") String expression) { new Debugger(sender).execute(expression); } - + private double parseDoubleOrRelative(String pos, Location loc, int type) { if (loc == null || pos.length() == 0 || pos.charAt(0) != '~') return Double.parseDouble(pos);