Version 1.3.8.4

Author: EssentialGGBot

api/api/api.api

@@ -424,13 +424,13 @@ public abstract interface class gg/essential/api/utils/GuiUtil {
 	public abstract fun openScreen (Lnet/minecraft/client/gui/screens/Screen;)V
 	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge,1.20.4-neoforge,1.20.6-forge,1.20.6-neoforge,1.21.1-forge,1.21.1-neoforge,1.21.3-forge,1.21.3-neoforge,1.21.4-forge,1.21.4-neoforge,1.21.5-forge,1.21.5-neoforge
 	public abstract fun openedScreen ()Lnet/minecraft/client/gui/screens/Screen;
-	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric
+	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric
 	public static fun getOpenedScreen ()Lnet/minecraft/client/gui/screen/Screen;
-	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric
+	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric
 	public static fun open (Lnet/minecraft/client/gui/screen/Screen;)V
-	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric
+	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric
 	public abstract fun openScreen (Lnet/minecraft/client/gui/screen/Screen;)V
-	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric
+	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric
 	public abstract fun openedScreen ()Lnet/minecraft/client/gui/screen/Screen;
 	@1.12.2-forge,1.8.9-forge
 	public static fun getOpenedScreen ()Lnet/minecraft/client/gui/GuiScreen;
@@ -447,9 +447,9 @@ public final class gg/essential/api/utils/GuiUtil$Companion {
 	public final fun getOpenedScreen ()Lnet/minecraft/client/gui/screens/Screen;
 	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge,1.20.4-neoforge,1.20.6-forge,1.20.6-neoforge,1.21.1-forge,1.21.1-neoforge,1.21.3-forge,1.21.3-neoforge,1.21.4-forge,1.21.4-neoforge,1.21.5-forge,1.21.5-neoforge
 	public final fun open (Lnet/minecraft/client/gui/screens/Screen;)V
-	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric
+	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric
 	public final fun getOpenedScreen ()Lnet/minecraft/client/gui/screen/Screen;
-	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric
+	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric
 	public final fun open (Lnet/minecraft/client/gui/screen/Screen;)V
 	@1.12.2-forge,1.8.9-forge
 	public final fun getOpenedScreen ()Lnet/minecraft/client/gui/GuiScreen;
@@ -513,7 +513,7 @@ public final class gg/essential/api/utils/KotlinAdapter : net/minecraftforge/fml
 public abstract interface class gg/essential/api/utils/MinecraftUtils {
 	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge,1.20.4-neoforge,1.20.6-forge,1.20.6-neoforge,1.21.1-forge,1.21.1-neoforge,1.21.3-forge,1.21.3-neoforge,1.21.4-forge,1.21.4-neoforge,1.21.5-forge,1.21.5-neoforge
 	public abstract fun getResourceImage (Lnet/minecraft/resources/ResourceLocation;)Ljava/awt/image/BufferedImage;
-	@1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric
+	@1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric,1.21.6-fabric,1.21.7-fabric
 	public abstract fun getResourceImage (Lnet/minecraft/util/Identifier;)Ljava/awt/image/BufferedImage;
 	@1.12.2-forge,1.16.2-forge,1.8.9-forge
 	public abstract fun getResourceImage (Lnet/minecraft/util/ResourceLocation;)Ljava/awt/image/BufferedImage;

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

@@ -20,6 +20,7 @@ fun Project.configurePreprocessTree(versions: File) {
     configure<RootPreprocessExtension> {
         strictExtraMappings.set(true)
 
+        val fabric12107 = createNode("1.21.7-fabric", 12107, "yarn")
         val fabric12106 = createNode("1.21.6-fabric", 12106, "yarn")
         val neoForge12105 = createNode("1.21.5-neoforge", 12105, "srg")
         val forge12105 = createNode("1.21.5-forge", 12105, "srg")
@@ -61,6 +62,7 @@ fun Project.configurePreprocessTree(versions: File) {
         val forge11202 = createNode("1.12.2-forge", 11202, "srg")
         val forge10809 = createNode("1.8.9-forge", 10809, "srg")
 
+        fabric12107.link(fabric12106)
         fabric12106.link(fabric12105, versions.resolve("1.21.6-1.21.5.txt"))
         neoForge12105.link(fabric12105)
         forge12105.link(fabric12105)

build.gradle.kts

@@ -130,6 +130,7 @@ dependencies {
             12104 -> "0.110.0+1.21.4"
             12105 -> "0.119.0+1.21.5"
             12106 -> "0.126.0+1.21.6"
+            12107 -> "0.128.1+1.21.7"
             else -> error("No fabric API version configured!")
         }
         include(modImplementation(fabricApi.module("fabric-api-base", fapiVersion))!!)

changelog/release-1.3.8.4.md

@@ -0,0 +1,8 @@
+Title: Bug Patch
+Summary: Minor bug fixes
+
+## New Versions
+- Added support for 1.21.7 Fabric
+
+## Bug Fixes
+- Fixed bold text rendering incorrectly on Minecraft 1.21.6+

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.8.3
+version=1.3.8.4

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-universalcraft = "412"
+universalcraft = "419"
 elementa = "708"
 vigilance = "306"
 mixinextras = "0.4.0"

settings.gradle.kts

@@ -117,6 +117,7 @@ listOf(
     "1.21.5-forge",
     "1.21.5-neoforge",
     "1.21.6-fabric",
+    "1.21.7-fabric",
 ).forEach { version ->
     include(":$version")
     project(":$version").apply {

src/main/java/gg/essential/network/connectionmanager/telemetry/TelemetryManager.java

@@ -44,6 +44,7 @@
 //$$ import oshi.hardware.CentralProcessor;
 //#endif
 
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -160,6 +161,7 @@ private void init(InitializationEvent event) {
             put("lang", UMinecraft.getMinecraft().gameSettings.language);
         }}));
         queueInstallerTelemetryPacket();
+        queueIntegrationModTelemetryPacket();
     }
 
     /**
@@ -257,15 +259,9 @@ private void queueInstallerTelemetryPacket() {
                 }
                 String pathChecksum = pathChecksumBuilder.toString();
 
-                // Grab the raw JSON object from the telemetry file
+                // Grab the raw JSON data from the telemetry file
                 // This is to allow installer to add telemetry fields without having to update the mod
-                String rawFile = new String(Files.readAllBytes(installerMetadataPath), StandardCharsets.UTF_8);
-                JsonObject telemetryObject = new Gson().fromJson(rawFile, JsonObject.class);
-                // Convert to map
-                HashMap<String, Object> telemetryMap = new HashMap<>();
-                for (Map.Entry<String, JsonElement> entry : telemetryObject.entrySet()) {
-                    telemetryMap.put(entry.getKey(), entry.getValue());
-                }
+                HashMap<String, Object> telemetryMap = getHashMapFromJsonFile(installerMetadataPath);
                 // Check if the game folder has been moved
                 boolean hasBeenMoved = false;
                 Object installPathChecksum = telemetryMap.get("installPathChecksum");
@@ -285,4 +281,36 @@ private void queueInstallerTelemetryPacket() {
         });
     }
 
+    private void queueIntegrationModTelemetryPacket() {
+        // We go async, since we are reading a file
+        Multithreading.runAsync(() -> {
+            try {
+                Path integrationModMetadataPath = Essential.getInstance().getBaseDir().toPath().resolve("partner-integration-mod-metadata.json");
+
+                if (Files.notExists(integrationModMetadataPath))
+                    return;
+
+                // Send telemetry file as-is
+                HashMap<String, Object> telemetryMap = getHashMapFromJsonFile(integrationModMetadataPath);
+                // Then queue the packet on the main thread again
+                Multithreading.scheduleOnMainThread(() -> enqueue(new ClientTelemetryPacket("PARTNER_INTEGRATION_MOD", telemetryMap)), 0, TimeUnit.SECONDS);
+                // Delete file after enqueueing, to ensure we only send this packet once.
+                Files.deleteIfExists(integrationModMetadataPath);
+            } catch (Exception e) {
+                Essential.logger.warn("Error when trying to parse partner integration mod telemetry!", e);
+            }
+        });
+    }
+
+    private HashMap<String, Object> getHashMapFromJsonFile(Path path) throws IOException {
+        String rawFile = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
+        JsonObject telemetryObject = new Gson().fromJson(rawFile, JsonObject.class);
+        // Convert to map
+        HashMap<String, Object> telemetryMap = new HashMap<>();
+        for (Map.Entry<String, JsonElement> entry : telemetryObject.entrySet()) {
+            telemetryMap.put(entry.getKey(), entry.getValue());
+        }
+        return telemetryMap;
+    }
+
 }

src/main/java/gg/essential/util/BuildInfo.java

@@ -53,6 +53,8 @@ public class BuildInfo {
         //$$ 12105;
         //#elseif MC==12106
         //$$ 12106;
+        //#elseif MC==12107
+        //$$ 12107;
         //#else
         //$$ ADD_CASE_FOR_NEW_VERSION_TO_ABOVE_LIST;
         //#endif

src/main/kotlin/gg/essential/gui/menu/LeftSideBar.kt

@@ -46,7 +46,7 @@ import gg.essential.vigilance.utils.onLeftClick
 import gg.essential.gui.elementa.state.v2.State as StateV2
 
 class LeftSideBar(
-    private val topButton: UIContainer,
+    private val topButtonAndMultiplayer: UIContainer,
     private val bottomButton: UIContainer,
     menuVisible: StateV2<Boolean>,
     collapsed: StateV2<Boolean>,
@@ -139,13 +139,13 @@ class LeftSideBar(
         bindConstraints(isCompact) { compact ->
             if (compact) {
                 x = if (EssentialConfig.closerMenuSidebar) {
-                    basicXConstraint { (topButton.getLeft() / 2) - (it.getWidth() / 2) }.coerceIn(
-                        basicXConstraint { topButton.getLeft() - (player.getWidth() / 2) - (wardrobeButton.getWidth() / 2) - PauseMenuDisplay.maxSpaceBetweenSides },
-                        17.pixels(alignOutside = true) boundTo topButton,
+                    basicXConstraint { (topButtonAndMultiplayer.getLeft() / 2) - (it.getWidth() / 2) }.coerceIn(
+                        basicXConstraint { topButtonAndMultiplayer.getLeft() - (player.getWidth() / 2) - (wardrobeButton.getWidth() / 2) - PauseMenuDisplay.maxSpaceBetweenSides },
+                        17.pixels(alignOutside = true) boundTo topButtonAndMultiplayer,
                     )
                 } else {
-                    basicXConstraint { (topButton.getLeft() / 2) - (it.getWidth() / 2) }
-                        .coerceAtMost(17.pixels(alignOutside = true) boundTo topButton)
+                    basicXConstraint { (topButtonAndMultiplayer.getLeft() / 2) - (it.getWidth() / 2) }
+                        .coerceAtMost(17.pixels(alignOutside = true) boundTo topButtonAndMultiplayer)
                 }
                 y = 0.pixels boundTo player
                 width = 100.percent boundTo player