Add support for 1.21.6 Fabric

Author: DJtheRedstoner

build.gradle.kts

@@ -50,6 +50,7 @@ dependencies {
             12103 -> "0.106.1+1.21.3"
             12104 -> "0.115.1+1.21.4"
             12105 -> "0.119.0+1.21.5"
+            12106 -> "0.125.1+1.21.6"
             else -> error("Unable to determine fabric api version")
         }
 

gradle.properties

@@ -1,6 +1,6 @@
 essential.defaults.loom=1
-essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.16.10
-org.gradle.jvmargs=-Xmx2G
+essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.16.14
+org.gradle.jvmargs=-Xmx4G
 # 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

root.gradle.kts

@@ -5,6 +5,7 @@ plugins {
 preprocess {
     strictExtraMappings.set(true)
 
+    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")
     val fabric12105 = createNode("1.21.5-fabric", 12105, "yarn")
@@ -45,6 +46,7 @@ preprocess {
     val forge11202 = createNode("1.12.2-forge", 11202, "srg")
     val forge10809 = createNode("1.8.9-forge", 10809, "srg")
 
+    fabric12106.link(fabric12105, file("versions/1.21.6-1.21.5.txt"))
     neoForge12105.link(fabric12105)
     forge12105.link(fabric12105)
     fabric12105.link(fabric12104)

settings.gradle.kts

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

src/main/java/gg/essential/partnermod/AdButton.java

@@ -18,7 +18,9 @@
 
 import java.util.function.Consumer;
 
-//#if MC>=12102
+//#if MC>=12106
+//$$ import net.minecraft.client.gl.RenderPipelines;
+//#elseif MC>12102
 //$$ import net.minecraft.client.render.RenderLayer;
 //#endif
 
@@ -100,7 +102,9 @@ public AdButton(int x, int y, ResourceLocation texture, Consumer<GuiButton> onPr
             //$$ RenderSystem.color4f(1f, 1f, 1f, this.alpha);
             //#endif
     //$$
-            //#if MC>=12105
+            //#if MC>=12106
+            //$$ context.drawTexture(RenderPipelines.GUI_TEXTURED, texture, this.getX(), this.getY(), x, 0, width, height, width * 2, height, ColorHelper.getWhite(this.alpha));
+            //#elseif MC>=12105
             //$$ context.drawTexture(RenderLayer::getGuiTextured, texture, this.getX(), this.getY(), x, 0, width, height, width * 2, height, ColorHelper.getWhite(this.alpha));
             //#elseif MC>=12102
             //$$ context.drawTexture(RenderLayer::getGuiTextured, texture, this.getX(), this.getY(), x, 0, width, height, width * 2, height);

src/main/java/gg/essential/partnermod/Draw.java

@@ -20,7 +20,9 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-//#if MC>12102
+//#if MC>=12106
+//$$ import net.minecraft.client.gl.RenderPipelines;
+//#elseif MC>12102
 //$$ import net.minecraft.client.render.RenderLayer;
 //#endif
 
@@ -74,7 +76,9 @@ public void texturedRect(ResourceLocation texture, int x, int y, int width, int
     }
 
     public void texturedRect(ResourceLocation texture, int x, int y, int width, int height, int u, int v, int textureWidth, int textureHeight, int color) {
-        //#if MC>=12102
+        //#if MC>=12106
+        //$$ drawContext.drawTexture(RenderPipelines.GUI_TEXTURED, texture, x, y, u, v, width, height, textureWidth, textureHeight, color);
+        //#elseif MC>=12102
         //$$ drawContext.drawTexture(RenderLayer::getGuiTextured, texture, x, y, u, v, width, height, textureWidth, textureHeight, color);
         //#else
         float red = ((color >> 16) & 0xFF) / 255f;

src/main/java/gg/essential/partnermod/EssentialPartner.java

@@ -80,7 +80,7 @@ public class EssentialPartner {
         "1.18", "1.18.1", "1.18.2",
         "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4",
         "1.20", "1.20.1", "1.20.2", "1.20.4", "1.20.6",
-        "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5"
+        "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6"
     ));
 
     private static final Set<String> NEOFORGE_SUPPORTED_VERSIONS = new HashSet<>(Arrays.asList(

src/main/java/gg/essential/partnermod/modal/ModalManager.java

@@ -103,11 +103,11 @@ private void handleDraw(
     ) {
         resetMousePosition();
 
-        //#if MC>=12000
+        //#if MC>=12000 && MC<12106
         //$$ MatrixStack stack = drawContext.getMatrices();
         //#endif
 
-        //#if MC>=11600
+        //#if MC>=11600 && MC<12106
         //$$ stack.push();
         //$$ stack.translate(0, 0, 10f);
         //#endif
@@ -125,7 +125,7 @@ private void handleDraw(
         handleDraw(draw);
         Draw.flushDeferred(draw);
 
-        //#if MC>=11600
+        //#if MC>=11600 && MC<12106
         //$$ stack.pop();
         //#endif
     }

versions/1.21.6-1.21.5.txt

@@ -0,0 +1 @@
+net.minecraft.GameVersion id() getId()

versions/1.21.6-fabric/gradle.properties

@@ -0,0 +1,2 @@
+essential.defaults.loom.minecraft=com.mojang:minecraft:1.21.6
+essential.defaults.loom.mappings=net.fabricmc:yarn:1.21.6+build.1:v2