Port to 1.21.11

PepperCode1 · PepperCode1 · commit 18d3681ea6d9 · 2025-12-21T08:58:13.000-08:00
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version "${loom_version}"
+	id 'net.fabricmc.fabric-loom-remap' version "${loom_version}"
 	id 'maven-publish'
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -3,17 +3,17 @@ org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = true
 
 # Fabric Properties
-loom_version = 1.12.7
-minecraft_version = 1.21.10
-yarn_mappings = 1.21.10+build.2
-loader_version = 0.17.3
+loom_version = 1.14.7
+minecraft_version = 1.21.11
+yarn_mappings = 1.21.11+build.3
+loader_version = 0.18.3
 
 # Mod Properties
 mod_version = 3.0.1
-mod_minecraft_version = 1.21.10
+mod_minecraft_version = 1.21.11
 maven_group = me.pepperbell
 archives_base_name = continuity
 
 # Dependencies
-fabric_version = 0.137.0+1.21.10
-modmenu_version = 16.0.0-rc.1
+fabric_version = 0.140.0+1.21.11
+modmenu_version = 17.0.0-alpha.1
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/src/main/java/me/pepperbell/continuity/client/mixin/BlockRenderLayersMixin.java b/src/main/java/me/pepperbell/continuity/client/mixin/BlockRenderLayersMixin.java
@@ -10,11 +10,11 @@
 import net.fabricmc.fabric.api.renderer.v1.render.RenderLayerHelper;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.render.BlockRenderLayer;
+import net.minecraft.client.render.BlockRenderLayers;
 import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.RenderLayers;
 
-@Mixin(RenderLayers.class)
-abstract class RenderLayersMixin {
+@Mixin(BlockRenderLayers.class)
+abstract class BlockRenderLayersMixin {
 	@Inject(method = "getBlockLayer(Lnet/minecraft/block/BlockState;)Lnet/minecraft/client/render/BlockRenderLayer;", at = @At("HEAD"), cancellable = true)
 	private static void continuity$onHeadGetBlockLayer(BlockState state, CallbackInfoReturnable<BlockRenderLayer> cir) {
 		if (!CustomBlockLayers.isEmpty() && ContinuityConfig.INSTANCE.customBlockLayers.get()) {
diff --git a/src/main/java/me/pepperbell/continuity/client/model/EmissiveBlockStateModel.java b/src/main/java/me/pepperbell/continuity/client/model/EmissiveBlockStateModel.java
@@ -16,7 +16,7 @@
 import net.fabricmc.fabric.api.util.TriState;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.render.BlockRenderLayer;
-import net.minecraft.client.render.RenderLayers;
+import net.minecraft.client.render.BlockRenderLayers;
 import net.minecraft.client.render.model.BlockStateModel;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.util.math.BlockPos;
@@ -112,15 +112,15 @@ public boolean transform(MutableQuadView quad) {
 				BlockRenderLayer renderLayer = quad.renderLayer();
 				if (renderLayer == null) {
 					if (calculateDefaultLayer) {
-						isDefaultLayerSolid = RenderLayers.getBlockLayer(state) == BlockRenderLayer.SOLID;
+						isDefaultLayerSolid = BlockRenderLayers.getBlockLayer(state) == BlockRenderLayer.SOLID;
 						calculateDefaultLayer = false;
 					}
 
 					if (isDefaultLayerSolid) {
-						emitter.renderLayer(BlockRenderLayer.CUTOUT_MIPPED);
+						emitter.renderLayer(BlockRenderLayer.CUTOUT);
 					}
 				} else if (renderLayer == BlockRenderLayer.SOLID) {
-					emitter.renderLayer(BlockRenderLayer.CUTOUT_MIPPED);
+					emitter.renderLayer(BlockRenderLayer.CUTOUT);
 				}
 
 				QuadUtil.interpolate(emitter, sprite, emissiveSprite);
diff --git a/src/main/java/me/pepperbell/continuity/client/properties/overlay/OverlayPropertiesSection.java b/src/main/java/me/pepperbell/continuity/client/properties/overlay/OverlayPropertiesSection.java
@@ -21,7 +21,7 @@ public class OverlayPropertiesSection {
 	protected int tintIndex = -1;
 	@Nullable
 	protected BlockState tintBlock;
-	protected BlockRenderLayer layer = BlockRenderLayer.CUTOUT_MIPPED;
+	protected BlockRenderLayer layer = BlockRenderLayer.CUTOUT;
 
 	public OverlayPropertiesSection(Properties properties, Identifier resourceId, String packId) {
 		this.properties = properties;
@@ -92,7 +92,6 @@ protected void parseLayer() {
 
 		String layerStr1 = layerStr.trim().toLowerCase(Locale.ROOT);
 		switch (layerStr1) {
-			case "cutout_mipped" -> layer = BlockRenderLayer.CUTOUT_MIPPED;
 			case "cutout" -> layer = BlockRenderLayer.CUTOUT;
 			case "translucent" -> layer = BlockRenderLayer.TRANSLUCENT;
 			default -> ContinuityClient.LOGGER.warn("Unknown 'layer' value '" + layerStr + " in file '" + resourceId + "' in pack '" + packId + "'");
diff --git a/src/main/java/me/pepperbell/continuity/client/resource/CustomBlockLayers.java b/src/main/java/me/pepperbell/continuity/client/resource/CustomBlockLayers.java
@@ -101,7 +101,6 @@ public void reload(ResourceManager manager) {
 	private enum BlockLayer {
 		SOLID(BlockRenderLayer.SOLID),
 		CUTOUT(BlockRenderLayer.CUTOUT),
-		CUTOUT_MIPPED(BlockRenderLayer.CUTOUT_MIPPED),
 		TRANSLUCENT(BlockRenderLayer.TRANSLUCENT);
 
 		public static final BlockLayer[] VALUES = values();
diff --git a/src/main/java/me/pepperbell/continuity/client/util/QuadUtil.java b/src/main/java/me/pepperbell/continuity/client/util/QuadUtil.java
@@ -9,7 +9,6 @@
 import net.minecraft.client.render.BlockRenderLayer;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.util.math.Direction;
-import net.minecraft.util.math.MathHelper;
 
 public final class QuadUtil {
 	public static void interpolate(MutableQuadView quad, Sprite oldSprite, Sprite newSprite) {
@@ -27,24 +26,10 @@ public static void interpolate(MutableQuadView quad, Sprite oldSprite, Sprite ne
 		}
 	}
 
-	public static void assignLerpedUvs(MutableQuadView quad, Sprite sprite) {
-		float delta = sprite.getUvScaleDelta();
-		float centerU = (sprite.getMinU() + sprite.getMaxU()) * 0.5f;
-		float centerV = (sprite.getMinV() + sprite.getMaxV()) * 0.5f;
-		float lerpedMinU = MathHelper.lerp(delta, sprite.getMinU(), centerU);
-		float lerpedMaxU = MathHelper.lerp(delta, sprite.getMaxU(), centerU);
-		float lerpedMinV = MathHelper.lerp(delta, sprite.getMinV(), centerV);
-		float lerpedMaxV = MathHelper.lerp(delta, sprite.getMaxV(), centerV);
-		quad.uv(0, lerpedMinU, lerpedMinV);
-		quad.uv(1, lerpedMinU, lerpedMaxV);
-		quad.uv(2, lerpedMaxU, lerpedMaxV);
-		quad.uv(3, lerpedMaxU, lerpedMinV);
-	}
-
 	public static void emitOverlayQuad(QuadEmitter emitter, Direction face, Sprite sprite, int color, @Nullable BlockRenderLayer renderLayer, TriState ao) {
 		emitter.square(face, 0, 0, 1, 1, 0);
 		emitter.color(color, color, color, color);
-		assignLerpedUvs(emitter, sprite);
+		emitter.spriteBake(sprite, MutableQuadView.BAKE_LOCK_UV);
 		emitter.renderLayer(renderLayer);
 		emitter.ambientOcclusion(ao);
 		emitter.emit();
diff --git a/src/main/resources/continuity.mixins.json b/src/main/resources/continuity.mixins.json
@@ -6,8 +6,8 @@
   "client": [
     "AtlasLoaderMixin",
     "AtlasManagerMixin",
+    "BlockRenderLayersMixin",
     "LifecycledResourceManagerImplMixin",
-    "RenderLayersMixin",
     "SpriteLoaderMixin",
     "SpriteMixin"
   ],
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -31,8 +31,8 @@
   ],
 
   "depends": {
-    "minecraft": "1.21.10",
-    "fabric-api": ">=0.135.0"
+    "minecraft": ">=1.21.11",
+    "fabric-api": ">=0.140.0"
   },
 
   "custom": {
diff --git a/src/main/resources/resourcepacks/default/pack.mcmeta b/src/main/resources/resourcepacks/default/pack.mcmeta
@@ -1,7 +1,7 @@
 {
   "pack": {
-    "min_format": 69,
-    "max_format": 69,
+    "min_format": 75,
+    "max_format": 999,
     "description": {
       "translate": "resourcePack.continuity.default.description"
     }
diff --git a/src/main/resources/resourcepacks/glass_pane_culling_fix/pack.mcmeta b/src/main/resources/resourcepacks/glass_pane_culling_fix/pack.mcmeta
@@ -1,7 +1,7 @@
 {
   "pack": {
-    "min_format": 69,
-    "max_format": 69,
+    "min_format": 75,
+    "max_format": 999,
     "description": {
       "translate": "resourcePack.continuity.glass_pane_culling_fix.description"
     }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id 'fabric-loom' version "${loom_version}"`
	`2`	`+ id 'net.fabricmc.fabric-loom-remap' version "${loom_version}"`
`3`	`3`	`id 'maven-publish'`
`4`	`4`	`}`
`5`	`5`