Merge remote-tracking branch 'origin/1.20.5/dev' into 1.21/dev

# Conflicts:
#	build.gradle
#	gradle.properties
#	src/main/java/me/pepperbell/continuity/client/properties/BaseCtmProperties.java
#	src/main/java/me/pepperbell/continuity/client/util/biome/BiomeRetriever.java

Author: PepperCode1

.github/workflows/build.yml

@@ -7,14 +7,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v2
-      - name: Set up JDK 17
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 21
           check-latest: true
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
       - name: Build artifacts
         run: ./gradlew build --stacktrace
       - name: Upload artifacts

README.md

@@ -1,12 +1,12 @@
 # Continuity
 
-Continuity is a Fabric mod that allows resource packs that use the OptiFine connected textures format, OptiFine emissive textures format (only for blocks and item models), or OptiFine custom block layers format to work without OptiFine.
+Continuity is a Minecraft mod that allows resource packs that use the OptiFine connected textures format, OptiFine emissive textures format (only for blocks and item models), or OptiFine custom block layers format to work without OptiFine.
 
-Continuity depends on Fabric API and is client-side only. It includes two built-in resource packs. The Default Connected Textures pack provides connected textures for glass, sandstone, and bookshelves, similar to the built-in connected textures provided by OptiFine. The Glass Pane Culling Fix pack culls faces between vertically stacked glass panes to make them look seamless with connected textures.
+Continuity is client-side only and includes two built-in resource packs. The Default Connected Textures pack provides connected textures for glass, sandstone, and bookshelves, similar to the built-in connected textures provided by OptiFine. The Glass Pane Culling Fix pack culls faces between vertically stacked glass panes to make them look seamless with connected textures.
 
 Formally, Continuity implements the Continuity connected textures specification, Continuity emissive textures specification, and Continuity custom block layers specification. All of these are extensions of the corresponding OptiFine specification and were created to provide more features to resource pack authors. The documentation for the Continuity specifications can be found at the [Continuity wiki](https://github.com/PepperCode1/Continuity/wiki).
 
-An official Forge version of Continuity is not planned at this time due to major technical differences between the Fabric and Forge APIs. An official Forge version of Continuity may be considered if these differences are minimized, possibly via the use of libraries.
+Continuity is developed as a Fabric mod and is recommended to be used with Fabric. However, [Connector](https://github.com/Sinytra/Connector) and [Forgified Fabric API](https://github.com/Sinytra/ForgifiedFabricAPI) allow Continuity to work well on other mod loaders such as NeoForge and Forge. Releases are made on CurseForge and Modrinth that are marked as working with these mod loaders; these releases contain the same code as equivalent releases for Fabric, but with additional metadata to declare Connector and Forgified Fabric API as dependencies. An official NeoForge version of Continuity that does not require Forgified Fabric API is not planned at this time due to major technical differences between the Fabric and NeoForge APIs.
 
 ### Links
 

gradle.properties

@@ -3,17 +3,17 @@ org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = true
 
 # Fabric Properties
-loom_version = 1.6.11
+loom_version = 1.12.7
 minecraft_version = 1.21
 yarn_mappings = 1.21+build.1
-loader_version = 0.15.11
+loader_version = 0.17.3
 
 # Mod Properties
-mod_version = 3.0.0
+mod_version = 3.0.1
 mod_minecraft_version = 1.21
 maven_group = me.pepperbell
 archives_base_name = continuity
 
 # Dependencies
 fabric_version = 0.100.1+1.21
-modmenu_version = 11.0.0-beta.1
+modmenu_version = 11.0.3

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -65,7 +65,7 @@ public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos
 		// especially if there is an actual use case for it.
 		BlockState appearanceState = state.getAppearance(blockView, pos, Direction.DOWN, state, pos);
 
-		quadTransform.prepare(blockView, appearanceState, state, pos, randomSupplier, context, ContinuityConfig.INSTANCE.useManualCulling.get(), getSliceFunc(appearanceState));
+		quadTransform.prepare(blockView, appearanceState, state, pos, randomSupplier.get().nextLong(), context, ContinuityConfig.INSTANCE.useManualCulling.get(), getSliceFunc(appearanceState));
 
 		context.pushTransform(quadTransform);
 		super.emitBlockQuads(blockView, state, pos, randomSupplier, context);
@@ -102,12 +102,21 @@ protected Function<Sprite, QuadProcessors.Slice> getSliceFunc(BlockState state)
 
 	protected static class CtmQuadTransform implements RenderContext.QuadTransform {
 		protected final ProcessingContextImpl processingContext = new ProcessingContextImpl();
+		protected final Supplier<Random> randomSupplier = new Supplier<>() {
+			private final Random random = Random.createLocal();
+
+			@Override
+			public Random get() {
+				random.setSeed(randomSeed);
+				return random;
+			}
+		};
 
 		protected BlockRenderView blockView;
 		protected BlockState appearanceState;
 		protected BlockState state;
 		protected BlockPos pos;
-		protected Supplier<Random> randomSupplier;
+		protected long randomSeed;
 		protected RenderContext renderContext;
 		protected boolean useManualCulling;
 		protected Function<Sprite, QuadProcessors.Slice> sliceFunc;
@@ -156,12 +165,12 @@ public boolean isActive() {
 			return active;
 		}
 
-		public void prepare(BlockRenderView blockView, BlockState appearanceState, BlockState state, BlockPos pos, Supplier<Random> randomSupplier, RenderContext renderContext, boolean useManualCulling, Function<Sprite, QuadProcessors.Slice> sliceFunc) {
+		public void prepare(BlockRenderView blockView, BlockState appearanceState, BlockState state, BlockPos pos, long randomSeed, RenderContext renderContext, boolean useManualCulling, Function<Sprite, QuadProcessors.Slice> sliceFunc) {
 			this.blockView = blockView;
 			this.appearanceState = appearanceState;
 			this.state = state;
 			this.pos = pos;
-			this.randomSupplier = randomSupplier;
+			this.randomSeed = randomSeed;
 			this.renderContext = renderContext;
 			this.useManualCulling = useManualCulling;
 			this.sliceFunc = sliceFunc;
@@ -176,7 +185,6 @@ public void reset() {
 			appearanceState = null;
 			state = null;
 			pos = null;
-			randomSupplier = null;
 			renderContext = null;
 			useManualCulling = false;
 			sliceFunc = null;

gradlew

@@ -66,7 +66,7 @@ public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos
 		}
 
 		MeshBuilder meshBuilder = container.meshBuilder;
-		quadTransform.prepare(meshBuilder.getEmitter(), blockView, state, pos, context, ContinuityConfig.INSTANCE.useManualCulling.get());
+		quadTransform.prepare(meshBuilder.getEmitter(), state, context, ContinuityConfig.INSTANCE.useManualCulling.get());
 
 		context.pushTransform(quadTransform);
 		super.emitBlockQuads(blockView, state, pos, randomSupplier, context);
@@ -120,9 +120,7 @@ public boolean isVanillaAdapter() {
 
 	protected static class EmissiveBlockQuadTransform implements RenderContext.QuadTransform {
 		protected QuadEmitter emitter;
-		protected BlockRenderView blockView;
 		protected BlockState state;
-		protected BlockPos pos;
 		protected RenderContext renderContext;
 		protected boolean useManualCulling;
 
@@ -177,11 +175,9 @@ public boolean didEmit() {
 			return didEmit;
 		}
 
-		public void prepare(QuadEmitter emitter, BlockRenderView blockView, BlockState state, BlockPos pos, RenderContext renderContext, boolean useManualCulling) {
+		public void prepare(QuadEmitter emitter, BlockState state, RenderContext renderContext, boolean useManualCulling) {
 			this.emitter = emitter;
-			this.blockView = blockView;
 			this.state = state;
-			this.pos = pos;
 			this.renderContext = renderContext;
 			this.useManualCulling = useManualCulling;
 
@@ -193,9 +189,7 @@ public void prepare(QuadEmitter emitter, BlockRenderView blockView, BlockState s
 
 		public void reset() {
 			emitter = null;
-			blockView = null;
 			state = null;
-			pos = null;
 			renderContext = null;
 			useManualCulling = false;