From c8cb188dfe971c52139b0e7fa744af3e3d676c37 Mon Sep 17 00:00:00 2001 From: Derek Date: Wed, 5 Mar 2025 20:19:20 +0000 Subject: [PATCH 01/18] Update src/main/java/org/derek/melon_proxy/MelonProxy.java --- .../org/derek/melon_proxy/MelonProxy.java | 28 +++++-------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/derek/melon_proxy/MelonProxy.java b/src/main/java/org/derek/melon_proxy/MelonProxy.java index 9a46549..8ab9c96 100644 --- a/src/main/java/org/derek/melon_proxy/MelonProxy.java +++ b/src/main/java/org/derek/melon_proxy/MelonProxy.java @@ -114,27 +114,13 @@ public class MelonProxy { private String convertLegacyColorsToMiniMessage(String message) { Map legacyToMiniMessage = new HashMap<>(); legacyToMiniMessage.put("&0", ""); - legacyToMiniMessage.put("&1", ""); - legacyToMiniMessage.put("&2", ""); - legacyToMiniMessage.put("&3", ""); - legacyToMiniMessage.put("&4", ""); - legacyToMiniMessage.put("&5", ""); - legacyToMiniMessage.put("&6", ""); - legacyToMiniMessage.put("&7", ""); - legacyToMiniMessage.put("&8", ""); - legacyToMiniMessage.put("&9", ""); - legacyToMiniMessage.put("&a", ""); - legacyToMiniMessage.put("&b", ""); - legacyToMiniMessage.put("&c", ""); - legacyToMiniMessage.put("&d", ""); - legacyToMiniMessage.put("&e", ""); - legacyToMiniMessage.put("&f", ""); - legacyToMiniMessage.put("&k", ""); - legacyToMiniMessage.put("&l", ""); - legacyToMiniMessage.put("&m", ""); - legacyToMiniMessage.put("&n", ""); - legacyToMiniMessage.put("&o", ""); - legacyToMiniMessage.put("&r", ""); + legacyToMiniMessage.put("&1", ""); legacyToMiniMessage.put("&2", ""); legacyToMiniMessage.put("&3", ""); + legacyToMiniMessage.put("&4", ""); legacyToMiniMessage.put("&5", ""); + legacyToMiniMessage.put("&6", ""); legacyToMiniMessage.put("&7", ""); legacyToMiniMessage.put("&8", ""); + legacyToMiniMessage.put("&9", ""); legacyToMiniMessage.put("&a", ""); legacyToMiniMessage.put("&b", ""); + legacyToMiniMessage.put("&c", ""); legacyToMiniMessage.put("&d", ""); legacyToMiniMessage.put("&e", ""); + legacyToMiniMessage.put("&f", ""); legacyToMiniMessage.put("&k", ""); legacyToMiniMessage.put("&l", ""); + legacyToMiniMessage.put("&m", ""); legacyToMiniMessage.put("&n", ""); legacyToMiniMessage.put("&o", ""); legacyToMiniMessage.put("&r", ""); for (Map.Entry entry : legacyToMiniMessage.entrySet()) { message = message.replace(entry.getKey(), entry.getValue()); From 82fe076333a630bf3ad54ad63915d06982544195 Mon Sep 17 00:00:00 2001 From: Derek Date: Wed, 5 Mar 2025 20:20:12 +0000 Subject: [PATCH 02/18] Update src/main/java/org/derek/melon_proxy/MelonProxy.java --- src/main/java/org/derek/melon_proxy/MelonProxy.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/derek/melon_proxy/MelonProxy.java b/src/main/java/org/derek/melon_proxy/MelonProxy.java index 8ab9c96..c1d9d44 100644 --- a/src/main/java/org/derek/melon_proxy/MelonProxy.java +++ b/src/main/java/org/derek/melon_proxy/MelonProxy.java @@ -113,14 +113,14 @@ public class MelonProxy { private String convertLegacyColorsToMiniMessage(String message) { Map legacyToMiniMessage = new HashMap<>(); - legacyToMiniMessage.put("&0", ""); - legacyToMiniMessage.put("&1", ""); legacyToMiniMessage.put("&2", ""); legacyToMiniMessage.put("&3", ""); - legacyToMiniMessage.put("&4", ""); legacyToMiniMessage.put("&5", ""); + legacyToMiniMessage.put("&0", ""); legacyToMiniMessage.put("&1", ""); legacyToMiniMessage.put("&2", ""); + legacyToMiniMessage.put("&4", ""); legacyToMiniMessage.put("&5", ""); legacyToMiniMessage.put("&3", ""); legacyToMiniMessage.put("&6", ""); legacyToMiniMessage.put("&7", ""); legacyToMiniMessage.put("&8", ""); legacyToMiniMessage.put("&9", ""); legacyToMiniMessage.put("&a", ""); legacyToMiniMessage.put("&b", ""); legacyToMiniMessage.put("&c", ""); legacyToMiniMessage.put("&d", ""); legacyToMiniMessage.put("&e", ""); legacyToMiniMessage.put("&f", ""); legacyToMiniMessage.put("&k", ""); legacyToMiniMessage.put("&l", ""); - legacyToMiniMessage.put("&m", ""); legacyToMiniMessage.put("&n", ""); legacyToMiniMessage.put("&o", ""); legacyToMiniMessage.put("&r", ""); + legacyToMiniMessage.put("&m", ""); legacyToMiniMessage.put("&n", ""); legacyToMiniMessage.put("&o", ""); + legacyToMiniMessage.put("&r", ""); for (Map.Entry entry : legacyToMiniMessage.entrySet()) { message = message.replace(entry.getKey(), entry.getValue()); From 2da3ecf83bfa92c2604e7460b0a62b69afe61995 Mon Sep 17 00:00:00 2001 From: Derek Date: Wed, 5 Mar 2025 20:23:13 +0000 Subject: [PATCH 03/18] Change: Update author --- src/main/java/org/derek/melon_proxy/MelonProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/derek/melon_proxy/MelonProxy.java b/src/main/java/org/derek/melon_proxy/MelonProxy.java index c1d9d44..9d748fe 100644 --- a/src/main/java/org/derek/melon_proxy/MelonProxy.java +++ b/src/main/java/org/derek/melon_proxy/MelonProxy.java @@ -15,7 +15,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -@Plugin(id = "melon_proxy", name = "Melon Proxy", version = "1.3", authors = {"Derek1256"}) +@Plugin(id = "melon_proxy", name = "Melon Proxy", version = "1.3", authors = {"Hyakutake@starmc"}) public class MelonProxy { private final ProxyServer server; From 6b98796d6b936abecb216cc403f35c4e73b579c7 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 7 Mar 2025 21:51:58 +0000 Subject: [PATCH 04/18] Add .forgejo/workflows/build.yaml --- .forgejo/workflows/build.yaml | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .forgejo/workflows/build.yaml diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml new file mode 100644 index 0000000..179a6f5 --- /dev/null +++ b/.forgejo/workflows/build.yaml @@ -0,0 +1,47 @@ +name: Build&Release + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + build_and_release: + runs-on: ubuntu-24.04 + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Set up JDK 21 + uses: actions/setup-java@v2 + with: + java-version: '21' + + - name: Cache Maven dependencies + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + + - name: Build with Maven + run: mvn clean install -DskipTests + + - name: Run tests + run: mvn test + + - name: Prepare release + run: mvn release:prepare -DreleaseVersion=1.0.0 -DdevelopmentVersion=1.1.0-SNAPSHOT -DpushChanges=false + + - name: Perform release + run: mvn release:perform + + - name: Publish release (optional) + run: | + git tag v1.0.0 + git push origin v1.0.0 From b48e5e1d450647f92f37d252c9e8881d6ee06d1d Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 7 Mar 2025 21:52:17 +0000 Subject: [PATCH 05/18] Update .forgejo/workflows/build.yaml --- .forgejo/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 179a6f5..64f7f88 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -10,7 +10,7 @@ on: jobs: build_and_release: - runs-on: ubuntu-24.04 + runs-on: ubuntu steps: - name: Checkout repository From d24e9e68181be804347fc3369c995a9bde4cce04 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 7 Mar 2025 21:55:30 +0000 Subject: [PATCH 06/18] Attempt to fix auth error --- .forgejo/workflows/build.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 64f7f88..68901b4 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -16,10 +16,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Set up JDK 21 - uses: actions/setup-java@v2 - with: - java-version: '21' + - name: Install JDK 21 + run: | + sudo apt update + sudo apt install -y openjdk-21-jdk + java -version - name: Cache Maven dependencies uses: actions/cache@v2 From c512b5ce058b8d8be9f621d6208d2fbb79c4c187 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 7 Mar 2025 21:57:35 +0000 Subject: [PATCH 07/18] mewhen --- .forgejo/workflows/build.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 68901b4..028afba 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -13,6 +13,13 @@ jobs: runs-on: ubuntu steps: + - name: Install Node.js + run: | + curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash - + sudo apt-get install -y nodejs + node -v + npm -v + - name: Checkout repository uses: actions/checkout@v2 @@ -26,9 +33,9 @@ jobs: uses: actions/cache@v2 with: path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + key: maven-${{ hashFiles('**/pom.xml') }} restore-keys: | - ${{ runner.os }}-maven- + maven- - name: Build with Maven run: mvn clean install -DskipTests From 38074b78fe2604bbf01d55c5940e207a6b12bb54 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 7 Mar 2025 22:00:55 +0000 Subject: [PATCH 08/18] CMON --- .forgejo/workflows/build.yaml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 028afba..13fb315 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -13,29 +13,18 @@ jobs: runs-on: ubuntu steps: - - name: Install Node.js - run: | - curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash - - sudo apt-get install -y nodejs - node -v - npm -v - - - name: Checkout repository - uses: actions/checkout@v2 - - name: Install JDK 21 run: | sudo apt update sudo apt install -y openjdk-21-jdk java -version - - name: Cache Maven dependencies - uses: actions/cache@v2 + - name: Checkout repository + uses: actions/checkout@v2 with: - path: ~/.m2/repository - key: maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - maven- + repository: MelonEconomy/Melon-Proxy + ref: main + - name: Build with Maven run: mvn clean install -DskipTests From 3c0b084a16ecdf2e5fece7e2552f4adc7670ac87 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 7 Mar 2025 22:02:19 +0000 Subject: [PATCH 09/18] Sigh --- .forgejo/workflows/build.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 13fb315..49604ab 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -10,13 +10,13 @@ on: jobs: build_and_release: - runs-on: ubuntu + runs-on: ubuntu-24.04 steps: - name: Install JDK 21 run: | - sudo apt update - sudo apt install -y openjdk-21-jdk + apt update + apt install -y openjdk-21-jdk java -version - name: Checkout repository @@ -25,7 +25,6 @@ jobs: repository: MelonEconomy/Melon-Proxy ref: main - - name: Build with Maven run: mvn clean install -DskipTests @@ -41,4 +40,4 @@ jobs: - name: Publish release (optional) run: | git tag v1.0.0 - git push origin v1.0.0 + git push origin v1.0.0 \ No newline at end of file From 2a19d87c72288924a91fe0695fe8a1f7c20395b3 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 7 Mar 2025 22:02:46 +0000 Subject: [PATCH 10/18] imaidiot --- .forgejo/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 49604ab..22cd322 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -10,7 +10,7 @@ on: jobs: build_and_release: - runs-on: ubuntu-24.04 + runs-on: ubuntu steps: - name: Install JDK 21 From efa44559371db07b87b7626bb0eeaa77cdcde48f Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 7 Mar 2025 22:06:46 +0000 Subject: [PATCH 11/18] Attempt i dont even know anymore --- .forgejo/workflows/build.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 22cd322..946c6b4 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -21,9 +21,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - with: - repository: MelonEconomy/Melon-Proxy - ref: main - name: Build with Maven run: mvn clean install -DskipTests @@ -40,4 +37,4 @@ jobs: - name: Publish release (optional) run: | git tag v1.0.0 - git push origin v1.0.0 \ No newline at end of file + git push origin v1.0.0 From 04531a2a4334ec35cf488ab2d79bd4e57148e688 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 7 Mar 2025 22:08:59 +0000 Subject: [PATCH 12/18] Dont fail on me now pleaser --- .forgejo/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 946c6b4..3cb51d8 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -15,12 +15,12 @@ jobs: steps: - name: Install JDK 21 run: | - apt update - apt install -y openjdk-21-jdk + sudo apt update + sudo apt install -y openjdk-21-jdk java -version - name: Checkout repository - uses: actions/checkout@v2 + run: git clone https://git.starmc.net/MelonEconomy/Melon-Proxy.git - name: Build with Maven run: mvn clean install -DskipTests From f138aa1b680c0f9f1112740393ae94d0b82143a9 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 7 Mar 2025 22:10:30 +0000 Subject: [PATCH 13/18] Update .forgejo/workflows/build.yaml --- .forgejo/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 3cb51d8..6ef4fd8 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -15,8 +15,8 @@ jobs: steps: - name: Install JDK 21 run: | - sudo apt update - sudo apt install -y openjdk-21-jdk + apt update + apt install -y openjdk-21-jdk java -version - name: Checkout repository From a6dcbab8617ab3d90b998758f1a807a9093d5570 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 7 Mar 2025 22:13:23 +0000 Subject: [PATCH 14/18] Attempt to steal from forgejo repo the repo check --- .forgejo/workflows/build.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 6ef4fd8..84506a8 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -20,7 +20,9 @@ jobs: java -version - name: Checkout repository - run: git clone https://git.starmc.net/MelonEconomy/Melon-Proxy.git + - uses: https://data.forgejo.org/actions/setup-node@v4 + with: + node-version: 20 - name: Build with Maven run: mvn clean install -DskipTests From cfa3040546807beef1ccfb335330946090082569 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 7 Mar 2025 22:16:44 +0000 Subject: [PATCH 15/18] please --- .forgejo/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 84506a8..6bf3142 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -20,9 +20,9 @@ jobs: java -version - name: Checkout repository - - uses: https://data.forgejo.org/actions/setup-node@v4 - with: - node-version: 20 + uses: https://data.forgejo.org/actions/checkout@v4 + with: + node-version: 20 - name: Build with Maven run: mvn clean install -DskipTests From c30662bc0aad36f9703331bce8461a50ccfb8302 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 7 Mar 2025 22:19:19 +0000 Subject: [PATCH 16/18] pls 2 --- .forgejo/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 6bf3142..0b239b6 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -20,9 +20,9 @@ jobs: java -version - name: Checkout repository - uses: https://data.forgejo.org/actions/checkout@v4 + uses: https://data.forgejo.org/actions/checkout@v2 with: - node-version: 20 + ref: ${{ github.sha }} - name: Build with Maven run: mvn clean install -DskipTests From d8d26300f51c3591fbcbee51ce2b35e331ff307b Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 11 Apr 2025 22:19:33 +0000 Subject: [PATCH 17/18] Update .forgejo/workflows/build.yaml --- .forgejo/workflows/build.yaml | 68 +++++++++++++++++------------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 0b239b6..53f4c8d 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -1,42 +1,42 @@ -name: Build&Release - -on: - push: - branches: - - main - pull_request: - branches: - - main +name: Compile Gradle Project +on: [push] jobs: - build_and_release: - runs-on: ubuntu - + Build Project: + runs-on: ubuntu-24.04 + env: + VERSION: ${{ github.ref_name }} + RELEASE_VERSION: ${{ github.ref_name }} + SNAPSHOT: ${{ endsWith(github.ref_name, '-snapshot') || contains(github.event.head_commit.message, '[snapshot]') }} + MAVEN_PUBLISHING_URL: ${{ vars.MAVEN_PUBLISHING_URL || 'https://nexus.gtnewhorizons.com/repository/releases/' }} steps: - - name: Install JDK 21 - run: | - apt update - apt install -y openjdk-21-jdk - java -version - - - name: Checkout repository - uses: https://data.forgejo.org/actions/checkout@v2 + - name: Checkout mod repo + uses: actions/checkout@v4 with: - ref: ${{ github.sha }} + fetch-depth: 32 + + - name: Set up JDK versions + uses: https://github.com/actions/setup-java@v4 + with: + java-version: | + 8 + 17 + 21 + distribution: 'zulu' - - name: Build with Maven - run: mvn clean install -DskipTests + - name: Setup Gradle + uses: https://github.com/gradle/gradle-build-action@v2 + with: + build-scan-publish: true + build-scan-terms-of-use-url: "https://gradle.com/terms-of-service" + build-scan-terms-of-use-agree: "yes" + validate-wrappers: true - - name: Run tests - run: mvn test + - name: Grant execute permission for gradlew + run: chmod +x gradlew - - name: Prepare release - run: mvn release:prepare -DreleaseVersion=1.0.0 -DdevelopmentVersion=1.1.0-SNAPSHOT -DpushChanges=false + - name: Setup the workspace + run: ./gradlew --build-cache --info --stacktrace ${{ inputs.workspace }} - - name: Perform release - run: mvn release:perform - - - name: Publish release (optional) - run: | - git tag v1.0.0 - git push origin v1.0.0 + - name: Compile the mod + run: ./gradlew --build-cache --info --stacktrace assemble \ No newline at end of file From 8adacb62e7f7d822245a13850eb246ca03affc34 Mon Sep 17 00:00:00 2001 From: Derek Date: Fri, 11 Apr 2025 22:20:14 +0000 Subject: [PATCH 18/18] Update .forgejo/workflows/build.yaml --- .forgejo/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 53f4c8d..0c8d6e1 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -3,7 +3,7 @@ name: Compile Gradle Project on: [push] jobs: Build Project: - runs-on: ubuntu-24.04 + runs-on: ubuntu env: VERSION: ${{ github.ref_name }} RELEASE_VERSION: ${{ github.ref_name }}