From 92459fd1d6e5ee9533ff514a99d6401c51fbcf6a Mon Sep 17 00:00:00 2001 From: KuryKat <57152799+KuryKat@users.noreply.github.com> Date: Fri, 13 Oct 2023 16:08:03 -0300 Subject: [PATCH 1/2] Relocate image4j to prevent ResolutionException fixes #45 --- build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index 2212406..f5e10a3 100644 --- a/build.gradle +++ b/build.gradle @@ -106,6 +106,9 @@ shadowJar { // Apache Commons Imaging needs to be put somewhere else to prevent a NoClassDefFoundError relocate "org.apache.commons.imaging", "${project.group}.shadow.org.apache.commons.imaging" + // image4j needs to be put somewhere else to prevent a ResolutionException with other mods - See Issue #45 + relocate "net.sf.image4j", "${project.group}.shadow.net.sf.image4j" + manifest.from(MANIFEST) } From 027e10a5fda1ea7902745842be8387ee7ed0964f Mon Sep 17 00:00:00 2001 From: KuryKat <57152799+KuryKat@users.noreply.github.com> Date: Fri, 13 Oct 2023 16:08:29 -0300 Subject: [PATCH 2/2] v2.2.2 Bump PATCH Version --- CHANGELOG.md | 6 ++++++ build.gradle | 2 +- src/main/java/dk/zlepper/itlt/itlt.java | 2 +- src/main/resources/META-INF/mods.toml | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a603b7..608c378 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ # Changelog +# v2.2.2 + +## Bug fixes + +- Fixed a compatibility issue with other mods that also use the image4j library. ([#45](https://github.com/zlepper/itlt/issues/45)) + # v2.2.1 ## MC 1.20-specific changes diff --git a/build.gradle b/build.gradle index f5e10a3..7853ce4 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id "org.spongepowered.mixin" version "0.7-SNAPSHOT" } -version = "1.20.01-2.2.1" // remember to update mods.toml and itlt.VERSION too +version = "1.20.01-2.2.2" // remember to update mods.toml and itlt.VERSION too group = "dk.zlepper.itlt" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "itlt" diff --git a/src/main/java/dk/zlepper/itlt/itlt.java b/src/main/java/dk/zlepper/itlt/itlt.java index 05cd195..a72beee 100644 --- a/src/main/java/dk/zlepper/itlt/itlt.java +++ b/src/main/java/dk/zlepper/itlt/itlt.java @@ -14,7 +14,7 @@ public final class itlt { public static final String MOD_ID = "itlt", - VERSION = "2.2.1"; + VERSION = "2.2.2"; public static final Logger LOGGER = LogManager.getLogger(); public static ModLoadingContext modLoadingContext; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 38318c8..182a745 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -10,7 +10,7 @@ license="MIT" # The modid of the mod modId="itlt" #mandatory # The version number of the mod - there's a few well known ${} variables usable here or just hardcode it -version="2.2.1" #mandatory +version="2.2.2" #mandatory # A display name for the mod displayName="It's The Little Things" #mandatory # A URL to query for updates for this mod. See the JSON update specification