From 3432e3dbd47d9b7b90dc8dfdff49eeda25370a84 Mon Sep 17 00:00:00 2001 From: Essential CI Date: Sat, 4 May 2024 09:26:02 +0000 Subject: [PATCH] Version 1.3.2.2 --- changelog/release-1.3.2.2.md | 5 +++++ gradle.properties | 2 +- src/main/kotlin/gg/essential/util/helpers.kt | 2 -- .../gg/essential/util/resource/EssentialAssetResourcePack.kt | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 changelog/release-1.3.2.2.md diff --git a/changelog/release-1.3.2.2.md b/changelog/release-1.3.2.2.md new file mode 100644 index 0000000..9d50722 --- /dev/null +++ b/changelog/release-1.3.2.2.md @@ -0,0 +1,5 @@ +Title: Bug Patch +Summary: Minor bug fixes + +## Compatibility +- Fixed game freezing with "Entity Texture Features" mod diff --git a/gradle.properties b/gradle.properties index 0314d9e..1d64584 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ org.gradle.configureondemand=true org.gradle.parallel.threads=128 org.gradle.jvmargs=-Xmx16G minecraftVersion=11202 -version=1.3.2.1+gb6bc6abcb6 +version=1.3.2.2+gc6bc4f09d7 diff --git a/src/main/kotlin/gg/essential/util/helpers.kt b/src/main/kotlin/gg/essential/util/helpers.kt index d37cabc..0949d7d 100644 --- a/src/main/kotlin/gg/essential/util/helpers.kt +++ b/src/main/kotlin/gg/essential/util/helpers.kt @@ -24,7 +24,6 @@ import gg.essential.gui.screenshot.components.ScreenshotBrowser import gg.essential.gui.screenshot.components.ScreenshotProperties import gg.essential.universal.UDesktop import gg.essential.universal.UMinecraft -import gg.essential.util.resource.EssentialAssetResourcePack import net.minecraft.client.gui.GuiOptions import net.minecraft.client.resources.FileResourcePack import net.minecraft.client.resources.FolderResourcePack @@ -193,7 +192,6 @@ sealed interface CodeSource { } fun addEssentialResourcePack(consumer: Consumer) { - consumer.accept(EssentialAssetResourcePack(Essential.getInstance().connectionManager.cosmeticsManager.assetLoader)) //#if MC>=12005 //$$ val info = makePackInfo("essential") diff --git a/src/main/kotlin/gg/essential/util/resource/EssentialAssetResourcePack.kt b/src/main/kotlin/gg/essential/util/resource/EssentialAssetResourcePack.kt index dfd41ca..4e28b53 100644 --- a/src/main/kotlin/gg/essential/util/resource/EssentialAssetResourcePack.kt +++ b/src/main/kotlin/gg/essential/util/resource/EssentialAssetResourcePack.kt @@ -45,6 +45,7 @@ import java.awt.image.BufferedImage * This resource pack will then respond to all resource request within the `essential` domain where the file name is the * hash of one of the registered resources. In particular it does not care about the folder nor the extension of the * requested path. This allows it to be used with vanilla functions which prepend folders or force a specific extension. + * FIXME this confuses third-party mods (in particular ETF), needs to be done differently * * If an asset is not yet loaded by the time it is requested from the resource pack, its priority will be increased to * [Blocking][AssetLoader.Priority.Blocking].