Split test mods into client and common. (#3033)

* Split test mods.

Signed-off-by: modmuss50 <modmuss50@gmail.com>

* Fixes

Signed-off-by: modmuss50 <modmuss50@gmail.com>

* Fixe datagen client

Signed-off-by: modmuss50 <modmuss50@gmail.com>

---------

Signed-off-by: modmuss50 <modmuss50@gmail.com>

build.gradle

@@ -10,7 +10,7 @@ plugins {
 	id "idea"
 	id "maven-publish"
 	id 'jacoco'
-	id "fabric-loom" version "1.2.4" apply false
+	id "fabric-loom" version "1.2.5" apply false
 	id "com.diffplug.spotless" version "6.18.0"
 	id "org.ajoberstar.grgit" version "3.1.0"
 	id "com.matthewprenger.cursegradle" version "1.4.0"
@@ -105,7 +105,7 @@ def testDependencies(project, List<String> depNames) {
 		}
 
 		clientOutputs.each {
-			testmodImplementation it
+			testmodClientImplementation it
 		}
 	}
 }
@@ -161,9 +161,16 @@ allprojects {
 		testmod {
 			compileClasspath += main.compileClasspath
 			runtimeClasspath += main.runtimeClasspath
+		}
 
+		testmodClient {
+			compileClasspath += main.compileClasspath
+			runtimeClasspath += main.runtimeClasspath
 			compileClasspath += client.compileClasspath
 			runtimeClasspath += client.runtimeClasspath
+
+			compileClasspath += testmod.compileClasspath
+			runtimeClasspath += testmod.runtimeClasspath
 		}
 	}
 
@@ -175,7 +182,7 @@ allprojects {
 				client()
 				ideConfigGenerated project.rootProject == project
 				name = "Testmod Client"
-				source sourceSets.testmod
+				source sourceSets.testmodClient
 			}
 			testmodServer {
 				server()
@@ -196,6 +203,7 @@ allprojects {
 
 		loom.mods.register(p.name + "-testmod") {
 			sourceSet p.sourceSets.testmod
+			sourceSet p.sourceSets.testmodClient
 		}
 	}
 
@@ -205,7 +213,9 @@ allprojects {
 		modApi "net.fabricmc:fabric-loader:${project.loader_version}"
 
 		testmodImplementation sourceSets.main.output
-		testmodImplementation sourceSets.client.output
+		testmodClientImplementation sourceSets.main.output
+		testmodClientImplementation sourceSets.client.output
+		testmodClientImplementation sourceSets.testmod.output
 	}
 
 	tasks.withType(ProcessResources).configureEach {
@@ -245,6 +255,7 @@ allprojects {
 
 	task testmodJar(type: Jar) {
 		from sourceSets.testmod.output
+		from sourceSets.testmodClient.output
 		destinationDirectory = new File(project.buildDir, "devlibs")
 		archiveClassifier = "testmod"
 	}
@@ -269,6 +280,8 @@ allprojects {
 		input = testmodJar.archiveFile
 		archiveClassifier = "testmod"
 		addNestedDependencies = false
+		includesClientOnlyClasses = true
+		clientOnlySourceSetName = sourceSets.testmodClient.name
 	}
 	build.dependsOn remapTestmodJar
 
@@ -287,13 +300,14 @@ remapTestmodJar {
 	def testModJarTasks = []
 
 	subprojects {
-		if (it.name == "deprecated" || !it.file("src/testmod").exists()) return
+		if (it.name == "deprecated" || !(it.file("src/testmod").exists() || it.file("src/testmodClient").exists())) return
 
 		testModJarTasks += it.tasks.remapTestmodJar
 	}
 
 	nestedJars.setFrom(testModJarTasks)
 	addNestedDependencies = true
+	clientOnlySourceSetName = sourceSets.testmodClient.name
 }
 
 // Apply auxiliary buildscripts to submodules
@@ -395,7 +409,7 @@ task coverage(type: JacocoReport, dependsOn: coverageTasks) {
 	// Add all source as input
 	allprojects { p ->
 		if (p.path.startsWith(":deprecated")) return
-		sourceSets p.sourceSets.main, p.sourceSets.client, p.sourceSets.testmod
+		sourceSets p.sourceSets.main, p.sourceSets.client, p.sourceSets.testmod, p.sourceSets.testmodClient
 	}
 
 	// Exclude mixins
@@ -498,12 +512,15 @@ subprojects {
 		// Make all modules depend on the gametest api (and thus res loader) to try and promote its usage.
 		if (project.name != "fabric-gametest-api-v1") {
 			testmodImplementation project(path: ':fabric-gametest-api-v1', configuration: 'namedElements')
+			testmodClientImplementation project(":fabric-gametest-api-v1").sourceSets.client.output
 			testmodImplementation project(path: ':fabric-resource-loader-v0', configuration: 'namedElements')
+			testmodClientImplementation project(":fabric-resource-loader-v0").sourceSets.client.output
 		}
 
 		// Make all testmods run with registry-sync-v0 as it is required to register new objects.
 		if (project.name != "fabric-registry-sync-v0") {
 			testmodRuntimeOnly project(path: ':fabric-registry-sync-v0', configuration: 'namedElements')
+			testmodClientImplementation project(":fabric-registry-sync-v0").sourceSets.client.output
 		}
 	}
 
@@ -583,10 +600,6 @@ subprojects.each {
 	remapJar.dependsOn("${it.path}:remapJar")
 }
 
-sourceSets {
-	testmod
-}
-
 // These modules are not included in the fat jar, maven will resolve them via the pom.
 def devOnlyModules = [
 		"fabric-gametest-api-v1",
@@ -601,6 +614,7 @@ dependencies {
 			clientImplementation project("${it.path}:").sourceSets.client.output
 
 			testmodImplementation project("${it.path}:").sourceSets.testmod.output
+			testmodClientImplementation project("${it.path}:").sourceSets.testmodClient.output
 		}
 	}
 }

fabric-api-base/src/testmod/resources/fabric.mod.json

@@ -10,7 +10,7 @@
       "net.fabricmc.fabric.test.base.FabricApiBaseTestInit"
     ],
     "client": [
-      "net.fabricmc.fabric.test.base.FabricApiAutoTestClient"
+      "net.fabricmc.fabric.test.base.client.FabricApiAutoTestClient"
     ],
     "server": [
       "net.fabricmc.fabric.test.base.FabricApiAutoTestServer"
@@ -20,6 +20,9 @@
     ]
   },
   "mixins": [
-    "fabric-api-base-testmod.mixins.json"
+    {
+      "config": "fabric-api-base-testmod.client.mixins.json",
+      "environment": "client"
+    }
   ]
 }

fabric-api-base/src/testmodClient/java/net/fabricmc/fabric/test/base/client/FabricApiAutoTestClient.java

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.base;
+package net.fabricmc.fabric.test.base.client;
 
-import static net.fabricmc.fabric.test.base.FabricClientTestHelper.clickScreenButton;
-import static net.fabricmc.fabric.test.base.FabricClientTestHelper.closeScreen;
-import static net.fabricmc.fabric.test.base.FabricClientTestHelper.enableDebugHud;
-import static net.fabricmc.fabric.test.base.FabricClientTestHelper.openGameMenu;
-import static net.fabricmc.fabric.test.base.FabricClientTestHelper.openInventory;
-import static net.fabricmc.fabric.test.base.FabricClientTestHelper.setPerspective;
-import static net.fabricmc.fabric.test.base.FabricClientTestHelper.submitAndWait;
-import static net.fabricmc.fabric.test.base.FabricClientTestHelper.takeScreenshot;
-import static net.fabricmc.fabric.test.base.FabricClientTestHelper.waitForLoadingComplete;
-import static net.fabricmc.fabric.test.base.FabricClientTestHelper.waitForScreen;
-import static net.fabricmc.fabric.test.base.FabricClientTestHelper.waitForWorldTicks;
+import static net.fabricmc.fabric.test.base.client.FabricClientTestHelper.clickScreenButton;
+import static net.fabricmc.fabric.test.base.client.FabricClientTestHelper.closeScreen;
+import static net.fabricmc.fabric.test.base.client.FabricClientTestHelper.enableDebugHud;
+import static net.fabricmc.fabric.test.base.client.FabricClientTestHelper.openGameMenu;
+import static net.fabricmc.fabric.test.base.client.FabricClientTestHelper.openInventory;
+import static net.fabricmc.fabric.test.base.client.FabricClientTestHelper.setPerspective;
+import static net.fabricmc.fabric.test.base.client.FabricClientTestHelper.submitAndWait;
+import static net.fabricmc.fabric.test.base.client.FabricClientTestHelper.takeScreenshot;
+import static net.fabricmc.fabric.test.base.client.FabricClientTestHelper.waitForLoadingComplete;
+import static net.fabricmc.fabric.test.base.client.FabricClientTestHelper.waitForScreen;
+import static net.fabricmc.fabric.test.base.client.FabricClientTestHelper.waitForWorldTicks;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;

fabric-api-base/src/testmodClient/java/net/fabricmc/fabric/test/base/client/FabricClientTestHelper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.base;
+package net.fabricmc.fabric.test.base.client;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
@@ -39,8 +39,8 @@ import net.minecraft.client.option.Perspective;
 import net.minecraft.client.util.ScreenshotRecorder;
 import net.minecraft.text.Text;
 
-import net.fabricmc.fabric.test.base.mixin.CyclingButtonWidgetAccessor;
-import net.fabricmc.fabric.test.base.mixin.ScreenAccessor;
+import net.fabricmc.fabric.test.base.client.mixin.CyclingButtonWidgetAccessor;
+import net.fabricmc.fabric.test.base.client.mixin.ScreenAccessor;
 import net.fabricmc.loader.api.FabricLoader;
 
 // Provides thread safe utils for interacting with a running game.

fabric-api-base/src/testmodClient/java/net/fabricmc/fabric/test/base/client/mixin/CyclingButtonWidgetAccessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.base.mixin;
+package net.fabricmc.fabric.test.base.client.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

fabric-api-base/src/testmodClient/java/net/fabricmc/fabric/test/base/client/mixin/ScreenAccessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.base.mixin;
+package net.fabricmc.fabric.test.base.client.mixin;
 
 import java.util.List;
 

fabric-api-base/src/testmodClient/resources/fabric-api-base-testmod.client.mixins.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "net.fabricmc.fabric.test.base.mixin",
+  "package": "net.fabricmc.fabric.test.base.client.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
     "CyclingButtonWidgetAccessor",

fabric-api-lookup-api-v1/src/testmod/resources/fabric.mod.json

@@ -13,7 +13,7 @@
       "net.fabricmc.fabric.test.lookup.FabricApiLookupTest"
     ],
     "client": [
-      "net.fabricmc.fabric.test.lookup.FabricApiLookupTestClient"
+      "net.fabricmc.fabric.test.lookup.client.FabricApiLookupTestClient"
     ]
   }
 }

fabric-api-lookup-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/lookup/client/FabricApiLookupTestClient.java

@@ -14,14 +14,11 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.lookup;
+package net.fabricmc.fabric.test.lookup.client;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.test.lookup.entity.FabricEntityApiLookupTestClient;
+import net.fabricmc.fabric.test.lookup.client.entity.FabricEntityApiLookupTestClient;
 
-@Environment(EnvType.CLIENT)
 public class FabricApiLookupTestClient implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {

fabric-api-lookup-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/lookup/client/entity/FabricEntityApiLookupTestClient.java

@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.lookup.entity;
+package net.fabricmc.fabric.test.lookup.client.entity;
 
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
+import net.fabricmc.fabric.test.lookup.entity.FabricEntityApiLookupTest;
 
-@Environment(EnvType.CLIENT)
 public class FabricEntityApiLookupTestClient {
 	public static void onInitializeClient() {
 		EntityRendererRegistry.register(FabricEntityApiLookupTest.INSPECTABLE_PIG, InspectablePigEntityRenderer::new);

fabric-api-lookup-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/lookup/client/entity/InspectablePigEntityRenderer.java

@@ -14,17 +14,13 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.lookup.entity;
+package net.fabricmc.fabric.test.lookup.client.entity;
 
 import net.minecraft.client.render.entity.EntityRendererFactory;
 import net.minecraft.client.render.entity.PigEntityRenderer;
 import net.minecraft.entity.passive.PigEntity;
 import net.minecraft.util.Identifier;
 
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-
-@Environment(EnvType.CLIENT)
 public class InspectablePigEntityRenderer extends PigEntityRenderer {
 	private static final Identifier TEXTURE = new Identifier("missingno");
 

fabric-command-api-v2/src/testmodClient/java/net/fabricmc/fabric/test/command/client/ClientCommandTest.java

@@ -31,14 +31,11 @@ import net.minecraft.command.argument.ItemStackArgumentType;
 import net.minecraft.text.Text;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 
-@Environment(EnvType.CLIENT)
 public final class ClientCommandTest implements ClientModInitializer {
 	private static final Logger LOGGER = LoggerFactory.getLogger(ClientCommandTest.class);
 	private static final DynamicCommandExceptionType IS_NULL = new DynamicCommandExceptionType(x -> Text.literal("The " + x + " is null"));

fabric-data-generation-api-v1/build.gradle

@@ -39,14 +39,14 @@ loom {
 		}
 		datagenClient {
 			client()
-			name "Data Generation"
+			name "Data Generation Client"
 			vmArg "-Dfabric-api.datagen"
 			vmArg "-Dfabric-api.datagen.output-dir=${file("src/testmod/generated")}"
 			vmArg "-Dfabric-api.datagen.strict-validation"
 
 			ideConfigGenerated = true
 			runDir "build/datagen"
-			source sourceSets.testmod
+			source sourceSets.testmodClient
 		}
 	}
 }

fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java

@@ -25,8 +25,8 @@ import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.SIMPLE_B
 import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.SIMPLE_ITEM_GROUP;
 
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Path;
-import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.BiConsumer;
@@ -39,19 +39,14 @@ import net.minecraft.advancement.Advancement;
 import net.minecraft.advancement.AdvancementFrame;
 import net.minecraft.advancement.criterion.OnKilledCriterion;
 import net.minecraft.block.Blocks;
-import net.minecraft.client.texture.atlas.AtlasSource;
-import net.minecraft.client.texture.atlas.AtlasSourceManager;
-import net.minecraft.client.texture.atlas.DirectoryAtlasSource;
-import net.minecraft.registry.RegistryKeys;
-import net.minecraft.data.DataOutput;
 import net.minecraft.data.client.BlockStateModelGenerator;
 import net.minecraft.data.client.ItemModelGenerator;
 import net.minecraft.data.server.recipe.RecipeJsonProvider;
 import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.attribute.EntityAttributes;
-import net.minecraft.item.Items;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
 import net.minecraft.loot.LootPool;
 import net.minecraft.loot.LootTable;
 import net.minecraft.loot.LootTables;
@@ -60,21 +55,22 @@ import net.minecraft.loot.entry.ItemEntry;
 import net.minecraft.loot.provider.number.ConstantLootNumberProvider;
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.registry.tag.ItemTags;
 import net.minecraft.registry.tag.TagKey;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
-import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.BiomeKeys;
 
+import net.fabricmc.api.EnvType;
 import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricAdvancementProvider;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricCodecDataProvider;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
@@ -83,6 +79,7 @@ import net.fabricmc.fabric.api.datagen.v1.provider.SimpleFabricLootTableProvider
 import net.fabricmc.fabric.api.recipe.v1.ingredient.DefaultCustomIngredients;
 import net.fabricmc.fabric.api.resource.conditions.v1.ConditionJsonProvider;
 import net.fabricmc.fabric.api.resource.conditions.v1.DefaultResourceConditions;
+import net.fabricmc.loader.api.FabricLoader;
 
 public class DataGeneratorTestEntrypoint implements DataGeneratorEntrypoint {
 	private static final Logger LOGGER = LoggerFactory.getLogger(DataGeneratorTestEntrypoint.class);
@@ -104,7 +101,17 @@ public class DataGeneratorTestEntrypoint implements DataGeneratorEntrypoint {
 		TestBlockTagProvider blockTagProvider = pack.addProvider(TestBlockTagProvider::new);
 		pack.addProvider((output, registries) -> new TestItemTagProvider(output, registries, blockTagProvider));
 		pack.addProvider(TestBiomeTagProvider::new);
-		pack.addProvider(TestAtlasSourceProvider::new);
+
+		// TODO replace with a client only entrypoint with FMJ 2
+		if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
+			try {
+				Class<?> clientEntrypointClass = Class.forName("net.fabricmc.fabric.test.datagen.client.DataGeneratorClientTestEntrypoint");
+				DataGeneratorEntrypoint entrypoint = (DataGeneratorEntrypoint) clientEntrypointClass.getConstructor().newInstance();
+				entrypoint.onInitializeDataGenerator(dataGenerator);
+			} catch (ClassNotFoundException | NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
+				throw new RuntimeException(e);
+			}
+		}
 	}
 
 	private static class TestRecipeProvider extends FabricRecipeProvider {
@@ -357,20 +364,4 @@ public class DataGeneratorTestEntrypoint implements DataGeneratorEntrypoint {
 			);
 		}
 	}
-
-	private static class TestAtlasSourceProvider extends FabricCodecDataProvider<List<AtlasSource>> {
-		private TestAtlasSourceProvider(FabricDataOutput dataOutput) {
-			super(dataOutput, DataOutput.OutputType.RESOURCE_PACK, "atlases", AtlasSourceManager.LIST_CODEC);
-		}
-
-		@Override
-		protected void configure(BiConsumer<Identifier, List<AtlasSource>> provider) {
-			provider.accept(new Identifier(MOD_ID, "atlas_source_test"), List.of(new DirectoryAtlasSource("example", "example/")));
-		}
-
-		@Override
-		public String getName() {
-			return "Atlas Sources";
-		}
-	}
 }

fabric-data-generation-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/datagen/client/DataGeneratorClientTestEntrypoint.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.fabricmc.fabric.test.datagen.client;
+
+import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.MOD_ID;
+
+import java.util.List;
+import java.util.function.BiConsumer;
+
+import net.minecraft.client.texture.atlas.AtlasSource;
+import net.minecraft.client.texture.atlas.AtlasSourceManager;
+import net.minecraft.client.texture.atlas.DirectoryAtlasSource;
+import net.minecraft.data.DataOutput;
+import net.minecraft.util.Identifier;
+
+import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
+import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
+import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricCodecDataProvider;
+
+@SuppressWarnings("unused")
+public class DataGeneratorClientTestEntrypoint implements DataGeneratorEntrypoint {
+	@Override
+	public void onInitializeDataGenerator(FabricDataGenerator dataGenerator) {
+		final FabricDataGenerator.Pack pack = dataGenerator.createBuiltinResourcePack(new Identifier(MOD_ID, "example_builtin"));
+		pack.addProvider(TestAtlasSourceProvider::new);
+	}
+
+	private static class TestAtlasSourceProvider extends FabricCodecDataProvider<List<AtlasSource>> {
+		private TestAtlasSourceProvider(FabricDataOutput dataOutput) {
+			super(dataOutput, DataOutput.OutputType.RESOURCE_PACK, "atlases", AtlasSourceManager.LIST_CODEC);
+		}
+
+		@Override
+		protected void configure(BiConsumer<Identifier, List<AtlasSource>> provider) {
+			provider.accept(new Identifier(MOD_ID, "atlas_source_test"), List.of(new DirectoryAtlasSource("example", "example/")));
+		}
+
+		@Override
+		public String getName() {
+			return "Atlas Sources";
+		}
+	}
+}

fabric-item-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/item/client/TooltipTests.java

@@ -20,11 +20,8 @@ import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
 
-@Environment(EnvType.CLIENT)
 public class TooltipTests implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {

fabric-lifecycle-events-v1/src/testmodClient/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientEntityLifecycleTests.java

@@ -26,8 +26,6 @@ import net.minecraft.entity.Entity;
 import net.minecraft.registry.Registries;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientEntityEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
@@ -36,7 +34,6 @@ import net.fabricmc.fabric.test.event.lifecycle.ServerLifecycleTests;
 /**
  * Tests related to the lifecycle of entities.
  */
-@Environment(EnvType.CLIENT)
 public final class ClientEntityLifecycleTests implements ClientModInitializer {
 	private static final boolean PRINT_CLIENT_ENTITY_MESSAGES = System.getProperty("fabric-lifecycle-events-testmod.printClientEntityMessages") != null;
 	private final List<Entity> clientEntities = new ArrayList<>();

fabric-lifecycle-events-v1/src/testmodClient/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientLifecycleTests.java

@@ -17,11 +17,8 @@
 package net.fabricmc.fabric.test.event.lifecycle.client;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 
-@Environment(EnvType.CLIENT)
 public final class ClientLifecycleTests implements ClientModInitializer {
 	private boolean startCalled;
 	private boolean stopCalled;

fabric-lifecycle-events-v1/src/testmodClient/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientTickTests.java

@@ -23,12 +23,9 @@ import net.minecraft.registry.RegistryKey;
 import net.minecraft.world.World;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.test.event.lifecycle.ServerLifecycleTests;
 
-@Environment(EnvType.CLIENT)
 public final class ClientTickTests implements ClientModInitializer {
 	private final Map<RegistryKey<World>, Integer> tickTracker = new HashMap<>();
 	private int ticks;

fabric-message-api-v1/src/testmod/resources/fabric.mod.json

@@ -14,7 +14,7 @@
       "net.fabricmc.fabric.test.message.ChatTest"
     ],
     "client": [
-      "net.fabricmc.fabric.test.message.ChatTestClient"
+      "net.fabricmc.fabric.test.message.client.ChatTestClient"
     ]
   }
 }

fabric-message-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/message/client/ChatTestClient.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.message;
+package net.fabricmc.fabric.test.message.client;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

fabric-networking-api-v1/src/testmod/resources/fabric.mod.json

@@ -16,11 +16,11 @@
       "net.fabricmc.fabric.test.networking.play.NetworkingPlayPacketTest"
     ],
     "client": [
-      "net.fabricmc.fabric.test.networking.channeltest.NetworkingChannelClientTest",
-      "net.fabricmc.fabric.test.networking.disconnectscreen.DisconnectScreenTest",
-      "net.fabricmc.fabric.test.networking.keybindreciever.NetworkingKeybindClientPacketTest",
-      "net.fabricmc.fabric.test.networking.login.NetworkingLoginQueryClientTest",
-      "net.fabricmc.fabric.test.networking.play.NetworkingPlayPacketClientTest"
+      "net.fabricmc.fabric.test.networking.client.channeltest.NetworkingChannelClientTest",
+      "net.fabricmc.fabric.test.networking.client.DisconnectScreenTest",
+      "net.fabricmc.fabric.test.networking.client.keybindreciever.NetworkingKeybindClientPacketTest",
+      "net.fabricmc.fabric.test.networking.client.login.NetworkingLoginQueryClientTest",
+      "net.fabricmc.fabric.test.networking.client.play.NetworkingPlayPacketClientTest"
     ]
   }
 }

fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/DisconnectScreenTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.networking.disconnectscreen;
+package net.fabricmc.fabric.test.networking.client;
 
 import net.minecraft.text.Text;
 

fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/ChannelList.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.networking.channeltest;
+package net.fabricmc.fabric.test.networking.client.channeltest;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;

fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/ChannelScreen.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.networking.channeltest;
+package net.fabricmc.fabric.test.networking.client.channeltest;
 
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.tooltip.Tooltip;

fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/NetworkingChannelClientTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.networking.channeltest;
+package net.fabricmc.fabric.test.networking.client.channeltest;
 
 import java.util.HashSet;
 import java.util.Set;

fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/keybindreciever/NetworkingKeybindClientPacketTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.networking.keybindreciever;
+package net.fabricmc.fabric.test.networking.client.keybindreciever;
 
 import org.lwjgl.glfw.GLFW;
 
@@ -22,16 +22,14 @@ import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
+import net.fabricmc.fabric.test.networking.keybindreciever.NetworkingKeybindPacketTest;
 
 // Sends a packet to the server when a keybinding was pressed
 // The server in response will send a chat message to the client.
-@Environment(EnvType.CLIENT)
 public class NetworkingKeybindClientPacketTest implements ClientModInitializer {
 	public static final KeyBinding TEST_BINDING = KeyBindingHelper.registerKeyBinding(new KeyBinding("key.fabric-networking-api-v1-testmod.test", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_RIGHT_BRACKET, "key.category.fabric-networking-api-v1-testmod"));
 

fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/login/NetworkingLoginQueryClientTest.java

@@ -14,18 +14,15 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.networking.login;
+package net.fabricmc.fabric.test.networking.client.login;
 
 import java.util.concurrent.CompletableFuture;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.networking.v1.ClientLoginNetworking;
 import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
 import net.fabricmc.fabric.test.networking.play.NetworkingPlayPacketTest;
 
-@Environment(EnvType.CLIENT)
 public final class NetworkingLoginQueryClientTest implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {

fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/play/NetworkingPlayPacketClientTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.networking.play;
+package net.fabricmc.fabric.test.networking.client.play;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
@@ -23,6 +23,7 @@ import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.networking.v1.PacketSender;
+import net.fabricmc.fabric.test.networking.play.NetworkingPlayPacketTest;
 
 public final class NetworkingPlayPacketClientTest implements ClientModInitializer, ClientPlayNetworking.PlayPacketHandler<NetworkingPlayPacketTest.OverlayPacket> {
 	@Override

fabric-object-builder-api-v1/src/testmod/resources/fabric.mod.json

@@ -21,7 +21,10 @@
   },
   "description": "Test mod for fabric object builder API v1.",
   "mixins": [
-    "fabric-object-builder-api-v1-testmod.mixins.json"
+    {
+      "config": "fabric-object-builder-api-v1-testmod.client.mixins.json",
+      "environment": "client"
+    }
   ],
   "entrypoints": {
     "main": [

fabric-object-builder-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/object/builder/client/TealSignClientTest.java

@@ -21,7 +21,7 @@ import net.minecraft.client.render.block.entity.SignBlockEntityRenderer;
 
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.test.object.builder.TealSignTest;
-import net.fabricmc.fabric.test.object.builder.mixin.BlockEntityRendererFactoriesAccessor;
+import net.fabricmc.fabric.test.object.builder.client.mixin.BlockEntityRendererFactoriesAccessor;
 
 public class TealSignClientTest implements ClientModInitializer {
 	@Override

fabric-object-builder-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/object/builder/client/mixin/BlockEntityRendererFactoriesAccessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.object.builder.mixin;
+package net.fabricmc.fabric.test.object.builder.client.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;

fabric-object-builder-api-v1/src/testmodClient/resources/fabric-object-builder-api-v1-testmod.client.mixins.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "net.fabricmc.fabric.test.object.builder.mixin",
+  "package": "net.fabricmc.fabric.test.object.builder.client.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
     "BlockEntityRendererFactoriesAccessor"

fabric-registry-sync-v0/src/testmod/resources/fabric.mod.json

@@ -13,7 +13,7 @@
       "net.fabricmc.fabric.test.registry.sync.RegistrySyncTest"
     ],
     "client": [
-      "net.fabricmc.fabric.test.registry.sync.RegistrySyncTestClient"
+      "net.fabricmc.fabric.test.registry.sync.client.RegistrySyncTestClient"
     ]
   }
 }

fabric-registry-sync-v0/src/testmodClient/java/net/fabricmc/fabric/test/registry/sync/client/RegistrySyncTestClient.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.test.registry.sync;
+package net.fabricmc.fabric.test.registry.sync.client;
 
 import java.util.Map;
 import java.util.Objects;
@@ -28,12 +28,10 @@ import org.slf4j.LoggerFactory;
 import net.minecraft.util.Identifier;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.impl.registry.sync.packet.RegistryPacketHandler;
+import net.fabricmc.fabric.test.registry.sync.RegistrySyncTest;
 
-@Environment(EnvType.CLIENT)
 public class RegistrySyncTestClient implements ClientModInitializer {
 	private static final Logger LOGGER = LoggerFactory.getLogger(RegistrySyncTestClient.class);
 

fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/FrameBlockEntity.java

@@ -24,10 +24,10 @@ import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
+import net.minecraft.registry.Registries;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.registry.Registries;
 
 import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachmentBlockEntity;
 

fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/RendererTest.java

@@ -21,9 +21,9 @@ import net.minecraft.block.Material;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
-import net.minecraft.util.Identifier;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
+import net.minecraft.util.Identifier;
 
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;

fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/ScreenTests.java

@@ -19,8 +19,8 @@ package net.fabricmc.fabric.test.screen;
 import java.util.List;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawableHelper;
@@ -30,13 +30,10 @@ import net.minecraft.client.gui.screen.TitleScreen;
 import net.minecraft.client.gui.widget.ClickableWidget;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenKeyboardEvents;
 import net.fabricmc.fabric.api.client.screen.v1.Screens;
 
-@Environment(EnvType.CLIENT)
 public final class ScreenTests implements ClientModInitializer {
 	private static final Logger LOGGER = LoggerFactory.getLogger("FabricScreenApiTests");