Skip to content
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.

Sign up for GitHub

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

Relocate image4j to prevent ResolutionException #46

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Relocate image4j to prevent ResolutionException #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
563cd35
Relocate image4j to prevent ResolutionException
KuryKat Oct 13, 2023
dedb8ca
v2.2.2
KuryKat Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
id "org.spongepowered.mixin" version "0.7-SNAPSHOT"
}

version = "1.20.2-2.2.1" // remember to update mods.toml and itlt.VERSION too
version = "1.20.2-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"

Expand Down Expand Up @@ -107,6 +107,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)
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dk/zlepper/itlt/itlt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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;

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <here>
Expand Down