From deae86fb7069843cf7fc4bb990542a542d6b778a Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Mon, 17 Jul 2023 02:47:12 +0700 Subject: [PATCH 1/6] Bump version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e2a8af44..1194e2db 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ minecraft_version=1.19.2 yarn_mappings=1.19.2+build.28 loader_version=0.14.19 # Mod Properties -mod_version=0.6.1-1.19.2 +mod_version=0.6.2-1.19.2 maven_group=me.melontini archives_base_name=dark-matter # Dependencies From 5cc9b7dca344a1e97cc9bd6af9350bf3035410fb Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Mon, 17 Jul 2023 02:47:36 +0700 Subject: [PATCH 2/6] Try using classloader --- .../danger/instrumentation/InstrumentationAccess.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dark-matter-danger/src/main/java/me/melontini/dark_matter/danger/instrumentation/InstrumentationAccess.java b/dark-matter-danger/src/main/java/me/melontini/dark_matter/danger/instrumentation/InstrumentationAccess.java index f5169680..c5e10679 100644 --- a/dark-matter-danger/src/main/java/me/melontini/dark_matter/danger/instrumentation/InstrumentationAccess.java +++ b/dark-matter-danger/src/main/java/me/melontini/dark_matter/danger/instrumentation/InstrumentationAccess.java @@ -172,7 +172,7 @@ public static void bootstrap(boolean bootstrap) { if (!Files.exists(jarPath)) { createAgentJar(jarPath, jar); } else { - try (InputStream stream = InstrumentationAccess.class.getResourceAsStream("jar/dark_matter_instrumentation_agent.jar")) { + try (InputStream stream = InstrumentationAccess.class.getClassLoader().getResourceAsStream("jar/dark_matter_instrumentation_agent.jar")) { if (stream != null) { byte[] bytes = stream.readAllBytes(); if (!Arrays.equals(Files.readAllBytes(jarPath), bytes)) { @@ -181,7 +181,7 @@ public static void bootstrap(boolean bootstrap) { createAgentJar(jarPath, jar); } } else { - throw new NullPointerException("Couldn't find included \"jar/dark_matter_instrumentation_agent.jar\"!"); + DarkMatterLog.error("Couldn't find included \"jar/dark_matter_instrumentation_agent.jar\"! Couldn't check jar version! Trying to attach anyway..."); } } } From 8dbd72d114c19508f810c21afda8582ab3ab4e86 Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Mon, 17 Jul 2023 04:21:33 +0700 Subject: [PATCH 3/6] Updated mc-publish to 3.3 --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 501c94d7..b76373e7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -27,7 +27,7 @@ jobs: echo "VERSION_INFORMATION=$(${{github.workspace}}/gradlew -q printVersionName)" >> $GITHUB_ENV echo "VERSION_PLAIN=$(${{github.workspace}}/gradlew -q printVersion)" >> $GITHUB_ENV - name: Publish Minecraft Mods - uses: Kir-Antipov/mc-publish@v3.2 + uses: Kir-Antipov/mc-publish@v3.3 with: version-type: beta changelog-file: CHANGELOG.md From 85fa0d84c1e70fca03516a4f18b1eeff9669bf32 Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Mon, 17 Jul 2023 04:47:35 +0700 Subject: [PATCH 4/6] Moved icons --- .../dark-matter-analytics-mixpanel}/icon.png | Bin .../src/main/resources/fabric.mod.json | 2 +- .../{ => assets/dark-matter-analytics}/icon.png | Bin .../src/main/resources/fabric.mod.json | 2 +- .../{ => assets/dark-matter-base}/icon.png | Bin dark-matter-base/src/main/resources/fabric.mod.json | 2 +- .../{ => assets/dark-matter-content}/icon.png | Bin .../src/main/resources/fabric.mod.json | 2 +- .../{ => assets/dark-matter-danger}/icon.png | Bin .../src/main/resources/fabric.mod.json | 2 +- .../{ => assets/dark-matter-enums}/icon.png | Bin .../src/main/resources/fabric.mod.json | 2 +- .../{ => assets/dark-matter-glitter}/icon.png | Bin .../src/main/resources/fabric.mod.json | 2 +- .../{ => assets/dark-matter-minecraft}/icon.png | Bin .../src/main/resources/fabric.mod.json | 2 +- .../{ => assets/dark-matter-mirage}/icon.png | Bin .../src/main/resources/fabric.mod.json | 2 +- .../{ => assets/dark-matter-recipe-book}/icon.png | Bin .../src/main/resources/fabric.mod.json | 2 +- .../resources/{ => assets/dark-matter}/icon.png | Bin src/main/resources/fabric.mod.json | 2 +- 22 files changed, 11 insertions(+), 11 deletions(-) rename dark-matter-analytics-mixpanel/src/main/resources/{ => assets/dark-matter-analytics-mixpanel}/icon.png (100%) rename dark-matter-analytics/src/main/resources/{ => assets/dark-matter-analytics}/icon.png (100%) rename dark-matter-base/src/main/resources/{ => assets/dark-matter-base}/icon.png (100%) rename dark-matter-content/src/main/resources/{ => assets/dark-matter-content}/icon.png (100%) rename dark-matter-danger/src/main/resources/{ => assets/dark-matter-danger}/icon.png (100%) rename dark-matter-enums/src/main/resources/{ => assets/dark-matter-enums}/icon.png (100%) rename dark-matter-glitter/src/main/resources/{ => assets/dark-matter-glitter}/icon.png (100%) rename dark-matter-minecraft/src/main/resources/{ => assets/dark-matter-minecraft}/icon.png (100%) rename dark-matter-mirage/src/main/resources/{ => assets/dark-matter-mirage}/icon.png (100%) rename dark-matter-recipe-book/src/main/resources/{ => assets/dark-matter-recipe-book}/icon.png (100%) rename src/main/resources/{ => assets/dark-matter}/icon.png (100%) diff --git a/dark-matter-analytics-mixpanel/src/main/resources/icon.png b/dark-matter-analytics-mixpanel/src/main/resources/assets/dark-matter-analytics-mixpanel/icon.png similarity index 100% rename from dark-matter-analytics-mixpanel/src/main/resources/icon.png rename to dark-matter-analytics-mixpanel/src/main/resources/assets/dark-matter-analytics-mixpanel/icon.png diff --git a/dark-matter-analytics-mixpanel/src/main/resources/fabric.mod.json b/dark-matter-analytics-mixpanel/src/main/resources/fabric.mod.json index 57d02b86..64d25e0b 100644 --- a/dark-matter-analytics-mixpanel/src/main/resources/fabric.mod.json +++ b/dark-matter-analytics-mixpanel/src/main/resources/fabric.mod.json @@ -9,7 +9,7 @@ ], "contact": {}, "license": "MIT", - "icon": "icon.png", + "icon": "assets/dark-matter-analytics-mixpanel/icon.png", "environment": "*", "entrypoints": { }, diff --git a/dark-matter-analytics/src/main/resources/icon.png b/dark-matter-analytics/src/main/resources/assets/dark-matter-analytics/icon.png similarity index 100% rename from dark-matter-analytics/src/main/resources/icon.png rename to dark-matter-analytics/src/main/resources/assets/dark-matter-analytics/icon.png diff --git a/dark-matter-analytics/src/main/resources/fabric.mod.json b/dark-matter-analytics/src/main/resources/fabric.mod.json index 8dce7413..fd17a7a4 100644 --- a/dark-matter-analytics/src/main/resources/fabric.mod.json +++ b/dark-matter-analytics/src/main/resources/fabric.mod.json @@ -9,7 +9,7 @@ ], "contact": {}, "license": "MIT", - "icon": "icon.png", + "icon": "assets/dark-matter-analytics/icon.png", "environment": "*", "entrypoints": { }, diff --git a/dark-matter-base/src/main/resources/icon.png b/dark-matter-base/src/main/resources/assets/dark-matter-base/icon.png similarity index 100% rename from dark-matter-base/src/main/resources/icon.png rename to dark-matter-base/src/main/resources/assets/dark-matter-base/icon.png diff --git a/dark-matter-base/src/main/resources/fabric.mod.json b/dark-matter-base/src/main/resources/fabric.mod.json index 0b37ee7f..fdf055ae 100644 --- a/dark-matter-base/src/main/resources/fabric.mod.json +++ b/dark-matter-base/src/main/resources/fabric.mod.json @@ -9,7 +9,7 @@ ], "contact": {}, "license": "MIT", - "icon": "icon.png", + "icon": "assets/dark-matter-base/icon.png", "environment": "*", "entrypoints": { }, diff --git a/dark-matter-content/src/main/resources/icon.png b/dark-matter-content/src/main/resources/assets/dark-matter-content/icon.png similarity index 100% rename from dark-matter-content/src/main/resources/icon.png rename to dark-matter-content/src/main/resources/assets/dark-matter-content/icon.png diff --git a/dark-matter-content/src/main/resources/fabric.mod.json b/dark-matter-content/src/main/resources/fabric.mod.json index 00a7668e..dc78aebc 100644 --- a/dark-matter-content/src/main/resources/fabric.mod.json +++ b/dark-matter-content/src/main/resources/fabric.mod.json @@ -9,7 +9,7 @@ ], "contact": {}, "license": "MIT", - "icon": "icon.png", + "icon": "assets/dark-matter-content/icon.png", "environment": "*", "entrypoints": { }, diff --git a/dark-matter-danger/src/main/resources/icon.png b/dark-matter-danger/src/main/resources/assets/dark-matter-danger/icon.png similarity index 100% rename from dark-matter-danger/src/main/resources/icon.png rename to dark-matter-danger/src/main/resources/assets/dark-matter-danger/icon.png diff --git a/dark-matter-danger/src/main/resources/fabric.mod.json b/dark-matter-danger/src/main/resources/fabric.mod.json index f5f58ffc..0d1423f7 100644 --- a/dark-matter-danger/src/main/resources/fabric.mod.json +++ b/dark-matter-danger/src/main/resources/fabric.mod.json @@ -9,7 +9,7 @@ ], "contact": {}, "license": "MIT", - "icon": "icon.png", + "icon": "assets/dark-matter-danger/icon.png", "environment": "*", "entrypoints": { "preLaunch": [ diff --git a/dark-matter-enums/src/main/resources/icon.png b/dark-matter-enums/src/main/resources/assets/dark-matter-enums/icon.png similarity index 100% rename from dark-matter-enums/src/main/resources/icon.png rename to dark-matter-enums/src/main/resources/assets/dark-matter-enums/icon.png diff --git a/dark-matter-enums/src/main/resources/fabric.mod.json b/dark-matter-enums/src/main/resources/fabric.mod.json index 9bc236b9..23119b30 100644 --- a/dark-matter-enums/src/main/resources/fabric.mod.json +++ b/dark-matter-enums/src/main/resources/fabric.mod.json @@ -9,7 +9,7 @@ ], "contact": {}, "license": "MIT", - "icon": "icon.png", + "icon": "assets/dark-matter-enums/icon.png", "environment": "*", "entrypoints": { }, diff --git a/dark-matter-glitter/src/main/resources/icon.png b/dark-matter-glitter/src/main/resources/assets/dark-matter-glitter/icon.png similarity index 100% rename from dark-matter-glitter/src/main/resources/icon.png rename to dark-matter-glitter/src/main/resources/assets/dark-matter-glitter/icon.png diff --git a/dark-matter-glitter/src/main/resources/fabric.mod.json b/dark-matter-glitter/src/main/resources/fabric.mod.json index 030f6363..e45e54ef 100644 --- a/dark-matter-glitter/src/main/resources/fabric.mod.json +++ b/dark-matter-glitter/src/main/resources/fabric.mod.json @@ -9,7 +9,7 @@ ], "contact": {}, "license": "MIT", - "icon": "icon.png", + "icon": "assets/dark-matter-glitter/icon.png", "environment": "*", "entrypoints": { }, diff --git a/dark-matter-minecraft/src/main/resources/icon.png b/dark-matter-minecraft/src/main/resources/assets/dark-matter-minecraft/icon.png similarity index 100% rename from dark-matter-minecraft/src/main/resources/icon.png rename to dark-matter-minecraft/src/main/resources/assets/dark-matter-minecraft/icon.png diff --git a/dark-matter-minecraft/src/main/resources/fabric.mod.json b/dark-matter-minecraft/src/main/resources/fabric.mod.json index 21ac50dc..8411797d 100644 --- a/dark-matter-minecraft/src/main/resources/fabric.mod.json +++ b/dark-matter-minecraft/src/main/resources/fabric.mod.json @@ -9,7 +9,7 @@ ], "contact": {}, "license": "MIT", - "icon": "icon.png", + "icon": "assets/dark-matter-minecraft/icon.png", "accessWidener" : "dark-matter.accesswidener", "environment": "*", "entrypoints": { diff --git a/dark-matter-mirage/src/main/resources/icon.png b/dark-matter-mirage/src/main/resources/assets/dark-matter-mirage/icon.png similarity index 100% rename from dark-matter-mirage/src/main/resources/icon.png rename to dark-matter-mirage/src/main/resources/assets/dark-matter-mirage/icon.png diff --git a/dark-matter-mirage/src/main/resources/fabric.mod.json b/dark-matter-mirage/src/main/resources/fabric.mod.json index a215f4f7..31202684 100644 --- a/dark-matter-mirage/src/main/resources/fabric.mod.json +++ b/dark-matter-mirage/src/main/resources/fabric.mod.json @@ -9,7 +9,7 @@ ], "contact": {}, "license": "MIT", - "icon": "icon.png", + "icon": "assets/dark-matter-mirage/icon.png", "environment": "*", "entrypoints": { }, diff --git a/dark-matter-recipe-book/src/main/resources/icon.png b/dark-matter-recipe-book/src/main/resources/assets/dark-matter-recipe-book/icon.png similarity index 100% rename from dark-matter-recipe-book/src/main/resources/icon.png rename to dark-matter-recipe-book/src/main/resources/assets/dark-matter-recipe-book/icon.png diff --git a/dark-matter-recipe-book/src/main/resources/fabric.mod.json b/dark-matter-recipe-book/src/main/resources/fabric.mod.json index 3a67e8ed..db47d50a 100644 --- a/dark-matter-recipe-book/src/main/resources/fabric.mod.json +++ b/dark-matter-recipe-book/src/main/resources/fabric.mod.json @@ -9,7 +9,7 @@ ], "contact": {}, "license": "MIT", - "icon": "icon.png", + "icon": "assets/dark-matter-recipe-book/icon.png", "environment": "*", "entrypoints": { }, diff --git a/src/main/resources/icon.png b/src/main/resources/assets/dark-matter/icon.png similarity index 100% rename from src/main/resources/icon.png rename to src/main/resources/assets/dark-matter/icon.png diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2500579a..2d509017 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -9,7 +9,7 @@ ], "contact": {}, "license": "MIT", - "icon": "icon.png", + "icon": "assets/dark-matter/icon.png", "environment": "*", "depends": { "fabricloader": "*", From a1dc5f14bf104c066e68fdae121959db47145dd1 Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Mon, 17 Jul 2023 04:48:37 +0700 Subject: [PATCH 5/6] Dummy doesn't depend on mc version --- src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2d509017..95b94b64 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -13,7 +13,7 @@ "environment": "*", "depends": { "fabricloader": "*", - "minecraft": ">=1.19" + "minecraft": "*" }, "custom": { "modmenu": { From 448646cafe8453979c44d99b504f260d044e10bd Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Mon, 17 Jul 2023 04:52:48 +0700 Subject: [PATCH 6/6] CHANGELOG.md --- CHANGELOG.md | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5db78631..f6b5ad2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,10 @@ ## What's new: -### Content +### Danger -* Fixed item groups not being registered. (1.20) -* Added createScreenHandler to RegistryUtil. -* Added missing `@Contarct`s to RegistryUtil. - -### Minecraft - -* Added the `world` field to accesswidener. (1.20) +* Fixed InstrumentationAccess failing to locate the agent jar. ### Misc -Base, Analytics and Danger will no longer have access wideners applied. \ No newline at end of file +* Moved icons into `assets/dark-matter*`. +* Dummy no longer depends on MC version. \ No newline at end of file