-
Notifications
You must be signed in to change notification settings - Fork 3
Improve the plugin for 0.2.0 Release #68
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Zoriot
wants to merge
23
commits into
master
Choose a base branch
from
build
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
b95c693
[WIP] feat(build): ✨ add Gradle build system and update project confi…
Zoriot 51aa6c2
feat(build): ✨ update dependencies and improve async task handling in…
Zoriot 9260c25
feat(build): ✨ enhance async operation handling and update module reg…
Zoriot 0beb3a9
fix(kml): ✨ fix JAXB context handling
Zoriot fc4b7af
feat(gen): ✨ refactor zip installation and extraction logic, improve …
Zoriot 2ed6e29
fix(stats): ✨ add validation for Network Module Build Team connection…
Zoriot c0efe6b
feat(build): ✨ update build configuration, enhance module registratio…
Zoriot 227b427
fix(housescripts): ✨ correct block query logic for roof type handling
Zoriot b48fc24
fix(generator): ✨ disable railway generator temporarly
Zoriot 64c6cdf
fix(generator): ✨ disable field generator temporarily
Zoriot d8f3aa6
refactor(generator): ✨ update generator components to use centralized…
Zoriot 0c9eccb
refactor(tree): ✨ update tree component logic and improve menu intera…
Zoriot b6befcf
feat(util): Update GeneratorUtils to 1.7.3
MineFact 73f3c65
refactor(item): ✨ simplify and clean up item metadata handling logic
Zoriot 61b8f3d
feat(util): Update Item Utils to 1.3.2
MineFact fb0c3ff
feat(util): Update Item Utils to 1.3.3
MineFact 49ef421
feat(util): Update Item Utils to 1.3.4
MineFact 93011c8
refactor(build): ✨ remove unused authlib dependency from build config…
Zoriot 557cf61
refactor(all): ✨ extract utilities into alps-lib
Zoriot fbdd680
fix(nav): ✨ fix others/default warp group
Zoriot a5819e5
fix(gen/kml): ✨ fix coordinate parsing and improve error handling
Zoriot 73b3597
refactor(build): ✨ rename packages to align with buildteamtools struc…
Zoriot ed341fc
feat(build): ✨ add GitHub Actions workflow for Java CI with Gradle
Zoriot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| # 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://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle | ||
|
|
||
| name: Java CI with Gradle | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ "master" ] | ||
| pull_request: | ||
| branches: [ "master" ] | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: read | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v5 | ||
| with: | ||
| fetch-depth: 0 # full history | ||
| fetch-tags: true # grab your tags | ||
| # Make sure we check out by branch name, not just SHA: | ||
| ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref_name }} | ||
|
|
||
| - name: Set up JDK 21 | ||
| uses: actions/setup-java@v5 | ||
| with: | ||
| java-version: '21' | ||
| distribution: 'temurin' | ||
|
|
||
| # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies. | ||
| # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md | ||
| - name: Setup Gradle | ||
| uses: gradle/actions/setup-gradle@v4 | ||
|
|
||
| - name: Build with Gradle Wrapper | ||
| run: ./gradlew clean build | ||
|
|
||
| - uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: Staging-Build | ||
| path: build/libs | ||
| compression-level: '9' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| /* | ||
| * This file was generated by the Gradle 'init' task. | ||
| */ | ||
|
|
||
| plugins { | ||
| java | ||
| alias(libs.plugins.lombok) | ||
| alias(libs.plugins.git.version) | ||
| alias(libs.plugins.shadow) | ||
| } | ||
|
|
||
| repositories { | ||
| //mavenLocal() // NEVER use in Production/Commits! | ||
| mavenCentral() | ||
| maven { | ||
| url = uri("https://repo.papermc.io/repository/maven-public/") | ||
| } | ||
|
|
||
| maven { | ||
| url = uri("https://maven.buildtheearth.net/releases") | ||
| } | ||
|
|
||
| maven { | ||
| url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") | ||
| } | ||
|
|
||
| maven { | ||
| url = uri("https://mvn.alps-bte.com/repository/alps-bte/") | ||
| } | ||
|
|
||
| maven { | ||
| url = uri("https://repo.onarandombox.com/content/groups/public/") | ||
| } | ||
|
|
||
| maven { | ||
| url = uri("https://repo.codemc.io/repository/maven-snapshots/") | ||
| } | ||
|
|
||
| maven { | ||
| url = uri("https://repo.codemc.io/repository/maven-public/") | ||
| } | ||
|
|
||
| maven { | ||
| url = uri("https://jitpack.io") | ||
| } | ||
|
|
||
| maven { | ||
| url = uri("https://repo.dmulloy2.net/repository/public/") | ||
| } | ||
|
|
||
| maven { | ||
| url = uri("https://maven.daporkchop.net/") | ||
| } | ||
|
|
||
| maven { | ||
| url = uri("https://download.java.net/maven/2") | ||
| } | ||
|
|
||
| maven { | ||
| url = uri("https://maven.enginehub.org/repo/") | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| //implementation(libs.com.alpsbte.alpslib.alpslib.libpsterra) CURRENTLY BROKEN | ||
| implementation(libs.alpslib.io) | ||
| implementation(libs.alpslib.utils) { | ||
| exclude(group = "com.github.cryptomorin", module = "XSeries") | ||
| } | ||
| implementation(libs.com.alpsbte.canvas) | ||
| implementation(libs.net.daporkchop.lib.binary) | ||
| implementation(libs.com.github.cryptomorin.xseries) | ||
| implementation(libs.net.wesjd.anvilgui) | ||
| implementation(libs.micycle.clipper2) | ||
| implementation(libs.org.json.json) | ||
| implementation(libs.com.google.code.gson.gson) | ||
| implementation(libs.com.squareup.okhttp3.okhttp.jvm) | ||
| implementation(libs.javaapiforkml) { | ||
| exclude(group = "com.sun.xml.bind", module = "jaxb-xjc") // Else Remapping will yell of duplicated classes | ||
| } | ||
| implementation(libs.com.googlecode.json.simple) | ||
| compileOnly(libs.io.papermc.paper.paper.api) | ||
| compileOnly(libs.com.fastasyncworldedit.fastasyncworldedit.core) | ||
| compileOnly(libs.com.fastasyncworldedit.fastasyncworldedit.bukkit) | ||
| } | ||
|
|
||
| val versionDetails: groovy.lang.Closure<com.palantir.gradle.gitversion.VersionDetails> by extra | ||
| val details = versionDetails() | ||
|
|
||
| group = "net.buildtheearth" | ||
| version = "0.2.0" + "-" + details.commitDistance + "-" + details.gitHash + "-SNAPSHOT" | ||
| description = "BuildTeamTools" | ||
| java.sourceCompatibility = JavaVersion.VERSION_21 | ||
| java.targetCompatibility = JavaVersion.VERSION_21 | ||
|
|
||
| tasks.withType<JavaCompile> { | ||
| options.encoding = "UTF-8" | ||
| } | ||
|
|
||
| tasks.withType<Javadoc> { | ||
| options.encoding = "UTF-8" | ||
| } | ||
|
|
||
| tasks.shadowJar { | ||
| // Exclude annotation classes (e.g. org.jetbrains.annotations) | ||
| exclude("org/jetbrains/annotations/**") | ||
| // Exclude slf4j classes | ||
| exclude("org/slf4j/**") | ||
| archiveClassifier = "" | ||
|
|
||
| relocationPrefix = "net.buildtheearth.buildteamtools.shaded" | ||
| enableAutoRelocation = true | ||
| } | ||
|
|
||
| tasks.assemble { | ||
| dependsOn(tasks.shadowJar) // Ensure that the shadowJar task runs before the build task | ||
| } | ||
|
|
||
| tasks.jar { | ||
| archiveClassifier = "UNSHADED" | ||
| enabled = false // Disable the default jar task since we are using shadowJar | ||
| } | ||
|
|
||
| tasks.processResources { | ||
| // work around IDEA-296490 | ||
| duplicatesStrategy = DuplicatesStrategy.INCLUDE | ||
| with(copySpec { | ||
| from("src/main/resources/plugin.yml") { | ||
| expand( | ||
| mapOf( | ||
| "version" to project.version, | ||
| "description" to project.description | ||
| ) | ||
| ) | ||
| } | ||
| }) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| # This file was generated by the Gradle 'init' task. | ||
| # https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties | ||
| org.gradle.configuration-cache=true | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| # This file was generated by the Gradle 'init' task. | ||
| # https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format | ||
|
|
||
| [versions] | ||
| com-alpsbte-alpslib-alpslib-libpsterra = "1.1.3" | ||
| com-alpsbte-canvas = "1.3" | ||
| com-fastasyncworldedit-fastasyncworldedit-bukkit = "2.12.3" | ||
| com-fastasyncworldedit-fastasyncworldedit-core = "2.12.3" | ||
| com-github-cryptomorin-xseries = "13.6.0" # https://github.com/CryptoMorin/XSeries/releases | ||
| com-google-code-gson-gson = "2.13.1" | ||
| com-mojang-authlib = "7.0.61" | ||
| com-squareup-okhttp3-okhttp-jvm = "5.1.0" | ||
| javaapiforkml = "3.0.10" # https://github.com/urbancamo/javaapiforkml | ||
| io-papermc-paper-paper-api = "1.21.10-R0.1-SNAPSHOT" | ||
| micycle-clipper2 = "1.2.2" | ||
| net-daporkchop-lib-binary = "0.5.7-SNAPSHOT" | ||
| net-wesjd-anvilgui = "1.10.8-SNAPSHOT" | ||
| org-json-json = "20251224" # https://mvnrepository.com/artifact/org.json/json/20251224 | ||
| io-freefair-lombok = "9.1.0" | ||
| com-googlecode-json-simple = "1.1.1" # https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple | ||
| com-palantir-git-version = "4.0.0" | ||
| com-gradleup-shadow = "9.3.0" | ||
| alpslib-io = "1.2.0" | ||
| alpslib-utils = "1.4.0" | ||
|
|
||
| [libraries] | ||
| com-alpsbte-alpslib-alpslib-libpsterra = { module = "com.alpsbte.alpslib:alpslib-libpsterra", version.ref = "com-alpsbte-alpslib-alpslib-libpsterra" } | ||
| com-alpsbte-canvas = { module = "com.alpsbte:canvas", version.ref = "com-alpsbte-canvas" } | ||
| com-fastasyncworldedit-fastasyncworldedit-bukkit = { module = "com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit", version.ref = "com-fastasyncworldedit-fastasyncworldedit-bukkit" } | ||
| com-fastasyncworldedit-fastasyncworldedit-core = { module = "com.fastasyncworldedit:FastAsyncWorldEdit-Core", version.ref = "com-fastasyncworldedit-fastasyncworldedit-core" } | ||
| com-github-cryptomorin-xseries = { module = "com.github.cryptomorin:XSeries", version.ref = "com-github-cryptomorin-xseries" } | ||
| com-google-code-gson-gson = { module = "com.google.code.gson:gson", version.ref = "com-google-code-gson-gson" } | ||
| com-mojang-authlib = { module = "com.mojang:authlib", version.ref = "com-mojang-authlib" } | ||
| com-squareup-okhttp3-okhttp-jvm = { module = "com.squareup.okhttp3:okhttp-jvm", version.ref = "com-squareup-okhttp3-okhttp-jvm" } | ||
| javaapiforkml = { module = "uk.m0nom:javaapiforkml", version.ref = "javaapiforkml" } | ||
| io-papermc-paper-paper-api = { module = "io.papermc.paper:paper-api", version.ref = "io-papermc-paper-paper-api" } | ||
| micycle-clipper2 = { module = "micycle:clipper2", version.ref = "micycle-clipper2" } | ||
| net-daporkchop-lib-binary = { module = "net.daporkchop.lib:binary", version.ref = "net-daporkchop-lib-binary" } | ||
| net-wesjd-anvilgui = { module = "net.wesjd:anvilgui", version.ref = "net-wesjd-anvilgui" } | ||
| org-json-json = { module = "org.json:json", version.ref = "org-json-json" } | ||
| com-googlecode-json-simple = { module = "com.googlecode.json-simple:json-simple", version.ref = "com-googlecode-json-simple" } | ||
| alpslib-io = { module = "com.alpsbte.alpslib:alpslib-io", version.ref = "alpslib-io" } | ||
| alpslib-utils = { module = "com.alpsbte.alpslib:alpslib-utils", version.ref = "alpslib-utils" } | ||
|
|
||
| [plugins] | ||
| lombok = { id = "io.freefair.lombok", version.ref = "io-freefair-lombok" } | ||
| git-version = { id = "com.palantir.git-version", version.ref = "com-palantir-git-version" } | ||
| shadow = { id = "com.gradleup.shadow", version.ref = "com-gradleup-shadow" } | ||
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip | ||
| networkTimeout=10000 | ||
| validateDistributionUrl=true | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The dependencies
net.daporkchop.lib:binary:0.5.7-SNAPSHOTandnet.wesjd:anvilgui:1.10.8-SNAPSHOTare pinned to-SNAPSHOTversions from third-party Maven repositories, which are mutable and can be replaced upstream without any change to the version string. If an attacker compromises the publisher or repository, they can silently ship a new JAR under the same coordinate, and your builds will automatically include and ship that untrusted code. To reduce this supply-chain risk, switch to immutable released versions (non-SNAPSHOT) or otherwise pin to artifacts whose content cannot change without updating the version you depend on.