Version 1.3.10.2

Author: EssentialGGBot

build-logic/src/main/kotlin/essential/repos.kt

@@ -21,12 +21,6 @@ fun RepositoryHandler.minecraft() = maven("https://libraries.minecraft.net")
 
 fun RepositoryHandler.mixin() = maven("https://repo.spongepowered.org/repository/maven-releases/")
 
-fun RepositoryHandler.modMenu() = maven("https://maven.terraformersmc.com/releases/") {
-    content {
-        includeGroup("com.terraformersmc")
-    }
-}
-
 // Documentation: https://docs.modrinth.com/maven
 fun RepositoryHandler.modrinth() = maven("https://api.modrinth.com/maven") {
     content {

build-logic/src/main/kotlin/essential/universal.kt

@@ -65,7 +65,6 @@ fun Project.universalLibs() {
         compileOnly("com.google.code.gson:gson:2.2.4")
         compileOnly("com.google.guava:guava:17.0")
         compileOnly("commons-codec:commons-codec:1.9")
-        compileOnly("org.apache.httpcomponents:httpclient:4.3.3") // TODO ideally switch to one of the libs we bundle
         compileOnly("io.netty:netty-all:4.0.23.Final")
         // These versions are configured in gradle/libs.versions.toml
         compileOnly("gg.essential:universalcraft-1.8.9-forge:${getVersion("universalcraft")}") {

build.gradle.kts

@@ -32,7 +32,6 @@ val mcPlatform: String by project.extra
 
 repositories {
     mavenLocal()
-    modMenu()
 }
 base.archivesName.set("Essential " + project.name)
 
@@ -97,7 +96,8 @@ dependencies {
     testImplementation(kotlin("test"))
 
     if (platform.isFabric && mcVersion >= 11600) {
-        val modMenuDependency = "com.terraformersmc:modmenu:${when {
+        repositories.modrinth()
+        val modMenuDependency = "maven.modrinth:modmenu:${when {
             platform.mcVersion >= 11800 -> "3.0.0"
             platform.mcVersion <= 11700 -> "1.16.22"
             else -> "2.0.14"
@@ -138,6 +138,21 @@ dependencies {
         include(modImplementation(fabricApi.module("fabric-networking-api-v1", fapiVersion))!!)
     }
 
+    // Dependencies for The Aether Mod gloves cosmetic hiding, @see [AetherGlovesCompat]
+    val mc = platform.mcVersion
+    when {
+        mc >= 12100 && !platform.isForge -> "accessories:1.1.0-beta.52+1.21.1"
+        mc == 12004 && platform.isNeoForge -> "curios:7.4.3+1.20.4"
+        mc == 12001 && platform.isFabric -> "accessories:1.0.0-beta.48+1.20.1"
+        mc == 12001 && platform.isForge -> "curios:1.19.2-5.1.6.4"
+        mc >= 11902 && mc < 12001 && platform.isForge -> "curios:1.19.2-5.1.6.4"
+        mc == 11202 -> "aether:1.12.2-v1.5.4.1"
+        else -> null
+    }?.let {
+        repositories.modrinth()
+        modCompileOnly("maven.modrinth:$it")
+    }
+
 
     constraints {
         val kotlin = KotlinVersion.minimal

changelog/release-1.3.10.2.md

@@ -0,0 +1,15 @@
+Title: Bug Patch
+Summary: Minor bug fixes
+
+## Improvements
+- Added option to disable collection of non-functional telemetry
+- Added code redemption to wardrobe
+
+## Bug Fixes
+- Fixed "Cosmetics loading" modal taking very long to complete
+- Fixed dark line in background of nametags with bold text
+- Fixed underscores in usernames being turned into italic formatting in some notifications
+- Fixed markdown rendering related crash in Social Menu
+
+## Compatibility
+- Added compatibility for The Aether's glove armor to hide some arm cosmetics

features.properties

@@ -1,2 +1,4 @@
 always=true
 suspensions_and_chat_filtering=true
+store_redemption_codes=true
+telemetry_opt_out=true

gradle.properties

@@ -10,4 +10,4 @@ minecraftVersion=11202
 # TODO remove once upgrading to Loom 1.10
 # fabric-api 1.21.5 was built with Loom 1.10, seems to work well enough in dev with our current 1.7 though
 loom.ignoreDependencyLoomVersionValidation=true
-version=1.3.10.1
+version=1.3.10.2

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-universalcraft = "431"
+universalcraft = "440"
 elementa = "712"
 vigilance = "306"
 mixinextras = "0.4.0"

gui/elementa/src/main/kotlin/gg/essential/gui/elementa/essentialmarkdown/MarkdownRenderer.kt

@@ -21,6 +21,7 @@ import gg.essential.gui.elementa.essentialmarkdown.ext.colorattribute.ColorAttri
 import gg.essential.gui.elementa.essentialmarkdown.ext.colorattribute.ColorAttributeExtension
 import gg.essential.gui.elementa.essentialmarkdown.drawables.*
 import java.awt.Color
+import java.net.MalformedURLException
 import java.net.URL
 
 class MarkdownRenderer @JvmOverloads constructor(
@@ -197,7 +198,11 @@ private class MarkdownRendererImpl(
         mark()
         super.visit(image)
         val fallback = unmarkAndCollect()
-        drawables.add(gg.essential.gui.elementa.essentialmarkdown.drawables.ImageDrawable(md, URL(image.destination), fallback))
+        try {
+            drawables.add(gg.essential.gui.elementa.essentialmarkdown.drawables.ImageDrawable(md, URL(image.destination), fallback))
+        } catch (e: MalformedURLException) {
+            drawables.addAll(fallback)
+        }
     }
 
     override fun visit(indentedCodeBlock: IndentedCodeBlock) {

gui/essential/src/main/java/gg/essential/handlers/MojangSkinManager.java

@@ -12,7 +12,7 @@
 package gg.essential.util;
 
 public class RateLimitException extends Exception {
-    public RateLimitException(String errorMessage) {
-        super(errorMessage);
+    public RateLimitException() {
+        super("Rate limit exceeded");
     }
 }