Merge remote-tracking branch 'origin/1.19.2-fabric' into 1.18.2-fabric

# Conflicts:
#	gradle.properties
#	src/main/resources/fabric.mod.json

.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

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.
+* Moved icons into `assets/dark-matter*`.
+* Dummy no longer depends on MC version.

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": {
   },

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": {
   },

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": {
   },

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": {
   },

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...");
                     }
                 }
             }

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": [

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": {
   },

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": {
   },

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": {

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": {
   },

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": {
   },

gradle.properties

@@ -8,7 +8,7 @@ minecraft_version=1.18.2
 yarn_mappings=1.18.2+build.4
 loader_version=0.14.19
 # Mod Properties
-mod_version=0.6.1-1.18.2
+mod_version=0.6.2-1.18.2
 maven_group=me.melontini
 archives_base_name=dark-matter
 # Dependencies

src/main/resources/fabric.mod.json

@@ -9,11 +9,11 @@
   ],
   "contact": {},
   "license": "MIT",
-  "icon": "icon.png",
+  "icon": "assets/dark-matter/icon.png",
   "environment": "*",
   "depends": {
     "fabricloader": "*",
-    "minecraft": ">=1.18"
+    "minecraft": "*"
   },
   "custom": {
     "modmenu": {