From e47d6521f44c4ae42ea72919a03299a7d44473cf Mon Sep 17 00:00:00 2001 From: generrosity Date: Tue, 1 Mar 2022 08:50:34 +1300 Subject: [PATCH 1/7] Update README.md additions for my dumb ass on how gradle works and where things end up, as this was a recent question in discord too --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b430b538..4603e949 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Dynmap 3.x+ uses Gradle for building support for all platforms, with all resulti default JDK must be a JDK 17 (or later) versions - older versions will still be compiled to run on the default JDK for those platforms (JDK 8, or JDK 16 for 1.17.x), and common libraries are built JDK 8. -To build, run: +To build and get all jars in `build/libs/`, run: ./gradlew setup build @@ -32,6 +32,10 @@ Or (on Windows): cd oldgradle gradlew.bat setup build +If you are familiar with gradle you can save time by specifing which build you want (or comment out unwanted builds from settings.gradle): + + ./gradlew :fabric-1.18:build + # What platforms are supported? The following target platforms are supported, and you can find them at the links supplied: From 1016c7833b7ae0874a1c6921ac280aadc48433ff Mon Sep 17 00:00:00 2001 From: generrosity Date: Tue, 1 Mar 2022 10:10:43 +1300 Subject: [PATCH 2/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4603e949..1554c173 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Dynmap 3.x+ uses Gradle for building support for all platforms, with all resulti default JDK must be a JDK 17 (or later) versions - older versions will still be compiled to run on the default JDK for those platforms (JDK 8, or JDK 16 for 1.17.x), and common libraries are built JDK 8. -To build and get all jars in `build/libs/`, run: +To build and get all jars in `target/`, run: ./gradlew setup build From 04fba0958356398a35af3534a2dc99022fce9de1 Mon Sep 17 00:00:00 2001 From: FedUpWith-Tech <7731191+FedUpWith-Tech@users.noreply.github.com> Date: Thu, 3 Mar 2022 10:53:59 -0500 Subject: [PATCH 3/7] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1554c173..712c295a 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Or (on Windows): cd oldgradle gradlew.bat setup build -If you are familiar with gradle you can save time by specifing which build you want (or comment out unwanted builds from settings.gradle): +If you are familiar with gradle you can save time by specifying which build you want (or comment out unwanted builds from settings.gradle): ./gradlew :fabric-1.18:build From ec6fd59999db9b277aebdb0e1ecc5ffbba79a3c0 Mon Sep 17 00:00:00 2001 From: FedUpWith-Tech <7731191+FedUpWith-Tech@users.noreply.github.com> Date: Thu, 3 Mar 2022 10:55:56 -0500 Subject: [PATCH 4/7] Update gibberish.txt --- .github/workflows/gibberish.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/gibberish.txt b/.github/workflows/gibberish.txt index cab35152..3e056d77 100644 --- a/.github/workflows/gibberish.txt +++ b/.github/workflows/gibberish.txt @@ -36,6 +36,8 @@ ko patreon README Gradle +gradlew +gradle Curseforge SpigotMC PaperMC From 015309f8bab9fa92503066e2274896b1f4e78eae Mon Sep 17 00:00:00 2001 From: generrosity Date: Sat, 5 Mar 2022 20:37:52 +1300 Subject: [PATCH 5/7] adding additional condensed warnings --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 712c295a..96a8132d 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,10 @@ Or (on Windows): cd oldgradle gradlew.bat setup build -If you are familiar with gradle you can save time by specifying which build you want (or comment out unwanted builds from settings.gradle): +Those familiar with gradle can save time by specifying a build (or commenting in settings.gradle) BUT this is not suitable for uploading DEV code changes. + +NOTE: PR code submissions MUST be built and TESTED for ALL platforms (including oldgradle), or be rejected and negatively influence future approvals. +For more check [contributing rules](#contributing-to-dynmaps-code). ./gradlew :fabric-1.18:build From f52d2e6c1a122d16ecfbc53f9401d62bd012a6c7 Mon Sep 17 00:00:00 2001 From: David Pfeiffer Date: Sat, 5 Mar 2022 16:03:44 -0800 Subject: [PATCH 6/7] Small style improvements to marker labels --- .../src/main/resources/extracted/web/css/dynmap_style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DynmapCore/src/main/resources/extracted/web/css/dynmap_style.css b/DynmapCore/src/main/resources/extracted/web/css/dynmap_style.css index 3e8099f8..bcf69b8f 100644 --- a/DynmapCore/src/main/resources/extracted/web/css/dynmap_style.css +++ b/DynmapCore/src/main/resources/extracted/web/css/dynmap_style.css @@ -905,15 +905,15 @@ color: #fff; background: rgba(0,0,0,0.6); - padding: 2px; + padding: 2px 6px; -moz-border-radius: 3px; border-radius: 3px; } .dynmap .mapMarker .markerName16x16 { - top: -6px; - left: 10px; + top: -12px; + left: 12px; } .dynmap .mapMarker .markerName8x8 { From 8aa757b0493e97b4f04f969740e45de1729e7b65 Mon Sep 17 00:00:00 2001 From: FedUpWith-Tech <7731191+FedUpWith-Tech@users.noreply.github.com> Date: Sun, 6 Mar 2022 19:47:17 -0500 Subject: [PATCH 7/7] Update gibberish.txt adding more things to ignore --- .github/workflows/gibberish.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/gibberish.txt b/.github/workflows/gibberish.txt index 3e056d77..fe8288b8 100644 --- a/.github/workflows/gibberish.txt +++ b/.github/workflows/gibberish.txt @@ -38,6 +38,7 @@ README Gradle gradlew gradle +oldgradle Curseforge SpigotMC PaperMC @@ -57,3 +58,4 @@ JDK ForgeGradle Kosma Kosma's +DEV