1.21.1 Update

.gitattributes

@@ -1,2 +1,2 @@
 # Auto detect text files and perform LF normalization
-* text=auto
+* text=auto eol=lf

.github/workflows/build.yml

@@ -1,40 +1,44 @@
-# Automatically build the project and run any configured tests for every push
-# and submitted pull request. This can help catch issues that only occur on
-# certain platforms or Java versions, and provides a first line of defence
-# against bad commits.
-
-name: build
-on: [pull_request, push]
+name: Build
+on:
+  - pull_request
+  - push
 
 jobs:
   build:
-    strategy:
-      matrix:
-        # Use these Java versions
-        java: [
-          17,    # Current Java LTS & minimum supported by Minecraft
-        ]
-        # and run on both Linux and Windows
-        os: [ubuntu-22.04, windows-2022]
-    runs-on: ${{ matrix.os }}
+    if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
+    runs-on: ubuntu-latest
     steps:
-      - name: checkout repository
-        uses: actions/checkout@v3
-      - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-      - name: setup jdk ${{ matrix.java }}
-        uses: actions/setup-java@v3
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Validate Gradle wrapper
+        uses: gradle/actions/wrapper-validation@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+      - name: Use Gradle cache for faster builds
+        uses: actions/cache@v4
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+      - name: Cleanup Gradle Cache
+        # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
+        # Restoring these files from a GitHub Actions cache might cause problems for future builds.
+        run: |
+          rm -f ~/.gradle/caches/modules-2/modules-2.lock
+          rm -f ~/.gradle/caches/modules-2/gc.properties
+      - name: Setup Gradle Wrapper Cache
+        uses: actions/cache@v4
         with:
-          java-version: ${{ matrix.java }}
-          distribution: 'microsoft'
-      - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
-        run: chmod +x ./gradlew
-      - name: build
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+      - name: Grant execute permission to gradlew
+        run: chmod +x gradlew
+      - name: Build
         run: ./gradlew build
-      - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
-        uses: actions/upload-artifact@v3
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
         with:
-          name: Artifacts
+          name: AutoSlabs
           path: build/libs/

README.md

@@ -1,2 +1,19 @@
 # Auto Slabs
- Automatically Generate vertical slabs for every instance of SlabBlock
+ Automatically generate vertical slabs for every instance of SlabBlock. Supports Vanilla, as well as any mod that adds Slabs.
+
+#### A key bind to change the placement mode `K` (Can be changed in the key binds menu)
+
+## Easy config with modmenu
+- Placement Master Toggle: Toggles the ability to vertical slabs  
+- Crosshair Icon Visibility: How long will the icon be showed for after changing the placement mode  
+- Slab Lines: Toggles the placement guid when looking at blocks  
+
+![config-menu](https://github.com/user-attachments/assets/7bd51ab0-819b-413e-a9f8-f7b1a1ef35fd)
+
+
+https://github.com/Andrew6rant/Auto-Slabs/assets/57331134/84e2186a-f51c-4147-b98d-9eca6235cc46
+
+Mixed slab functionality and rendering is being tracked on the [mixedslabs branch](https://github.com/Andrew6rant/Auto-Slabs/tree/mixedslabs) of this repository
+
+https://github.com/Andrew6rant/Auto-Slabs/assets/57331134/ba89a5bd-cac9-4c24-bb84-bf58e168b73d
+

build.gradle

@@ -1,12 +1,9 @@
 plugins {
-	id 'fabric-loom' version '1.0-SNAPSHOT'
+	id 'fabric-loom' version '1.11-SNAPSHOT'
 	id 'maven-publish'
 
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
-
 archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
@@ -17,12 +14,18 @@ repositories {
 	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
 	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
 	// for more information about repositories.
-    maven {
-        url = "https://jitpack.io"
-    }
     maven {
 		url = uri("https://ueaj.dev/maven")
     }
+	maven {
+		url "https://maven.terraformersmc.com/releases/"
+	}
+	maven {
+		url "https://jitpack.io"
+	}
+	maven {
+		url = "https://api.modrinth.com/maven"
+	}
 }
 
 dependencies {
@@ -33,30 +36,51 @@ dependencies {
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
-	// Uncomment the following line to enable the deprecated Fabric API modules. 
+
+    // ARRP from JitPack
+    modImplementation include("com.github.TriibuNupsik:ARRP:${project.arrp_version}")
+
+	// MidnightLib from TeamMidnightDust
+	modImplementation include ("maven.modrinth:midnightlib:${project.midnightlib_version}")  
+
+	modImplementation ("com.terraformersmc:modmenu:${project.modmenu_version}") {
+		exclude module: "fabric-api"
+	}
+
+	// Uncomment the following line to enable the deprecated Fabric API modules.
 	// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
 
 	// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
-    modApi("com.github.Virtuoel:Statement:${project.statement_version}", {
-        exclude group: "net.fabricmc.fabric-api"
-    })
-    modImplementation("net.devtech:arrp:${project.arrp_version}")
 }
 
 processResources {
 	inputs.property "version", project.version
+	inputs.property "loader_version", project.loader_version
+	filteringCharset "UTF-8"
 
 	filesMatching("fabric.mod.json") {
-		expand "version": project.version
+		expand "version": project.version,
+				"loader_version": project.loader_version
 	}
 }
 
+def targetJavaVersion = 17
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 17
+	// ensure that the encoding is set to UTF-8, no matter what the system default is
+	// this fixes some edge cases with special characters not displaying correctly
+	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+	// If Javadoc is generated, this must be specified in that task too.
+	it.options.encoding = "UTF-8"
+	if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
+		it.options.release.set(targetJavaVersion)
+	}
 }
 
 java {
+	def javaVersion = JavaVersion.toVersion(targetJavaVersion)
+	if (JavaVersion.current() < javaVersion) {
+		toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
+	}
 	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
 	// if it is present.
 	// If you remove this line, sources will not be generated.
@@ -72,7 +96,8 @@ jar {
 // configure the maven publication
 publishing {
 	publications {
-		mavenJava(MavenPublication) {
+		create("mavenJava", MavenPublication) {
+			artifactId = project.archives_base_name
 			from components.java
 		}
 	}

gradle.properties

@@ -4,16 +4,18 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.19.3
-yarn_mappings=1.19.3+build.5
-loader_version=0.14.12
+minecraft_version=1.21.1
+yarn_mappings=1.21.1+build.3
+loader_version=0.16.0
 
 # Mod Properties
-mod_version=1.0.0
+mod_version=1.2.0
 maven_group=io.github.andrew6rant.autoslabs
 archives_base_name=autoslabs
 
 # Dependencies
-fabric_version=0.72.0+1.19.3
-statement_version=4.2.5
-arrp_version=0.6.7
+fabric_version=0.116.4+1.21.1
+# statement_version=4.2.9  # Removed - using internal fork
+arrp_version=0.10.0
+midnightlib_version=1.6.9+1.21-fabric
+modmenu_version=11.0.3

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/io/github/andrew6rant/autoslabs/AutoSlabs.java

@@ -1,87 +1,56 @@
 package io.github.andrew6rant.autoslabs;
 
+import io.github.andrew6rant.autoslabs.config.CommonConfig;
+import io.github.andrew6rant.autoslabs.statement.StatementStateRefresher;
+import io.github.andrew6rant.autoslabs.util.Util;
 import net.devtech.arrp.api.RRPCallback;
 import net.devtech.arrp.api.RuntimeResourcePack;
-import net.devtech.arrp.json.blockstate.JState;
-import net.devtech.arrp.json.blockstate.JVariant;
-import net.devtech.arrp.json.models.JModel;
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
+import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.minecraft.block.Block;
-import net.minecraft.block.SlabBlock;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.registry.Registries;
-import net.minecraft.state.property.EnumProperty;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.Direction;
-import virtuoel.statement.api.StateRefresher;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static io.github.andrew6rant.autoslabs.config.CommonConfig.dumpResources;
 
 public class AutoSlabs implements ModInitializer {
-	public static final RuntimeResourcePack AUTO_SLABS_RESOURCES = RuntimeResourcePack.create("autoslabs:resources");
+	public static final RuntimeResourcePack AUTO_SLABS_RESOURCES = RuntimeResourcePack.create(Identifier.of("autoslabs", "resources"));
+
+	public static final Map<PlayerEntity, SlabLockEnum> slabLockPosition = new HashMap<>();
 
 	@Override
 	public void onInitialize() {
+		// Register config with MidnightLib
+		CommonConfig.init("auto_slabs", CommonConfig.class);
+
+		// Config is initialized in a static block in StateMixin. I need it to run earlier than State$get, and AutoSlabs$onInitialize is too late.
 		for (Block block : Registries.BLOCK) {
-			if (block instanceof SlabBlock) {
-				StateRefresher.INSTANCE.addBlockProperty(block, EnumProperty.of("vertical_type", VerticalType.class), VerticalType.FALSE);
-				Identifier id = Registries.BLOCK.getId(block);
-				String namespace = id.getNamespace();
-				String path = id.getPath();
-				Identifier vertical_north_south_top_slab = new Identifier(namespace, "block/"+path + "_vertical_north_south_top");
-				Identifier vertical_north_south_bottom_slab = new Identifier(namespace, "block/"+path + "_vertical_north_south_bottom");
-				Identifier vertical_east_west_top_slab = new Identifier(namespace, "block/"+path + "_vertical_east_west_top");
-				Identifier vertical_east_west_bottom_slab = new Identifier(namespace, "block/"+path + "_vertical_east_west_bottom");
-				// Yes, I know these models are incredibly inefficient, but I need to parent them this way for the best mod compatibility.
-				JModel verticalSlabNorthSouthTopModel = JModel.model().parent(namespace+":block/"+path)
-						.element(JModel.element().from(0, 0, 0).to(16, 16, 8)
-								.faces(JModel.faces()
-										.north(JModel.face("side").cullface(Direction.NORTH).uv(0, 0, 16, 16))
-										.east(JModel.face("side").cullface(Direction.EAST).uv(0, 0, 8, 16))
-										.south(JModel.face("side").cullface(Direction.SOUTH).uv(0, 0, 16, 16))
-										.west(JModel.face("side").cullface(Direction.WEST).uv(0, 0, 8, 16))
-										.up(JModel.face("top").cullface(Direction.UP).uv(0, 0, 16, 8))
-										.down(JModel.face("bottom").cullface(Direction.DOWN).uv(0, 0, 16, 8))));
-				JModel verticalSlabNorthSouthBottomModel = JModel.model().parent(namespace+":block/"+path)
-						.element(JModel.element().from(0, 0, 8).to(16, 16, 16)
-								.faces(JModel.faces()
-										.north(JModel.face("side").cullface(Direction.NORTH).uv(0, 0, 16, 16))
-										.east(JModel.face("side").cullface(Direction.EAST).uv(0, 0, 8, 16))
-										.south(JModel.face("side").cullface(Direction.SOUTH).uv(0, 0, 16, 16))
-										.west(JModel.face("side").cullface(Direction.WEST).uv(8, 0, 16, 16))
-										.up(JModel.face("top").cullface(Direction.UP).uv(0, 8, 16, 16))
-										.down(JModel.face("bottom").cullface(Direction.DOWN).uv(0, 0, 16, 8))));
-				JModel verticalSlabEastWestTopModel = JModel.model().parent(namespace+":block/"+path)
-						.element(JModel.element().from(8, 0, 0).to(16, 16, 16)
-								.faces(JModel.faces()
-										.north(JModel.face("side").cullface(Direction.NORTH).uv(0, 0, 8, 16))
-										.east(JModel.face("side").cullface(Direction.EAST).uv(0, 0, 16, 16))
-										.south(JModel.face("side").cullface(Direction.SOUTH).uv(8, 0, 16, 16))
-										.west(JModel.face("side").cullface(Direction.WEST).uv(0, 0, 16, 16))
-										.up(JModel.face("top").cullface(Direction.UP).uv(8, 0, 16, 16))
-										.down(JModel.face("bottom").cullface(Direction.DOWN).uv(8, 0, 16, 16))));
-				JModel verticalSlabEastWestBottomModel = JModel.model().parent(namespace+":block/"+path)
-						.element(JModel.element().from(0, 0, 0).to(8, 16, 16)
-								.faces(JModel.faces()
-										.north(JModel.face("side").cullface(Direction.NORTH).uv(8, 0, 16, 16))
-										.east(JModel.face("side").cullface(Direction.EAST).uv(0, 0, 16, 16))
-										.south(JModel.face("side").cullface(Direction.SOUTH).uv(0, 0, 8, 16))
-										.west(JModel.face("side").cullface(Direction.WEST).uv(0, 0, 16, 16))
-										.up(JModel.face("top").cullface(Direction.UP).uv(0, 0, 8, 16))
-										.down(JModel.face("bottom").cullface(Direction.DOWN).uv(0, 0, 8, 16))));
+			Util.registerSlab(block);
+		}
+
+		RegistryEntryAddedCallback.event(Registries.BLOCK).register((raw, id, block) -> Util.registerSlab(block));
+		PayloadTypeRegistry.playC2S().register(SlabLockPayload.ID, SlabLockPayload.CODEC);
 
-				AUTO_SLABS_RESOURCES.addModel(verticalSlabNorthSouthTopModel, vertical_north_south_top_slab);
-				AUTO_SLABS_RESOURCES.addModel(verticalSlabNorthSouthBottomModel, vertical_north_south_bottom_slab);
-				AUTO_SLABS_RESOURCES.addModel(verticalSlabEastWestTopModel, vertical_east_west_top_slab);
-				AUTO_SLABS_RESOURCES.addModel(verticalSlabEastWestBottomModel, vertical_east_west_bottom_slab);
+		StatementStateRefresher.INSTANCE.reorderBlockStates();
 
-				AUTO_SLABS_RESOURCES.addBlockState(JState.state(new JVariant()
-						.put("type=bottom,vertical_type=north_south", JState.model(vertical_north_south_bottom_slab))
-						.put("type=bottom,vertical_type=east_west", JState.model(vertical_east_west_bottom_slab))
-						.put("type=top,vertical_type=north_south", JState.model(vertical_north_south_top_slab))
-						.put("type=top,vertical_type=east_west", JState.model(vertical_east_west_top_slab))
-				), id);
-			}
+		// custom ARRP entrypoint that is only available in my fork of ARRP
+		RRPCallback.BETWEEN_MODS_AND_USER.register(a -> a.add(AUTO_SLABS_RESOURCES));
+		if (dumpResources) {
+			AUTO_SLABS_RESOURCES.dump();
 		}
-		StateRefresher.INSTANCE.reorderBlockStates();
-		RRPCallback.BEFORE_USER.register(a -> a.add(AUTO_SLABS_RESOURCES));
-		//AUTO_SLABS_RESOURCES.dump();
+
+		ServerPlayNetworking.registerGlobalReceiver(SlabLockPayload.ID, (payload, context) -> {
+			SlabLockEnum slabLockBuf = SlabLockEnum.POSITION_VALUES[payload.slabLock()];
+			slabLockPosition.put(context.player(), slabLockBuf);
+		});
+
+		// Initialize placement handler
+		PlacementHandler.init();
 	}
 }