Modernize 1.7.10 branch

.gitattributes

@@ -0,0 +1,5 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,91 @@
+name: 🐛 ​ Bug report
+description: Report an issue or problem.
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Hello! Thanks for reporting a bug to the spark team.
+
+        Before going any further, please check to see if your bug has already been:
+
+        * fixed (check the [changelog](https://spark.lucko.me/changelog))
+        * reported by someone else (check the [open issues](https://github.com/lucko/spark/issues))
+
+        Please also consider raising the issue in our [Discord](https://discord.gg/PAGT2fu) before reporting it here. (more often you can get help faster there!)
+
+        Thanks! :)
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Please provide a short description of the issue in the space below.
+      placeholder: Description goes here!
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction-steps
+    attributes:
+      label: Reproduction Steps
+      description: Please provide a clear list of steps we should follow in order to reproduce your issue in the space below.
+      placeholder: List reproduction steps here, please!
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behaviour
+    attributes:
+      label: Expected Behaviour
+      description: Please provide a description of what you expected to happen.
+      placeholder: Describe what you expected to happen here.
+    validations:
+      required: true
+  - type: textarea
+    id: platform-version
+    attributes:
+      label: Platform Information
+      description: |
+        Please provide details about the platform that spark is running on.
+
+        This *must* include the versions of all relevant components.
+
+        * Minecraft Version - e.g. "Minecraft 1.19.4"
+        * Platform Type - e.g. "server", "client" or "proxy"
+        * Platform Brand - e.g. "Forge", "Fabric", "Paper"
+        * Platform Version - e.g. "Forge 47.1.44", "Paper git-Paper-124"
+      value: |
+        * Minecraft Version: 
+        * Platform Type: 
+        * Platform Brand: 
+        * Platform Version:
+    validations:
+      required: true
+  - type: input
+    id: spark-version
+    attributes:
+      label: Spark Version
+      description: Please provide the exact version number of spark you are using.
+      placeholder: v1.10.50
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Logs and Configs
+      description: If you think it would be helpful, please also include a pastebin of any relevant config files or log output. You should use https://gist.github.com/ to upload, then include the link below.
+      placeholder: https://gist.github.com/HelpfulBugReporter/ThisIsAVeryUsefulLogOutput
+    validations:
+      required: false
+  - type: textarea
+    id: extra-info
+    attributes:
+      label: Extra Details
+      description: Please include any other relevant details in the space below.
+      placeholder: I was able to reproduce this only at the end of a rainbow.
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: |
+        Please fill in the fields above with as much detail as possible before submitting. :)
+
+        Thanks!

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 💬 ​ Ask a question
+    url: https://discord.gg/PAGT2fu
+    about: We use Discord to provide support for the project. If you have a question, need help, or aren't sure if you've found a bug or not, please come and talk to us there!

.github/ISSUE_TEMPLATE/suggestion.yml

@@ -0,0 +1,37 @@
+name: 💡 ​ Suggestion
+description: Suggest an idea for an improvement or change.
+labels: ["suggestion"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before going any further, please check to see if your suggestion has already been:
+
+        * implemented (check the [docs](https://spark.lucko.me/docs))
+        * proposed by someone else (check the [open issues](https://github.com/lucko/spark/issues))
+
+        Thanks!
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Please provide a short description of your suggestion in the space below.
+      placeholder: Hello, perhaps you should...
+    validations:
+      required: true
+  - type: textarea
+    id: proposed-behaviour
+    attributes:
+      label: Proposed Behaviour
+      description: Please provide a short explanation of how the feature should work / be changed, and how this will affect the project.
+      placeholder: It would...
+    validations:
+      required: true
+  - type: textarea
+    id: extra-info
+    attributes:
+      label: Extra Details
+      description: Please include any other relevant details in the space below.
+      placeholder: I think this should only function at the end of a rainbow.
+    validations:
+      required: false

.github/workflows/ci.yml

@@ -0,0 +1,52 @@
+name: Build Gradle
+
+on:
+  push:
+    branches:
+      - 'master'
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - 'master'
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-gradle:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Validate Gradle wrapper
+        uses: gradle/actions/wrapper-validation@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Run build and tests with Gradle wrapper
+        run: ./gradlew test build
+
+      - name: Upload all artifacts
+        uses: actions/upload-artifact@v4
+        if: matrix.os == 'ubuntu-latest'
+        with:
+          name: jars
+          path: |
+            **/build/libs/spark-1.*-*.jar

README.md

@@ -37,8 +37,8 @@ It is:
 It works by sampling statistical data about the systems activity, and constructing a call graph based on this data. The call graph is then displayed in an online viewer for further analysis by the user.
 
 There are two different profiler engines:
-* Native `AsyncGetCallTrace` + `perf_events` - uses [async-profiler](https://github.com/jvm-profiling-tools/async-profiler) (*only available on Linux x86_64 systems*)
-* Built-in Java `ThreadMXBean` - an improved version of the popular [WarmRoast profiler](https://github.com/sk89q/WarmRoast) by sk89q.
+* Native/Async - uses the [async-profiler](https://github.com/async-profiler/async-profiler) library (*only available on Linux & macOS systems*)
+* Java - uses `ThreadMXBean`, an improved version of the popular [WarmRoast profiler](https://github.com/sk89q/WarmRoast) by sk89q.
 
 ### :zap: Memory Inspection
 

build.gradle

@@ -2,13 +2,12 @@ plugins {
     id 'org.cadixdev.licenser' version '0.6.1' apply false
 }
 
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.api.tasks.testing.logging.TestLogEvent
+
 allprojects {
     group = 'me.lucko'
     version = '1.10-SNAPSHOT'
-
-    configurations {
-        compileClasspath // Fabric-loom needs this for remap jar for some reason
-    }
 }
 
 subprojects {
@@ -22,12 +21,39 @@ subprojects {
         patchVersion = determinePatchVersion()
         pluginVersion = baseVersion + '.' + patchVersion
         pluginDescription = 'spark is a performance profiling plugin/mod for Minecraft clients, servers and proxies.'
+
+        applyExcludes = { Jar jarTask ->
+            jarTask.exclude 'module-info.class'
+            jarTask.exclude 'META-INF/maven/**'
+            jarTask.exclude 'META-INF/proguard/**'
+            jarTask.exclude 'META-INF/LICENSE'
+            jarTask.exclude 'META-INF/NOTICE'
+            // protobuf
+            jarTask.exclude '**/*.proto'
+            jarTask.exclude '**/*.proto.bin'
+            // async-profiler
+            jarTask.exclude 'linux-arm64/**'
+            jarTask.exclude 'linux-x64/**'
+            jarTask.exclude 'macos/**'
+        }
     }
 
-    tasks.withType(JavaCompile) {
-        options.encoding = 'UTF-8'
-        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
-            options.release = 8
+    if(it.name != "spark-forge1710") {
+        tasks.withType(JavaCompile).configureEach {
+            options.encoding = 'UTF-8'
+            if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+                options.release = 8
+            }
+        }
+    }
+
+    tasks.withType(Test).configureEach {
+        testLogging {
+            events = [TestLogEvent.PASSED, TestLogEvent.FAILED, TestLogEvent.SKIPPED]
+            exceptionFormat = TestExceptionFormat.FULL
+            showExceptions = true
+            showCauses = true
+            showStackTraces = true
         }
     }
 
@@ -41,6 +67,16 @@ subprojects {
     }
 
     repositories {
+        // Fix issue with lwjgl-freetype not being found on macOS / ForgeGradle issue
+        //
+        // Could not resolve all files for configuration ':_compileJava_1'.
+        // Could not find lwjgl-freetype-3.3.3-natives-macos-patch.jar (org.lwjgl:lwjgl-freetype:3.3.3).
+        maven {
+            url "https://libraries.minecraft.net"
+            content {
+                includeModule("org.lwjgl", "lwjgl-freetype")
+            }
+        }
         mavenCentral()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven { url "https://repo.lucko.me/" }

gradle.properties

@@ -1 +1,4 @@
-org.gradle.jvmargs=-Xmx2G
+org.gradle.jvmargs=-Xmx2G
+org.gradle.parallel=false
+
+rfg.disableDependencyDeobfuscation=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists