26.1 further changes /build

Author: Traben-0

build.gradle.kts

@@ -126,7 +126,7 @@ dependencies {
 
     "SODIUM" setVar (
             modImpl("maven.modrinth:sodium:",
-                26_01_00 to null,
+                26_01_00 to ver("Amr4VcZo", null, null),
                 1_21_05 to ver("fVbw1C7i", null,  "dfyNHRhw"),
                 1_21_04 to ver("c3YkZvne", null,  "XgEfENfn"),
                 1_21_03 to ver("rLBgU2jc", null,  "M0CXIL7c"),
@@ -143,7 +143,7 @@ dependencies {
 
     "IRIS" setVar (
             modImpl("maven.modrinth:iris:",
-                26_01_00 to null,
+                26_01_00 to ver("4cGUAiJ6", null, null),
                 //1_21_11 to ver("TSXvi2yD", null,  "t3ruzodq"), //"k9tHcfnb"), //todo why does this break
                 1_21_06 to ver("l77DAK6U", null,  "t3ruzodq"), //"xA5cxBvz"), // same here
                 1_21_05 to ver("U6evbjd0", null,  "t3ruzodq"), //"KAopiPos"),
@@ -169,7 +169,7 @@ dependencies {
 
     if (platform.isFabric) {
         modImpl("maven.modrinth:modmenu:",
-            26_01_00 to "lWZE38V3",
+            26_01_00 to "XIDyVLo7",
             1_21_05 to "R7uVB42W",
             1_21_02 to "PcJvQYqu",
             1_21_00 to "9FL4cmP7",

root.gradle.kts

@@ -6,7 +6,7 @@ plugins {
     // Any project using `gg.essential.multi-version` must have a parent with this root plugin applied.
     // Advanced users may use multiple (potentially independent) multi-version trees in different sub-projects.
     // This is currently equivalent to applying `com.replaymod.preprocess-root`.
-    kotlin("jvm") version "2.0.0" apply false
+    kotlin("jvm") version "2.3.0" apply false
     id("gg.essential.loom") version "1.15.48" apply false // https://repo.essential.gg/#/public/gg/essential/loom/gg.essential.loom.gradle.plugin
     id("gg.essential.multi-version.root")
 }

src/main/java/traben/entity_texture_features/features/texture_handlers/ETFDirectory.java

@@ -46,8 +46,15 @@ public static ResourceLocation getDirectoryVersionOf(@Nullable ResourceLocation
 
     @NotNull
     public static ETFDirectory getDirectoryOf(@NotNull ResourceLocation vanillaIdentifier) {
-        Object2ReferenceOpenHashMap<@NotNull ResourceLocation, @NotNull ETFDirectory> cache = getCache();
-        return cache.computeIfAbsent(vanillaIdentifier, ETFDirectory::findDirectoryOf);
+        Object2ReferenceOpenHashMap<@NotNull ResourceLocation, ETFDirectory> cache = getCache();
+        var value = cache.get(vanillaIdentifier);
+        if (value == null) {
+            value = findDirectoryOf(vanillaIdentifier);
+            cache.put(vanillaIdentifier, value);
+        }
+        return value;
+        // compute if absent can crash
+        //return cache.computeIfAbsent(vanillaIdentifier, ETFDirectory::findDirectoryOf);
     }
 
     @NotNull

src/main/java/traben/entity_texture_features/mixin/mixins/mods/iris/MixinFullyBufferedMultiBufferSource.java

@@ -1,5 +1,5 @@
 package traben.entity_texture_features.mixin.mixins.mods.iris;
-//#if !IRIS || MC == 12002 || MC < 12000
+//#if !IRIS || MC == 12002 || MC < 12000 || MC >= 26.1
 //$$ import net.minecraft.client.Minecraft;
 //$$ import org.spongepowered.asm.mixin.Mixin;
 //$$ import org.spongepowered.asm.mixin.Pseudo;

src/main/java/traben/entity_texture_features/mixin/mixins/mods/iris/MixinInnerWrappedRenderType.java

@@ -1,5 +1,5 @@
 package traben.entity_texture_features.mixin.mixins.mods.iris;
-//#if !IRIS || MC == 12002 || MC < 12000
+//#if !IRIS || MC == 12002 || MC < 12000 || MC >= 26.1
 //$$ import net.minecraft.client.Minecraft;
 //$$ import org.spongepowered.asm.mixin.Mixin;
 //$$ import org.spongepowered.asm.mixin.Pseudo;