1.21.1 Split SourceSets

build.gradle

@@ -137,7 +137,7 @@ allprojects {
 		resolutionStrategy.force("net.fabricmc:fabric-loader:$loader_version")
 	}
 
-	processResources {
+	tasks.withType(ProcessResources).configureEach {
 		Map<String, ?> properties = [
 				version: version,
 				loader_version: loader_version,
@@ -148,7 +148,7 @@ allprojects {
 				// property replacement is a bit too eager
 				class_5124: "\$class_5124",
 				class_56: "\$class_56",
-                class_9665: "\$class_9665",
+				class_9665: "\$class_9665",
 				class_7226: "\$class_7226",
 				class_1793: "\$class_1793"
 		]
@@ -172,36 +172,56 @@ subprojects {
 
 	archivesBaseName = "porting_lib_" + name
 
+	// Must be added before the split source sets are setup.
+	java.withSourcesJar()
+
 	loom {
 		runs.configureEach {
 			File output = file("src/main/resources/data/porting_lib_$name/structures/gametest")
 			property("porting_lib.gametest.quickexport.output", output.absolutePath)
 		}
+		splitEnvironmentSourceSets()
 		mods.register("porting_lib_" + name) {
 			sourceSet sourceSets.main
+			sourceSet sourceSets.client
 		}
-		File aw = file("src/main/resources/porting_lib_${name}.accesswidener")
-		if (aw.exists())
-			accessWidenerPath.set(aw)
+		File commonAW = file("src/main/resources/porting_lib_${name}.accesswidener")
+		File clientAW = file("src/client/resources/porting_lib_${name}.accesswidener")
+		if (commonAW.exists() && !clientAW.exists())
+			accessWidenerPath.set(commonAW)
+		else if (clientAW.exists() && !commonAW.exists())
+			accessWidenerPath.set(clientAW)
 	}
 
 	// these two modules are used by all others automatically.
-	if (name != "core" && name != "gametest") {
-		portingLib {
-			addModuleDependency("core") // core depends on gametest
+	afterEvaluate {
+		if (name != "core" && name != "gametest") {
+			portingLib {
+				addModuleDependency("core") // core depends on gametest
+			}
 		}
 	}
 
 	validateModule {
 		projectName = project.name
 		readMe.set(rootProject.file("README.md"))
-		resources.set(project.file("src/main/resources"))
+		var resourcesDir = project.file("src/main/resources")
+		if (resourcesDir.exists()) {
+			resources.set(resourcesDir)
+		}
+		var clientResourcesDir = project.file("src/client/resources")
+		if (clientResourcesDir.exists()) {
+			clientResources.set(clientResourcesDir)
+		}
 	}
 
 	sortAccessWidener {
-		File awFile = project.file("src/main/resources/${project.name}.accesswidener")
-		if (awFile.exists())
-			aw.set(awFile)
+		File commonAWFile = project.file("src/main/resources/${project.name}.accesswidener")
+		if (commonAWFile.exists())
+			aw.set(commonAWFile)
+		File clientAWFile = project.file("src/client/resources/${project.name}.accesswidener")
+		if (clientAWFile.exists())
+			aw.set(clientAWFile)
 	}
 
 	processResources {
@@ -211,8 +231,6 @@ subprojects {
 		}
 	}
 
-	java.withSourcesJar()
-
 	publishing {
 		repositories {
 			maven {

buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/PortingLibExtension.java

@@ -14,11 +14,13 @@
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.plugins.JavaPlugin;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.Delete;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
+import org.gradle.api.tasks.SourceSetOutput;
 import org.gradle.api.tasks.TaskContainer;
 import org.gradle.jvm.tasks.Jar;
 import org.gradle.language.base.plugins.LifecycleBasePlugin;
@@ -46,6 +48,7 @@ public void addModuleDependencies(List<String> names) {
 	public void addModuleDependency(String name) {
 		Project project = this.getProject();
 		DependencyHandler dependencies = project.getDependencies();
+		SourceSetOutput clientOutput = project.findProject(":" + name).getExtensions().findByType(JavaPluginExtension.class).getSourceSets().getByName("client").getOutput();
 
 		Dependency dependency = dependencies.project(Map.of(
 				"path", ":" + name,
@@ -60,6 +63,7 @@ public void addModuleDependency(String name) {
 		}
 		modules.add("porting_lib_" + name);
 		dependencies.add("api", dependency);
+		dependencies.add("clientImplementation", clientOutput);
 
 		if (name.equals("mixin_extensions")) {
 			// special case, also an AP
@@ -71,6 +75,7 @@ public void addModuleDependency(String name) {
 			Project depProject = project.project(":" + name);
 			SourceSetContainer sourceSets = depProject.getExtensions().getByType(SourceSetContainer.class);
 			settings.sourceSet(sourceSets.getByName("main"), depProject);
+			settings.sourceSet(sourceSets.getByName("client"), depProject);
 		}));
 	}
 

buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/tasks/FmjExpander.java

@@ -19,12 +19,12 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
 public class FmjExpander extends FilterReader {
 	public static final String RESOURCES = "src/main/resources";
+	public static final String CLIENT_RESOURCES = "src/client/resources";
 	public static final String FMJ = "fabric.mod.json";
 	public static final String TEMPLATE_FMJ = RESOURCES + "/template." + FMJ;
 
@@ -93,28 +93,48 @@ public JsonObject expandFmj(JsonObject moduleFmj) {
 			tryMerge(template, key, value);
 		}
 
+		if (template.get("id").getAsString().endsWith("-datagen")) {
+			return template;
+		}
+
 		String name = "porting_lib_" + this.projectName;
 		Path resources = this.projectDirPath.resolve(RESOURCES);
+		Path clientResources = this.projectDirPath.resolve(CLIENT_RESOURCES);
 
 		// fill in mixins
-		String mixinsFileName = name + ".mixins.json";
-		Path mixins = resources.resolve(mixinsFileName);
-		if (Files.exists(mixins)) {
+		String commonMixinsFileName = name + ".mixins.json";
+		Path commonMixins = resources.resolve(commonMixinsFileName);
+		String clientMixinsFileName = name + ".client.mixins.json";
+		Path clientMixins = clientResources.resolve(clientMixinsFileName);
+		boolean hasCommon = Files.exists(commonMixins);
+		boolean hasClient = Files.exists(clientMixins);
+		if (hasCommon || hasClient) {
 			JsonArray array = new JsonArray();
-			array.add(mixinsFileName);
+			if (hasCommon) {
+				array.add(commonMixinsFileName);
+			}
+			if (hasClient) {
+				JsonObject clientConfig = new JsonObject();
+				clientConfig.addProperty("config", clientMixinsFileName);
+				clientConfig.addProperty("environment", "client");
+				array.add(clientConfig);
+			}
 			template.add("mixins", array);
 		}
+
 		// and AW
 		String awFileName = name + ".accesswidener";
-		Path aw = resources.resolve(awFileName);
-		if (Files.exists(aw)) {
+		if (Files.exists(resources.resolve(awFileName)) || Files.exists(clientResources.resolve(awFileName))) {
 			template.addProperty("accessWidener", awFileName);
 		}
+
 		// and modules
-		String[] modules = this.projectModules.split(",");
-		JsonObject depends = template.get("depends").getAsJsonObject();
-		for (String module : modules) {
-			depends.addProperty(module, "*");
+		if (!this.projectModules.isEmpty()) {
+			String[] modules = this.projectModules.split(",");
+			JsonObject depends = template.get("depends").getAsJsonObject();
+			for (String module : modules) {
+				depends.addProperty(module, "*");
+			}
 		}
 
 		return template;

buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/tasks/ValidateModuleTask.java

@@ -34,19 +34,61 @@ public abstract class ValidateModuleTask extends DefaultTask {
 	@InputFile
 	public abstract RegularFileProperty getReadMe();
 
+	@Optional
 	@InputDirectory
 	public abstract DirectoryProperty getResources();
 
+	@Optional
+	@InputDirectory
+	public abstract DirectoryProperty getClientResources();
+
+	public Path getFMJ(String name, boolean hasCommonResources, boolean hasClientResources) {
+		if (hasCommonResources && hasClientResources) {
+			Path resources = this.getResources().get().getAsFile().toPath();
+			Path clientResources = this.getClientResources().get().getAsFile().toPath();
+			Path commonFmjPath = resources.resolve("fabric.mod.json");
+			Path clientFmjPath = clientResources.resolve("fabric.mod.json");
+			if (Files.exists(commonFmjPath) && !Files.exists(clientFmjPath)) {
+				return commonFmjPath;
+			} else if (Files.exists(clientFmjPath) && !Files.exists(commonFmjPath)) {
+				return clientFmjPath;
+			} else {
+				throw new IllegalStateException(name + " does not have a fabric.mod.json or has a duplicate fabric.mod.json");
+			}
+		} else {
+			if (hasCommonResources) {
+				Path resources = this.getResources().get().getAsFile().toPath();
+				Path fmjPath = resources.resolve("fabric.mod.json");
+				if (Files.exists(fmjPath)) {
+					return fmjPath;
+				} else {
+					throw new IllegalStateException(name + " does not have a fabric.mod.json");
+				}
+			}
+			if (hasClientResources) {
+				Path resources = this.getClientResources().get().getAsFile().toPath();
+				Path fmjPath = resources.resolve("fabric.mod.json");
+				if (Files.exists(fmjPath)) {
+					return fmjPath;
+				} else {
+					throw new IllegalStateException(name + " does not have a fabric.mod.json");
+				}
+			}
+		}
+		throw new IllegalStateException(name + " does not have a fabric.mod.json");
+	}
+
 	@TaskAction
 	public void validateModule() throws IOException {
 		String name = this.getProjectName().get();
 		boolean ignoreName = this.getIgnoreName().getOrElse(Boolean.FALSE);
-		Path resources = this.getResources().get().getAsFile().toPath();
+		boolean hasCommonResources = this.getResources().isPresent();
+		boolean hasClientResources = this.getClientResources().isPresent();
+
 		Path readme = this.getReadMe().get().getAsFile().toPath();
 
-		Path fmj = resources.resolve("fabric.mod.json");
-		if (!Files.exists(fmj))
-			throw new IllegalStateException(name + " does not have a fabric.mod.json");
+		Path fmj = getFMJ(name, hasCommonResources, hasClientResources);
+
 		JsonObject json = Utils.jsonFromPath(fmj);
 
 		if (!ignoreName) {
@@ -55,8 +97,11 @@ public void validateModule() throws IOException {
 		}
 
 		checkDescription(json);
-		checkAw(name, resources, json);
-		checkMixins(name, resources, json);
+		if (hasCommonResources)
+			checkAw(name, this.getResources().get().getAsFile().toPath(), json);
+		if (hasClientResources)
+			checkAw(name, this.getClientResources().get().getAsFile().toPath(), json);
+//		checkMixins(name, resources, json); TODO: re enable later
 		checkReadMe(readme, name);
 	}
 

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 org.gradle.caching=true
 
-loom_version = 1.7.+
+loom_version = 1.11.+
 
 mod_version = 3.1.0
 

gradle/wrapper/gradle-wrapper.properties

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

modules/attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/mixin/client/LocalPlayerMixin.java → modules/attributes/src/client/java/io/github/fabricators_of_create/porting_lib/attributes/client/mixin/LocalPlayerMixin.java

@@ -1,4 +1,4 @@
-package io.github.fabricators_of_create.porting_lib.attributes.mixin.client;
+package io.github.fabricators_of_create.porting_lib.attributes.client.mixin;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;

modules/attributes/src/client/resources/porting_lib_attributes.client.mixins.json

@@ -0,0 +1,14 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "priority": 951,
+  "package": "io.github.fabricators_of_create.porting_lib.attributes.client.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "client": [
+    "LocalPlayerMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1,
+    "maxShiftBy": 5
+  }
+}

modules/attributes/src/main/resources/porting_lib_attributes.mixins.json

@@ -12,9 +12,6 @@
     "common.ServerGamePacketListenerImplMixin",
     "common.ServerPlayerMixin"
   ],
-  "client": [
-    "client.LocalPlayerMixin"
-  ],
   "injectors": {
     "defaultRequire": 1,
     "maxShiftBy": 5

modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibBaseClient.java → modules/base/src/client/java/io/github/fabricators_of_create/porting_lib/client/PortingLibBaseClient.java

@@ -1,4 +1,4 @@
-package io.github.fabricators_of_create.porting_lib;
+package io.github.fabricators_of_create.porting_lib.client;
 
 import io.github.fabricators_of_create.porting_lib.event.common.ModsLoadedCallback;
 

modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ColorHandlersCallback.java → modules/base/src/client/java/io/github/fabricators_of_create/porting_lib/client/event/ColorHandlersCallback.java

@@ -1,4 +1,4 @@
-package io.github.fabricators_of_create.porting_lib.event.client;
+package io.github.fabricators_of_create.porting_lib.client.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/CreateSkullModelsCallback.java → modules/base/src/client/java/io/github/fabricators_of_create/porting_lib/client/event/CreateSkullModelsCallback.java

@@ -1,4 +1,4 @@
-package io.github.fabricators_of_create.porting_lib.event.client;
+package io.github.fabricators_of_create.porting_lib.client.event;
 
 import com.google.common.collect.ImmutableMap;
 

modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/DrawSelectionEvents.java → modules/base/src/client/java/io/github/fabricators_of_create/porting_lib/client/event/DrawSelectionEvents.java

@@ -1,4 +1,4 @@
-package io.github.fabricators_of_create.porting_lib.event.client;
+package io.github.fabricators_of_create.porting_lib.client.event;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 

modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/EntityAddedLayerCallback.java → modules/base/src/client/java/io/github/fabricators_of_create/porting_lib/client/event/EntityAddedLayerCallback.java

@@ -1,4 +1,4 @@
-package io.github.fabricators_of_create.porting_lib.event.client;
+package io.github.fabricators_of_create.porting_lib.client.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/FieldOfViewEvents.java → modules/base/src/client/java/io/github/fabricators_of_create/porting_lib/client/event/FieldOfViewEvents.java

@@ -1,4 +1,4 @@
-package io.github.fabricators_of_create.porting_lib.event.client;
+package io.github.fabricators_of_create.porting_lib.client.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/FogEvents.java → modules/base/src/client/java/io/github/fabricators_of_create/porting_lib/client/event/FogEvents.java

@@ -1,4 +1,4 @@
-package io.github.fabricators_of_create.porting_lib.event.client;
+package io.github.fabricators_of_create.porting_lib.client.event;
 
 import com.mojang.blaze3d.shaders.FogShape;
 

modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/InstanceRegistrationCallback.java → modules/base/src/client/java/io/github/fabricators_of_create/porting_lib/client/event/InstanceRegistrationCallback.java

@@ -1,4 +1,4 @@
-package io.github.fabricators_of_create.porting_lib.event.client;
+package io.github.fabricators_of_create.porting_lib.client.event;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/InteractEvents.java → modules/base/src/client/java/io/github/fabricators_of_create/porting_lib/client/event/InteractEvents.java

@@ -1,4 +1,4 @@
-package io.github.fabricators_of_create.porting_lib.event.client;
+package io.github.fabricators_of_create.porting_lib.client.event;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;

modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/KeyInputCallback.java → modules/base/src/client/java/io/github/fabricators_of_create/porting_lib/client/event/KeyInputCallback.java

@@ -1,4 +1,4 @@
-package io.github.fabricators_of_create.porting_lib.event.client;
+package io.github.fabricators_of_create.porting_lib.client.event;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/LivingEntityRenderEvents.java → modules/base/src/client/java/io/github/fabricators_of_create/porting_lib/client/event/LivingEntityRenderEvents.java

@@ -1,4 +1,4 @@
-package io.github.fabricators_of_create.porting_lib.event.client;
+package io.github.fabricators_of_create.porting_lib.client.event;
 
 import com.mojang.blaze3d.vertex.PoseStack;