From fb8d95dacbdaa62f6198fee66f866b376aaac65f Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 1 May 2023 13:55:19 +0100 Subject: [PATCH] Split test mods into client and common. (#3033) --- build.gradle | 32 +++++++--- .../LegacyClientLifecycleEventsTest.java | 0 .../src/testmod/resources/fabric.mod.json | 7 ++- .../base/client}/FabricApiAutoTestClient.java | 24 ++++---- .../base/client}/FabricClientTestHelper.java | 6 +- .../mixin/CyclingButtonWidgetAccessor.java | 2 +- .../base/client}/mixin/ScreenAccessor.java | 2 +- ...abric-api-base-testmod.client.mixins.json} | 2 +- .../src/testmod/resources/fabric.mod.json | 2 +- .../client}/FabricApiLookupTestClient.java | 7 +-- .../FabricEntityApiLookupTestClient.java | 6 +- .../entity/InspectablePigEntityRenderer.java | 6 +- .../test/tag/client/v1/ClientTagTest.java | 0 .../resources/fabric.mod.json | 0 .../command/client/ClientCommandTest.java | 3 - fabric-data-generation-api-v1/build.gradle | 4 +- .../datagen/DataGeneratorTestEntrypoint.java | 36 +++++------ .../DataGeneratorClientTestEntrypoint.java | 58 ++++++++++++++++++ .../event/client/EntityEventTestsClient.java | 0 .../fabric/test/item/client/TooltipTests.java | 3 - .../client/keybinding/KeyBindingsTest.java | 0 .../lang/en_us.json | 0 .../resources/fabric.mod.json | 0 .../ClientBlockEntityLifecycleTests.java | 0 .../client/ClientEntityLifecycleTests.java | 3 - .../client/ClientLifecycleTests.java | 3 - .../lifecycle/client/ClientTickTests.java | 3 - .../src/testmod/resources/fabric.mod.json | 2 +- .../test/message/client}/ChatTestClient.java | 2 +- .../test/model/BakedModelFeatureRenderer.java | 0 .../fabric/test/model/BakedModelRenderer.java | 0 .../fabric/test/model/ModelTestModClient.java | 0 .../model/SpecificModelReloadListener.java | 0 .../models/half_red_sand.json | 0 .../resources/fabric.mod.json | 0 .../src/testmod/resources/fabric.mod.json | 10 +-- .../client}/DisconnectScreenTest.java | 2 +- .../client}/channeltest/ChannelList.java | 2 +- .../client}/channeltest/ChannelScreen.java | 2 +- .../NetworkingChannelClientTest.java | 2 +- .../NetworkingKeybindClientPacketTest.java | 6 +- .../login/NetworkingLoginQueryClientTest.java | 5 +- .../play/NetworkingPlayPacketClientTest.java | 3 +- .../src/testmod/resources/fabric.mod.json | 5 +- .../builder/client/TealSignClientTest.java | 2 +- .../BlockEntityRendererFactoriesAccessor.java | 2 +- ...builder-api-v1-testmod.client.mixins.json} | 2 +- .../renderer/simple/FrameBlockEntity.java | 2 +- .../simple/client/FrameBakedModel.java | 0 .../client/FrameModelResourceProvider.java | 0 .../simple/client/FrameUnbakedModel.java | 0 .../simple/client/PillarBakedModel.java | 0 .../client/PillarModelVariantProvider.java | 0 .../simple/client/PillarUnbakedModel.java | 0 .../simple/client/RendererClientTest.java | 0 .../blockstates/frame.json | 0 .../blockstates/frame_multipart.json | 0 .../blockstates/frame_weighted.json | 0 .../textures/block/pillar_alone.png | Bin .../textures/block/pillar_bottom.png | Bin .../textures/block/pillar_middle.png | Bin .../textures/block/pillar_top.png | Bin .../fluid/CustomizedFluidRenderer.java | 0 .../FabricFluidRenderingTestModClient.java | 0 .../rendering/client/ArmorRenderingTests.java | 0 .../client/DimensionalRenderingTest.java | 0 .../client/FeatureRendererGenericTests.java | 0 .../rendering/client/FeatureRendererTest.java | 0 .../rendering/client/HudAndShaderTest.java | 0 .../client/TooltipComponentTests.java | 0 .../client/WorldRenderEventsTests.java | 0 .../shaders/core/test.fsh | 0 .../shaders/core/test.json | 0 .../shaders/core/test.vsh | 0 .../shaders/core/test_local_import.glsl | 0 .../shaders/include/test_include.glsl | 0 .../textures/models/armor/test_layer_1.png | Bin .../fabric/test/screen/ScreenTests.java | 4 +- .../fabric/test/screen/SoundButton.java | 0 .../fabric/test/screen/StopSoundButton.java | 0 .../resources/fabric.mod.json | 0 .../client/ClientScreenHandlerTest.java | 0 .../client/PositionedScreen.java | 0 .../test/sound/client/ClientSoundTest.java | 0 .../fabric/test/sound/client/SineSound.java | 0 .../fabric/test/sound/client/SineStream.java | 0 .../fabric-sound-api-v1-testmod/sounds.json | 0 .../resources/fabric.mod.json | 0 .../ingame/client/FluidVariantRenderTest.java | 0 .../blockstates/fluid_chute.json | 0 .../blockstates/infinite_lava_source.json | 0 .../blockstates/infinite_water_source.json | 0 .../models/block/fluid_chute.json | 0 .../models/block/infinite_lava_source.json | 0 .../models/block/infinite_water_source.json | 0 .../models/item/extract_stick.json | 0 .../models/item/fluid_chute.json | 0 .../models/item/infinite_lava_source.json | 0 .../models/item/infinite_water_source.json | 0 .../textures/block/fluid_chute.png | Bin .../textures/block/infinite_lava_source.png | Bin .../textures/block/infinite_water_source.png | Bin .../textures/item/extract_stick.png | Bin .../src/testmod/resources/fabric.mod.json | 2 +- .../client}/BlockEntityRendererTest.java | 3 +- .../blockstates/test_sign.json | 0 .../blockstates/test_wall_sign.json | 0 .../models/block/test_sign.json | 0 .../models/item/test_sign.json | 0 gradle/validate-annotations.gradle | 4 +- 110 files changed, 157 insertions(+), 114 deletions(-) rename deprecated/fabric-events-lifecycle-v0/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/event/lifecycle/legacy/client/LegacyClientLifecycleEventsTest.java (100%) rename fabric-api-base/src/{testmod/java/net/fabricmc/fabric/test/base => testmodClient/java/net/fabricmc/fabric/test/base/client}/FabricApiAutoTestClient.java (77%) rename fabric-api-base/src/{testmod/java/net/fabricmc/fabric/test/base => testmodClient/java/net/fabricmc/fabric/test/base/client}/FabricClientTestHelper.java (97%) rename fabric-api-base/src/{testmod/java/net/fabricmc/fabric/test/base => testmodClient/java/net/fabricmc/fabric/test/base/client}/mixin/CyclingButtonWidgetAccessor.java (94%) rename fabric-api-base/src/{testmod/java/net/fabricmc/fabric/test/base => testmodClient/java/net/fabricmc/fabric/test/base/client}/mixin/ScreenAccessor.java (94%) rename fabric-api-base/src/{testmod/resources/fabric-api-base-testmod.mixins.json => testmodClient/resources/fabric-api-base-testmod.client.mixins.json} (75%) rename fabric-api-lookup-api-v1/src/{testmod/java/net/fabricmc/fabric/test/lookup => testmodClient/java/net/fabricmc/fabric/test/lookup/client}/FabricApiLookupTestClient.java (79%) rename fabric-api-lookup-api-v1/src/{testmod/java/net/fabricmc/fabric/test/lookup => testmodClient/java/net/fabricmc/fabric/test/lookup/client}/entity/FabricEntityApiLookupTestClient.java (85%) rename fabric-api-lookup-api-v1/src/{testmod/java/net/fabricmc/fabric/test/lookup => testmodClient/java/net/fabricmc/fabric/test/lookup/client}/entity/InspectablePigEntityRenderer.java (88%) rename fabric-client-tags-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java (100%) rename fabric-client-tags-api-v1/src/{testmod => testmodClient}/resources/fabric.mod.json (100%) rename fabric-command-api-v2/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/command/client/ClientCommandTest.java (98%) create mode 100644 fabric-data-generation-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/datagen/client/DataGeneratorClientTestEntrypoint.java rename fabric-entity-events-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/entity/event/client/EntityEventTestsClient.java (100%) rename fabric-item-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/item/client/TooltipTests.java (92%) rename fabric-key-binding-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/client/keybinding/KeyBindingsTest.java (100%) rename fabric-key-binding-api-v1/src/{testmod => testmodClient}/resources/assets/fabric-keybindings-v1-testmod/lang/en_us.json (100%) rename fabric-key-binding-api-v1/src/{testmod => testmodClient}/resources/fabric.mod.json (100%) rename fabric-lifecycle-events-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientBlockEntityLifecycleTests.java (100%) rename fabric-lifecycle-events-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientEntityLifecycleTests.java (97%) rename fabric-lifecycle-events-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientLifecycleTests.java (94%) rename fabric-lifecycle-events-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientTickTests.java (95%) rename fabric-message-api-v1/src/{testmod/java/net/fabricmc/fabric/test/message => testmodClient/java/net/fabricmc/fabric/test/message/client}/ChatTestClient.java (98%) rename fabric-models-v0/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/model/BakedModelFeatureRenderer.java (100%) rename fabric-models-v0/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/model/BakedModelRenderer.java (100%) rename fabric-models-v0/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/model/ModelTestModClient.java (100%) rename fabric-models-v0/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/model/SpecificModelReloadListener.java (100%) rename fabric-models-v0/src/{testmod => testmodClient}/resources/assets/fabric-models-v0-testmod/models/half_red_sand.json (100%) rename fabric-models-v0/src/{testmod => testmodClient}/resources/fabric.mod.json (100%) rename fabric-networking-api-v1/src/{testmod/java/net/fabricmc/fabric/test/networking/disconnectscreen => testmodClient/java/net/fabricmc/fabric/test/networking/client}/DisconnectScreenTest.java (95%) rename fabric-networking-api-v1/src/{testmod/java/net/fabricmc/fabric/test/networking => testmodClient/java/net/fabricmc/fabric/test/networking/client}/channeltest/ChannelList.java (96%) rename fabric-networking-api-v1/src/{testmod/java/net/fabricmc/fabric/test/networking => testmodClient/java/net/fabricmc/fabric/test/networking/client}/channeltest/ChannelScreen.java (98%) rename fabric-networking-api-v1/src/{testmod/java/net/fabricmc/fabric/test/networking => testmodClient/java/net/fabricmc/fabric/test/networking/client}/channeltest/NetworkingChannelClientTest.java (97%) rename fabric-networking-api-v1/src/{testmod/java/net/fabricmc/fabric/test/networking => testmodClient/java/net/fabricmc/fabric/test/networking/client}/keybindreciever/NetworkingKeybindClientPacketTest.java (92%) rename fabric-networking-api-v1/src/{testmod/java/net/fabricmc/fabric/test/networking => testmodClient/java/net/fabricmc/fabric/test/networking/client}/login/NetworkingLoginQueryClientTest.java (90%) rename fabric-networking-api-v1/src/{testmod/java/net/fabricmc/fabric/test/networking => testmodClient/java/net/fabricmc/fabric/test/networking/client}/play/NetworkingPlayPacketClientTest.java (92%) rename fabric-object-builder-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/object/builder/client/TealSignClientTest.java (93%) rename fabric-object-builder-api-v1/src/{testmod/java/net/fabricmc/fabric/test/object/builder => testmodClient/java/net/fabricmc/fabric/test/object/builder/client}/mixin/BlockEntityRendererFactoriesAccessor.java (95%) rename fabric-object-builder-api-v1/src/{testmod/resources/fabric-object-builder-api-v1-testmod.mixins.json => testmodClient/resources/fabric-object-builder-api-v1-testmod.client.mixins.json} (70%) rename fabric-renderer-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/renderer/simple/client/FrameBakedModel.java (100%) rename fabric-renderer-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/renderer/simple/client/FrameModelResourceProvider.java (100%) rename fabric-renderer-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/renderer/simple/client/FrameUnbakedModel.java (100%) rename fabric-renderer-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/renderer/simple/client/PillarBakedModel.java (100%) rename fabric-renderer-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/renderer/simple/client/PillarModelVariantProvider.java (100%) rename fabric-renderer-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/renderer/simple/client/PillarUnbakedModel.java (100%) rename fabric-renderer-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/renderer/simple/client/RendererClientTest.java (100%) rename fabric-renderer-api-v1/src/{testmod => testmodClient}/resources/assets/fabric-renderer-api-v1-testmod/blockstates/frame.json (100%) rename fabric-renderer-api-v1/src/{testmod => testmodClient}/resources/assets/fabric-renderer-api-v1-testmod/blockstates/frame_multipart.json (100%) rename fabric-renderer-api-v1/src/{testmod => testmodClient}/resources/assets/fabric-renderer-api-v1-testmod/blockstates/frame_weighted.json (100%) rename fabric-renderer-api-v1/src/{testmod => testmodClient}/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_alone.png (100%) rename fabric-renderer-api-v1/src/{testmod => testmodClient}/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_bottom.png (100%) rename fabric-renderer-api-v1/src/{testmod => testmodClient}/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_middle.png (100%) rename fabric-renderer-api-v1/src/{testmod => testmodClient}/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_top.png (100%) rename fabric-rendering-fluids-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/client/rendering/fluid/CustomizedFluidRenderer.java (100%) rename fabric-rendering-fluids-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/client/rendering/fluid/FabricFluidRenderingTestModClient.java (100%) rename fabric-rendering-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/rendering/client/ArmorRenderingTests.java (100%) rename fabric-rendering-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/rendering/client/DimensionalRenderingTest.java (100%) rename fabric-rendering-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/rendering/client/FeatureRendererGenericTests.java (100%) rename fabric-rendering-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/rendering/client/FeatureRendererTest.java (100%) rename fabric-rendering-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/rendering/client/HudAndShaderTest.java (100%) rename fabric-rendering-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/rendering/client/TooltipComponentTests.java (100%) rename fabric-rendering-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/rendering/client/WorldRenderEventsTests.java (100%) rename fabric-rendering-v1/src/{testmod => testmodClient}/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.fsh (100%) rename fabric-rendering-v1/src/{testmod => testmodClient}/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.json (100%) rename fabric-rendering-v1/src/{testmod => testmodClient}/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.vsh (100%) rename fabric-rendering-v1/src/{testmod => testmodClient}/resources/assets/fabric-rendering-v1-testmod/shaders/core/test_local_import.glsl (100%) rename fabric-rendering-v1/src/{testmod => testmodClient}/resources/assets/fabric-rendering-v1-testmod/shaders/include/test_include.glsl (100%) rename fabric-rendering-v1/src/{testmod => testmodClient}/resources/assets/fabric-rendering-v1-testmod/textures/models/armor/test_layer_1.png (100%) rename fabric-screen-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/screen/ScreenTests.java (97%) rename fabric-screen-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/screen/SoundButton.java (100%) rename fabric-screen-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/screen/StopSoundButton.java (100%) rename fabric-screen-api-v1/src/{testmod => testmodClient}/resources/fabric.mod.json (100%) rename fabric-screen-handler-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/screenhandler/client/ClientScreenHandlerTest.java (100%) rename fabric-screen-handler-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/screenhandler/client/PositionedScreen.java (100%) rename fabric-sound-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/sound/client/ClientSoundTest.java (100%) rename fabric-sound-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/sound/client/SineSound.java (100%) rename fabric-sound-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/sound/client/SineStream.java (100%) rename fabric-sound-api-v1/src/{testmod => testmodClient}/resources/assets/fabric-sound-api-v1-testmod/sounds.json (100%) rename fabric-sound-api-v1/src/{testmod => testmodClient}/resources/fabric.mod.json (100%) rename fabric-transfer-api-v1/src/{testmod => testmodClient}/java/net/fabricmc/fabric/test/transfer/ingame/client/FluidVariantRenderTest.java (100%) rename fabric-transfer-api-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transfer-api-v1-testmod/blockstates/fluid_chute.json (100%) rename fabric-transfer-api-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transfer-api-v1-testmod/blockstates/infinite_lava_source.json (100%) rename fabric-transfer-api-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transfer-api-v1-testmod/blockstates/infinite_water_source.json (100%) rename fabric-transfer-api-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transfer-api-v1-testmod/models/block/fluid_chute.json (100%) rename fabric-transfer-api-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transfer-api-v1-testmod/models/block/infinite_lava_source.json (100%) rename fabric-transfer-api-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transfer-api-v1-testmod/models/block/infinite_water_source.json (100%) rename fabric-transfer-api-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transfer-api-v1-testmod/models/item/extract_stick.json (100%) rename fabric-transfer-api-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transfer-api-v1-testmod/models/item/fluid_chute.json (100%) rename fabric-transfer-api-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transfer-api-v1-testmod/models/item/infinite_lava_source.json (100%) rename fabric-transfer-api-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transfer-api-v1-testmod/models/item/infinite_water_source.json (100%) rename fabric-transfer-api-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transfer-api-v1-testmod/textures/block/fluid_chute.png (100%) rename fabric-transfer-api-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transfer-api-v1-testmod/textures/block/infinite_lava_source.png (100%) rename fabric-transfer-api-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transfer-api-v1-testmod/textures/block/infinite_water_source.png (100%) rename fabric-transfer-api-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transfer-api-v1-testmod/textures/item/extract_stick.png (100%) rename fabric-transitive-access-wideners-v1/src/{testmod/java/net/fabricmc/fabric/test/access => testmodClient/java/net/fabricmc/fabric/test/access/client}/BlockEntityRendererTest.java (90%) rename fabric-transitive-access-wideners-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transitive-access-wideners-v1-testmod/blockstates/test_sign.json (100%) rename fabric-transitive-access-wideners-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transitive-access-wideners-v1-testmod/blockstates/test_wall_sign.json (100%) rename fabric-transitive-access-wideners-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transitive-access-wideners-v1-testmod/models/block/test_sign.json (100%) rename fabric-transitive-access-wideners-v1/src/{testmod/resources/assets => testmodClient/resources}/fabric-transitive-access-wideners-v1-testmod/models/item/test_sign.json (100%) diff --git a/build.gradle b/build.gradle index f5677ce7e..42da79cbf 100644 --- a/build.gradle +++ b/build.gradle @@ -105,7 +105,7 @@ def testDependencies(project, List 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 } } } diff --git a/deprecated/fabric-events-lifecycle-v0/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/legacy/client/LegacyClientLifecycleEventsTest.java b/deprecated/fabric-events-lifecycle-v0/src/testmodClient/java/net/fabricmc/fabric/test/event/lifecycle/legacy/client/LegacyClientLifecycleEventsTest.java similarity index 100% rename from deprecated/fabric-events-lifecycle-v0/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/legacy/client/LegacyClientLifecycleEventsTest.java rename to deprecated/fabric-events-lifecycle-v0/src/testmodClient/java/net/fabricmc/fabric/test/event/lifecycle/legacy/client/LegacyClientLifecycleEventsTest.java diff --git a/fabric-api-base/src/testmod/resources/fabric.mod.json b/fabric-api-base/src/testmod/resources/fabric.mod.json index cff207497..05db3dc8f 100644 --- a/fabric-api-base/src/testmod/resources/fabric.mod.json +++ b/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" + } ] } diff --git a/fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/FabricApiAutoTestClient.java b/fabric-api-base/src/testmodClient/java/net/fabricmc/fabric/test/base/client/FabricApiAutoTestClient.java similarity index 77% rename from fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/FabricApiAutoTestClient.java rename to fabric-api-base/src/testmodClient/java/net/fabricmc/fabric/test/base/client/FabricApiAutoTestClient.java index 0d89ef9b0..9cbfc2cdd 100644 --- a/fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/FabricApiAutoTestClient.java +++ b/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; diff --git a/fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/FabricClientTestHelper.java b/fabric-api-base/src/testmodClient/java/net/fabricmc/fabric/test/base/client/FabricClientTestHelper.java similarity index 97% rename from fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/FabricClientTestHelper.java rename to fabric-api-base/src/testmodClient/java/net/fabricmc/fabric/test/base/client/FabricClientTestHelper.java index a6cc70c8a..2d944948a 100644 --- a/fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/FabricClientTestHelper.java +++ b/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. diff --git a/fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/mixin/CyclingButtonWidgetAccessor.java b/fabric-api-base/src/testmodClient/java/net/fabricmc/fabric/test/base/client/mixin/CyclingButtonWidgetAccessor.java similarity index 94% rename from fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/mixin/CyclingButtonWidgetAccessor.java rename to fabric-api-base/src/testmodClient/java/net/fabricmc/fabric/test/base/client/mixin/CyclingButtonWidgetAccessor.java index a1b257223..cca8b118b 100644 --- a/fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/mixin/CyclingButtonWidgetAccessor.java +++ b/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; diff --git a/fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/mixin/ScreenAccessor.java b/fabric-api-base/src/testmodClient/java/net/fabricmc/fabric/test/base/client/mixin/ScreenAccessor.java similarity index 94% rename from fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/mixin/ScreenAccessor.java rename to fabric-api-base/src/testmodClient/java/net/fabricmc/fabric/test/base/client/mixin/ScreenAccessor.java index 8976a8b74..fd444c43c 100644 --- a/fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/mixin/ScreenAccessor.java +++ b/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; diff --git a/fabric-api-base/src/testmod/resources/fabric-api-base-testmod.mixins.json b/fabric-api-base/src/testmodClient/resources/fabric-api-base-testmod.client.mixins.json similarity index 75% rename from fabric-api-base/src/testmod/resources/fabric-api-base-testmod.mixins.json rename to fabric-api-base/src/testmodClient/resources/fabric-api-base-testmod.client.mixins.json index 2cdbca0a7..c7451283c 100644 --- a/fabric-api-base/src/testmod/resources/fabric-api-base-testmod.mixins.json +++ b/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", diff --git a/fabric-api-lookup-api-v1/src/testmod/resources/fabric.mod.json b/fabric-api-lookup-api-v1/src/testmod/resources/fabric.mod.json index 1c1937879..0543c96bf 100644 --- a/fabric-api-lookup-api-v1/src/testmod/resources/fabric.mod.json +++ b/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" ] } } diff --git a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/FabricApiLookupTestClient.java b/fabric-api-lookup-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/lookup/client/FabricApiLookupTestClient.java similarity index 79% rename from fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/FabricApiLookupTestClient.java rename to fabric-api-lookup-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/lookup/client/FabricApiLookupTestClient.java index 8a3b409f4..34d7f7f18 100644 --- a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/FabricApiLookupTestClient.java +++ b/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() { diff --git a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/entity/FabricEntityApiLookupTestClient.java b/fabric-api-lookup-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/lookup/client/entity/FabricEntityApiLookupTestClient.java similarity index 85% rename from fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/entity/FabricEntityApiLookupTestClient.java rename to fabric-api-lookup-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/lookup/client/entity/FabricEntityApiLookupTestClient.java index 0c761e58d..c2cee5d63 100644 --- a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/entity/FabricEntityApiLookupTestClient.java +++ b/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); diff --git a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/entity/InspectablePigEntityRenderer.java b/fabric-api-lookup-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/lookup/client/entity/InspectablePigEntityRenderer.java similarity index 88% rename from fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/entity/InspectablePigEntityRenderer.java rename to fabric-api-lookup-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/lookup/client/entity/InspectablePigEntityRenderer.java index 71830c2df..6baf19b8a 100644 --- a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/entity/InspectablePigEntityRenderer.java +++ b/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"); diff --git a/fabric-client-tags-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java b/fabric-client-tags-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java similarity index 100% rename from fabric-client-tags-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java rename to fabric-client-tags-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java diff --git a/fabric-client-tags-api-v1/src/testmod/resources/fabric.mod.json b/fabric-client-tags-api-v1/src/testmodClient/resources/fabric.mod.json similarity index 100% rename from fabric-client-tags-api-v1/src/testmod/resources/fabric.mod.json rename to fabric-client-tags-api-v1/src/testmodClient/resources/fabric.mod.json diff --git a/fabric-command-api-v2/src/testmod/java/net/fabricmc/fabric/test/command/client/ClientCommandTest.java b/fabric-command-api-v2/src/testmodClient/java/net/fabricmc/fabric/test/command/client/ClientCommandTest.java similarity index 98% rename from fabric-command-api-v2/src/testmod/java/net/fabricmc/fabric/test/command/client/ClientCommandTest.java rename to fabric-command-api-v2/src/testmodClient/java/net/fabricmc/fabric/test/command/client/ClientCommandTest.java index d83c0a509..f936fe543 100644 --- a/fabric-command-api-v2/src/testmod/java/net/fabricmc/fabric/test/command/client/ClientCommandTest.java +++ b/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")); diff --git a/fabric-data-generation-api-v1/build.gradle b/fabric-data-generation-api-v1/build.gradle index 3a836833b..9f8dcf84a 100644 --- a/fabric-data-generation-api-v1/build.gradle +++ b/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 } } } diff --git a/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java b/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java index dfd2261ee..e99066128 100644 --- a/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java +++ b/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java @@ -25,6 +25,7 @@ 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.Optional; import java.util.concurrent.CompletableFuture; @@ -38,7 +39,6 @@ import net.minecraft.advancement.Advancement; import net.minecraft.advancement.AdvancementFrame; import net.minecraft.advancement.criterion.OnKilledCriterion; import net.minecraft.block.Blocks; -import net.minecraft.data.DataOutput; import net.minecraft.data.client.BlockStateModelGenerator; import net.minecraft.data.client.ItemModelGenerator; import net.minecraft.data.server.recipe.RecipeJsonProvider; @@ -62,18 +62,15 @@ 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.util.math.BlockPos; -import net.minecraft.util.math.GlobalPos; -import net.minecraft.world.World; 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; @@ -82,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); @@ -103,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(TestCodecDataProvider::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 { @@ -356,20 +364,4 @@ public class DataGeneratorTestEntrypoint implements DataGeneratorEntrypoint { ); } } - - private static class TestCodecDataProvider extends FabricCodecDataProvider { - private TestCodecDataProvider(FabricDataOutput dataOutput) { - super(dataOutput, DataOutput.OutputType.RESOURCE_PACK, "test_positions", GlobalPos.CODEC); - } - - @Override - protected void configure(BiConsumer provider) { - provider.accept(new Identifier(MOD_ID, "test_pos_1"), GlobalPos.create(World.OVERWORLD, BlockPos.ORIGIN)); - } - - @Override - public String getName() { - return "Codec data provider"; - } - } } diff --git a/fabric-data-generation-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/datagen/client/DataGeneratorClientTestEntrypoint.java b/fabric-data-generation-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/datagen/client/DataGeneratorClientTestEntrypoint.java new file mode 100644 index 000000000..ee9e178cd --- /dev/null +++ b/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> { + private TestAtlasSourceProvider(FabricDataOutput dataOutput) { + super(dataOutput, DataOutput.OutputType.RESOURCE_PACK, "atlases", AtlasSourceManager.LIST_CODEC); + } + + @Override + protected void configure(BiConsumer> provider) { + provider.accept(new Identifier(MOD_ID, "atlas_source_test"), List.of(new DirectoryAtlasSource("example", "example/"))); + } + + @Override + public String getName() { + return "Atlas Sources"; + } + } +} diff --git a/fabric-entity-events-v1/src/testmod/java/net/fabricmc/fabric/test/entity/event/client/EntityEventTestsClient.java b/fabric-entity-events-v1/src/testmodClient/java/net/fabricmc/fabric/test/entity/event/client/EntityEventTestsClient.java similarity index 100% rename from fabric-entity-events-v1/src/testmod/java/net/fabricmc/fabric/test/entity/event/client/EntityEventTestsClient.java rename to fabric-entity-events-v1/src/testmodClient/java/net/fabricmc/fabric/test/entity/event/client/EntityEventTestsClient.java diff --git a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/client/TooltipTests.java b/fabric-item-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/item/client/TooltipTests.java similarity index 92% rename from fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/client/TooltipTests.java rename to fabric-item-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/item/client/TooltipTests.java index cca5864cc..a007a4deb 100644 --- a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/client/TooltipTests.java +++ b/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() { diff --git a/fabric-key-binding-api-v1/src/testmod/java/net/fabricmc/fabric/test/client/keybinding/KeyBindingsTest.java b/fabric-key-binding-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/client/keybinding/KeyBindingsTest.java similarity index 100% rename from fabric-key-binding-api-v1/src/testmod/java/net/fabricmc/fabric/test/client/keybinding/KeyBindingsTest.java rename to fabric-key-binding-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/client/keybinding/KeyBindingsTest.java diff --git a/fabric-key-binding-api-v1/src/testmod/resources/assets/fabric-keybindings-v1-testmod/lang/en_us.json b/fabric-key-binding-api-v1/src/testmodClient/resources/assets/fabric-keybindings-v1-testmod/lang/en_us.json similarity index 100% rename from fabric-key-binding-api-v1/src/testmod/resources/assets/fabric-keybindings-v1-testmod/lang/en_us.json rename to fabric-key-binding-api-v1/src/testmodClient/resources/assets/fabric-keybindings-v1-testmod/lang/en_us.json diff --git a/fabric-key-binding-api-v1/src/testmod/resources/fabric.mod.json b/fabric-key-binding-api-v1/src/testmodClient/resources/fabric.mod.json similarity index 100% rename from fabric-key-binding-api-v1/src/testmod/resources/fabric.mod.json rename to fabric-key-binding-api-v1/src/testmodClient/resources/fabric.mod.json diff --git a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientBlockEntityLifecycleTests.java b/fabric-lifecycle-events-v1/src/testmodClient/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientBlockEntityLifecycleTests.java similarity index 100% rename from fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientBlockEntityLifecycleTests.java rename to fabric-lifecycle-events-v1/src/testmodClient/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientBlockEntityLifecycleTests.java diff --git a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientEntityLifecycleTests.java b/fabric-lifecycle-events-v1/src/testmodClient/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientEntityLifecycleTests.java similarity index 97% rename from fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientEntityLifecycleTests.java rename to fabric-lifecycle-events-v1/src/testmodClient/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientEntityLifecycleTests.java index d9d4817c3..eb1632137 100644 --- a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientEntityLifecycleTests.java +++ b/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 clientEntities = new ArrayList<>(); diff --git a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientLifecycleTests.java b/fabric-lifecycle-events-v1/src/testmodClient/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientLifecycleTests.java similarity index 94% rename from fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientLifecycleTests.java rename to fabric-lifecycle-events-v1/src/testmodClient/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientLifecycleTests.java index 4088f2f53..5d1f3f8eb 100644 --- a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientLifecycleTests.java +++ b/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; diff --git a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientTickTests.java b/fabric-lifecycle-events-v1/src/testmodClient/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientTickTests.java similarity index 95% rename from fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientTickTests.java rename to fabric-lifecycle-events-v1/src/testmodClient/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientTickTests.java index cf783d666..5ec16c4bb 100644 --- a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientTickTests.java +++ b/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, Integer> tickTracker = new HashMap<>(); private int ticks; diff --git a/fabric-message-api-v1/src/testmod/resources/fabric.mod.json b/fabric-message-api-v1/src/testmod/resources/fabric.mod.json index 06bbd4d47..89bf6e19a 100644 --- a/fabric-message-api-v1/src/testmod/resources/fabric.mod.json +++ b/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" ] } } diff --git a/fabric-message-api-v1/src/testmod/java/net/fabricmc/fabric/test/message/ChatTestClient.java b/fabric-message-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/message/client/ChatTestClient.java similarity index 98% rename from fabric-message-api-v1/src/testmod/java/net/fabricmc/fabric/test/message/ChatTestClient.java rename to fabric-message-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/message/client/ChatTestClient.java index 6fb9d9e8a..73f1a7f3d 100644 --- a/fabric-message-api-v1/src/testmod/java/net/fabricmc/fabric/test/message/ChatTestClient.java +++ b/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; diff --git a/fabric-models-v0/src/testmod/java/net/fabricmc/fabric/test/model/BakedModelFeatureRenderer.java b/fabric-models-v0/src/testmodClient/java/net/fabricmc/fabric/test/model/BakedModelFeatureRenderer.java similarity index 100% rename from fabric-models-v0/src/testmod/java/net/fabricmc/fabric/test/model/BakedModelFeatureRenderer.java rename to fabric-models-v0/src/testmodClient/java/net/fabricmc/fabric/test/model/BakedModelFeatureRenderer.java diff --git a/fabric-models-v0/src/testmod/java/net/fabricmc/fabric/test/model/BakedModelRenderer.java b/fabric-models-v0/src/testmodClient/java/net/fabricmc/fabric/test/model/BakedModelRenderer.java similarity index 100% rename from fabric-models-v0/src/testmod/java/net/fabricmc/fabric/test/model/BakedModelRenderer.java rename to fabric-models-v0/src/testmodClient/java/net/fabricmc/fabric/test/model/BakedModelRenderer.java diff --git a/fabric-models-v0/src/testmod/java/net/fabricmc/fabric/test/model/ModelTestModClient.java b/fabric-models-v0/src/testmodClient/java/net/fabricmc/fabric/test/model/ModelTestModClient.java similarity index 100% rename from fabric-models-v0/src/testmod/java/net/fabricmc/fabric/test/model/ModelTestModClient.java rename to fabric-models-v0/src/testmodClient/java/net/fabricmc/fabric/test/model/ModelTestModClient.java diff --git a/fabric-models-v0/src/testmod/java/net/fabricmc/fabric/test/model/SpecificModelReloadListener.java b/fabric-models-v0/src/testmodClient/java/net/fabricmc/fabric/test/model/SpecificModelReloadListener.java similarity index 100% rename from fabric-models-v0/src/testmod/java/net/fabricmc/fabric/test/model/SpecificModelReloadListener.java rename to fabric-models-v0/src/testmodClient/java/net/fabricmc/fabric/test/model/SpecificModelReloadListener.java diff --git a/fabric-models-v0/src/testmod/resources/assets/fabric-models-v0-testmod/models/half_red_sand.json b/fabric-models-v0/src/testmodClient/resources/assets/fabric-models-v0-testmod/models/half_red_sand.json similarity index 100% rename from fabric-models-v0/src/testmod/resources/assets/fabric-models-v0-testmod/models/half_red_sand.json rename to fabric-models-v0/src/testmodClient/resources/assets/fabric-models-v0-testmod/models/half_red_sand.json diff --git a/fabric-models-v0/src/testmod/resources/fabric.mod.json b/fabric-models-v0/src/testmodClient/resources/fabric.mod.json similarity index 100% rename from fabric-models-v0/src/testmod/resources/fabric.mod.json rename to fabric-models-v0/src/testmodClient/resources/fabric.mod.json diff --git a/fabric-networking-api-v1/src/testmod/resources/fabric.mod.json b/fabric-networking-api-v1/src/testmod/resources/fabric.mod.json index 3a7472728..403abb957 100644 --- a/fabric-networking-api-v1/src/testmod/resources/fabric.mod.json +++ b/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" ] } } diff --git a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/disconnectscreen/DisconnectScreenTest.java b/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/DisconnectScreenTest.java similarity index 95% rename from fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/disconnectscreen/DisconnectScreenTest.java rename to fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/DisconnectScreenTest.java index 1892061cb..5c44f56b1 100644 --- a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/disconnectscreen/DisconnectScreenTest.java +++ b/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; diff --git a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/channeltest/ChannelList.java b/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/ChannelList.java similarity index 96% rename from fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/channeltest/ChannelList.java rename to fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/ChannelList.java index 4da3f04a6..41fd7b0c0 100644 --- a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/channeltest/ChannelList.java +++ b/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.DrawContext; diff --git a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/channeltest/ChannelScreen.java b/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/ChannelScreen.java similarity index 98% rename from fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/channeltest/ChannelScreen.java rename to fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/ChannelScreen.java index b4e5f9e4a..ed3f5d03b 100644 --- a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/channeltest/ChannelScreen.java +++ b/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.DrawContext; import net.minecraft.client.gui.screen.Screen; diff --git a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/channeltest/NetworkingChannelClientTest.java b/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/NetworkingChannelClientTest.java similarity index 97% rename from fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/channeltest/NetworkingChannelClientTest.java rename to fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/NetworkingChannelClientTest.java index 9325cb944..32eb0b08b 100644 --- a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/channeltest/NetworkingChannelClientTest.java +++ b/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; diff --git a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/keybindreciever/NetworkingKeybindClientPacketTest.java b/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/keybindreciever/NetworkingKeybindClientPacketTest.java similarity index 92% rename from fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/keybindreciever/NetworkingKeybindClientPacketTest.java rename to fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/keybindreciever/NetworkingKeybindClientPacketTest.java index 89033d24f..8aee7c3f7 100644 --- a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/keybindreciever/NetworkingKeybindClientPacketTest.java +++ b/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")); diff --git a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/login/NetworkingLoginQueryClientTest.java b/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/login/NetworkingLoginQueryClientTest.java similarity index 90% rename from fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/login/NetworkingLoginQueryClientTest.java rename to fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/login/NetworkingLoginQueryClientTest.java index 88e1d6598..f7db617bb 100644 --- a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/login/NetworkingLoginQueryClientTest.java +++ b/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() { diff --git a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/play/NetworkingPlayPacketClientTest.java b/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/play/NetworkingPlayPacketClientTest.java similarity index 92% rename from fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/play/NetworkingPlayPacketClientTest.java rename to fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/play/NetworkingPlayPacketClientTest.java index 61e115f8d..0c0fb240b 100644 --- a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/play/NetworkingPlayPacketClientTest.java +++ b/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 { @Override diff --git a/fabric-object-builder-api-v1/src/testmod/resources/fabric.mod.json b/fabric-object-builder-api-v1/src/testmod/resources/fabric.mod.json index 15a089569..73f83fd37 100644 --- a/fabric-object-builder-api-v1/src/testmod/resources/fabric.mod.json +++ b/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": [ diff --git a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/client/TealSignClientTest.java b/fabric-object-builder-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/object/builder/client/TealSignClientTest.java similarity index 93% rename from fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/client/TealSignClientTest.java rename to fabric-object-builder-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/object/builder/client/TealSignClientTest.java index 4dc63b785..570126cfb 100644 --- a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/client/TealSignClientTest.java +++ b/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 diff --git a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/mixin/BlockEntityRendererFactoriesAccessor.java b/fabric-object-builder-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/object/builder/client/mixin/BlockEntityRendererFactoriesAccessor.java similarity index 95% rename from fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/mixin/BlockEntityRendererFactoriesAccessor.java rename to fabric-object-builder-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/object/builder/client/mixin/BlockEntityRendererFactoriesAccessor.java index ec4ae6910..0a30dc3e0 100644 --- a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/mixin/BlockEntityRendererFactoriesAccessor.java +++ b/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; diff --git a/fabric-object-builder-api-v1/src/testmod/resources/fabric-object-builder-api-v1-testmod.mixins.json b/fabric-object-builder-api-v1/src/testmodClient/resources/fabric-object-builder-api-v1-testmod.client.mixins.json similarity index 70% rename from fabric-object-builder-api-v1/src/testmod/resources/fabric-object-builder-api-v1-testmod.mixins.json rename to fabric-object-builder-api-v1/src/testmodClient/resources/fabric-object-builder-api-v1-testmod.client.mixins.json index 26fe75093..c39b40776 100644 --- a/fabric-object-builder-api-v1/src/testmod/resources/fabric-object-builder-api-v1-testmod.mixins.json +++ b/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" diff --git a/fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/FrameBlockEntity.java b/fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/FrameBlockEntity.java index 90781af75..5ed12957e 100644 --- a/fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/FrameBlockEntity.java +++ b/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; diff --git a/fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/client/FrameBakedModel.java b/fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/simple/client/FrameBakedModel.java similarity index 100% rename from fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/client/FrameBakedModel.java rename to fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/simple/client/FrameBakedModel.java diff --git a/fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/client/FrameModelResourceProvider.java b/fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/simple/client/FrameModelResourceProvider.java similarity index 100% rename from fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/client/FrameModelResourceProvider.java rename to fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/simple/client/FrameModelResourceProvider.java diff --git a/fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/client/FrameUnbakedModel.java b/fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/simple/client/FrameUnbakedModel.java similarity index 100% rename from fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/client/FrameUnbakedModel.java rename to fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/simple/client/FrameUnbakedModel.java diff --git a/fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/client/PillarBakedModel.java b/fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/simple/client/PillarBakedModel.java similarity index 100% rename from fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/client/PillarBakedModel.java rename to fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/simple/client/PillarBakedModel.java diff --git a/fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/client/PillarModelVariantProvider.java b/fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/simple/client/PillarModelVariantProvider.java similarity index 100% rename from fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/client/PillarModelVariantProvider.java rename to fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/simple/client/PillarModelVariantProvider.java diff --git a/fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/client/PillarUnbakedModel.java b/fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/simple/client/PillarUnbakedModel.java similarity index 100% rename from fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/client/PillarUnbakedModel.java rename to fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/simple/client/PillarUnbakedModel.java diff --git a/fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/client/RendererClientTest.java b/fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/simple/client/RendererClientTest.java similarity index 100% rename from fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/simple/client/RendererClientTest.java rename to fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/simple/client/RendererClientTest.java diff --git a/fabric-renderer-api-v1/src/testmod/resources/assets/fabric-renderer-api-v1-testmod/blockstates/frame.json b/fabric-renderer-api-v1/src/testmodClient/resources/assets/fabric-renderer-api-v1-testmod/blockstates/frame.json similarity index 100% rename from fabric-renderer-api-v1/src/testmod/resources/assets/fabric-renderer-api-v1-testmod/blockstates/frame.json rename to fabric-renderer-api-v1/src/testmodClient/resources/assets/fabric-renderer-api-v1-testmod/blockstates/frame.json diff --git a/fabric-renderer-api-v1/src/testmod/resources/assets/fabric-renderer-api-v1-testmod/blockstates/frame_multipart.json b/fabric-renderer-api-v1/src/testmodClient/resources/assets/fabric-renderer-api-v1-testmod/blockstates/frame_multipart.json similarity index 100% rename from fabric-renderer-api-v1/src/testmod/resources/assets/fabric-renderer-api-v1-testmod/blockstates/frame_multipart.json rename to fabric-renderer-api-v1/src/testmodClient/resources/assets/fabric-renderer-api-v1-testmod/blockstates/frame_multipart.json diff --git a/fabric-renderer-api-v1/src/testmod/resources/assets/fabric-renderer-api-v1-testmod/blockstates/frame_weighted.json b/fabric-renderer-api-v1/src/testmodClient/resources/assets/fabric-renderer-api-v1-testmod/blockstates/frame_weighted.json similarity index 100% rename from fabric-renderer-api-v1/src/testmod/resources/assets/fabric-renderer-api-v1-testmod/blockstates/frame_weighted.json rename to fabric-renderer-api-v1/src/testmodClient/resources/assets/fabric-renderer-api-v1-testmod/blockstates/frame_weighted.json diff --git a/fabric-renderer-api-v1/src/testmod/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_alone.png b/fabric-renderer-api-v1/src/testmodClient/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_alone.png similarity index 100% rename from fabric-renderer-api-v1/src/testmod/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_alone.png rename to fabric-renderer-api-v1/src/testmodClient/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_alone.png diff --git a/fabric-renderer-api-v1/src/testmod/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_bottom.png b/fabric-renderer-api-v1/src/testmodClient/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_bottom.png similarity index 100% rename from fabric-renderer-api-v1/src/testmod/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_bottom.png rename to fabric-renderer-api-v1/src/testmodClient/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_bottom.png diff --git a/fabric-renderer-api-v1/src/testmod/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_middle.png b/fabric-renderer-api-v1/src/testmodClient/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_middle.png similarity index 100% rename from fabric-renderer-api-v1/src/testmod/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_middle.png rename to fabric-renderer-api-v1/src/testmodClient/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_middle.png diff --git a/fabric-renderer-api-v1/src/testmod/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_top.png b/fabric-renderer-api-v1/src/testmodClient/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_top.png similarity index 100% rename from fabric-renderer-api-v1/src/testmod/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_top.png rename to fabric-renderer-api-v1/src/testmodClient/resources/assets/fabric-renderer-api-v1-testmod/textures/block/pillar_top.png diff --git a/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/CustomizedFluidRenderer.java b/fabric-rendering-fluids-v1/src/testmodClient/java/net/fabricmc/fabric/test/client/rendering/fluid/CustomizedFluidRenderer.java similarity index 100% rename from fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/CustomizedFluidRenderer.java rename to fabric-rendering-fluids-v1/src/testmodClient/java/net/fabricmc/fabric/test/client/rendering/fluid/CustomizedFluidRenderer.java diff --git a/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/FabricFluidRenderingTestModClient.java b/fabric-rendering-fluids-v1/src/testmodClient/java/net/fabricmc/fabric/test/client/rendering/fluid/FabricFluidRenderingTestModClient.java similarity index 100% rename from fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/FabricFluidRenderingTestModClient.java rename to fabric-rendering-fluids-v1/src/testmodClient/java/net/fabricmc/fabric/test/client/rendering/fluid/FabricFluidRenderingTestModClient.java diff --git a/fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/client/ArmorRenderingTests.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/ArmorRenderingTests.java similarity index 100% rename from fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/client/ArmorRenderingTests.java rename to fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/ArmorRenderingTests.java diff --git a/fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/client/DimensionalRenderingTest.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/DimensionalRenderingTest.java similarity index 100% rename from fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/client/DimensionalRenderingTest.java rename to fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/DimensionalRenderingTest.java diff --git a/fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/client/FeatureRendererGenericTests.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/FeatureRendererGenericTests.java similarity index 100% rename from fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/client/FeatureRendererGenericTests.java rename to fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/FeatureRendererGenericTests.java diff --git a/fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/client/FeatureRendererTest.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/FeatureRendererTest.java similarity index 100% rename from fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/client/FeatureRendererTest.java rename to fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/FeatureRendererTest.java diff --git a/fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/client/HudAndShaderTest.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/HudAndShaderTest.java similarity index 100% rename from fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/client/HudAndShaderTest.java rename to fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/HudAndShaderTest.java diff --git a/fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/client/TooltipComponentTests.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/TooltipComponentTests.java similarity index 100% rename from fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/client/TooltipComponentTests.java rename to fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/TooltipComponentTests.java diff --git a/fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/client/WorldRenderEventsTests.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/WorldRenderEventsTests.java similarity index 100% rename from fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/client/WorldRenderEventsTests.java rename to fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/WorldRenderEventsTests.java diff --git a/fabric-rendering-v1/src/testmod/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.fsh b/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.fsh similarity index 100% rename from fabric-rendering-v1/src/testmod/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.fsh rename to fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.fsh diff --git a/fabric-rendering-v1/src/testmod/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.json b/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.json similarity index 100% rename from fabric-rendering-v1/src/testmod/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.json rename to fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.json diff --git a/fabric-rendering-v1/src/testmod/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.vsh b/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.vsh similarity index 100% rename from fabric-rendering-v1/src/testmod/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.vsh rename to fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/shaders/core/test.vsh diff --git a/fabric-rendering-v1/src/testmod/resources/assets/fabric-rendering-v1-testmod/shaders/core/test_local_import.glsl b/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/shaders/core/test_local_import.glsl similarity index 100% rename from fabric-rendering-v1/src/testmod/resources/assets/fabric-rendering-v1-testmod/shaders/core/test_local_import.glsl rename to fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/shaders/core/test_local_import.glsl diff --git a/fabric-rendering-v1/src/testmod/resources/assets/fabric-rendering-v1-testmod/shaders/include/test_include.glsl b/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/shaders/include/test_include.glsl similarity index 100% rename from fabric-rendering-v1/src/testmod/resources/assets/fabric-rendering-v1-testmod/shaders/include/test_include.glsl rename to fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/shaders/include/test_include.glsl diff --git a/fabric-rendering-v1/src/testmod/resources/assets/fabric-rendering-v1-testmod/textures/models/armor/test_layer_1.png b/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/textures/models/armor/test_layer_1.png similarity index 100% rename from fabric-rendering-v1/src/testmod/resources/assets/fabric-rendering-v1-testmod/textures/models/armor/test_layer_1.png rename to fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/textures/models/armor/test_layer_1.png diff --git a/fabric-screen-api-v1/src/testmod/java/net/fabricmc/fabric/test/screen/ScreenTests.java b/fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/ScreenTests.java similarity index 97% rename from fabric-screen-api-v1/src/testmod/java/net/fabricmc/fabric/test/screen/ScreenTests.java rename to fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/ScreenTests.java index ab69377de..1a039f19e 100644 --- a/fabric-screen-api-v1/src/testmod/java/net/fabricmc/fabric/test/screen/ScreenTests.java +++ b/fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/ScreenTests.java @@ -18,6 +18,7 @@ package net.fabricmc.fabric.test.screen; import java.util.List; +import com.mojang.blaze3d.systems.RenderSystem; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,13 +29,10 @@ import net.minecraft.client.gui.widget.ClickableWidget; 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.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 { public static final Identifier GUI_ICONS_TEXTURE = new Identifier("textures/gui/icons.png"); private static final Logger LOGGER = LoggerFactory.getLogger("FabricScreenApiTests"); diff --git a/fabric-screen-api-v1/src/testmod/java/net/fabricmc/fabric/test/screen/SoundButton.java b/fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/SoundButton.java similarity index 100% rename from fabric-screen-api-v1/src/testmod/java/net/fabricmc/fabric/test/screen/SoundButton.java rename to fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/SoundButton.java diff --git a/fabric-screen-api-v1/src/testmod/java/net/fabricmc/fabric/test/screen/StopSoundButton.java b/fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/StopSoundButton.java similarity index 100% rename from fabric-screen-api-v1/src/testmod/java/net/fabricmc/fabric/test/screen/StopSoundButton.java rename to fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/StopSoundButton.java diff --git a/fabric-screen-api-v1/src/testmod/resources/fabric.mod.json b/fabric-screen-api-v1/src/testmodClient/resources/fabric.mod.json similarity index 100% rename from fabric-screen-api-v1/src/testmod/resources/fabric.mod.json rename to fabric-screen-api-v1/src/testmodClient/resources/fabric.mod.json diff --git a/fabric-screen-handler-api-v1/src/testmod/java/net/fabricmc/fabric/test/screenhandler/client/ClientScreenHandlerTest.java b/fabric-screen-handler-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screenhandler/client/ClientScreenHandlerTest.java similarity index 100% rename from fabric-screen-handler-api-v1/src/testmod/java/net/fabricmc/fabric/test/screenhandler/client/ClientScreenHandlerTest.java rename to fabric-screen-handler-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screenhandler/client/ClientScreenHandlerTest.java diff --git a/fabric-screen-handler-api-v1/src/testmod/java/net/fabricmc/fabric/test/screenhandler/client/PositionedScreen.java b/fabric-screen-handler-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screenhandler/client/PositionedScreen.java similarity index 100% rename from fabric-screen-handler-api-v1/src/testmod/java/net/fabricmc/fabric/test/screenhandler/client/PositionedScreen.java rename to fabric-screen-handler-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screenhandler/client/PositionedScreen.java diff --git a/fabric-sound-api-v1/src/testmod/java/net/fabricmc/fabric/test/sound/client/ClientSoundTest.java b/fabric-sound-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/sound/client/ClientSoundTest.java similarity index 100% rename from fabric-sound-api-v1/src/testmod/java/net/fabricmc/fabric/test/sound/client/ClientSoundTest.java rename to fabric-sound-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/sound/client/ClientSoundTest.java diff --git a/fabric-sound-api-v1/src/testmod/java/net/fabricmc/fabric/test/sound/client/SineSound.java b/fabric-sound-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/sound/client/SineSound.java similarity index 100% rename from fabric-sound-api-v1/src/testmod/java/net/fabricmc/fabric/test/sound/client/SineSound.java rename to fabric-sound-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/sound/client/SineSound.java diff --git a/fabric-sound-api-v1/src/testmod/java/net/fabricmc/fabric/test/sound/client/SineStream.java b/fabric-sound-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/sound/client/SineStream.java similarity index 100% rename from fabric-sound-api-v1/src/testmod/java/net/fabricmc/fabric/test/sound/client/SineStream.java rename to fabric-sound-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/sound/client/SineStream.java diff --git a/fabric-sound-api-v1/src/testmod/resources/assets/fabric-sound-api-v1-testmod/sounds.json b/fabric-sound-api-v1/src/testmodClient/resources/assets/fabric-sound-api-v1-testmod/sounds.json similarity index 100% rename from fabric-sound-api-v1/src/testmod/resources/assets/fabric-sound-api-v1-testmod/sounds.json rename to fabric-sound-api-v1/src/testmodClient/resources/assets/fabric-sound-api-v1-testmod/sounds.json diff --git a/fabric-sound-api-v1/src/testmod/resources/fabric.mod.json b/fabric-sound-api-v1/src/testmodClient/resources/fabric.mod.json similarity index 100% rename from fabric-sound-api-v1/src/testmod/resources/fabric.mod.json rename to fabric-sound-api-v1/src/testmodClient/resources/fabric.mod.json diff --git a/fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/ingame/client/FluidVariantRenderTest.java b/fabric-transfer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/transfer/ingame/client/FluidVariantRenderTest.java similarity index 100% rename from fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/ingame/client/FluidVariantRenderTest.java rename to fabric-transfer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/transfer/ingame/client/FluidVariantRenderTest.java diff --git a/fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/blockstates/fluid_chute.json b/fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/blockstates/fluid_chute.json similarity index 100% rename from fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/blockstates/fluid_chute.json rename to fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/blockstates/fluid_chute.json diff --git a/fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/blockstates/infinite_lava_source.json b/fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/blockstates/infinite_lava_source.json similarity index 100% rename from fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/blockstates/infinite_lava_source.json rename to fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/blockstates/infinite_lava_source.json diff --git a/fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/blockstates/infinite_water_source.json b/fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/blockstates/infinite_water_source.json similarity index 100% rename from fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/blockstates/infinite_water_source.json rename to fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/blockstates/infinite_water_source.json diff --git a/fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/models/block/fluid_chute.json b/fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/models/block/fluid_chute.json similarity index 100% rename from fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/models/block/fluid_chute.json rename to fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/models/block/fluid_chute.json diff --git a/fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/models/block/infinite_lava_source.json b/fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/models/block/infinite_lava_source.json similarity index 100% rename from fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/models/block/infinite_lava_source.json rename to fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/models/block/infinite_lava_source.json diff --git a/fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/models/block/infinite_water_source.json b/fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/models/block/infinite_water_source.json similarity index 100% rename from fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/models/block/infinite_water_source.json rename to fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/models/block/infinite_water_source.json diff --git a/fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/models/item/extract_stick.json b/fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/models/item/extract_stick.json similarity index 100% rename from fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/models/item/extract_stick.json rename to fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/models/item/extract_stick.json diff --git a/fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/models/item/fluid_chute.json b/fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/models/item/fluid_chute.json similarity index 100% rename from fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/models/item/fluid_chute.json rename to fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/models/item/fluid_chute.json diff --git a/fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/models/item/infinite_lava_source.json b/fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/models/item/infinite_lava_source.json similarity index 100% rename from fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/models/item/infinite_lava_source.json rename to fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/models/item/infinite_lava_source.json diff --git a/fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/models/item/infinite_water_source.json b/fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/models/item/infinite_water_source.json similarity index 100% rename from fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/models/item/infinite_water_source.json rename to fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/models/item/infinite_water_source.json diff --git a/fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/textures/block/fluid_chute.png b/fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/textures/block/fluid_chute.png similarity index 100% rename from fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/textures/block/fluid_chute.png rename to fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/textures/block/fluid_chute.png diff --git a/fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/textures/block/infinite_lava_source.png b/fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/textures/block/infinite_lava_source.png similarity index 100% rename from fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/textures/block/infinite_lava_source.png rename to fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/textures/block/infinite_lava_source.png diff --git a/fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/textures/block/infinite_water_source.png b/fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/textures/block/infinite_water_source.png similarity index 100% rename from fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/textures/block/infinite_water_source.png rename to fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/textures/block/infinite_water_source.png diff --git a/fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/textures/item/extract_stick.png b/fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/textures/item/extract_stick.png similarity index 100% rename from fabric-transfer-api-v1/src/testmod/resources/assets/fabric-transfer-api-v1-testmod/textures/item/extract_stick.png rename to fabric-transfer-api-v1/src/testmodClient/resources/fabric-transfer-api-v1-testmod/textures/item/extract_stick.png diff --git a/fabric-transitive-access-wideners-v1/src/testmod/resources/fabric.mod.json b/fabric-transitive-access-wideners-v1/src/testmod/resources/fabric.mod.json index 74aa9023b..2bf1ababf 100644 --- a/fabric-transitive-access-wideners-v1/src/testmod/resources/fabric.mod.json +++ b/fabric-transitive-access-wideners-v1/src/testmod/resources/fabric.mod.json @@ -14,7 +14,7 @@ "net.fabricmc.fabric.test.access.SignBlockEntityTest" ], "client": [ - "net.fabricmc.fabric.test.access.BlockEntityRendererTest" + "net.fabricmc.fabric.test.access.client.BlockEntityRendererTest" ] } } diff --git a/fabric-transitive-access-wideners-v1/src/testmod/java/net/fabricmc/fabric/test/access/BlockEntityRendererTest.java b/fabric-transitive-access-wideners-v1/src/testmodClient/java/net/fabricmc/fabric/test/access/client/BlockEntityRendererTest.java similarity index 90% rename from fabric-transitive-access-wideners-v1/src/testmod/java/net/fabricmc/fabric/test/access/BlockEntityRendererTest.java rename to fabric-transitive-access-wideners-v1/src/testmodClient/java/net/fabricmc/fabric/test/access/client/BlockEntityRendererTest.java index dd1e2d950..bb2315f12 100644 --- a/fabric-transitive-access-wideners-v1/src/testmod/java/net/fabricmc/fabric/test/access/BlockEntityRendererTest.java +++ b/fabric-transitive-access-wideners-v1/src/testmodClient/java/net/fabricmc/fabric/test/access/client/BlockEntityRendererTest.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package net.fabricmc.fabric.test.access; +package net.fabricmc.fabric.test.access.client; import net.minecraft.client.render.block.entity.BlockEntityRendererFactories; import net.minecraft.client.render.block.entity.SignBlockEntityRenderer; import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.test.access.SignBlockEntityTest; public class BlockEntityRendererTest implements ClientModInitializer { @Override diff --git a/fabric-transitive-access-wideners-v1/src/testmod/resources/assets/fabric-transitive-access-wideners-v1-testmod/blockstates/test_sign.json b/fabric-transitive-access-wideners-v1/src/testmodClient/resources/fabric-transitive-access-wideners-v1-testmod/blockstates/test_sign.json similarity index 100% rename from fabric-transitive-access-wideners-v1/src/testmod/resources/assets/fabric-transitive-access-wideners-v1-testmod/blockstates/test_sign.json rename to fabric-transitive-access-wideners-v1/src/testmodClient/resources/fabric-transitive-access-wideners-v1-testmod/blockstates/test_sign.json diff --git a/fabric-transitive-access-wideners-v1/src/testmod/resources/assets/fabric-transitive-access-wideners-v1-testmod/blockstates/test_wall_sign.json b/fabric-transitive-access-wideners-v1/src/testmodClient/resources/fabric-transitive-access-wideners-v1-testmod/blockstates/test_wall_sign.json similarity index 100% rename from fabric-transitive-access-wideners-v1/src/testmod/resources/assets/fabric-transitive-access-wideners-v1-testmod/blockstates/test_wall_sign.json rename to fabric-transitive-access-wideners-v1/src/testmodClient/resources/fabric-transitive-access-wideners-v1-testmod/blockstates/test_wall_sign.json diff --git a/fabric-transitive-access-wideners-v1/src/testmod/resources/assets/fabric-transitive-access-wideners-v1-testmod/models/block/test_sign.json b/fabric-transitive-access-wideners-v1/src/testmodClient/resources/fabric-transitive-access-wideners-v1-testmod/models/block/test_sign.json similarity index 100% rename from fabric-transitive-access-wideners-v1/src/testmod/resources/assets/fabric-transitive-access-wideners-v1-testmod/models/block/test_sign.json rename to fabric-transitive-access-wideners-v1/src/testmodClient/resources/fabric-transitive-access-wideners-v1-testmod/models/block/test_sign.json diff --git a/fabric-transitive-access-wideners-v1/src/testmod/resources/assets/fabric-transitive-access-wideners-v1-testmod/models/item/test_sign.json b/fabric-transitive-access-wideners-v1/src/testmodClient/resources/fabric-transitive-access-wideners-v1-testmod/models/item/test_sign.json similarity index 100% rename from fabric-transitive-access-wideners-v1/src/testmod/resources/assets/fabric-transitive-access-wideners-v1-testmod/models/item/test_sign.json rename to fabric-transitive-access-wideners-v1/src/testmodClient/resources/fabric-transitive-access-wideners-v1-testmod/models/item/test_sign.json diff --git a/gradle/validate-annotations.gradle b/gradle/validate-annotations.gradle index 26c93961d..ac3cafcaa 100644 --- a/gradle/validate-annotations.gradle +++ b/gradle/validate-annotations.gradle @@ -5,6 +5,8 @@ task validateAnnotations(type: ValidateAnnotations) { // Only apply to default source directories since there's also generated package-info files. source file("src/client/java") source file("src/main/java") + source file("src/testmod/java") + source file("src/testmodClient/java") } tasks.check.dependsOn validateAnnotations @@ -15,7 +17,7 @@ class ValidateAnnotations extends SourceTask { @TaskAction def run() { - for (def dir in ['api', 'impl', 'mixin']) { + for (def dir in ['api', 'impl', 'mixin', 'test']) { getSource().matching { include "net/fabricmc/fabric/$dir/" }.forEach { if (it.isDirectory()) { return