Merge branch 'master' of https://github.com/TownyAdvanced/Towny.git

Author: Jsinco

.github/workflows/deploy_prerelease.yml

@@ -5,12 +5,13 @@ env:
   CURR_VER: 0.0.0.0
   SUPPORTED: " for MC 1.19.* & 1.20.* & 1.21.*"
 jobs:
-  deploy_prerelease:
+  build_towny_and_publish_prerelease:
     runs-on: ubuntu-latest
+
     strategy:
       matrix:
         java: ['21']
-    name: Deploying Towny Prerelease
+    name: Build Towny and Publish Pre-Release
     steps:
       - name: checkout repo content
         uses: actions/checkout@v3 # checkout the repository content to github runner.
@@ -25,21 +26,18 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: mvn -B clean package -DskipTests=false
-      - name: setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.2'
-      - name: get sponsors.txt using PHP
-        run: php ./.github/workflows/prerelease/get_sponsors.php
-      - name: create staging dir
-        run: mkdir staging && cp sponsors.txt staging
+
       - name: setup python
         uses: actions/setup-python@v3
         with:
           python-version: 3.8 #install the python needed
+      - name: create sponsors.txt
+        run: python ./.github/workflows/prerelease/get_sponsors.py
+      - name: create staging dir
+        run: mkdir staging && cp sponsors.txt staging
       - name: execute sponsortable.py
         run: python ./.github/workflows/prerelease/sponsortable.py
-      - name: execute preRelease.py
+      - name: execute prerelease.py
         id: prerelease_py
         run: python ./.github/workflows/prerelease/prerelease.py
       - name: create pre-release
@@ -54,24 +52,3 @@ jobs:
             ./Towny/target/towny-${{ env.CURR_VER }}.jar
         env:
           GITHUB_REPOSITORY: my_gh_org/my_gh_repo
-      - name: prepare maven settings.xml
-        uses: s4u/maven-settings-action@v2.8.0
-        with:
-          githubServer: false
-          servers: |
-            [{
-              "id": "nexus",
-              "username": "${{ secrets.GLAREREPO_USERNAME }}",
-              "password": "${{ secrets.GLAREREPO_PASSWORD }}"
-            }]
-      - name: deploy to glaremaster repo
-        run: mvn deploy
-      - name: deploy javadoc to github pages
-        uses: MathieuSoysal/Javadoc-publisher.yml@v2.5.0
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          javadoc-branch: javadoc
-          java-version: 21
-          target-folder: javadoc/prerelease
-          javadoc-source-folder: target/reports/apidocs
-          project: maven

.github/workflows/prerelease/get_sponsors.php

@@ -0,0 +1,143 @@
+from urllib.request import Request, urlopen
+from html.parser import HTMLParser
+
+FILE_NAME = "sponsors.txt"
+BASE_URL = "https://github.com/sponsors/LlmDl/sponsors_partial?filter=active&page={page}"
+
+
+class SponsorsParser(HTMLParser):
+    def __init__(self):
+        super().__init__()
+        self.results = []
+
+        self.in_block = False
+        self.block_depth = 0
+
+        self.block_public_user = None
+        self.block_is_private = False
+
+        self.capture_tooltip = False
+        self.tooltip_text = []
+
+    def handle_starttag(self, tag, attrs):
+        attrs = dict(attrs)
+        class_attr = attrs.get("class", "")
+
+        if tag == "div" and "d-flex" in class_attr and "mb-1" in class_attr and "mr-1" in class_attr:
+            self.in_block = True
+            self.block_depth = 1
+            self.block_public_user = None
+            self.block_is_private = False
+            self.capture_tooltip = False
+            self.tooltip_text = []
+            return
+
+        if not self.in_block:
+            return
+
+        if tag == "div":
+            self.block_depth += 1
+            return
+
+        if tag == "a":
+            href = attrs.get("href", "").strip()
+
+            if href.startswith("/") and not href.startswith("//"):
+                username = href.lstrip("/").strip()
+                if username:
+                    self.block_public_user = username
+            return
+
+        if tag == "svg":
+            if attrs.get("aria-label") == "Private Sponsor":
+                self.block_is_private = True
+            return
+
+        if tag == "tool-tip":
+            self.capture_tooltip = True
+            self.tooltip_text = []
+            return
+
+    def handle_data(self, data):
+        if self.capture_tooltip:
+            self.tooltip_text.append(data)
+
+    def handle_endtag(self, tag):
+        if not self.in_block:
+            return
+
+        if tag == "tool-tip":
+            text = "".join(self.tooltip_text).strip()
+            if text == "Private Sponsor":
+                self.block_is_private = True
+            self.capture_tooltip = False
+            self.tooltip_text = []
+            return
+
+        if tag == "div":
+            self.block_depth -= 1
+
+            if self.block_depth == 0:
+                if self.block_public_user:
+                    self.results.append(self.block_public_user)
+                elif self.block_is_private:
+                    self.results.append("*privateSponsor")
+
+                self.in_block = False
+                self.block_public_user = None
+                self.block_is_private = False
+                self.capture_tooltip = False
+                self.tooltip_text = []
+
+
+def fetch_html(url):
+    req = Request(url, headers={"User-Agent": "Mozilla/5.0"})
+    with urlopen(req, timeout=30) as response:
+        return response.read().decode("utf-8", errors="ignore")
+
+
+def main():
+    public_sponsors = []
+    private_sponsors = []
+    page = 1
+
+    while True:
+        url = BASE_URL.format(page=page)
+
+        try:
+            html = fetch_html(url)
+        except Exception:
+            break
+
+        if not html.strip():
+            break
+
+        parser = SponsorsParser()
+        parser.feed(html)
+
+        if not parser.results:
+            break
+
+        for sponsor in parser.results:
+            if sponsor == "*privateSponsor":
+                private_sponsors.append(sponsor)
+            else:
+                public_sponsors.append(sponsor)
+
+        page += 1
+
+    sponsors = public_sponsors + private_sponsors
+
+    with open(FILE_NAME, "w", encoding="utf-8") as f:
+        f.write("\n".join(sponsors))
+        if sponsors:
+            f.write("\n")
+
+    print(f"Public sponsors: {len(public_sponsors)}")
+    print(f"Private sponsors: {len(private_sponsors)}")
+    print(f"Total lines: {len(sponsors)}")
+    print(f"Wrote {FILE_NAME}")
+
+
+if __name__ == "__main__":
+    main()

.github/workflows/prerelease/get_sponsors.py

@@ -0,0 +1,22 @@
+name: Publish Javadoc on Prerelease
+
+on:
+  workflow_run:
+    workflows: ["Deploy Pre-release"]
+    types:
+      - completed
+  workflow_dispatch:
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy JavaDoc 🚀
+        uses: MathieuSoysal/Javadoc-publisher.yml@v2.5.0
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          javadoc-branch: javadoc
+          java-version: 21
+          target-folder: javadoc/prerelease
+          javadoc-source-folder: target/reports/apidocs
+          project: maven

.github/workflows/publish-javadoc-on-prerelease.yml

@@ -2,6 +2,10 @@ name: Publish to Glare Repo
 
 on:
   workflow_dispatch:
+  workflow_run:
+    workflows: ["Deploy Pre-release"]
+    types:
+      - completed
 
 jobs:
   deploy_to_glare_repo:
@@ -20,7 +24,7 @@ jobs:
           java-version: ${{ matrix.java }}
           java-package: jdk
           cache: 'maven'
-      - name: maven-settings-action
+      - name: prepare maven settings.xml
         uses: s4u/maven-settings-action@v2.8.0
         with:
           githubServer: false
@@ -30,5 +34,5 @@ jobs:
               "username": "${{ secrets.GLAREREPO_USERNAME }}",
               "password": "${{ secrets.GLAREREPO_PASSWORD }}"
             }]
-
-      - run: mvn deploy
+      - name: deploy to glaremaster
+        run: mvn deploy

.github/workflows/publish_to_glare_repo.yml

@@ -13,7 +13,7 @@
 
     <artifactId>towny</artifactId>
     <packaging>jar</packaging>
-    <version>0.102.0.11</version>
+    <version>0.102.0.12</version>
 
     <licenses>
         <license>
@@ -275,6 +275,7 @@
                         <source>${java.version}</source>
                         <doclint>all,-missing</doclint>
                         <doctitle>Towny - ${project.version}</doctitle>
+                        <notimestamp>true</notimestamp>
                         <groups>
                             <group>
                                 <title>Events</title>
@@ -327,7 +328,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.6.1</version>
+                    <version>3.6.2</version>
                     <configuration>
                         <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
                         <artifactSet>