From df3654b36459f74f558d83ea24b5742c49ef31a0 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 1 May 2022 15:44:16 +0100 Subject: [PATCH] Move deprecated modules, create own maven BOM for the deprecated modules. (#2171) * Move deprecated modules to a sub directory. Remove deprecated modules from the default maven pom Create a new "fabric-api-legacy" bom with the deprecated modules. * Fix main "fabric" project not beign a dep for the legacy bom. * rename artifact to fabric-api-deprecated * Spotless * Use the latest version of spotless. --- .gitattributes | 1 + .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- HEADER | 27 +-- build.gradle | 84 +++++---- deprecated/build.gradle | 38 ++++ .../fabric-commands-v0}/build.gradle | 0 .../fabric/api/registry/CommandRegistry.java | 0 .../assets/fabric-commands-v0/icon.png | Bin .../src/main/resources/fabric.mod.json | 0 .../fabric-containers-v0}/build.gradle | 0 .../client/screen/ContainerScreenFactory.java | 0 .../client/screen/ScreenProviderRegistry.java | 0 .../api/container/ContainerFactory.java | 0 .../container/ContainerProviderRegistry.java | 0 .../container/ScreenProviderRegistryImpl.java | 0 .../impl/container/ContainerProviderImpl.java | 0 .../container/ServerPlayerEntitySyncHook.java | 0 .../container/MixinServerPlayerEntity.java | 0 .../container/ServerPlayerEntityAccessor.java | 0 .../assets/fabric-containers-v0/icon.png | Bin .../fabric-containers-v0.accurate.mixins.json | 0 .../fabric-containers-v0.mixins.json | 0 .../src/main/resources/fabric.mod.json | 0 .../fabric-events-lifecycle-v0}/build.gradle | 0 .../api/event/client/ClientTickCallback.java | 0 .../api/event/client/ItemTooltipCallback.java | 0 .../api/event/server/ServerStartCallback.java | 0 .../api/event/server/ServerStopCallback.java | 0 .../api/event/server/ServerTickCallback.java | 0 .../api/event/world/WorldTickCallback.java | 0 .../event/lifecycle/LegacyEventInvokers.java | 0 .../client/LegacyClientEventInvokers.java | 0 .../event/lifecycle/MixinMinecraftServer.java | 0 .../fabric-events-lifecycle-v0/icon.png | Bin .../src/main/resources/fabric.mod.json | 0 .../legacy/LegacyLifecycleEventsTest.java | 0 .../LegacyClientLifecycleEventsTest.java | 0 .../src/testmod/resources/fabric.mod.json | 0 .../fabric-keybindings-v0}/build.gradle | 0 .../client/keybinding/FabricKeyBinding.java | 0 .../client/keybinding/KeyBindingRegistry.java | 0 .../assets/fabric-keybindings-v0/icon.png | Bin .../src/main/resources/fabric.mod.json | 0 .../fabric-networking-v0}/build.gradle | 0 .../event/network/C2SPacketTypeCallback.java | 0 .../event/network/S2CPacketTypeCallback.java | 0 .../api/network/ClientSidePacketRegistry.java | 0 .../fabric/api/network/PacketConsumer.java | 0 .../fabric/api/network/PacketContext.java | 0 .../fabric/api/network/PacketRegistry.java | 0 .../api/network/ServerSidePacketRegistry.java | 0 .../fabric/api/server/PlayerStream.java | 0 .../ClientSidePacketRegistryImpl.java | 0 .../networking/OldClientNetworkingHooks.java | 0 .../impl/networking/OldNetworkingHooks.java | 0 .../ServerSidePacketRegistryImpl.java | 0 .../assets/fabric-networking-v0/icon.png | Bin .../src/main/resources/fabric.mod.json | 0 .../build.gradle | 0 .../v1/BlockEntityRendererRegistry.java | 0 .../v1/EntityModelLayerRegistry.java | 0 .../v1/EntityRendererRegistry.java | 0 ...tyFeatureRendererRegistrationCallback.java | 0 .../assets/renderer-registries-v1/icon.png | Bin .../src/main/resources/fabric.mod.json | 0 .../fabric-rendering-v0}/build.gradle | 0 .../client/render/ColorProviderRegistry.java | 0 .../render/InvalidateRenderStateCallback.java | 0 .../rendering/RenderingCallbackInvoker.java | 0 .../assets/fabric-rendering-v0/icon.png | Bin .../src/main/resources/fabric.mod.json | 0 fabric-models-v0/build.gradle | 2 +- .../fabric/test/model/ModelTestModClient.java | 2 +- gradle/module-validation.gradle | 10 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew.bat | 178 +++++++++--------- settings.gradle | 17 +- 78 files changed, 214 insertions(+), 151 deletions(-) create mode 100644 .gitattributes create mode 100644 deprecated/build.gradle rename {fabric-commands-v0 => deprecated/fabric-commands-v0}/build.gradle (100%) rename {fabric-commands-v0 => deprecated/fabric-commands-v0}/src/main/java/net/fabricmc/fabric/api/registry/CommandRegistry.java (100%) rename {fabric-commands-v0 => deprecated/fabric-commands-v0}/src/main/resources/assets/fabric-commands-v0/icon.png (100%) rename {fabric-commands-v0 => deprecated/fabric-commands-v0}/src/main/resources/fabric.mod.json (100%) rename {fabric-containers-v0 => deprecated/fabric-containers-v0}/build.gradle (100%) rename {fabric-containers-v0 => deprecated/fabric-containers-v0}/src/main/java/net/fabricmc/fabric/api/client/screen/ContainerScreenFactory.java (100%) rename {fabric-containers-v0 => deprecated/fabric-containers-v0}/src/main/java/net/fabricmc/fabric/api/client/screen/ScreenProviderRegistry.java (100%) rename {fabric-containers-v0 => deprecated/fabric-containers-v0}/src/main/java/net/fabricmc/fabric/api/container/ContainerFactory.java (100%) rename {fabric-containers-v0 => deprecated/fabric-containers-v0}/src/main/java/net/fabricmc/fabric/api/container/ContainerProviderRegistry.java (100%) rename {fabric-containers-v0 => deprecated/fabric-containers-v0}/src/main/java/net/fabricmc/fabric/impl/client/container/ScreenProviderRegistryImpl.java (100%) rename {fabric-containers-v0 => deprecated/fabric-containers-v0}/src/main/java/net/fabricmc/fabric/impl/container/ContainerProviderImpl.java (100%) rename {fabric-containers-v0 => deprecated/fabric-containers-v0}/src/main/java/net/fabricmc/fabric/impl/container/ServerPlayerEntitySyncHook.java (100%) rename {fabric-containers-v0 => deprecated/fabric-containers-v0}/src/main/java/net/fabricmc/fabric/mixin/container/MixinServerPlayerEntity.java (100%) rename {fabric-containers-v0 => deprecated/fabric-containers-v0}/src/main/java/net/fabricmc/fabric/mixin/container/ServerPlayerEntityAccessor.java (100%) rename {fabric-containers-v0 => deprecated/fabric-containers-v0}/src/main/resources/assets/fabric-containers-v0/icon.png (100%) rename {fabric-containers-v0 => deprecated/fabric-containers-v0}/src/main/resources/fabric-containers-v0.accurate.mixins.json (100%) rename {fabric-containers-v0 => deprecated/fabric-containers-v0}/src/main/resources/fabric-containers-v0.mixins.json (100%) rename {fabric-containers-v0 => deprecated/fabric-containers-v0}/src/main/resources/fabric.mod.json (100%) rename {fabric-events-lifecycle-v0 => deprecated/fabric-events-lifecycle-v0}/build.gradle (100%) rename {fabric-events-lifecycle-v0 => deprecated/fabric-events-lifecycle-v0}/src/main/java/net/fabricmc/fabric/api/event/client/ClientTickCallback.java (100%) rename {fabric-events-lifecycle-v0 => deprecated/fabric-events-lifecycle-v0}/src/main/java/net/fabricmc/fabric/api/event/client/ItemTooltipCallback.java (100%) rename {fabric-events-lifecycle-v0 => deprecated/fabric-events-lifecycle-v0}/src/main/java/net/fabricmc/fabric/api/event/server/ServerStartCallback.java (100%) rename {fabric-events-lifecycle-v0 => deprecated/fabric-events-lifecycle-v0}/src/main/java/net/fabricmc/fabric/api/event/server/ServerStopCallback.java (100%) rename {fabric-events-lifecycle-v0 => deprecated/fabric-events-lifecycle-v0}/src/main/java/net/fabricmc/fabric/api/event/server/ServerTickCallback.java (100%) rename {fabric-events-lifecycle-v0 => deprecated/fabric-events-lifecycle-v0}/src/main/java/net/fabricmc/fabric/api/event/world/WorldTickCallback.java (100%) rename {fabric-events-lifecycle-v0 => deprecated/fabric-events-lifecycle-v0}/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/LegacyEventInvokers.java (100%) rename {fabric-events-lifecycle-v0 => deprecated/fabric-events-lifecycle-v0}/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/client/LegacyClientEventInvokers.java (100%) rename {fabric-events-lifecycle-v0 => deprecated/fabric-events-lifecycle-v0}/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MixinMinecraftServer.java (100%) rename {fabric-events-lifecycle-v0 => deprecated/fabric-events-lifecycle-v0}/src/main/resources/assets/fabric-events-lifecycle-v0/icon.png (100%) rename {fabric-events-lifecycle-v0 => deprecated/fabric-events-lifecycle-v0}/src/main/resources/fabric.mod.json (100%) rename {fabric-events-lifecycle-v0 => deprecated/fabric-events-lifecycle-v0}/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/legacy/LegacyLifecycleEventsTest.java (100%) rename {fabric-events-lifecycle-v0 => deprecated/fabric-events-lifecycle-v0}/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/legacy/client/LegacyClientLifecycleEventsTest.java (100%) rename {fabric-events-lifecycle-v0 => deprecated/fabric-events-lifecycle-v0}/src/testmod/resources/fabric.mod.json (100%) rename {fabric-keybindings-v0 => deprecated/fabric-keybindings-v0}/build.gradle (100%) rename {fabric-keybindings-v0 => deprecated/fabric-keybindings-v0}/src/main/java/net/fabricmc/fabric/api/client/keybinding/FabricKeyBinding.java (100%) rename {fabric-keybindings-v0 => deprecated/fabric-keybindings-v0}/src/main/java/net/fabricmc/fabric/api/client/keybinding/KeyBindingRegistry.java (100%) rename {fabric-keybindings-v0 => deprecated/fabric-keybindings-v0}/src/main/resources/assets/fabric-keybindings-v0/icon.png (100%) rename {fabric-keybindings-v0 => deprecated/fabric-keybindings-v0}/src/main/resources/fabric.mod.json (100%) rename {fabric-networking-v0 => deprecated/fabric-networking-v0}/build.gradle (100%) rename {fabric-networking-v0 => deprecated/fabric-networking-v0}/src/main/java/net/fabricmc/fabric/api/event/network/C2SPacketTypeCallback.java (100%) rename {fabric-networking-v0 => deprecated/fabric-networking-v0}/src/main/java/net/fabricmc/fabric/api/event/network/S2CPacketTypeCallback.java (100%) rename {fabric-networking-v0 => deprecated/fabric-networking-v0}/src/main/java/net/fabricmc/fabric/api/network/ClientSidePacketRegistry.java (100%) rename {fabric-networking-v0 => deprecated/fabric-networking-v0}/src/main/java/net/fabricmc/fabric/api/network/PacketConsumer.java (100%) rename {fabric-networking-v0 => deprecated/fabric-networking-v0}/src/main/java/net/fabricmc/fabric/api/network/PacketContext.java (100%) rename {fabric-networking-v0 => deprecated/fabric-networking-v0}/src/main/java/net/fabricmc/fabric/api/network/PacketRegistry.java (100%) rename {fabric-networking-v0 => deprecated/fabric-networking-v0}/src/main/java/net/fabricmc/fabric/api/network/ServerSidePacketRegistry.java (100%) rename {fabric-networking-v0 => deprecated/fabric-networking-v0}/src/main/java/net/fabricmc/fabric/api/server/PlayerStream.java (100%) rename {fabric-networking-v0 => deprecated/fabric-networking-v0}/src/main/java/net/fabricmc/fabric/impl/networking/ClientSidePacketRegistryImpl.java (100%) rename {fabric-networking-v0 => deprecated/fabric-networking-v0}/src/main/java/net/fabricmc/fabric/impl/networking/OldClientNetworkingHooks.java (100%) rename {fabric-networking-v0 => deprecated/fabric-networking-v0}/src/main/java/net/fabricmc/fabric/impl/networking/OldNetworkingHooks.java (100%) rename {fabric-networking-v0 => deprecated/fabric-networking-v0}/src/main/java/net/fabricmc/fabric/impl/networking/ServerSidePacketRegistryImpl.java (100%) rename {fabric-networking-v0 => deprecated/fabric-networking-v0}/src/main/resources/assets/fabric-networking-v0/icon.png (100%) rename {fabric-networking-v0 => deprecated/fabric-networking-v0}/src/main/resources/fabric.mod.json (100%) rename {fabric-renderer-registries-v1 => deprecated/fabric-renderer-registries-v1}/build.gradle (100%) rename {fabric-renderer-registries-v1 => deprecated/fabric-renderer-registries-v1}/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/BlockEntityRendererRegistry.java (100%) rename {fabric-renderer-registries-v1 => deprecated/fabric-renderer-registries-v1}/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/EntityModelLayerRegistry.java (100%) rename {fabric-renderer-registries-v1 => deprecated/fabric-renderer-registries-v1}/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/EntityRendererRegistry.java (100%) rename {fabric-renderer-registries-v1 => deprecated/fabric-renderer-registries-v1}/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/LivingEntityFeatureRendererRegistrationCallback.java (100%) rename {fabric-renderer-registries-v1 => deprecated/fabric-renderer-registries-v1}/src/main/resources/assets/renderer-registries-v1/icon.png (100%) rename {fabric-renderer-registries-v1 => deprecated/fabric-renderer-registries-v1}/src/main/resources/fabric.mod.json (100%) rename {fabric-rendering-v0 => deprecated/fabric-rendering-v0}/build.gradle (100%) rename {fabric-rendering-v0 => deprecated/fabric-rendering-v0}/src/main/java/net/fabricmc/fabric/api/client/render/ColorProviderRegistry.java (100%) rename {fabric-rendering-v0 => deprecated/fabric-rendering-v0}/src/main/java/net/fabricmc/fabric/api/client/render/InvalidateRenderStateCallback.java (100%) rename {fabric-rendering-v0 => deprecated/fabric-rendering-v0}/src/main/java/net/fabricmc/fabric/impl/client/rendering/RenderingCallbackInvoker.java (100%) rename {fabric-rendering-v0 => deprecated/fabric-rendering-v0}/src/main/resources/assets/fabric-rendering-v0/icon.png (100%) rename {fabric-rendering-v0 => deprecated/fabric-rendering-v0}/src/main/resources/fabric.mod.json (100%) diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..fcadb2cf9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text eol=lf diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a30174eaf..901ed1be3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ jobs: build: strategy: matrix: - java: [17-jdk] + java: [17-jdk, 18-jdk] runs-on: ubuntu-20.04 container: image: eclipse-temurin:${{ matrix.java }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 76c4a20e9..643bb4835 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ jobs: build: runs-on: ubuntu-20.04 container: - image: eclipse-temurin:17-jdk + image: eclipse-temurin:18-jdk options: --user root steps: - run: apt update && apt install git -y && git --version diff --git a/HEADER b/HEADER index d5f99faa4..5a30d7f98 100644 --- a/HEADER +++ b/HEADER @@ -1,13 +1,16 @@ -Copyright (c) 2016, 2017, 2018, 2019 FabricMC +/* + * 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. + */ -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. diff --git a/build.gradle b/build.gradle index 16e0b6f3e..506c95d0e 100644 --- a/build.gradle +++ b/build.gradle @@ -9,8 +9,8 @@ plugins { id "eclipse" id "idea" id "maven-publish" - id "fabric-loom" version "0.11.33" apply false - id "org.cadixdev.licenser" version "0.6.1" + id "fabric-loom" version "0.12.19" apply false + id "com.diffplug.spotless" version "6.5.1" id "org.ajoberstar.grgit" version "3.1.0" id "com.matthewprenger.cursegradle" version "1.4.0" id "com.modrinth.minotaur" version "1.1.0" @@ -89,19 +89,42 @@ def moduleDependencies(project, List depNames) { } allprojects { + group = "net.fabricmc.fabric-api" + + tasks.withType(GenerateModuleMetadata) { + enabled = false + } + + if (signingEnabled) { + remoteSign { + requestUrl = ENV.SIGNING_SERVER + pgpAuthKey = ENV.SIGNING_PGP_KEY + jarAuthKey = ENV.SIGNING_JAR_KEY + + afterEvaluate { + // PGP sign all maven publications. + sign publishing.publications.mavenJava + } + } + } + + publishing { + setupRepositories(repositories) + } + + if (it.name == "deprecated") return + apply plugin: "java-library" apply plugin: "checkstyle" apply plugin: "maven-publish" apply plugin: "fabric-loom" - apply plugin: "org.cadixdev.licenser" + apply plugin: "com.diffplug.spotless" apply plugin: "me.modmuss50.remotesign" tasks.withType(JavaCompile).configureEach { it.options.release = 17 } - group = "net.fabricmc.fabric-api" - sourceSets { testmod { compileClasspath += main.compileClasspath @@ -138,10 +161,6 @@ allprojects { shareRemapCaches = true } - repositories { - mavenLocal() - } - processResources { inputs.property "version", project.version @@ -150,9 +169,10 @@ allprojects { } } - license { - header rootProject.file("HEADER") - include "**/*.java" + spotless { + java { + licenseHeaderFile(rootProject.file("HEADER")) + } } java { @@ -169,22 +189,9 @@ allprojects { reproducibleFileOrder = true } - tasks.withType(GenerateModuleMetadata) { - enabled = false - } - if (signingEnabled) { remoteSign { - requestUrl = ENV.SIGNING_SERVER - pgpAuthKey = ENV.SIGNING_PGP_KEY - jarAuthKey = ENV.SIGNING_JAR_KEY - sign remapJar - - afterEvaluate { - // PGP sign all maven publications. - sign publishing.publications.mavenJava - } } } @@ -259,6 +266,8 @@ loom { test.dependsOn runGametest subprojects { + if (it.name == "deprecated") return + dependencies { testmodImplementation sourceSets.main.output @@ -286,8 +295,6 @@ subprojects { } } } - - setupRepositories(repositories) } // We manually handle the pom generation @@ -332,6 +339,9 @@ publishing { pom.withXml { def depsNode = asNode().appendNode("dependencies") subprojects.each { + // Dont depend on the deprecated modules in the main artifact. + if (it.path.startsWith(":deprecated")) return + def depNode = depsNode.appendNode("dependency") depNode.appendNode("groupId", it.group) depNode.appendNode("artifactId", it.name) @@ -341,8 +351,6 @@ publishing { } } } - - setupRepositories(repositories) } // Required until the deprecation is removed. Fabric API's main jar that is published to maven does not contain sub modules. @@ -364,9 +372,11 @@ void setupRepositories(RepositoryHandler repositories) { } } -task licenseFormatAll -subprojects { p -> licenseFormatAll.dependsOn("${p.path}:licenseFormat") } -subprojects.each { remapJar.dependsOn("${it.path}:remapJar") } +subprojects.each { + if (it.name == "deprecated") return + + remapJar.dependsOn("${it.path}:remapJar") +} sourceSets { testmod @@ -381,9 +391,11 @@ def devOnlyModules = [ dependencies { afterEvaluate { subprojects.each { - api project(path: ":${it.name}", configuration: "namedElements") + if (it.name == "deprecated") return - testmodImplementation project("${it.name}:").sourceSets.testmod.output + api project(path: "${it.path}", configuration: "namedElements") + + testmodImplementation project("${it.path}:").sourceSets.testmod.output } } } @@ -391,10 +403,10 @@ dependencies { remapJar { afterEvaluate { subprojects.each { - if (it.name in devOnlyModules) return + if (it.name in devOnlyModules || it.name == "deprecated") return // Include the signed or none signed jar from the sub project. - nestedJars.from project("${it.name}:").tasks.getByName(signingEnabled ? "signRemapJar" : "remapJar") + nestedJars.from project("${it.path}").tasks.getByName(signingEnabled ? "signRemapJar" : "remapJar") } } } diff --git a/deprecated/build.gradle b/deprecated/build.gradle new file mode 100644 index 000000000..1b38d1c03 --- /dev/null +++ b/deprecated/build.gradle @@ -0,0 +1,38 @@ +/** + * This project generates a maven bill of materials (BOM) that includes the deprecated modules, alongside the main project. + */ + +apply plugin: "maven-publish" + +version = rootProject.version + +publishing { + publications { + mavenJava(MavenPublication) { + artifactId = 'fabric-api-deprecated' + + pom.withXml { + def depsNode = asNode().appendNode("dependencies") + allprojects.each { + if (it.name == "deprecated") return // Dont depend on yourself :) + + // Depend on all of the deprecated projects + if (!it.path.startsWith(":deprecated")) return + + def depNode = depsNode.appendNode("dependency") + depNode.appendNode("groupId", it.group) + depNode.appendNode("artifactId", it.name) + depNode.appendNode("version", it.version) + depNode.appendNode("scope", "compile") + } + + // Depend on the main project. + def depNode = depsNode.appendNode("dependency") + depNode.appendNode("groupId", group) + depNode.appendNode("artifactId", "fabric-api") + depNode.appendNode("version", version) + depNode.appendNode("scope", "compile") + } + } + } +} diff --git a/fabric-commands-v0/build.gradle b/deprecated/fabric-commands-v0/build.gradle similarity index 100% rename from fabric-commands-v0/build.gradle rename to deprecated/fabric-commands-v0/build.gradle diff --git a/fabric-commands-v0/src/main/java/net/fabricmc/fabric/api/registry/CommandRegistry.java b/deprecated/fabric-commands-v0/src/main/java/net/fabricmc/fabric/api/registry/CommandRegistry.java similarity index 100% rename from fabric-commands-v0/src/main/java/net/fabricmc/fabric/api/registry/CommandRegistry.java rename to deprecated/fabric-commands-v0/src/main/java/net/fabricmc/fabric/api/registry/CommandRegistry.java diff --git a/fabric-commands-v0/src/main/resources/assets/fabric-commands-v0/icon.png b/deprecated/fabric-commands-v0/src/main/resources/assets/fabric-commands-v0/icon.png similarity index 100% rename from fabric-commands-v0/src/main/resources/assets/fabric-commands-v0/icon.png rename to deprecated/fabric-commands-v0/src/main/resources/assets/fabric-commands-v0/icon.png diff --git a/fabric-commands-v0/src/main/resources/fabric.mod.json b/deprecated/fabric-commands-v0/src/main/resources/fabric.mod.json similarity index 100% rename from fabric-commands-v0/src/main/resources/fabric.mod.json rename to deprecated/fabric-commands-v0/src/main/resources/fabric.mod.json diff --git a/fabric-containers-v0/build.gradle b/deprecated/fabric-containers-v0/build.gradle similarity index 100% rename from fabric-containers-v0/build.gradle rename to deprecated/fabric-containers-v0/build.gradle diff --git a/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/client/screen/ContainerScreenFactory.java b/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/client/screen/ContainerScreenFactory.java similarity index 100% rename from fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/client/screen/ContainerScreenFactory.java rename to deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/client/screen/ContainerScreenFactory.java diff --git a/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/client/screen/ScreenProviderRegistry.java b/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/client/screen/ScreenProviderRegistry.java similarity index 100% rename from fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/client/screen/ScreenProviderRegistry.java rename to deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/client/screen/ScreenProviderRegistry.java diff --git a/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/container/ContainerFactory.java b/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/container/ContainerFactory.java similarity index 100% rename from fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/container/ContainerFactory.java rename to deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/container/ContainerFactory.java diff --git a/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/container/ContainerProviderRegistry.java b/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/container/ContainerProviderRegistry.java similarity index 100% rename from fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/container/ContainerProviderRegistry.java rename to deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/container/ContainerProviderRegistry.java diff --git a/fabric-containers-v0/src/main/java/net/fabricmc/fabric/impl/client/container/ScreenProviderRegistryImpl.java b/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/impl/client/container/ScreenProviderRegistryImpl.java similarity index 100% rename from fabric-containers-v0/src/main/java/net/fabricmc/fabric/impl/client/container/ScreenProviderRegistryImpl.java rename to deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/impl/client/container/ScreenProviderRegistryImpl.java diff --git a/fabric-containers-v0/src/main/java/net/fabricmc/fabric/impl/container/ContainerProviderImpl.java b/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/impl/container/ContainerProviderImpl.java similarity index 100% rename from fabric-containers-v0/src/main/java/net/fabricmc/fabric/impl/container/ContainerProviderImpl.java rename to deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/impl/container/ContainerProviderImpl.java diff --git a/fabric-containers-v0/src/main/java/net/fabricmc/fabric/impl/container/ServerPlayerEntitySyncHook.java b/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/impl/container/ServerPlayerEntitySyncHook.java similarity index 100% rename from fabric-containers-v0/src/main/java/net/fabricmc/fabric/impl/container/ServerPlayerEntitySyncHook.java rename to deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/impl/container/ServerPlayerEntitySyncHook.java diff --git a/fabric-containers-v0/src/main/java/net/fabricmc/fabric/mixin/container/MixinServerPlayerEntity.java b/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/mixin/container/MixinServerPlayerEntity.java similarity index 100% rename from fabric-containers-v0/src/main/java/net/fabricmc/fabric/mixin/container/MixinServerPlayerEntity.java rename to deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/mixin/container/MixinServerPlayerEntity.java diff --git a/fabric-containers-v0/src/main/java/net/fabricmc/fabric/mixin/container/ServerPlayerEntityAccessor.java b/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/mixin/container/ServerPlayerEntityAccessor.java similarity index 100% rename from fabric-containers-v0/src/main/java/net/fabricmc/fabric/mixin/container/ServerPlayerEntityAccessor.java rename to deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/mixin/container/ServerPlayerEntityAccessor.java diff --git a/fabric-containers-v0/src/main/resources/assets/fabric-containers-v0/icon.png b/deprecated/fabric-containers-v0/src/main/resources/assets/fabric-containers-v0/icon.png similarity index 100% rename from fabric-containers-v0/src/main/resources/assets/fabric-containers-v0/icon.png rename to deprecated/fabric-containers-v0/src/main/resources/assets/fabric-containers-v0/icon.png diff --git a/fabric-containers-v0/src/main/resources/fabric-containers-v0.accurate.mixins.json b/deprecated/fabric-containers-v0/src/main/resources/fabric-containers-v0.accurate.mixins.json similarity index 100% rename from fabric-containers-v0/src/main/resources/fabric-containers-v0.accurate.mixins.json rename to deprecated/fabric-containers-v0/src/main/resources/fabric-containers-v0.accurate.mixins.json diff --git a/fabric-containers-v0/src/main/resources/fabric-containers-v0.mixins.json b/deprecated/fabric-containers-v0/src/main/resources/fabric-containers-v0.mixins.json similarity index 100% rename from fabric-containers-v0/src/main/resources/fabric-containers-v0.mixins.json rename to deprecated/fabric-containers-v0/src/main/resources/fabric-containers-v0.mixins.json diff --git a/fabric-containers-v0/src/main/resources/fabric.mod.json b/deprecated/fabric-containers-v0/src/main/resources/fabric.mod.json similarity index 100% rename from fabric-containers-v0/src/main/resources/fabric.mod.json rename to deprecated/fabric-containers-v0/src/main/resources/fabric.mod.json diff --git a/fabric-events-lifecycle-v0/build.gradle b/deprecated/fabric-events-lifecycle-v0/build.gradle similarity index 100% rename from fabric-events-lifecycle-v0/build.gradle rename to deprecated/fabric-events-lifecycle-v0/build.gradle diff --git a/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/client/ClientTickCallback.java b/deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/client/ClientTickCallback.java similarity index 100% rename from fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/client/ClientTickCallback.java rename to deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/client/ClientTickCallback.java diff --git a/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/client/ItemTooltipCallback.java b/deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/client/ItemTooltipCallback.java similarity index 100% rename from fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/client/ItemTooltipCallback.java rename to deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/client/ItemTooltipCallback.java diff --git a/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/server/ServerStartCallback.java b/deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/server/ServerStartCallback.java similarity index 100% rename from fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/server/ServerStartCallback.java rename to deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/server/ServerStartCallback.java diff --git a/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/server/ServerStopCallback.java b/deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/server/ServerStopCallback.java similarity index 100% rename from fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/server/ServerStopCallback.java rename to deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/server/ServerStopCallback.java diff --git a/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/server/ServerTickCallback.java b/deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/server/ServerTickCallback.java similarity index 100% rename from fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/server/ServerTickCallback.java rename to deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/server/ServerTickCallback.java diff --git a/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/world/WorldTickCallback.java b/deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/world/WorldTickCallback.java similarity index 100% rename from fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/world/WorldTickCallback.java rename to deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/api/event/world/WorldTickCallback.java diff --git a/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/LegacyEventInvokers.java b/deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/LegacyEventInvokers.java similarity index 100% rename from fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/LegacyEventInvokers.java rename to deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/LegacyEventInvokers.java diff --git a/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/client/LegacyClientEventInvokers.java b/deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/client/LegacyClientEventInvokers.java similarity index 100% rename from fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/client/LegacyClientEventInvokers.java rename to deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/client/LegacyClientEventInvokers.java diff --git a/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MixinMinecraftServer.java b/deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MixinMinecraftServer.java similarity index 100% rename from fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MixinMinecraftServer.java rename to deprecated/fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MixinMinecraftServer.java diff --git a/fabric-events-lifecycle-v0/src/main/resources/assets/fabric-events-lifecycle-v0/icon.png b/deprecated/fabric-events-lifecycle-v0/src/main/resources/assets/fabric-events-lifecycle-v0/icon.png similarity index 100% rename from fabric-events-lifecycle-v0/src/main/resources/assets/fabric-events-lifecycle-v0/icon.png rename to deprecated/fabric-events-lifecycle-v0/src/main/resources/assets/fabric-events-lifecycle-v0/icon.png diff --git a/fabric-events-lifecycle-v0/src/main/resources/fabric.mod.json b/deprecated/fabric-events-lifecycle-v0/src/main/resources/fabric.mod.json similarity index 100% rename from fabric-events-lifecycle-v0/src/main/resources/fabric.mod.json rename to deprecated/fabric-events-lifecycle-v0/src/main/resources/fabric.mod.json diff --git a/fabric-events-lifecycle-v0/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/legacy/LegacyLifecycleEventsTest.java b/deprecated/fabric-events-lifecycle-v0/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/legacy/LegacyLifecycleEventsTest.java similarity index 100% rename from fabric-events-lifecycle-v0/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/legacy/LegacyLifecycleEventsTest.java rename to deprecated/fabric-events-lifecycle-v0/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/legacy/LegacyLifecycleEventsTest.java diff --git a/fabric-events-lifecycle-v0/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/legacy/client/LegacyClientLifecycleEventsTest.java b/deprecated/fabric-events-lifecycle-v0/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/legacy/client/LegacyClientLifecycleEventsTest.java similarity index 100% rename from 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/testmod/java/net/fabricmc/fabric/test/event/lifecycle/legacy/client/LegacyClientLifecycleEventsTest.java diff --git a/fabric-events-lifecycle-v0/src/testmod/resources/fabric.mod.json b/deprecated/fabric-events-lifecycle-v0/src/testmod/resources/fabric.mod.json similarity index 100% rename from fabric-events-lifecycle-v0/src/testmod/resources/fabric.mod.json rename to deprecated/fabric-events-lifecycle-v0/src/testmod/resources/fabric.mod.json diff --git a/fabric-keybindings-v0/build.gradle b/deprecated/fabric-keybindings-v0/build.gradle similarity index 100% rename from fabric-keybindings-v0/build.gradle rename to deprecated/fabric-keybindings-v0/build.gradle diff --git a/fabric-keybindings-v0/src/main/java/net/fabricmc/fabric/api/client/keybinding/FabricKeyBinding.java b/deprecated/fabric-keybindings-v0/src/main/java/net/fabricmc/fabric/api/client/keybinding/FabricKeyBinding.java similarity index 100% rename from fabric-keybindings-v0/src/main/java/net/fabricmc/fabric/api/client/keybinding/FabricKeyBinding.java rename to deprecated/fabric-keybindings-v0/src/main/java/net/fabricmc/fabric/api/client/keybinding/FabricKeyBinding.java diff --git a/fabric-keybindings-v0/src/main/java/net/fabricmc/fabric/api/client/keybinding/KeyBindingRegistry.java b/deprecated/fabric-keybindings-v0/src/main/java/net/fabricmc/fabric/api/client/keybinding/KeyBindingRegistry.java similarity index 100% rename from fabric-keybindings-v0/src/main/java/net/fabricmc/fabric/api/client/keybinding/KeyBindingRegistry.java rename to deprecated/fabric-keybindings-v0/src/main/java/net/fabricmc/fabric/api/client/keybinding/KeyBindingRegistry.java diff --git a/fabric-keybindings-v0/src/main/resources/assets/fabric-keybindings-v0/icon.png b/deprecated/fabric-keybindings-v0/src/main/resources/assets/fabric-keybindings-v0/icon.png similarity index 100% rename from fabric-keybindings-v0/src/main/resources/assets/fabric-keybindings-v0/icon.png rename to deprecated/fabric-keybindings-v0/src/main/resources/assets/fabric-keybindings-v0/icon.png diff --git a/fabric-keybindings-v0/src/main/resources/fabric.mod.json b/deprecated/fabric-keybindings-v0/src/main/resources/fabric.mod.json similarity index 100% rename from fabric-keybindings-v0/src/main/resources/fabric.mod.json rename to deprecated/fabric-keybindings-v0/src/main/resources/fabric.mod.json diff --git a/fabric-networking-v0/build.gradle b/deprecated/fabric-networking-v0/build.gradle similarity index 100% rename from fabric-networking-v0/build.gradle rename to deprecated/fabric-networking-v0/build.gradle diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/event/network/C2SPacketTypeCallback.java b/deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/event/network/C2SPacketTypeCallback.java similarity index 100% rename from fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/event/network/C2SPacketTypeCallback.java rename to deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/event/network/C2SPacketTypeCallback.java diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/event/network/S2CPacketTypeCallback.java b/deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/event/network/S2CPacketTypeCallback.java similarity index 100% rename from fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/event/network/S2CPacketTypeCallback.java rename to deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/event/network/S2CPacketTypeCallback.java diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/ClientSidePacketRegistry.java b/deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/ClientSidePacketRegistry.java similarity index 100% rename from fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/ClientSidePacketRegistry.java rename to deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/ClientSidePacketRegistry.java diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketConsumer.java b/deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketConsumer.java similarity index 100% rename from fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketConsumer.java rename to deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketConsumer.java diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketContext.java b/deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketContext.java similarity index 100% rename from fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketContext.java rename to deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketContext.java diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketRegistry.java b/deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketRegistry.java similarity index 100% rename from fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketRegistry.java rename to deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/PacketRegistry.java diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/ServerSidePacketRegistry.java b/deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/ServerSidePacketRegistry.java similarity index 100% rename from fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/ServerSidePacketRegistry.java rename to deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/network/ServerSidePacketRegistry.java diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/server/PlayerStream.java b/deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/server/PlayerStream.java similarity index 100% rename from fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/server/PlayerStream.java rename to deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/api/server/PlayerStream.java diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/ClientSidePacketRegistryImpl.java b/deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/ClientSidePacketRegistryImpl.java similarity index 100% rename from fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/ClientSidePacketRegistryImpl.java rename to deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/ClientSidePacketRegistryImpl.java diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/OldClientNetworkingHooks.java b/deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/OldClientNetworkingHooks.java similarity index 100% rename from fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/OldClientNetworkingHooks.java rename to deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/OldClientNetworkingHooks.java diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/OldNetworkingHooks.java b/deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/OldNetworkingHooks.java similarity index 100% rename from fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/OldNetworkingHooks.java rename to deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/OldNetworkingHooks.java diff --git a/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/ServerSidePacketRegistryImpl.java b/deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/ServerSidePacketRegistryImpl.java similarity index 100% rename from fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/ServerSidePacketRegistryImpl.java rename to deprecated/fabric-networking-v0/src/main/java/net/fabricmc/fabric/impl/networking/ServerSidePacketRegistryImpl.java diff --git a/fabric-networking-v0/src/main/resources/assets/fabric-networking-v0/icon.png b/deprecated/fabric-networking-v0/src/main/resources/assets/fabric-networking-v0/icon.png similarity index 100% rename from fabric-networking-v0/src/main/resources/assets/fabric-networking-v0/icon.png rename to deprecated/fabric-networking-v0/src/main/resources/assets/fabric-networking-v0/icon.png diff --git a/fabric-networking-v0/src/main/resources/fabric.mod.json b/deprecated/fabric-networking-v0/src/main/resources/fabric.mod.json similarity index 100% rename from fabric-networking-v0/src/main/resources/fabric.mod.json rename to deprecated/fabric-networking-v0/src/main/resources/fabric.mod.json diff --git a/fabric-renderer-registries-v1/build.gradle b/deprecated/fabric-renderer-registries-v1/build.gradle similarity index 100% rename from fabric-renderer-registries-v1/build.gradle rename to deprecated/fabric-renderer-registries-v1/build.gradle diff --git a/fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/BlockEntityRendererRegistry.java b/deprecated/fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/BlockEntityRendererRegistry.java similarity index 100% rename from fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/BlockEntityRendererRegistry.java rename to deprecated/fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/BlockEntityRendererRegistry.java diff --git a/fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/EntityModelLayerRegistry.java b/deprecated/fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/EntityModelLayerRegistry.java similarity index 100% rename from fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/EntityModelLayerRegistry.java rename to deprecated/fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/EntityModelLayerRegistry.java diff --git a/fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/EntityRendererRegistry.java b/deprecated/fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/EntityRendererRegistry.java similarity index 100% rename from fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/EntityRendererRegistry.java rename to deprecated/fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/EntityRendererRegistry.java diff --git a/fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/LivingEntityFeatureRendererRegistrationCallback.java b/deprecated/fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/LivingEntityFeatureRendererRegistrationCallback.java similarity index 100% rename from fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/LivingEntityFeatureRendererRegistrationCallback.java rename to deprecated/fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/LivingEntityFeatureRendererRegistrationCallback.java diff --git a/fabric-renderer-registries-v1/src/main/resources/assets/renderer-registries-v1/icon.png b/deprecated/fabric-renderer-registries-v1/src/main/resources/assets/renderer-registries-v1/icon.png similarity index 100% rename from fabric-renderer-registries-v1/src/main/resources/assets/renderer-registries-v1/icon.png rename to deprecated/fabric-renderer-registries-v1/src/main/resources/assets/renderer-registries-v1/icon.png diff --git a/fabric-renderer-registries-v1/src/main/resources/fabric.mod.json b/deprecated/fabric-renderer-registries-v1/src/main/resources/fabric.mod.json similarity index 100% rename from fabric-renderer-registries-v1/src/main/resources/fabric.mod.json rename to deprecated/fabric-renderer-registries-v1/src/main/resources/fabric.mod.json diff --git a/fabric-rendering-v0/build.gradle b/deprecated/fabric-rendering-v0/build.gradle similarity index 100% rename from fabric-rendering-v0/build.gradle rename to deprecated/fabric-rendering-v0/build.gradle diff --git a/fabric-rendering-v0/src/main/java/net/fabricmc/fabric/api/client/render/ColorProviderRegistry.java b/deprecated/fabric-rendering-v0/src/main/java/net/fabricmc/fabric/api/client/render/ColorProviderRegistry.java similarity index 100% rename from fabric-rendering-v0/src/main/java/net/fabricmc/fabric/api/client/render/ColorProviderRegistry.java rename to deprecated/fabric-rendering-v0/src/main/java/net/fabricmc/fabric/api/client/render/ColorProviderRegistry.java diff --git a/fabric-rendering-v0/src/main/java/net/fabricmc/fabric/api/client/render/InvalidateRenderStateCallback.java b/deprecated/fabric-rendering-v0/src/main/java/net/fabricmc/fabric/api/client/render/InvalidateRenderStateCallback.java similarity index 100% rename from fabric-rendering-v0/src/main/java/net/fabricmc/fabric/api/client/render/InvalidateRenderStateCallback.java rename to deprecated/fabric-rendering-v0/src/main/java/net/fabricmc/fabric/api/client/render/InvalidateRenderStateCallback.java diff --git a/fabric-rendering-v0/src/main/java/net/fabricmc/fabric/impl/client/rendering/RenderingCallbackInvoker.java b/deprecated/fabric-rendering-v0/src/main/java/net/fabricmc/fabric/impl/client/rendering/RenderingCallbackInvoker.java similarity index 100% rename from fabric-rendering-v0/src/main/java/net/fabricmc/fabric/impl/client/rendering/RenderingCallbackInvoker.java rename to deprecated/fabric-rendering-v0/src/main/java/net/fabricmc/fabric/impl/client/rendering/RenderingCallbackInvoker.java diff --git a/fabric-rendering-v0/src/main/resources/assets/fabric-rendering-v0/icon.png b/deprecated/fabric-rendering-v0/src/main/resources/assets/fabric-rendering-v0/icon.png similarity index 100% rename from fabric-rendering-v0/src/main/resources/assets/fabric-rendering-v0/icon.png rename to deprecated/fabric-rendering-v0/src/main/resources/assets/fabric-rendering-v0/icon.png diff --git a/fabric-rendering-v0/src/main/resources/fabric.mod.json b/deprecated/fabric-rendering-v0/src/main/resources/fabric.mod.json similarity index 100% rename from fabric-rendering-v0/src/main/resources/fabric.mod.json rename to deprecated/fabric-rendering-v0/src/main/resources/fabric.mod.json diff --git a/fabric-models-v0/build.gradle b/fabric-models-v0/build.gradle index 2a5dd55e8..54331b1c6 100644 --- a/fabric-models-v0/build.gradle +++ b/fabric-models-v0/build.gradle @@ -6,6 +6,6 @@ moduleDependencies(project, [ ]) dependencies { - testmodImplementation project(path: ':fabric-renderer-registries-v1', configuration: 'namedElements') + testmodImplementation project(path: ':fabric-rendering-v1', configuration: 'namedElements') testmodImplementation project(path: ':fabric-resource-loader-v0', configuration: 'namedElements') } diff --git a/fabric-models-v0/src/testmod/java/net/fabricmc/fabric/test/model/ModelTestModClient.java b/fabric-models-v0/src/testmod/java/net/fabricmc/fabric/test/model/ModelTestModClient.java index 41eae61b9..2f54acddf 100644 --- a/fabric-models-v0/src/testmod/java/net/fabricmc/fabric/test/model/ModelTestModClient.java +++ b/fabric-models-v0/src/testmod/java/net/fabricmc/fabric/test/model/ModelTestModClient.java @@ -22,7 +22,7 @@ import net.minecraft.util.Identifier; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry; -import net.fabricmc.fabric.api.client.rendereregistry.v1.LivingEntityFeatureRendererRegistrationCallback; +import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityFeatureRendererRegistrationCallback; import net.fabricmc.fabric.api.resource.ResourceManagerHelper; public class ModelTestModClient implements ClientModInitializer { diff --git a/gradle/module-validation.gradle b/gradle/module-validation.gradle index a1ed31e8b..170a37b4f 100644 --- a/gradle/module-validation.gradle +++ b/gradle/module-validation.gradle @@ -8,6 +8,8 @@ import groovy.json.JsonSlurper */ subprojects { + if (it.name == "deprecated") return + // Create the task task validateModules(type: ValidateModuleTask) } @@ -52,10 +54,14 @@ class ValidateModuleTask extends DefaultTask { switch (moduleLifecycle) { case "stable": case "experimental": + break case "deprecated": - break; + if (!project.path.startsWith(":deprecated")) { + throw new GradleException("Deprecated module ${project} must be in the deprecated sub directory.") + } + break default: - throw new GradleException("Module ${project} has an invalid module lifecycle ${json.custom.get('fabric-api:module-lifecycle')}"); + throw new GradleException("Module ${project} has an invalid module lifecycle ${json.custom.get('fabric-api:module-lifecycle')}") } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102e0..aa991fcea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew.bat b/gradlew.bat index ac1b06f93..107acd32c 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,89 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle index 6028689eb..26c4f730c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,35 +16,29 @@ include 'fabric-api-base' include 'fabric-api-lookup-api-v1' include 'fabric-biome-api-v1' include 'fabric-blockrenderlayer-v1' -include 'fabric-commands-v0' include 'fabric-command-api-v1' -include 'fabric-containers-v0' include 'fabric-content-registries-v0' include 'fabric-crash-report-info-v1' include 'fabric-data-generation-api-v1' include 'fabric-dimensions-v1' include 'fabric-entity-events-v1' include 'fabric-events-interaction-v0' -include 'fabric-events-lifecycle-v0' include 'fabric-game-rule-api-v1' include 'fabric-gametest-api-v1' include 'fabric-item-api-v1' include 'fabric-item-groups-v0' -include 'fabric-keybindings-v0' include 'fabric-key-binding-api-v1' include 'fabric-lifecycle-events-v1' include 'fabric-loot-tables-v1' include 'fabric-mining-level-api-v1' include 'fabric-models-v0' -include 'fabric-networking-v0' include 'fabric-networking-api-v1' include 'fabric-object-builder-api-v1' include 'fabric-particles-v1' include 'fabric-registry-sync-v0' include 'fabric-renderer-api-v1' include 'fabric-renderer-indigo' -include 'fabric-renderer-registries-v1' -include 'fabric-rendering-v0' + include 'fabric-rendering-v1' include 'fabric-rendering-data-attachment-v1' include 'fabric-rendering-fluids-v1' @@ -56,3 +50,12 @@ include 'fabric-textures-v0' include 'fabric-transfer-api-v1' include 'fabric-convention-tags-v1' include 'fabric-transitive-access-wideners-v1' + +include 'deprecated' +include 'deprecated:fabric-commands-v0' +include 'deprecated:fabric-containers-v0' +include 'deprecated:fabric-events-lifecycle-v0' +include 'deprecated:fabric-keybindings-v0' +include 'deprecated:fabric-networking-v0' +include 'deprecated:fabric-renderer-registries-v1' +include 'deprecated:fabric-rendering-v0'