diff --git a/common-files/src/main/resources/config.yml b/common-files/src/main/resources/config.yml index 9080e1c67..ac123e9ba 100644 --- a/common-files/src/main/resources/config.yml +++ b/common-files/src/main/resources/config.yml @@ -89,7 +89,7 @@ resource-pack: # Fix images that are not within the texture atlas. It is unreasonable to always rely on plugins to fix your mistakes. # You should strive to make your resource pack more standardized after gaining some experience with resource packs. fix-atlas: true - # Optimize your resource pack by reducing its size without any noticeable quality loss. + # Optimize your resource pack by reducing its size without any quality loss. optimization: enable: false # .png @@ -97,7 +97,7 @@ resource-pack: enable: true # Use Zopfli for PNG compression (very slow). More iterations = smaller files. # In fact, setting the number of iterations between 4 and 8 is generally sufficient. Increasing it further rarely leads to significant optimization in size. - zopfli-iterations: 0 # 0 = disable + zopfli-iterations: 6 # 0 = disable # If your image is special, for example, containing color pixels that need to be specifically recognized by a shader, the optimization might break it. You can add exclusions here. exclude: - assets/minecraft/textures/block/do_not_optimize.png diff --git a/common-files/src/main/resources/craft-engine.properties b/common-files/src/main/resources/craft-engine.properties index be2f90fc4..23c13b14f 100644 --- a/common-files/src/main/resources/craft-engine.properties +++ b/common-files/src/main/resources/craft-engine.properties @@ -20,7 +20,6 @@ caffeine=${caffeine_version} slf4j-api=${slf4j_version} zstd-jni=${zstd_version} commons-io=${commons_io_version} -commons-imaging=${commons_imaging_version} commons-lang3=${commons_lang3_version} byte-buddy=${byte_buddy_version} snake-yaml=${snake_yaml_version} diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 47fc55970..9ad35c52d 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -69,8 +69,6 @@ dependencies { compileOnly("com.mojang:authlib:${rootProject.properties["authlib_version"]}") // concurrentutil compileOnly("ca.spottedleaf:concurrentutil:${rootProject.properties["concurrent_util_version"]}") - // imaging - compileOnly("org.apache.commons:commons-imaging:${rootProject.properties["commons_imaging_version"]}") } java { diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java index 23e168c72..e5b116f5d 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java @@ -321,7 +321,7 @@ public abstract class CraftEngine implements Plugin { Dependencies.GEANTY_REF, Dependencies.CLOUD_CORE, Dependencies.CLOUD_SERVICES, Dependencies.GSON, - Dependencies.COMMONS_IO, Dependencies.COMMONS_LANG3, Dependencies.COMMONS_IMAGING, + Dependencies.COMMONS_IO, Dependencies.COMMONS_LANG3, Dependencies.ZSTD, Dependencies.BYTE_BUDDY, Dependencies.BYTE_BUDDY_AGENT, Dependencies.SNAKE_YAML, diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java index 5adccc541..0d44161bb 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java @@ -153,13 +153,6 @@ public class Dependencies { List.of(Relocation.of("commons", "org{}apache{}commons")) ); - public static final Dependency COMMONS_IMAGING = new Dependency( - "commons-imaging", - "org{}apache{}commons", - "commons-imaging", - List.of(Relocation.of("commons", "org{}apache{}commons")) - ); - public static final Dependency BYTE_BUDDY = new Dependency( "byte-buddy", "net{}bytebuddy", diff --git a/core/src/main/java/net/momirealms/craftengine/core/util/PngOptimizer.java b/core/src/main/java/net/momirealms/craftengine/core/util/PngOptimizer.java index 1b699185b..2d74fbbb0 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/util/PngOptimizer.java +++ b/core/src/main/java/net/momirealms/craftengine/core/util/PngOptimizer.java @@ -1,6 +1,5 @@ package net.momirealms.craftengine.core.util; -import net.momirealms.craftengine.core.pack.model.ItemModels; import net.momirealms.craftengine.core.plugin.config.Config; import net.momirealms.craftengine.core.util.zopfli.Options; import net.momirealms.craftengine.core.util.zopfli.ZopfliOutputStream; diff --git a/gradle.properties b/gradle.properties index fc8a9e3f3..86514135e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx1G # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=0.0.64.21 +project_version=0.0.64.22 config_version=51 lang_version=36 project_group=net.momirealms @@ -37,10 +37,9 @@ lz4_version=1.8.0 geantyref_version=1.3.16 zstd_version=1.5.7-4 commons_io_version=2.20.0 -commons_imaging_version=1.0.0-alpha6 commons_lang3_version=3.19.0 sparrow_nbt_version=0.10.6 -sparrow_util_version=0.52 +sparrow_util_version=0.54 fastutil_version=8.5.18 netty_version=4.1.127.Final joml_version=1.10.8