diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 0000000000..592f768b09 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -0,0 +1,67 @@ +name: 🐞 Bug Report +description: Report an issue you've encountered +labels: [ bug ] +body: + - type: markdown + attributes: + value: "## 👋 Welcome!" + - type: markdown + attributes: + value: | + ### 📋 Checklist + Thank you for taking your time to report this bug! + Before reporting, please ensure that: + - You are using the **latest** available version of Forgified Fabric API + - You've installed a **minimal set of mods** required to reproduce the issue. + Issues with modpacks and excessive amount of mods will *not* be accepted, as they take a long time to diagnose. + Knowing which mods are causing problems allows us to focus on fixing the issue as soon as possible. + If you're unsure which mods might be at fault, try using [binary search](https://www.reddit.com/r/feedthebeast/comments/evpy6r/tips_for_modpack_authors_how_to_find_misbehaving/) - removing half of installed mods + repeatedly until the faulty mod is found. + + > [!WARNING] + > Note: Custom server APIs (such as Mohist, Magma, Arclight) are **not supported**. + > This also applies to launchers for mobile platforms (Pojav, FoldCraft). + - type: dropdown + id: version + attributes: + label: Minecraft version + description: What version of Minecraft are you running? Please note that only the versions listed below are supported. If you're running an outdated version, update to receive support. + options: + - "26.1.x" + - "1.21.1 (LTS)" + default: 0 + validations: + required: true + - type: input + id: description + attributes: + label: Describe the bug + description: "A clear and concise description of what the bug is." + validations: + required: true + - type: textarea + id: repro + attributes: + label: Steps to reproduce + description: | + How do you trigger this bug? Please walk us through it step by step. + If applicable, add screenshots to help explain your problem. + value: | + 1. + 2. + 3. + ... + validations: + required: true + - type: input + id: logs + attributes: + label: Logs + description: | + If applicable (crash, error output in console), please provide your debug.log **and** crash report + To upload logs, use an external paste site, such as [Github Gist](https://gist.github.com/) (recommended), [Ubuntu Pastebin](https://paste.ubuntu.com/) or [Pastebin](http://pastebin.com) + - type: textarea + id: context + attributes: + label: Additional context + description: "Add any other context about the problem here, such as your current environment or other mods that might be causing this bug." diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index fc740656e9..efa5ee4a54 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,8 +1,8 @@ blank_issues_enabled: true contact_links: - - name: FabricMC Discord - url: https://discord.gg/v6v4pMv - about: Please ask here for help with installing Fabric. + - name: Sinytra Discord + url: https://discord.sinytra.org + about: Please ask here for help with installing Forgified Fabric API. - name: GitHub Discussions - url: https://github.com/FabricMC/fabric/discussions - about: Please look here for frequently asked questions and questions on how to use Fabric API. + url: https://github.com/Sinytra/ForgifiedFabricAPI/discussions + about: Please look here for frequently asked questions and questions on how to use Forgified Fabric API. diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index db93dc068b..c1c9ed2b66 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,91 +1,65 @@ name: Build -on: [push, pull_request] + +on: [ push, pull_request, merge_group ] + jobs: build: - runs-on: ubuntu-24.04 + strategy: + matrix: + java: [ 25-ubuntu ] + + runs-on: ubuntu-latest + + container: + image: mcr.microsoft.com/openjdk/jdk:${{ matrix.java }} + options: --user root + steps: - - uses: actions/setup-java@v5 - with: - distribution: 'microsoft' - java-version: '25' - - uses: actions/checkout@v6 + - name: Install Git + run: apt update && apt install git -y && git --version + + - name: Checkout repository + uses: actions/checkout@v6 with: fetch-depth: 0 - - uses: gradle/actions/wrapper-validation@v4 - - run: ./gradlew check build outJar :buildSrc:check publishToMavenLocal --stacktrace - - uses: FabricMCBot/publish-checkstyle-report@4627c82002aa370b6cb2a3140f34c7a8c55a5297 + + - name: Validate wrapper + uses: gradle/actions/wrapper-validation@v5 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v6 + with: + gradle-home-cache-cleanup: true + + - name: Setup env properties + shell: bash + run: | + mkdir -p ~/.gradle/ + echo "GRADLE_USER_HOME=${HOME}/.gradle" >> $GITHUB_ENV + + - name: Create placeholder assets dir + run: mkdir -p ${{ env.GRADLE_USER_HOME }}/caches/fabric-loom/assets + + - name: Build with Gradle + run: ./gradlew build publishToMavenLocal --stacktrace + + - uses: Juuxel/publish-checkstyle-report@v1 if: ${{ failure() }} with: reports: | **/build/reports/checkstyle/*.xml - - uses: actions/upload-artifact@v7 + + - name: Upload build outputs + uses: actions/upload-artifact@v7 with: name: Artifacts ${{ matrix.java }} path: | build/libs/ ./*/build/libs/ build/publishMods/ - - uses: actions/upload-artifact@v7 - with: - name: Maven Local ${{ matrix.java }} - path: ~/.m2/repository/net/fabricmc/ - - uses: actions/upload-artifact@v7 - with: - name: Artifacts ${{ matrix.java }} - archive: false - path: | - build/out/ - client_test: - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@v6 - with: - fetch-depth: 0 - - uses: actions/setup-java@v5 - with: - distribution: 'microsoft' - java-version: '25' - - run: | - curl -L -o tracy-capture https://github.com/modmuss50/tracy-utils/releases/download/0.0.2/linux-x86_64-tracy-capture - chmod +x tracy-capture - mkdir run && echo "eula=true" >> run/eula.txt - - run: ./gradlew runClientGametest --stacktrace --warning-mode=fail - env: - ENABLE_TRACY: false - - uses: actions/upload-artifact@v7 - if: always() - with: - name: Test Screenshots - path: run/screenshots - - uses: actions/upload-artifact@v7 - if: always() - with: - name: Tracy Profile - path: profile.tracy - - server_test: - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@v6 + - name: Upload maven local + uses: actions/upload-artifact@v7 with: - fetch-depth: 0 - - uses: actions/setup-java@v5 - with: - distribution: 'microsoft' - java-version: '25' - - run: mkdir run && echo "eula=true" >> run/eula.txt - - run: ./gradlew runAutoTestServer runGametest --stacktrace --warning-mode=fail - - check_resources: - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@v6 - with: - fetch-depth: 0 - - uses: actions/setup-java@v5 - with: - distribution: 'microsoft' - java-version: '25' - - run: ./gradlew generateResources --stacktrace --warning-mode=fail - - run: if [ -n "$(git status --porcelain)" ]; then exit 1; fi + name: Maven Local ${{ matrix.java }} + path: /root/.m2/repository/org/sinytra/forgified-fabric-api/ diff --git a/.github/workflows/manage_issues.yml b/.github/workflows/manage_issues.yml deleted file mode 100644 index b72767a52b..0000000000 --- a/.github/workflows/manage_issues.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Manage Issues - -on: - issues: - types: [ labeled, unlabeled ] - -jobs: - labels: - runs-on: ubuntu-24.04 - steps: - - uses: FabricMC/fabric-action-scripts@v2 - with: - context: ${{ github.event.action }} - label: ${{ github.event.label.name }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f7219ce339..46c6457af6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,35 +1,122 @@ name: Release -on: [workflow_dispatch] # Manual trigger +on: + workflow_dispatch: + inputs: + release_type: + description: 'The published artifact release type' + required: false + default: 'STABLE' + type: choice + options: + - STABLE + - BETA + - ALPHA permissions: + actions: read contents: write jobs: build: - runs-on: ubuntu-24.04 + name: Build + + runs-on: ubuntu-latest + + outputs: + changelog: ${{ steps.changelog.outputs.changelog }} + + container: + image: mcr.microsoft.com/openjdk/jdk:25-ubuntu + options: --user root + steps: - - uses: actions/setup-java@v5 - with: - distribution: 'microsoft' - java-version: '25' - - uses: actions/checkout@v6 + - name: Install Git + run: apt update && apt install git -y && git --version + + - name: Add safe directory + run: git config --global --add safe.directory /__w/ForgifiedFabricAPI/ForgifiedFabricAPI + + - name: Checkout repository + uses: actions/checkout@v6 with: fetch-depth: 0 + - uses: FabricMC/fabric-action-scripts@v2 id: changelog with: context: changelog workflow_id: release.yml - - uses: gradle/actions/wrapper-validation@v4 - - run: ./gradlew checkVersion build publish publishMods -x check --stacktrace --no-configuration-cache + + - name: Validate wrapper + uses: gradle/actions/wrapper-validation@v5 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v6 + with: + cache-write-only: true + + - name: Build with Gradle + run: ./gradlew clean build --stacktrace + + publish: + strategy: + fail-fast: false + matrix: + include: + - name: Maven + task: publish + url: https://maven.su5ed.dev/releases/org/sinytra/forgified-fabric-api + + - name: GitHub + task: publishGithub + url: https://github.com/Sinytra/ForgifiedFabricAPI/releases + + - name: CurseForge + task: publishCurseforge + url: https://www.curseforge.com/minecraft/mc-mods/forgified-fabric-api + + - name: Modrinth + task: publishModrinth + url: https://modrinth.com/mod/forgified-fabric-api + + name: Publish ${{ matrix.name }} + + needs: build + + runs-on: ubuntu-latest + + environment: + name: ${{ matrix.name }} + url: ${{ matrix.url }} + + steps: + - name: Checkout repository + uses: actions/checkout@v6 + with: + fetch-depth: 0 + + - name: Setup Java + uses: actions/setup-java@v5 + with: + distribution: 'microsoft' + java-version: '25' + + - name: Validate wrapper + uses: gradle/actions/wrapper-validation@v5 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v6 + with: + cache-read-only: true + + - name: Publish with Gradle + run: ./gradlew clean build ${{ matrix.task }} --stacktrace env: + PUBLISH_RELEASE_TYPE: ${{ inputs.release_type }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} + MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} MAVEN_URL: ${{ secrets.MAVEN_URL }} MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} - CHANGELOG: ${{ steps.changelog.outputs.changelog }} - SIGNING_SERVER: ${{ secrets.SIGNING_SERVER }} - SIGNING_PGP_KEY: ${{ secrets.SIGNING_PGP_KEY }} - SIGNING_JAR_KEY: ${{ secrets.SIGNING_JAR_KEY }} + CHANGELOG: ${{ needs.build.outputs.changelog }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 7689688da6..0000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,442 +0,0 @@ -# Fabric API development guidelines - -This document describes the development guidelines for Fabric API. It may be amended at any time. Therefore you should refer to the development guidelines when working on any contributions. - -Following these guidelines should ensure your contributions to Fabric API are quick to review, consistent with other code in Fabric API and well thought out. This document should not be seen completely as a strict ruleset but instead the thought process that a Fabric team member would consider during the design, implementation and review of contributions to Fabric API. - -Old code or parts thereof might not yet be up to the standards defined by these guidelines. When working with old code, try to adhere to these guidelines, but don't bulk update legacy code to match them. The team will handle updating older code to match the newer standards when appropriate. - -## Scope - -In order to retain maintainability, portability and discoverability, Fabric API only targets features that are important to a broader set of mods. Whether an addition is desirable is a balance between its -- usefulness, -- complexity, -- inherent necessity for compatibility, -- performance impact, -- continued support by the authors or other interested parties. - -Fabric API generally is not meant for bugfixes, performance improvements or gameplay changes, and exceptions need careful evaluation. - -It is highly recommended that an issue be opened or a message be posted in the official Discord server, to discuss whether a feature is in scope, before it is designed or implemented. Design choices may also warrant prior discussion to avoid wasting time. - -## Structure of the guidelines - -The rest of this document is split in the following categories: - -- [**General design considerations**](#general-design-considerations): Broad guidelines to keep in mind when writing APIs for Fabric. -- [**API conventions**](#api-conventions): Guidelines for common API patterns. -- [**Implementation guidelines**](#implementation-guidelines): Guidelines to keep in mind when writing implementation code. -- [**Documentation**](#documentation): Guidelines for writing documentation. Extensive documentation of the offered features is essential for usability. -- [**Structure of Fabric API**](#structure-of-fabric-api): Organization of code within Fabric API. -- [**Code formatting**](#code-formatting): Specific Java code formatting standards. -- [**Testing**](#testing): Guidelines for writing testmod code. Tests showing that the submitted feature is working should be included in the PR. -- [**Pull Request checklist**](#checklist-before-submitting-a-pull-request): Smaller things to keep in mind when submitting a Pull Request. - -## General design considerations - -When designing an API addition, the following goals should be kept in mind: -- Simplicity: Additions should be - - easy to use, - - inherently hard to misuse or protected against misuse, - - reasonably self contained, - - sufficiently capable, yet not excessively loaded with niche features, - - suitable for simple implementations, - - not overly abstract. -- Familiarity: Additions should reuse or extend existing designs/patterns in other parts of Fabric API or vanilla. -- Extensibility: Additions should be open for future expansion without needing to deprecate anything. -- Portability: Additions should not be too closely coupled with specific vanilla code. They should - - avoid exposure of unimportant aspects, - - project into the future and consider potential future vanilla development, - - avoid auxiliary libraries, - - be portable for the sake of simplicity and extensibility. -- Performance: Additions should - - be fast to initialize and execute, - - have low or zero allocation rate, - - have low resident memory use, - - keep extreme uses in mind (nuke, bulk command execution, spamming etc). - -One important consideration when designing an API is spending some time thinking about the API in isolation without any influence from underlying implementation and vanilla code. Considering the API as a single entity rather than a part of a larger implementation, akin a regular user of the API may help find missing coverage, bad return values or parts of the API that could be improved. - -Additionally, any feature provided by Fabric API should be fully usable by mods without mixins or reflection. Helper methods may be used to bridge these gaps. - -It can be assumed that nothing other than Fabric API itself accesses non-api packages directly, regardless of their visibility. Reflection doesn't have to be accounted for anywhere. - -## API conventions -This section covers Fabric API guidelines for common patterns. - -### Backwards compatibility -Fabric API makes strong backwards compatibility guarantees, by which contributors must abide. **Modders should not need to update their source code when they update Fabric API**, with the following exceptions: - -- APIs might be broken due to **related** changes in Minecraft updates. - - Preserving backwards compatibility in these cases will be considered if possible. - - Deprecated code will usually be removed if it requires non-trivial updates. - - This is limited to code directly affected by the Minecraft version update. Minecraft making breaking changes in some areas of its API is not a reason to break unrelated parts of Fabric API. -- Experimental modules might be broken if necessary. - - Changes that affect compilation but not the resulting bytecode are allowed in experimental modules, for example some generic changes. - - Even if an API is marked as experimental, avoid breaking the ecosystem of mods using it. - - Changes that will cause hard crashes in many mods when they are released should be delayed until the next majorly breaking Minecraft version update. -- There might not be a way around a breaking change. - - If a major oversight is noticed in an API, it might be broken to address the oversight. Such cases require careful consideration, and should always be discussed with the team beforehand. - - Remember that deprecating code is always an option. - -### Targeted Minecraft versions -- Fabric API does not have strict Minecraft version support policies, but rather supports what is feasible and what the community is interested in. - - In particular, the latest stable Minecraft version and the latest subsequent snapshot or pre-release version are always supported. - - Which features go in older stable versions is a tradeoff between how easy it is, how many mods are still using that version, and what the community is willing to contribute. -- New features can be targeted at any supported version. - - Maintainers will take care of cherry-picking the feature to the other branches when applicable. - - In doubt, prefer PR'ing to newer stable versions. -- Backporting PRs for older versions will generally be accepted, depending on how many changes were required. - -### Discouraged API design patterns - -- Avoid the old `Api.INSTANCE` pattern in favor of static methods. - - This pattern may be used if the backing implementation may be changed by another mod (such as the renderer api). Even then there should be static methods to access the standard api facilities. -- Avoid unnecessary use of generics. - - Unless Vanilla Minecraft mandates the use of generics, or a good reason exists to use generics. -- Avoid optionals in return values, fields and parameters. - - Where possible, you should prefer a `@Nullable T`. - - If vanilla exposes optionals in return types, then returning an optional is fine. -- Avoid requiring the user to cast to a subtype if possible. - - Adding methods to vanilla types can be done via interface injection. -- Avoid exposing java `record`s as public API. - - Records expose more than is necessary for most APIs, which makes them difficult to evolve. - - Prefer to expose an interface that is implemented by an impl record. - -### API design patterns to consider - -- Transitive Access Wideners (TAWs) should be used to expose access to private or protected members in vanilla classes. - - Most TAWs should go in the dedicated `fabric-transitive-access-wideners-v1` module. - - Remember to add the `transitive-` prefix, otherwise dependent mods will not see the access modifications. - - Some TAWs such as Block subclass constructors are automatically generated. Make sure that you don't edit the `.classtweaker` file in `src` directly. Rather edit the template file (`template.classtweaker`) and run the `gradlew generateClassTweaker` task to update the generated file. - - Large amounts of TAWs for a specific purpose can be included in another module, as is the case for the data generation API, for example. - - Do **not** expose TAWs for functions that take a `String` identifier. - - This makes it too easy to forget the mod ID namespace, so the identifier would often end up in the vanilla `minecraft` namespace. - - In general, keep the API guidelines in mind when deciding whether something should be a TAW. -- Interface injection (i.e. making a minecraft class or interface extend a Fabric interface) should be considered over separate static helpers. - - Interface injection requires both a `fabric.mod.json` custom value to make it visible in Minecraft source code, and a mixin to actually implement the interface at runtime. - - Injected interfaces should have **no abstract methods**. - - Methods that are guaranteed to be implemented via a mixin to a vanilla class should contain a default body that throws an error. - Otherwise, the compiler will complain when it can't find the implementation of an interface method on a class. - For example: - ```java - default void injectedMethod() { - throw new UnsupportedOperationException("Implemented via mixin"); - } - ``` - - Never use interface injection to add methods that modders must implement. Rather define a subclass or subinterface in Fabric API. -- Builders can be used instead of constructors or factory methods with large amounts of parameters. - -### API class modifiers and member visibility - -- Classes in Fabric API should be `final` classes unless the class exposed in the API is explicitly meant for extension. -- `private` constructors should be used in API classes unless the class is explicitly meant to be instantiated. - - This only applies to modder-facing classes, i.e. classes in the `net.fabricmc.fabric.api` subpackage. See below for package structure. - - They should be placed at the very bottom or top of the class to not hurt readability. -- Access modifiers for fields and methods should be as strict as possible. - - If a method is intended to only be for use by mods implementing an api, a `protected` method should suffice. - -### Annotations -- Nullable members, parameters or return values must be annotated with the `@Nullable` annotation. - - Any member, parameter or return value that is not marked as nullable can be assumed to be nonnull. The `@NotNull` annotation should never be used, it is implicit. - - Introducing custom types might be appropriate (no need to specify `List<@Nullable String>` everywhere). -- Deprecated API members should have the `@Deprecated` annotation. - - Avoid specifying `forRemoval = true`, the functionality will be supported as long as possible. - - Exceptions are made for experimental APIs, where deprecated for removal functionality might be removed after sufficient time has passed. - - A javadoc `@deprecated` comment should be added to deprecated members with migration instructions. -- Experimental API classes should all have the `@ApiStatus.Experimental` annotation. - - The annotation is not required on individual members, unless the class itself is not experimental. -- `@ApiStatus.NonExtendable` should be used for API interfaces or classes that modders must not implement or override, but can't be `final` for some reason. - - Adding methods to such interfaces or classes is not a breaking change. -- `@ApiStatus.Internal` is automatically applied to all implementation packages to avoid IDE autocompletion suggesting them. There should be no need for internal methods or classes in the public API package. - -### Naming -- All names should follow the [Yarn naming standards](https://github.com/FabricMC/yarn/blob/HEAD/CONVENTIONS.md). -- If a class only contains getter methods, the `get` prefix may be omitted for methods. The `get` prefix may also be omitted where it is not appropriate. -- Accessor mixins should be named **Target**Accessor, other mixins should be named **Target**Mixin, where `Target` is the target class name. More details in the mixin section below. - -### Events - -- Events should not be used if there is only one subscriber, like a handler in a registered unique namespace. -- Events should be produced and fully usable with minimal object allocation. - - In particular, avoid data holder objects for inputs, but rather pass them as separate parameters. -- Events should use dedicated callback interfaces. - - Callback interfaces should be `@FunctionalInterface`s. - - Callback methods should be uniquely named such that a handler can implement multiple at once. - - Avoid words that are already clear from the parameters. For example, prefer `onStartTick(MinecraftServer)` over `onStartServerTick(MinecraftServer)`. The interface should still be named `StartServerTick` if "server" is not already implied by the containing class. - - Callback signatures should use the most specific type, if appropriate. E.g. `WorldChunk` over `Chunk`. - - Callback signatures should pass context that the listener might be expected to use, without excess. For example: - - Events involving a `MinecraftServer` directly should consider passing a `MinecraftServer` parameter. - - If the server is easily available via the other context parameters (for example a `ServerWorld`), passing it explicitly is unnecessary. - - Consider passing the `MinecraftClient` instance as a parameter if it makes sense. -- `Event<>` objects should be in the class declaring the event field or getter. - - Usually, an event will be a stored in a `public static final` field. - - Sometimes an event might be specific to a class instance. In that case, there should be static methods that return event instances. One example of this is an event specific to a registry. - - Related callbacks and events should be grouped in classes. - -Example: -```java -public final class FooEvents { - public static final Event ALLOW = ...; - public static final Event BEFORE = ...; - public static final Event AFTER = ...; - - @FunctionalInterface - public interface Allow { - boolean allowFoo(/* relevant parameters */); - } - - @FunctionalInterface - public interface Before { - void beforeFoo(/* relevant parameters */); - } - - @FunctionalInterface - public interface Two { - void afterFoo(/* relevant parameters */); - } - - // Holder class is not meant for instantiation. - private ExampleEvents() { - } -} -``` - -#### Event naming - -- Callback interfaces: - - Callback interfaces should be named using present tense. For example, `ChunkUnload` and not `ChunkUnloaded`. - - The methods should be named in line with the action of the event, such as `entryAdded(...)`. - - Method names for notification events should be prefixed with `on`. - For example, a `DataLoad` event would have an `onDataLoad` method. - - Events that may allow or block some action should start with `Allow`. For example, an event to cancel player death might be called `AllowPlayerDeath`, with method name `allowDeath`. -- `Event<>` fields and methods: - - The field or method exposing the `Event<>` object should be named similarly to the callback interface. -- The `fabric-lifecycle-events-v1` module is a good example of event naming standards. - - -#### Event ordering - -- Processes happening in multiple steps should use multiple events. - - While Fabric provides an event phase system, purpose-driven events should always be preferred. - - For example, an event that both cancels and notifies of an action will produce false notifications (notified but later canceled). It would be preferable to have an `AllowXxx` event for cancellation, and then a `BeforeXxx` event for notification. - -## Implementation guidelines - -### Simplicity - -- Simple code that is easy to debug and reason about is generally preferable to the shortest possible implementation. -- Limited duplication can be better than indirection, unless the code is complex or used several times. -- Indirections might make the code harder to read, and should be weighed against their benefits. Examples include: - - Lambda methods (`forEach`, streams). - - Method splitting. - - Recursion. - - Complex class hierarchies. -- Functional operators (i.e. interfaces) should be designed for maximal readability, and only used when necessary. - - Ask for concrete objects if applicable. - - Don't include superfluous methods. For example, replace `shouldApply`+`apply` with a single `apply` that returns success. - - Consider having the user implement a larger interface as a class. - - Consider using a custom interface if it is beneficial for comprehension or documentation. -- The overall complexity of a module shouldn't be ignored in favor of the simplicity of each individual piece. Similarly, the overall complexity of one small piece shouldn't be ignored in favor of the simplicity of the module as a whole. - -### Code quality -- Strongly validate inputs to detect misuse. - - Exceptions should be thrown in the first method that can reasonably detect misuse. - - Precondition assertions such as `Objects.requireNonNull` for non-null parameters are strongly encouraged. - - This might apply to other cases, such as strong JSON validation. -- Use the weakest suitable interface or class when exposing anything without harming expected uses. - - However, prefer `Collection` over `Iterable`. -- Non-trivial reused (directly or derived) inline constants should be moved to static final fields. -- Javac shouldn't produce any warnings in its default configuration. - -### Thread safety - -Since Minecraft has two primary threads, the render and server threads, APIs dealing with shared state need to consider thread safety. This will usually require consideration on a case-by-case basis. - -- A registry shared between the render and the server threads may for example wish to use locking for infrequent accesses, or otherwise a copy-on-write strategy to ensure lock-free reads and thread-safe writes. -- Lazily initialized caches accessed from multiple threads require `volatile`. Use an intermediate variable to only have one volatile read: -```java -private volatile Stuff cachedStuff = null; - -private Stuff stuff() { - Stuff stuff = this.cachedStuff; - - if (stuff == null) { - this.cachedStuff = stuff = compute(); - } - - return stuff; -} -``` -- Read-only access from multiple threads does not need synchronization. - -## Documentation - -- Every API class should carry a Javadoc comment explaining its purpose and reference related classes. Example code in the primary class of any major feature should outline the use, including related vanilla invocations/registrations/etc as applicable to provide an idea of how to start. - - Parameters, implementation bodies, etc... may be omitted as appropriate, since the examples are not meant as to be fully working implementations. - - The examples should be more akin to pseudocode with a checklist for the process and pointers to everything needed. - - These examples should be written for developers that have a knowledge of Java and basic knowledge of the Minecraft codebase. -- A brief description belongs in the 1st paragraph, with further paragraphs separated by blank lines and starting with `

`. Javadoc for methods may follow with another blank line before describing parameters, return values and exceptions with the appropriate tags. All accessible members should be described appropriately. -- Good documentation doesn't only explain what something is, but (as appropriate) why it exists, what are the intended use cases, what use cases something is not suitable for and any semantics that need to be kept in mind. - - In particular, tricky implementation details should be explained by a few comments when appropriate. -- Direct references to classes or members should use the `@link` and `@linkplain` tags, unspecific further reading elsewhere may use `@see`. -- Deprecated elements should describe and reference the replacement or alternative in Javadoc `@deprecated`. The `@deprecated` tag has to be last, everything else may be removed while adding it. -- The Fabric Wiki is the proper place for additional in-depth documentation and how-tos. Examples are not necessary for simple events. - -## Structure of Fabric API -Fabric API is organized in different modules. Each module is located in a specific folder matching the module id. For example under `fabric-item-api-v1/` for the Item API (v1). - -### Module naming conventions -- Module names should be named after the exposed functionality. - - Consider future developments when naming a module: they might later be expanded. -- Module names should usually be suffixed by `-api`. - - Modules whose primary purpose is not interaction with their API do not need this suffix. For example, `fabric-transitive-access-wideners-v1` or `fabric-convention-tags-v2`. - - Event modules should have the `-events` suffix instead. -- Module names should always be suffixed by a major version (`-v1`, `-v2`, etc). - - The major version starts at `v1` for new functionality, unless they replace a module with equivalent functionality, in which case the version is incremented. - - `vn` and `vn+1` module names need not match exactly. For example, `fabric-loot-tables-v1` was replaced by `fabric-loot-api-v2`. - -### Deprecated modules -Modules that are entirely deprecated are in the `deprecated/` folder. All of their API classes should be deprecated, and their `fabric.mod.json` should have the deprecated lifecycle marker. (See PR checklist below). - -A module may only be deprecated if all of its functionality is also provided by a non-deprecated module or vanilla Minecraft itself. - -### Experimental modules -Modules whose design is hard to evaluate might go through an experimental phase, allowing for relaxed backwards compatibility requirements, as described in the Backwards compatibility section. - -Writers of experimental modules need to consider the following additional requirements: -- All API classes should be marked as `@ApiStatus.Experimental`. Do not use `@Deprecated` to generate compiler and IDE warnings for experimental modules. -- All API classes should carry a javadoc comment, worded similarly to the following example: - ```java - /** - * (normal javadoc here) - * - *

Experimental feature, may be removed or changed without further notice. - */ - ``` -- The module's `fabric.mod.json` should have the experimental lifecycle marker. (See PR checklist below). -- Note that experimental modules should be in the root folder of the Fabric API repository, as they are expected to be stabilized eventually. - -### Versioning, dependencies - -The initial version of a module should **always** be `1.0.0`, never 0.x for non-legacy modules. -Do not increment versions when writing a pull request. Version increments will be applied by maintainers after the pull request is merged. - -Every module should in its `fabric.mod.json` declare dependencies for: -- `"fabricloader": ">=x.y.z"`, where `x.y.z` is the version used at the time the module is added. -- Other used modules, for example `"fabric-api-base": "*"` if events are used. No explicit version needs to be specified. -- Minecraft and Java version dependencies do not need to be specified. -- In general, version ranges in module dependencies should be optimistic, omitting an upper bound until it is known. - - -### Packages - -Each module contains various sourcesets in the `src` folder: -- `src/client`: Code for client-only additions such as rendering hooks. -- `src/main`: Code for additions that are available on both the client and the server. -- `src/testmod`: Testing code. - -Inside the relevant sourceset, all Fabric API code should be in a subpackage of `net.fabricmc.fabric`. -- Add `.api`, `.impl` and `.mixin` for public-facing API, implementation details, and mixins respectively. -- Add `.client` or `.server` for client-only or dedicated server-only code respectively. Common code requires no additional folder. -- Add module name subpackage. It might contain multiple parts separated by `.`. -- For API only: add the module major version with a v prefix, for example `.v1` -- Further subpackages can be added as needed, all singular. - -A good example is the Lifecycle Events (v1) module. - - -### Mixins - -These guidelines should be followed with regards to a mixin's visibility and naming: - -| | Accessors | Mixin | -|------------|--------------------|----------------------------------------------------------------------------| -| Naming | **Target**Accessor | **Target**Mixin (May include `Client/Server` or `Legacy` prefix if needed) | -| Visibility | public | package-private* | - -\* A mixin may be public if a subclass extends a super mixin in a different package. Example: `abstract class ServerWorldMixin extends WorldMixin` - -The organization of mixins with a package is dependent on the type of module. -- Generally if there are a small amount of mixins, then having all mixins in the same package is fine. -- Client only and dedicated server only mixins should be moved into `client/server` subpackages. -- If a module is generally complex or has multiple distinct parts, multiple mixins for each class target may exist assuming said mixins are separated into subpackages by feature. - - -## Code formatting - -Formatting should be consistent with the remainder of Fabric API. - -The general code formatting is as follows: -- Single tabs per indentation level, 2 extra tabs for continued lines. -- Blank line between block statements within the same indentation level (unless adjacent to if, else, do etc). -- No blank lines at the start or end of a block, i.e. no blank line after `{` or before `}`. -- Blank line after input (parameter) validation, if present. -- New line after `{` unless empty (`{}` or `{ }`), never before. -- Line length usually below 120 columns, sometimes up to 160 if beneficial for readability. -- Single space after `if`, `for`, `do`, `break` unless followed by `;`. -- No space after `(` or before `)`. -- Statements should use the block form except for single-line if statements that use a short condition and nothing else. -- Ternary operator use only within a single line total. - -Fabric API uses the Gradle checkstyle plugin. If you run `gradle check` any style errors will be logged in the output. The style errors can also be viewed in a generated webpage by the Gradle task. - -### Style guidelines - -These are less strict guidelines for the code style, but you should generally obey these: - -- No redundant static access qualifiers. - - For example if you call `ClassHere.staticThing()` inside of another method in `ClassHere`, you should avoid fully qualifying the static access to `staticThing()`. -- The use of the `this` qualifier is optional. You may need to use it in order to avoid shadowing variables but its general use elsewhere is fine. - - Generally keep consistent with the current standard inside of the class you are editing. - -## Testing -Including testing code when submitting new features is essential, both to demonstrate the feature, and to ensure that it works correctly. -Testing code should not be in the regular source sets, it belongs to so-called "test mods". - -- Test mods are located in the `testmod` source set. Example: `fabric-lifecycle-events-v1/src/testmod/` -- Test mods should provide the necessary content to debug an issue with the api manually. - - Test mods can also be helpful in order to illustrate how to use a module as a fallback for wiki pages that have yet to be written. -- If a test mod can be partially automated then it is encouraged to implement an automatically failing test if something goes wrong. - - This allows issues with the implementation or porting issues to be detected immediately. - - For example, if a test mod checks if commands are registered on the server and the commands are not on the `CommandDispatcher` then the test should fail. - - Good places to run the automated checks include: - - The mod initializer if applicable. - - In a listener for `ServerLifecycleEvents.SERVER_STARTED` if a server instance is required. - - A game test. - - Test failures should always throw an `AssertionError` explaining what condition was not met during the test. - -Fabric API pull requests should be tested in the dev environment and in production (on both a client and dedicated server). -The `gradlew build` command can be used to produce the Fabric API fatjar, located in `builds/libs/`. - -#### Common mistakes -One highly likely cause of a production failure is the use of `remap=false` in a mixin. If `remap=false` is used, you need to verify the mixin works in dev and production. Most likely the mixin will not work in production. - -## Checklist before submitting a pull request - -### Apply license headers -There is a Gradle task that can automate this for you. Simply run `gradlew spotlessApply`. - -### Run checks -- The `gradlew check` task runs all the style checks and game tests. -- Code style can be checked with the faster `gradlew checkstyleMain checkstyleTestmod`. - - -### Any new modules/newly deprecated modules need to specify the correct module lifecycle. -If you have created a new module you need to specify the module lifecycle. The `gradlew check` task will pick up any missing module lifecycles for you and tell you the subproject it is missing in. The module lifecycle is specified in the `fabric.mod.json`. - -**Example:** - -```json= -"custom": { - "fabric-api:module-lifecycle": "" -} -``` - -The supported values for the `ModuleLifecycle` are: -- `"stable"` -- `"experimental"` -- `"deprecated"` - -### Testing -See the Testing section above. Make sure to describe in the pull request body how you tested your code, and include relevant test mod code with your pull request. diff --git a/README.md b/README.md index 74c068300a..2fe9c1c80f 100644 --- a/README.md +++ b/README.md @@ -1,90 +1,113 @@ -# Fabric API +

+ +

+

+ + + + + +

-Essential hooks for modding with Fabric. +## 📖 About -Fabric API is the library for essential hooks and interoperability mechanisms for Fabric mods. Examples include: +Essential hooks for modding with Fabric, now available on NeoForge! + +Fabric API is the library for essential hooks and interoperability mechanisms for mods. Examples include: - Exposing functionality that is useful but difficult to access for many mods such as particles, biomes and dimensions -- Adding events, hooks and APIs to improve interoperability between mods. +- Adding events, hooks and APIs to improve interopability between mods. - Essential features such as registry synchronization and adding information to crash reports. - An advanced rendering API designed for compatibility with optimization mods and graphics overhaul mods. -Also check out [Fabric Loader](https://github.com/FabricMC/fabric-loader), the (mostly) version-independent mod loader that powers Fabric. Fabric API is a mod like any other Fabric mod which requires Fabric Loader to be installed. +**📘 The official documentation is available at [sinytra.org](https://sinytra.org/docs).** -For support and discussion for both developers and users, visit [the Fabric Discord server](https://discord.gg/v6v4pMv). +The Forgified Fabric API (FFAPI) is a direct port of [Fabric API](https://github.com/FabricMC/fabric) for the NeoForge +modloader, regularly kept up to date with the upstream repository. It is designed to make cross platform mod development +easier by allowing developers to use Fabric API as a common library to interact with the game's code on both platforms. +However, it is not an abstraction layer, and loader-specific code still needs to be handled separately for each +platform. -## Using Fabric API to play with mods +### 💬 Join the Community -Make sure you have installed fabric loader first. More information about installing Fabric Loader can be found [here](https://fabricmc.net/use/). +We have an official [Discord community](https://discord.gg/mamk7z3TKZ) for our projects. By joining, you can: -To use Fabric API, download it from [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api), [GitHub Releases](https://github.com/FabricMC/fabric/releases) or [Modrinth](https://modrinth.com/mod/fabric-api). +- Get help and technical support from our team and community members +- Keep in touch with the latest development updates and community events +- Engage in the project's development and collaborate with our team +- ... and just hang out with the rest of our community. -The downloaded jar file should be placed in your `mods` folder. +### Compatibility -## Using Fabric API to develop mods +The Forgified Fabric API has checks in place to ensure full api compatibility with Fabric API. This usually +includes `net.fabricmc.*.api` packages and other non-internal code. However, we make no guarantees for implementation +code and internal APIs, as they are subject to change at any time. For the best results, avoid using internal classes +and look for native solutions offered by your platform. -To set up a Fabric development environment, check out the [Fabric example mod](https://github.com/FabricMC/fabric-example-mod) and follow the instructions there. The example mod already depends on Fabric API. +### Design Goals -To include the full Fabric API with all modules in the development environment, add the following to your `dependencies` block in the gradle buildscript: +Our goal is to port as much of Fabric API to use NeoForge's systems as possible and keep modifications to minecraft's +code at minimum, in order to increase mod compatibility and reduce maintenance costs. On the other hand, it's important +that using NeoForge's API doesn't come at the expense of preserving intended behavior. -### Groovy DSL +## 📋 Using Forgified Fabric API to play with mods -```groovy -modImplementation "net.fabricmc.fabric-api:fabric-api:FABRIC_API_VERSION" -``` +Make sure you have installed NeoForge first. More information about installing NeoForge can be +found [here](https://neoforged.net/). -### Kotlin DSL +The Forgified Fabric API is available for download on the following platforms: -```kotlin -modImplementation("net.fabricmc.fabric-api:fabric-api:FABRIC_API_VERSION") -``` +- [GitHub Releases](https://github.com/Sinytra/ForgifiedFabricAPI/releases) +- [CurseForge](https://www.curseforge.com/minecraft/mc-mods/forgified-fabric-api) +- [Modrinth](https://modrinth.com/mod/forgified-fabric-api) + +The downloaded jar file should be placed in your `mods` folder. -Alternatively, modules from Fabric API can be specified individually as shown below (including module jar to your mod jar): +## 🛠️ Using Forgified Fabric API to develop mods -### Groovy DSL +To set up a NeoForge development environment, please read the [NeoForge docs](https://docs.neoforged.net/) and follow the instructions there. + +The Forgified Fabric API is published under the `org.sinytra.forgified-fabric-api` group. To include the full Forgified +Fabric API with all modules in the development environment, add the following to your `dependencies` block in the gradle +buildscript: ```groovy -// Make a collection of all api modules we wish to use -Set apiModules = [ - "fabric-api-base", - "fabric-command-api-v1", - "fabric-lifecycle-events-v1", - "fabric-networking-api-v1" -] - -// Add each module as a dependency -apiModules.forEach { - include(modImplementation(fabricApi.module(it, FABRIC_API_VERSION))) +repositories { + maven { + url "https://maven.sinytra.org" + } } -``` - -### Kotlin DSL - -```kotlin -// Make a set of all api modules we wish to use -setOf( - "fabric-api-base", - "fabric-command-api-v1", - "fabric-lifecycle-events-v1", - "fabric-networking-api-v1" -).forEach { - // Add each module as a dependency - modImplementation(fabricApi.module(it, FABRIC_API_VERSION)) +dependencies { + implementation "org.sinytra.forgified-fabric-api:forgified-fabric-api:FABRIC_API_VERSION" } ``` -Instead of hardcoding version constants all over the build script, Gradle properties may be used to replace these constants. Properties are defined in the `gradle.properties` file at the root of a project. More information is available [here](https://docs.gradle.org/current/userguide/organizing_gradle_projects.html#declare_properties_in_gradle_properties_file). +Instead of hardcoding version constants all over the build script, Gradle properties may be used to replace these +constants. Properties are defined in the `gradle.properties` file at the root of a project. More information is +available [here](https://docs.gradle.org/current/userguide/organizing_gradle_projects.html#declare_properties_in_gradle_properties_file). + +### Mod metadata properties -## Contributing +FFAPI's data generation and gametest frameworks rely on discovering consumers using Fabric mod entrypoint information, +which is not available on NeoForge. Instead, we provide a special mod metadata property that will be used in its place. -See something Fabric API doesn't support, a bug or something that may be useful? We welcome contributions to improve Fabric API. -Make sure to read [the development guidelines](./CONTRIBUTING.md). +The supported entrypoints are `fabric-datagen`, `fabric-gametest` and `fabric-client-gametest`. They can be defined +in your `neoforged.mods.toml` file as follows (replacing `examplemod` with your own mod id): + +```toml +[modproperties.examplemod."fabric:entrypoints"] +fabric-datagen = ["com.example.examplemod.data.DataGenEntrypoint"] +fabric-gametest = ["com.example.examplemod.test.ExampleGameTest"] +fabric-client-gametest = ["com.example.examplemod.client.test.ExampleClientTest"] +``` ## Modules -Fabric API is designed to be modular for ease of updating. This also has the advantage of splitting up the codebase into smaller chunks. +Fabric API is designed to be modular for ease of updating. This also has the advantage of splitting up the codebase into +smaller chunks. Each module contains its own `README.md`* explaining the module's purpose and additional info on using the module. \* The README for each module is being worked on; not every module has a README at the moment + diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000000..9f38e7aea8 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,326 @@ +import me.modmuss50.mpp.ReleaseType +import org.apache.commons.codec.digest.DigestUtils +import org.eclipse.jgit.api.Git +import org.sinytra.ffapi.task.MergeAccessTransformersTask +import org.sinytra.ffapi.task.MergeInterfaceInjectionTask + +plugins { + java + `maven-publish` + id("net.neoforged.moddev") // Version declared in buildSrc + id("me.modmuss50.mod-publish-plugin") version "2.0.+" +} + +val implementationVersion: String by project +val versionMc: String by project +val versionNeoForge: String by project +val versionForgifiedFabricLoader: String by project +val curseforge_minecraft_versions: String by project + +val curseForgeId: String by project +val modrinthId: String by project +val githubRepository: String by project +val publishBranch: String by project + +val META_PROJECTS: List = listOf( + "deprecated", + "internal", + "fabric-api-bom", + "fabric-api-catalog" +) +val DEV_ONLY_MODULES: List = listOf( + "fabric-gametest-api-v1" +) + +ext["getSubprojectVersion"] = object : groovy.lang.Closure(this) { + fun doCall(project: Project): String { + return getSubprojectVersion(project) + } +} +ext["moduleDependencies"] = object : groovy.lang.Closure(this) { + fun doCall(project: Project, depNames: List) { + moduleDependencies(project, depNames) + } +} +ext["testDependencies"] = object : groovy.lang.Closure(this) { + fun doCall(project: Project, depNames: List) { + testDependencies(project, depNames) + } +} + +val upstreamVersion = version + +ext["upstreamVersion"] = upstreamVersion + +version = "$upstreamVersion+$versionMc+$implementationVersion${(if (System.getenv("GITHUB_RUN_NUMBER") == null) "+local" else "")}" +println("Version: $version") + +val injectedInterfaces = configurations.create("injectedInterfaces") + +allprojects { + apply(plugin = "maven-publish") + + publishing { + repositories { + val env = System.getenv() + if (env["MAVEN_URL"] != null) { + repositories.maven { + url = uri(env["MAVEN_URL"] as String) + if (env["MAVEN_USERNAME"] != null) { + credentials { + username = env["MAVEN_USERNAME"] + password = env["MAVEN_PASSWORD"] + } + } + } + } + } + } + + group = "org.sinytra.forgified-fabric-api" + + if (project.name in META_PROJECTS) { + return@allprojects + } + + apply(plugin = "java-library") + apply(plugin = "net.neoforged.moddev") + + java { + toolchain.languageVersion.set(JavaLanguageVersion.of(25)) + withSourcesJar() + } + + repositories { + mavenCentral() + mavenLocal() + maven { + name = "FabricMC" + url = uri("https://maven.fabricmc.net") + } + maven { + name = "Mojank" + url = uri("https://libraries.minecraft.net/") + } + maven { + name = "NeoForged" + url = uri("https://maven.neoforged.net/releases") + } + maven { + name = "Sinytra" + url = uri("https://maven.su5ed.dev/releases") + } + } + + neoForge { + enable { + version = versionNeoForge + isDisableRecompilation = true + } + + runs { + create("client") { + client() + } + create("data") { + clientData() + } + create("server") { + server() + } + } + } + + // Run this task after updating minecraft to regenerate any required resources + tasks.register("generateResources") { + + } +} + +dependencies { + // Include Forgified Fabric Loader + jarJar("org.sinytra:forgified-fabric-loader:$versionForgifiedFabricLoader") { + version { + strictly(versionForgifiedFabricLoader) + prefer(versionForgifiedFabricLoader) + } + } + + // Make FFLoader available to consumers + api("org.sinytra:forgified-fabric-loader:$versionForgifiedFabricLoader") + + accessTransformers(project(":fabric-transitive-access-wideners-v1")) +} + +// Subprojects + +allprojects { + if (project.name in META_PROJECTS) { + return@allprojects + } + + tasks.register("generate") { + group = "sinytra" + } + + // Setup must come before generators + apply(plugin = "ffapi.neo-setup") + apply(plugin = "ffapi.neo-conversion") + apply(plugin = "ffapi.neo-entrypoint") + apply(plugin = "ffapi.package-info") + + allprojects.forEach { p -> + if (!META_PROJECTS.contains(p.name)) { + neoForge.mods.register(p.name) { + sourceSet(p.sourceSets.main.get()) + } + + if (p.file("src/testmod").exists() || p.file("src/testmodClient").exists()) { + neoForge.mods.register(p.name + "-testmod") { + sourceSet(p.sourceSets.getByName("testmod")) + } + } + } + } + + tasks.named("sourcesJar") { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + } + + publishing { + publications { + register("mavenJava") { + from(components["java"]) + } + } + } + + if (project != rootProject) { + neoForge.runs { + listOf("client", "server").forEach { run -> + named(run) { + loadedMods = neoForge.mods.filterNot { it.name.contains("test") } + } + } + } + + rootProject.dependencies.add("interfaceInjectionData", project(project.path)) + rootProject.dependencies.add("accessTransformers", project(project.path)) + } +} + +val mergeInterfaces = tasks.register("mergeInterfaces", MergeInterfaceInjectionTask::class) { + inputFiles.from(configurations.interfaceInjectionData) + outputFile = file("build/$name/merged.json") +} + +val mergeAccessTransformers = tasks.register("mergeAccessTransformers", MergeAccessTransformersTask::class) { + inputFiles.from(configurations.accessTransformers) + outputFile = file("build/$name/merged.accesstransformer") +} + +neoForge { + interfaceInjectionData { + publish(mergeInterfaces) + } + accessTransformers { + publish(mergeAccessTransformers) + } +} + +publishMods { + file.set(tasks.jar.flatMap { it.archiveFile }) + changelog.set(providers.environmentVariable("CHANGELOG").orElse("# ${project.version}")) + type.set(providers.environmentVariable("PUBLISH_RELEASE_TYPE").orElse("alpha").map(ReleaseType::of)) + modLoaders.add("neoforge") + dryRun.set(!providers.environmentVariable("CI").isPresent) + displayName.set("[$versionMc] Forgified Fabric API ${project.version}") + + val compatibleVersions = curseforge_minecraft_versions.split(",") + + github { + accessToken.set(providers.environmentVariable("GITHUB_TOKEN")) + repository.set(githubRepository) + commitish.set(publishBranch) + } + curseforge { + accessToken.set(providers.environmentVariable("CURSEFORGE_TOKEN")) + projectId.set(curseForgeId) + minecraftVersions = compatibleVersions + client.set(true) + server.set(true) + } + modrinth { + accessToken.set(providers.environmentVariable("MODRINTH_TOKEN")) + projectId.set(modrinthId) + minecraftVersions = compatibleVersions + } +} + +dependencies { + afterEvaluate { + subprojects.forEach { proj -> + if (proj.name in META_PROJECTS) { + return@forEach + } + + jarJar(api(project(proj.path))!!) + "testmodImplementation"(proj.sourceSets.getByName("testmod").output) + } + } +} + +val git: Git? = runCatching { Git.open(rootDir) }.getOrNull() + +fun getSubprojectVersion(project: Project): String { + // Get the version from the gradle.properties file + val version = properties["${project.name}-version"] as? String + ?: throw NullPointerException("Could not find version for " + project.name) + + if (git == null) { + return "$version+nogit" + } + + val dirPath = project.projectDir.relativeTo(rootProject.projectDir) + val latestCommits = git.log().addPath(dirPath.path).setMaxCount(1).call().toList() + if (latestCommits.isEmpty()) { + return "$version+uncommited" + } + + return version + "+" + latestCommits[0].id.name.substring(0, 8) + DigestUtils.sha256Hex(versionMc).substring(0, 2) +} + +fun moduleDependencies(project: Project, depNames: List) { + val deps = depNames.map { project.dependencies.project(":$it") } + + project.dependencies { + deps.forEach { + api(it) + add("accessTransformers", it) + add("interfaceInjectionData", it) + } + } +} + +fun testDependencies(project: Project, depNames: List) { + val deps = depNames.map { project.dependencies.project(":$it") } + + project.dependencies { + deps.forEach { + "testmodImplementation"(it) + } + } +} + +neoForge.runs { + listOf("client", "server").forEach { run -> + named(run) { + sourceSet = sourceSets.named("main") + loadedMods.set(loadedMods.map { it.filterNot { it.name.contains("testmod") } }.get()) + } + } + +// named("testmodServer") { +// loadedMods.set(loadedMods.map { it.filter { it.name.contains("recipe") || !it.name.contains("testmod") } }.get()) +// } +} diff --git a/build.gradle b/build.gradle.old similarity index 95% rename from build.gradle rename to build.gradle.old index a91444d643..cfd864d7f1 100644 --- a/build.gradle +++ b/build.gradle.old @@ -2,10 +2,10 @@ plugins { id "java-library" id "eclipse" id "maven-publish" - id "net.fabricmc.fabric-loom" version "1.15.5" apply false - id "com.diffplug.spotless" version "8.3.0" + id "net.fabricmc.fabric-loom" version "1.16.2" apply false + id "com.diffplug.spotless" version "8.5.1" id "me.modmuss50.remotesign" version "0.5.0" apply false - id "me.modmuss50.mod-publish-plugin" version "1.1.0" + id "me.modmuss50.mod-publish-plugin" version "2.0.1" } def branchProvider = providers.of(GitBranchValueSource.class) {} @@ -23,6 +23,7 @@ def debugArgs = [ "-Dmixin.debug.verify=true", //"-Dmixin.debug.strict=true", "-Dmixin.debug.countInjections=true", + "-Dfabric.resource_loader.debug.reloaders_identity.strict=true", "-XX:+UseZGC", "-XX:+UseCompactObjectHeaders", "-XX:+AlwaysPreTouch", @@ -471,15 +472,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') - testmodClientImplementation project(":fabric-gametest-api-v1").sourceSets.client.output + testmodClientImplementation this.project(":fabric-gametest-api-v1").sourceSets.client.output testmodImplementation project(path: ':fabric-resource-loader-v1') - testmodClientImplementation project(":fabric-resource-loader-v1").sourceSets.client.output + testmodClientImplementation this.project(":fabric-resource-loader-v1").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') - testmodClientImplementation project(":fabric-registry-sync-v0").sourceSets.client.output + testmodClientImplementation this.project(":fabric-registry-sync-v0").sourceSets.client.output } } @@ -626,10 +627,10 @@ dependencies { } api project(path: "${it.path}") - clientImplementation project("${it.path}:").sourceSets.client.output + clientImplementation this.project("${it.path}:").sourceSets.client.output - testmodImplementation project("${it.path}:").sourceSets.testmod.output - testmodClientImplementation project("${it.path}:").sourceSets.testmodClient.output + testmodImplementation this.project("${it.path}:").sourceSets.testmod.output + testmodClientImplementation this.project("${it.path}:").sourceSets.testmodClient.output } } @@ -679,6 +680,8 @@ publishMods { accessToken = providers.environmentVariable("CURSEFORGE_API_KEY") projectId = "306612" project.curseforge_minecraft_versions.split(",").each { minecraftVersions.add(it.trim()) } + client = true + server = true } modrinth { diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle deleted file mode 100644 index aabaea66a7..0000000000 --- a/buildSrc/build.gradle +++ /dev/null @@ -1,25 +0,0 @@ -plugins { - id 'checkstyle' - id "com.diffplug.spotless" version "6.20.0" -} - -repositories { - mavenCentral() -} - -checkstyle { - configFile = file("../checkstyle.xml") - toolVersion = "10.20.2" -} - -spotless { - lineEndings = com.diffplug.spotless.LineEnding.UNIX - - java { - licenseHeaderFile(file("../HEADER")) - removeUnusedImports() - importOrder('java', 'javax', '', 'net.minecraft', 'net.fabricmc') - indentWithTabs() - trimTrailingWhitespace() - } -} diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 0000000000..acb1ed8489 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,44 @@ +plugins { + java + `java-base` + `java-library` + `kotlin-dsl` +} + +repositories { + // The org.jetbrains.kotlin.jvm plugin requires a repository + // where to download the Kotlin compiler dependencies from. + mavenCentral() + maven { + name = "FabricMC" + url = uri("https://maven.fabricmc.net") + } + maven { + name = "Mojank" + url = uri("https://libraries.minecraft.net") + } + maven { + name = "NeoForged" + url = uri("https://maven.neoforged.net/releases") + } + maven { + name = "Architectury" + url = uri("https://maven.architectury.dev") + } + gradlePluginPortal() +} + +dependencies { + implementation("net.neoforged:moddev-gradle:2.0.142") + + implementation("net.fabricmc:fabric-loader:0.15.10") + implementation("net.fabricmc:class-tweaker:0.3.0-beta.2") + + implementation("com.google.code.gson:gson:2.10.1") + implementation("com.moandjiezana.toml:toml4j:0.7.2") + implementation("dev.architectury:at:1.0.1") + + implementation("commons-codec:commons-codec:1.17.0") + + implementation("org.eclipse.jgit:org.eclipse.jgit:6.9.0.202403050737-r") +} diff --git a/buildSrc/src/main/java/net/fabricmc/fabric/impl/build/AbstractGitValueSource.java b/buildSrc/src/main/java/net/fabricmc/fabric/impl/build/AbstractGitValueSource.java deleted file mode 100644 index b437420de5..0000000000 --- a/buildSrc/src/main/java/net/fabricmc/fabric/impl/build/AbstractGitValueSource.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.impl.build; - -import java.io.ByteArrayOutputStream; - -import javax.inject.Inject; - -import org.gradle.api.provider.ValueSource; -import org.gradle.api.provider.ValueSourceParameters; -import org.gradle.process.ExecOperations; -import org.gradle.process.ExecResult; - -public abstract class AbstractGitValueSource implements ValueSource { - @Inject - protected abstract ExecOperations getExecOperations(); - - protected String git(String... args) { - var outputStream = new ByteArrayOutputStream(); - ExecResult result = getExecOperations().exec(spec -> { - spec.commandLine("git"); - spec.args((Object[]) args); - spec.setStandardOutput(outputStream); - }); - result.assertNormalExitValue(); - return outputStream.toString().trim(); - } -} diff --git a/buildSrc/src/main/java/net/fabricmc/fabric/impl/build/CommitHashValueSource.java b/buildSrc/src/main/java/net/fabricmc/fabric/impl/build/CommitHashValueSource.java deleted file mode 100644 index 0a64d2a662..0000000000 --- a/buildSrc/src/main/java/net/fabricmc/fabric/impl/build/CommitHashValueSource.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.impl.build; - -import org.gradle.api.provider.Property; -import org.gradle.api.provider.ValueSourceParameters; - -public abstract class CommitHashValueSource extends AbstractGitValueSource { - public interface Parameters extends ValueSourceParameters { - Property getDirectory(); - } - - @Override - public String obtain() { - return git("log", "-1", "--format=%H", "--", getParameters().getDirectory().get()); - } -} diff --git a/buildSrc/src/main/kotlin/ffapi.neo-conversion.gradle.kts b/buildSrc/src/main/kotlin/ffapi.neo-conversion.gradle.kts new file mode 100644 index 0000000000..1f2bfea115 --- /dev/null +++ b/buildSrc/src/main/kotlin/ffapi.neo-conversion.gradle.kts @@ -0,0 +1,123 @@ +import net.neoforged.moddevgradle.dsl.ModDevExtension +import net.neoforged.moddevgradle.dsl.NeoForgeExtension +import org.sinytra.ffapi.InterfaceInjection +import org.sinytra.ffapi.LoomExtension +import org.sinytra.ffapi.task.GenerateAccessTransformerTask +import org.sinytra.ffapi.task.GenerateInjectedInterfacesTask +import org.sinytra.ffapi.task.GenerateModMetadataTask + +val versionMc: String by rootProject +val versionNeoForge: String by rootProject + +val modDev = extensions.getByType() +val loomStub = extensions.create("loom") + +object Constants { + const val modMetaBaseTaskName = "ModMetadata" + const val atBaseTaskName = "AccessTransformer" + const val modMetadataPath = "META-INF/neoforge.mods.toml" + const val accessTransformerPath = "META-INF/accesstransformer.cfg" + const val injectedInterfacesPath = "META-INF/interfaces.json" + const val generateATTaskName = "generateAccessTransformer" + const val generateInjectedInterfacesTaskName = "generateInjectedInterfaces" +} + +extensions.getByType().configureEach { + // We have to capture the source set name for the lazy string literals, + // otherwise it'll just be whatever the last source set is in the list. + val sourceSetName = name + val resourceRoots = resources.srcDirs + + val modMetaTaskName = getTaskName("generate", Constants.modMetaBaseTaskName) + val generateModMeta = tasks.register(modMetaTaskName, GenerateModMetadataTask::class.java) { + group = "sinytra" + description = "Generates neoforge.mods.toml for $sourceSetName fabric mod." + + // Only apply to default source directory since we also add the generated + // sources to the source set. + sourceRoots.from(resourceRoots) + outputFile = file("src/generated/$sourceSetName/resources/${Constants.modMetadataPath}") + forgeVersionString = versionNeoForge + minecraftVersionString = versionMc + } + + if (sourceSetName != "main") { + resources.srcDirs(files("src/generated/$sourceSetName/resources").builtBy(generateModMeta)) + } + + val cleanTask = tasks.register(getTaskName("clean", Constants.modMetaBaseTaskName), Delete::class.java) { + group = "sinytra" + delete(file("src/generated/$sourceSetName/resources")) + } + tasks.named("clean") { + dependsOn(cleanTask) + } + tasks.named("generate") { + dependsOn(generateModMeta) + } + tasks.named("jar") { + exclude("fabric.mod.json") + } +} + +extensions.getByType().named("main").configure { + val generatedAtFile = file("src/generated/main/resources/${Constants.accessTransformerPath}") + val generateAccessTransformer = tasks.register(Constants.generateATTaskName, GenerateAccessTransformerTask::class.java) { + group = "sinytra" + description = "Generates accesstransformer.cfg for fabric mod." + + outputFile = generatedAtFile + classTweaker = provider { loomStub.accessWidenerPath.orNull } + } + + val generateInjectedInterfaces = tasks.register(Constants.generateInjectedInterfacesTaskName, GenerateInjectedInterfacesTask::class) { + group = "sinytra" + + outputFile = file("src/generated/main/resources/${Constants.injectedInterfacesPath}") + classTweaker = provider { loomStub.accessWidenerPath.orNull } + } + + val modMetaTaskName = getTaskName("generate", Constants.modMetaBaseTaskName) + resources.srcDir( + files("src/generated/main/resources") + .builtBy(generateAccessTransformer, generateInjectedInterfaces, modMetaTaskName) + ) + + tasks.named("generate") { + dependsOn(generateAccessTransformer, generateInjectedInterfaces) + } + tasks.named("copyAccessTransformersPublications") { + dependsOn(generateAccessTransformer) + } + tasks.named("copyInterfaceInjectionDataPublications") { + dependsOn(generateInjectedInterfaces) + } +} + +afterEvaluate { + loomStub.accessWidenerPath.orNull?.also { value -> + tasks.withType { + exclude(loomStub.accessWidenerPath.get().asFile.name) + } + + val atFile = tasks.named(Constants.generateATTaskName).flatMap { it.outputFile } + modDev.accessTransformers.from(atFile) + modDev.accessTransformers.publish(atFile) + + val file = value.asFile + val fileOutputDir = file("src/generated/main/resources") + + val hasInterfaces = file.bufferedReader().use(InterfaceInjection::hasInjectedInterfaces) + if (hasInterfaces) { + val neoForge = the() + val generatedFile = fileOutputDir.resolve(Constants.injectedInterfacesPath) + + neoForge.interfaceInjectionData.from( + files(generatedFile).builtBy(Constants.generateInjectedInterfacesTaskName) + ) + neoForge.interfaceInjectionData.publish(generatedFile) + } + } +} + + diff --git a/buildSrc/src/main/kotlin/ffapi.neo-entrypoint.gradle.kts b/buildSrc/src/main/kotlin/ffapi.neo-entrypoint.gradle.kts new file mode 100644 index 0000000000..b05114afc9 --- /dev/null +++ b/buildSrc/src/main/kotlin/ffapi.neo-entrypoint.gradle.kts @@ -0,0 +1,171 @@ +import net.fabricmc.loader.impl.metadata.* +import kotlin.io.path.createDirectories +import kotlin.io.path.writeText + +val versionMc: String by rootProject +val versionNeoForge: String by rootProject + +val sourceSets = extensions.getByType() + +// Source sets that can contain the mod entrypoint file +val masterSourceSets = listOf("main", "testmod").mapNotNull(sourceSets::findByName).filter { it.java.srcDirs.any(File::exists) || it.resources.srcDirs.any(File::exists) } + +masterSourceSets.forEach { sourceSet -> + val modMetadataJson = sourceSet.java.srcDirs.map { it.parentFile.resolve("resources/fabric.mod.json") }.firstOrNull(File::exists) ?: return@forEach + val baseTaskName = "ForgeModEntrypoint" + val taskName = sourceSet.getTaskName("generate", baseTaskName) + val targetDir = project.file("src/generated/${sourceSet.name}/java") + val task = tasks.register(taskName, GenerateForgeModEntrypoint::class.java) { + group = "sinytra" + description = "Generates entrypoint files for ${sourceSet.name} fabric mod." + project.tasks.findByName(sourceSet.getTaskName("generate", "ImplPackageInfos"))?.let { mustRunAfter(it) } + + // Only apply to default source directory since we also add the generated + // sources to the source set. + sourceRoots.from(sourceSet.java.srcDirs) + outputDir.set(targetDir) + fabricModJson.set(modMetadataJson) + testEnvironment = sourceSet.name == "testmod" + includeVersion.set(project.parent?.name == "deprecated") + } + sourceSet.java.srcDir(task) + val cleanTask = tasks.register(sourceSet.getTaskName("clean", baseTaskName), Delete::class.java) { + group = "sinytra" + delete(file("src/generated/${sourceSet.name}/java")) + project.tasks.findByName(sourceSet.getTaskName("clean", "ImplPackageInfos"))?.let { mustRunAfter(it) } + } + tasks.named("clean") { + dependsOn(cleanTask) + } + tasks.named("generate") { + dependsOn(task) + } +} + +abstract class GenerateForgeModEntrypoint : DefaultTask() { + @get:SkipWhenEmpty + @get:InputFiles + val sourceRoots: ConfigurableFileCollection = project.objects.fileCollection() + + @get:InputFile + val fabricModJson: RegularFileProperty = project.objects.fileProperty() + + @get:Input + val includeVersion: Property = project.objects.property(Boolean::class) + + @get:Input + val testEnvironment: Property = project.objects.property(Boolean::class) + + @get:OutputDirectory + val outputDir: DirectoryProperty = project.objects.directoryProperty() + + private val projectNamePattern = "^fabric_(.+?)(?:_v\\d)?\$".toRegex() + private val projectVersionNamePattern = "^fabric_(.+?_v\\d.*)?\$".toRegex() + + @TaskAction + fun run() { + val modMetadata = parseModMetadata(fabricModJson.asFile.get()) + val modid = normalizeModid(modMetadata.id) + + val className = "GeneratedEntryPoint" + val packageName = packageNameForEntryPoint(modid, includeVersion.get()) + val packagePath = packageName.replace('/', '.') + val packageDir = outputDir.file(packagePath).get().asFile.toPath() + packageDir.createDirectories() + val destFile = packageDir.resolve("$className.java") + + val commonEntrypoints = + modMetadata.getEntrypoints("main").map(EntrypointMetadata::getValue).filter(::entryPointExists) + .map { createEntrypointCall(it, "onInitialize") } + val clientEntrypoints = + modMetadata.getEntrypoints("client").map(EntrypointMetadata::getValue).filter(::entryPointExists) + .map { createEntrypointCall(it, "onInitializeClient") } + val serverEntrypoints = + modMetadata.getEntrypoints("server").map(EntrypointMetadata::getValue).filter(::entryPointExists) + .map { createEntrypointCall(it, "onInitializeServer") } + val separator = "\n " + val nestedSeparator = "\n " + + val commonEntrypointInit = if (commonEntrypoints.isNotEmpty()) { + """// Initialize main entrypoints + ${commonEntrypoints.joinToString(separator)}""" + } else "" + val clientEntrypointInit = if (clientEntrypoints.isNotEmpty()) { + """ + // Initialize client entrypoints + if (net.neoforged.fml.loading.FMLEnvironment.getDist().isClient()) { + ${clientEntrypoints.joinToString(nestedSeparator)} + }""" + } else "" + val serverEntrypointInit = if (serverEntrypoints.isNotEmpty()) { + """ + // Initialize server entrypoints + if (net.neoforged.fml.loading.FMLEnvironment.getDist().isDedicatedServer()) { + ${serverEntrypoints.joinToString(nestedSeparator)} + }""" + } else "" + val entrypointInitializers = listOf(commonEntrypointInit, clientEntrypointInit, serverEntrypointInit) + .filter(String::isNotEmpty) + .joinToString(separator = separator) + val testEnvSetup = if (testEnvironment.get()) + """// Setup test environment + net.neoforged.neoforge.registries.GameData.unfreezeData();$separator""" + else "" + + val template = """ + package $packageName; + + @net.neoforged.fml.common.Mod($className.MOD_ID) + public class $className { + public static final String MOD_ID = "$modid"; + public static final String RAW_MOD_ID = "${modMetadata.id}"; + + public $className(net.neoforged.bus.api.IEventBus bus) { + $testEnvSetup$entrypointInitializers + } + } + """.trimIndent() + + destFile.writeText(template) + } + + private fun packageNameForEntryPoint(modid: String, includeVersion: Boolean): String { + val uniqueName = (if (includeVersion) projectVersionNamePattern else projectNamePattern).find(modid)?.groups?.get(1)?.value + ?: throw RuntimeException("Unable to determine generated package name for mod $modid") + return "org.sinytra.fabric.$uniqueName.generated" + } + + private fun entryPointExists(path: String): Boolean { + return sourceRoots.any { root -> + val className = path.split("::").first().replace('.', '/') + root.resolve(className + ".java").exists() + } + } + + private fun createEntrypointCall(entrypoint: String, method: String): String { + val parts = entrypoint.split("::") + if (parts.size == 1) { + return "new ${parts[0]}().$method();" + } else if (parts.size == 2) { + return "${parts[0]}.${parts[1]}();" + } + throw IllegalStateException("invalid entrypoint: $entrypoint"); + } + + private fun normalizeModid(modid: String): String { + return modid.replace('-', '_') + } + + private fun parseModMetadata(file: File): LoaderModMetadata { + return file.inputStream().use { + ModMetadataParser.parseMetadata( + it, + "", + listOf(), + VersionOverrides(), + DependencyOverrides(project.file("nonexistent").toPath()), + false + ) + } + } +} diff --git a/buildSrc/src/main/kotlin/ffapi.neo-setup.gradle.kts b/buildSrc/src/main/kotlin/ffapi.neo-setup.gradle.kts new file mode 100644 index 0000000000..70be096a2d --- /dev/null +++ b/buildSrc/src/main/kotlin/ffapi.neo-setup.gradle.kts @@ -0,0 +1,112 @@ +import net.neoforged.moddevgradle.dsl.ModDevExtension + +val versionMc: String by rootProject +val versionNeoForge: String by rootProject +val versionForgifiedFabricLoader: String by rootProject + +val modDev = extensions.getByType() +val sourceSets = extensions.getByType() + +val mainSourceSet = sourceSets.getByName("main") + +mainSourceSet.apply { + java { + srcDir("src/client/java") + } + resources { + srcDir("src/client/resources") + } +} + +val testmod: SourceSet by sourceSets.creating { + compileClasspath += mainSourceSet.compileClasspath + runtimeClasspath += mainSourceSet.runtimeClasspath + + java { + srcDir("src/testmodClient/java") + } + resources { + srcDir("src/testmodClient/resources") + } +} + +sourceSets.named("test") { + compileClasspath += testmod.compileClasspath + runtimeClasspath += testmod.runtimeClasspath +} + +dependencies { + "implementation"("org.sinytra:forgified-fabric-loader:$versionForgifiedFabricLoader") + + "testmodImplementation"(mainSourceSet.output) + + "testImplementation"(testmod.output) + "testImplementation"("org.mockito:mockito-core:5.4.0") + "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.8.1") + "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.8.1") + "testRuntimeOnly"("org.junit.platform:junit-platform-launcher") + + if (project.name != "fabric-gametest-api-v1") { + "testmodImplementation"(project(":fabric-gametest-api-v1")) + } +} + +tasks { + afterEvaluate { + named("jar") { + manifest { + attributes( + "Implementation-Version" to project.version + ) + } + } + } + + named("test") { + useJUnitPlatform() + isEnabled = false + } + + named("processResources") { + filesMatching("assets/*/icon.png") { + exclude() + rootProject.file("src/main/resources/assets/fabric/icon.png").copyTo(destinationDir.resolve(path)) + } + } +} + +modDev.apply { + runs { + configureEach { + systemProperty("forge.logging.console.level", "debug") + systemProperty("mixin.debug", "true") + } + + create("gametestServer") { + type = "gameTestServer" + sourceSet = testmod + + // Enable the gametest runner + systemProperty("neoforge.enableGameTest", "true") + } + + create("gametestClient") { + client() + sourceSet = testmod + + // Enable the gametest runner + systemProperty("fabric.client.gametest", "true") + } + + create("testmodClient") { + client() + sourceSet = testmod + } + + create("testmodServer") { + server() + sourceSet = testmod + } + } +} + diff --git a/buildSrc/src/main/kotlin/ffapi.package-info.gradle.kts b/buildSrc/src/main/kotlin/ffapi.package-info.gradle.kts new file mode 100644 index 0000000000..6e53864bf9 --- /dev/null +++ b/buildSrc/src/main/kotlin/ffapi.package-info.gradle.kts @@ -0,0 +1,97 @@ +import org.gradle.api.tasks.SourceSetContainer +import java.nio.file.Files +import java.nio.file.Path +import kotlin.io.path.* + +val targetSourceSets = setOf("main", "client") + +val sourceSets = extensions.getByType() + +sourceSets.configureEach { + if (name in targetSourceSets) { + // We have to capture the source set name for the lazy string literals, + // otherwise it'll just be whatever the last source set is in the list. + val sourceSetName = name + val taskName = getTaskName("generate", "ImplPackageInfos") + val task = project.tasks.register(taskName) { + group = "sinytra" + description = "Generates package-info files for $sourceSetName implementation packages." + // Only apply to default source directory since we also add the generated + // sources to the source set. + header.set(rootProject.file("HEADER")) + sourceRoots.from(this@configureEach.java.srcDirs) + outputDir.set(file("src/generated/$sourceSetName/java")) + } + java.srcDir(task) + val cleanTask = project.tasks.register(getTaskName("clean", "ImplPackageInfos")) { + group = "sinytra" + delete(file("src/generated/$sourceSetName/java")) + } + tasks.named("clean") { + dependsOn(cleanTask) + } + tasks.named("generate") { + dependsOn(task) + } + } +} + +open class GenerateImplPackageInfos : DefaultTask() { + companion object { + val INTERNAL_DIRS = setOf("impl", "mixin") + const val PACKAGE_INFO = "package-info.java" + } + + @InputFile + val header: RegularFileProperty = project.objects.fileProperty() + + @SkipWhenEmpty + @InputFiles + val sourceRoots: ConfigurableFileCollection = project.objects.fileCollection() + + @OutputDirectory + val outputDir: DirectoryProperty = project.objects.directoryProperty() + + @TaskAction + fun execute() { + val output: Path = outputDir.get().asFile.toPath() + val headerText = header.get().asFile.readLines().joinToString("\n") // normalize line endings + sourceRoots.files + .filter(File::isDirectory) + .forEach { sourceRoot -> generateForRoot(sourceRoot, output, headerText) } + } + + private fun generateForRoot(sourceRoot: File, output: Path, headerText: String) { + val root = sourceRoot.toPath() + for (dir in INTERNAL_DIRS) { + val implDir = root.resolve("net/fabricmc/fabric/$dir") + if (implDir.notExists()) { + continue + } + + Files.walk(implDir).filter(Path::isDirectory).forEach { dirPath -> + val containsJava = dirPath.listDirectoryEntries().any { + it.isRegularFile() && it.fileName.toString().endsWith(".java") + } + + if (containsJava && dirPath.resolve(PACKAGE_INFO).notExists()) { + val relativePath = root.relativize(dirPath) + val target = output.resolve(relativePath) + target.createDirectories() + + val packageName = relativePath.toString().replace(File.separator, ".") + target.resolve(PACKAGE_INFO).writeText( + """$headerText + |/** + |* Implementation code for ${project.name}. + |*/ + |@ApiStatus.Internal + |package $packageName; + |import org.jetbrains.annotations.ApiStatus; + """.trimMargin() + ) + } + } + } + } +} diff --git a/buildSrc/src/main/kotlin/org/sinytra/ffapi/Aw2At.kt b/buildSrc/src/main/kotlin/org/sinytra/ffapi/Aw2At.kt new file mode 100644 index 0000000000..65479c393f --- /dev/null +++ b/buildSrc/src/main/kotlin/org/sinytra/ffapi/Aw2At.kt @@ -0,0 +1,69 @@ +/* + * This file is part of fabric-loom, licensed under the MIT License (MIT). + * + * Copyright (c) 2021-2023 FabricMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package org.sinytra.ffapi + +import dev.architectury.at.AccessChange +import dev.architectury.at.AccessTransform +import dev.architectury.at.AccessTransformSet +import dev.architectury.at.ModifierChange +import net.fabricmc.classtweaker.api.ClassTweakerReader +import net.fabricmc.classtweaker.api.visitor.AccessWidenerVisitor +import net.fabricmc.classtweaker.api.visitor.AccessWidenerVisitor.AccessType +import net.fabricmc.classtweaker.api.visitor.AccessWidenerVisitor.AccessType.* +import net.fabricmc.classtweaker.api.visitor.ClassTweakerVisitor +import org.cadixdev.bombe.type.signature.MethodSignature +import java.io.BufferedReader + +object Aw2At { + private fun toAt(access: AccessType): AccessTransform? { + return when (access) { + ACCESSIBLE -> AccessTransform.of(AccessChange.PUBLIC) + EXTENDABLE, MUTABLE -> AccessTransform.of(AccessChange.PUBLIC, ModifierChange.REMOVE) + } + } + + fun toAccessTransformSet(reader: BufferedReader?): AccessTransformSet { + val atSet: AccessTransformSet = AccessTransformSet.create() + + ClassTweakerReader.create(object : ClassTweakerVisitor { + override fun visitAccessWidener(owner: String): AccessWidenerVisitor { + return object : AccessWidenerVisitor { + override fun visitClass(access: AccessType, transitive: Boolean) { + atSet.getOrCreateClass(owner).merge(toAt(access)) + } + + override fun visitMethod(name: String, descriptor: String, access: AccessType, transitive: Boolean) { + atSet.getOrCreateClass(owner).mergeMethod(MethodSignature.of(name, descriptor), toAt(access)) + } + + override fun visitField(name: String, descriptor: String, access: AccessType, transitive: Boolean) { + atSet.getOrCreateClass(owner).mergeField(name, toAt(access)) + } + } + } + }).read(reader, "official") // the mod ID is unused as of CT 0.1.1 + + return atSet + } +} diff --git a/buildSrc/src/main/kotlin/org/sinytra/ffapi/InterfaceInjection.kt b/buildSrc/src/main/kotlin/org/sinytra/ffapi/InterfaceInjection.kt new file mode 100644 index 0000000000..4054de4b18 --- /dev/null +++ b/buildSrc/src/main/kotlin/org/sinytra/ffapi/InterfaceInjection.kt @@ -0,0 +1,60 @@ +package org.sinytra.ffapi + +import net.fabricmc.classtweaker.api.ClassTweakerReader +import net.fabricmc.classtweaker.api.visitor.AccessWidenerVisitor +import net.fabricmc.classtweaker.api.visitor.ClassTweakerVisitor +import java.io.BufferedReader + +object InterfaceInjection { + fun hasInjectedInterfaces(reader: BufferedReader?): Boolean { + var hasInterfaces = false + + ClassTweakerReader.create(object : ClassTweakerVisitor { + override fun visitAccessWidener(owner: String): AccessWidenerVisitor { + return object : AccessWidenerVisitor {} + } + + override fun visitInjectedInterface(owner: String, iface: String, transitive: Boolean) { + hasInterfaces = true + } + }).read(reader, "official") + + return hasInterfaces + } + + fun toInjectedInterfaces(reader: BufferedReader?): Map> { + val interfaces: MutableMap> = mutableMapOf() + + ClassTweakerReader.create(object : ClassTweakerVisitor { + override fun visitAccessWidener(owner: String): AccessWidenerVisitor { + return object : AccessWidenerVisitor {} + } + + override fun visitEnumExtension(owner: String, addedConstant: String, transitive: Boolean) { + throw NotImplementedError() + } + + override fun visitInjectedInterface(owner: String, iface: String, transitive: Boolean) { + val converted = convertGenerics(iface) + interfaces.computeIfAbsent(owner) { mutableListOf() }.add(converted) + } + }).read(reader, "official") + + return interfaces + } + + private fun convertGenerics(name: String): String { + val open = name.indexOf('<') + if (open == -1) return name + val close = name.lastIndexOf('>') + + val stripped = name.substring(open + 1, close) + .split(';') + .filter { it.isNotEmpty() } + .joinToString(",") { param -> + if (param.startsWith("T")) param.drop(1) else param + } + + return name.substring(0, open) + "<" + stripped + ">" + } +} diff --git a/buildSrc/src/main/kotlin/org/sinytra/ffapi/LfWriter.kt b/buildSrc/src/main/kotlin/org/sinytra/ffapi/LfWriter.kt new file mode 100644 index 0000000000..105ad6e6b2 --- /dev/null +++ b/buildSrc/src/main/kotlin/org/sinytra/ffapi/LfWriter.kt @@ -0,0 +1,38 @@ +/* + * This file is part of fabric-loom, licensed under the MIT License (MIT). + * + * Copyright (c) 2021 FabricMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package dev.architectury.loom.util + +import java.io.BufferedWriter +import java.io.IOException +import java.io.Writer + +/** + * A [BufferedWriter] that writes `\n` (LF) instead of [System.lineSeparator]. + */ +class LfWriter(out: Writer) : BufferedWriter(out) { + @Throws(IOException::class) + override fun newLine() { + write('\n'.code) + } +} diff --git a/buildSrc/src/main/kotlin/org/sinytra/ffapi/LoomExtension.kt b/buildSrc/src/main/kotlin/org/sinytra/ffapi/LoomExtension.kt new file mode 100644 index 0000000000..ecfd9baf17 --- /dev/null +++ b/buildSrc/src/main/kotlin/org/sinytra/ffapi/LoomExtension.kt @@ -0,0 +1,7 @@ +package org.sinytra.ffapi + +import org.gradle.api.file.RegularFileProperty + +interface LoomExtension { + abstract val accessWidenerPath: RegularFileProperty +} diff --git a/buildSrc/src/main/kotlin/org/sinytra/ffapi/task/GenerateAccessTransformerTask.kt b/buildSrc/src/main/kotlin/org/sinytra/ffapi/task/GenerateAccessTransformerTask.kt new file mode 100644 index 0000000000..e0b64018ed --- /dev/null +++ b/buildSrc/src/main/kotlin/org/sinytra/ffapi/task/GenerateAccessTransformerTask.kt @@ -0,0 +1,39 @@ +package org.sinytra.ffapi.task + +import dev.architectury.at.AccessTransformSet +import dev.architectury.at.io.AccessTransformFormats +import dev.architectury.loom.util.LfWriter +import org.gradle.api.DefaultTask +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.tasks.InputFile +import org.gradle.api.tasks.Optional +import org.gradle.api.tasks.OutputFile +import org.gradle.api.tasks.TaskAction +import org.sinytra.ffapi.Aw2At +import kotlin.io.path.bufferedReader +import kotlin.io.path.bufferedWriter +import kotlin.io.path.createDirectories + +abstract class GenerateAccessTransformerTask : DefaultTask() { + @get:OutputFile + abstract val outputFile: RegularFileProperty + + @get:InputFile + @get:Optional + abstract val classTweaker: RegularFileProperty + + @TaskAction + fun run() { + val atPath = outputFile.get().asFile.toPath() + + if (classTweaker.isPresent) { + val ctPath = classTweaker.get().asFile.toPath() + + val tweaker = AccessTransformSet.create() + ctPath.bufferedReader().use { tweaker.merge(Aw2At.toAccessTransformSet(it)) } + + atPath.parent.createDirectories() + LfWriter(atPath.bufferedWriter()).use { AccessTransformFormats.FML.write(it, tweaker) } + } + } +} diff --git a/buildSrc/src/main/kotlin/org/sinytra/ffapi/task/GenerateInjectedInterfacesTask.kt b/buildSrc/src/main/kotlin/org/sinytra/ffapi/task/GenerateInjectedInterfacesTask.kt new file mode 100644 index 0000000000..3d647ede3f --- /dev/null +++ b/buildSrc/src/main/kotlin/org/sinytra/ffapi/task/GenerateInjectedInterfacesTask.kt @@ -0,0 +1,41 @@ +package org.sinytra.ffapi.task + +import com.google.gson.GsonBuilder +import org.gradle.api.DefaultTask +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.tasks.InputFile +import org.gradle.api.tasks.Optional +import org.gradle.api.tasks.OutputFile +import org.gradle.api.tasks.TaskAction +import org.sinytra.ffapi.InterfaceInjection +import kotlin.io.path.bufferedReader +import kotlin.io.path.createDirectories +import kotlin.io.path.writeText + +abstract class GenerateInjectedInterfacesTask : DefaultTask() { + @get:OutputFile + abstract val outputFile: RegularFileProperty + + @get:InputFile + @get:Optional + abstract val classTweaker: RegularFileProperty + + @TaskAction + fun run() { + val output = outputFile.asFile.get().toPath() + + if (classTweaker.isPresent) { + val ctPath = classTweaker.get().asFile.toPath() + + // Process injected interfaces + val interfaces = ctPath.bufferedReader().use(InterfaceInjection::toInjectedInterfaces) + if (!interfaces.isEmpty()) { + val gson = GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create() + val text = gson.toJson(interfaces) + + output.parent.createDirectories() + output.writeText(text) + } + } + } +} diff --git a/buildSrc/src/main/kotlin/org/sinytra/ffapi/task/GenerateModMetadataTask.kt b/buildSrc/src/main/kotlin/org/sinytra/ffapi/task/GenerateModMetadataTask.kt new file mode 100644 index 0000000000..ffccba3cca --- /dev/null +++ b/buildSrc/src/main/kotlin/org/sinytra/ffapi/task/GenerateModMetadataTask.kt @@ -0,0 +1,203 @@ +package org.sinytra.ffapi.task + +import com.google.gson.JsonParser +import com.moandjiezana.toml.TomlWriter +import org.gradle.api.DefaultTask +import org.gradle.api.file.ConfigurableFileCollection +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.provider.Property +import org.gradle.api.tasks.* +import kotlin.io.path.* + +abstract class GenerateModMetadataTask : DefaultTask() { + @get:SkipWhenEmpty + @get:InputFiles + abstract val sourceRoots: ConfigurableFileCollection + + @get:OutputFile + abstract val outputFile: RegularFileProperty + + @get:Input + @get:Optional + abstract val forgeVersionString: Property + + @get:Input + @get:Optional + abstract val minecraftVersionString: Property + + private fun normalizeModid(modid: String): String { + return modid.replace('-', '_') + } + + data class ModsToml( + val modLoader: String, + val loaderVersion: String, + val license: String, + val displayTest: String?, + val issueTrackerURL: String?, + + val mods: List, + val dependencies: Map>, + val mixins: List?, + val modproperties: Map>? + ) + + data class ModDependency( + val modId: String, + val type: String, + val versionRange: String, + val ordering: String, + val side: String + ) + + data class Mod( + val modId: String, + val version: String, + val displayName: String, + val logoFile: String?, + val iconFile: String?, + val authors: String?, + val description: String?, + val displayURL: String + ) + + data class Mixin( + val config: String + ) + + @TaskAction + fun run() { + val output = outputFile.get().asFile.toPath() + for (sourceRoot in sourceRoots) { + if (!sourceRoot.isDirectory()) { + continue + } + + val root = sourceRoot.toPath() + val fabricMetadata = root.resolve("fabric.mod.json") + val isTestMod = root.parent.name.contains("test") + + if (fabricMetadata.notExists()) { + continue + } + + val json = fabricMetadata.bufferedReader().use(JsonParser::parseReader).asJsonObject + + val originalModid = json.get("id").asString + val normalModid = normalizeModid(originalModid) + val excludedDeps = listOf("fabricloader", "java", "minecraft") + val modDependencies = + (json.getAsJsonObject("depends")?.entrySet() ?: emptySet()).filter { !excludedDeps.contains(it.key) }.map { + val normalDepModid = normalizeModid(it.key as String) + return@map ModDependency( + normalDepModid, + "required", + "*", + "NONE", + "BOTH" + ) + } + val baseDependencies: MutableList = mutableListOf() + + if (forgeVersionString.isPresent) { + val parts = forgeVersionString.get().split(".") + val neoMajorMC = parts[0] + val neoMinorMC = parts[1] + val neoPatchMC = parts[2] + val neoBuild = parts[3] + val nextMajor = neoMajorMC.toInt() + 1 + + baseDependencies += ModDependency( + "neoforge", + "required", + "[$neoMajorMC.$neoMinorMC.$neoPatchMC.$neoBuild,$nextMajor)", + "NONE", + "BOTH" + ) + } + if (minecraftVersionString.isPresent) { + val parts = minecraftVersionString.get().split(".") + val mcMajor = parts[0] + val mcMinor = parts[1] + val nextMajor = mcMajor.toInt() + 1 + + baseDependencies += ModDependency( + "minecraft", + "required", + "[$mcMajor.$mcMinor,$nextMajor)", + "NONE", + "BOTH" + ) + } + + val allDependencies: List = baseDependencies + modDependencies + val displayTest = when (json.get("environment")?.asString) { + "client" -> "IGNORE_ALL_VERSION" + "server" -> "IGNORE_SERVER_VERSION" + else -> null + } + val providedMods = buildList { + json.getAsJsonArray("provides")?.forEach { add(it.asString) } + if (originalModid != normalModid) { + add(originalModid) + } + } + val mods = listOf( + Mod( + modId = normalModid, + version = "\${file.jarVersion}", + displayName = "Forgified " + json.get("name").asString, + logoFile = json.get("icon")?.asString, // used because otherwise some launchers can't parse the logo + iconFile = json.get("icon")?.asString, + authors = (listOf("Sinytra") + (json.getAsJsonArray("authors")?.map { it.asString } ?: emptyList())).joinToString(separator = ", "), + description = json.get("description")?.asString, + displayURL = "https://github.com/Sinytra/ForgifiedFabricAPI" + ) + ) + val mixins = json.getAsJsonArray("mixins")?.map { + if (it.isJsonObject) { + Mixin(it.asJsonObject.get("config").asString) + } else if (it.isJsonPrimitive) { + Mixin(it.asString) + } else { + throw RuntimeException("Unknown mixin config type $it") + } + } + val allowedEntrypoints = listOf("fabric-client-gametest", "fabric-gametest", "fabric-datagen") + val modproperties = mutableMapOf(); + + if (isTestMod) { + modproperties["sinytra:use_default_fluid_type"] = true + } + + if (normalModid != originalModid) { + modproperties["fabric:provides"] = listOf(originalModid); + } + + json.getAsJsonObject("entrypoints") + ?.let { + val entrypoints = mutableMapOf>() + allowedEntrypoints.forEach { key -> + it.get(key)?.let { entrypoints[key] = it.asJsonArray.map { it.asString } } + } + modproperties["fabric:entrypoints"] = entrypoints + } + + val modsToml = ModsToml( + modLoader = "javafml", + loaderVersion = "*", + license = json.get("license")?.asString ?: "All Rights Reserved", + displayTest, + issueTrackerURL = "https://github.com/Sinytra/ForgifiedFabricAPI/issues", + + mods, + dependencies = mapOf(normalModid to allDependencies), + mixins, + modproperties.takeIf { it.isNotEmpty() }?.let { mapOf(normalModid to it) } + ) + output.deleteIfExists() + output.parent.createDirectories() + TomlWriter().write(modsToml, output.toFile()) + } + } +} diff --git a/buildSrc/src/main/kotlin/org/sinytra/ffapi/task/MergeAccessTransformersTask.kt b/buildSrc/src/main/kotlin/org/sinytra/ffapi/task/MergeAccessTransformersTask.kt new file mode 100644 index 0000000000..d5849c7d41 --- /dev/null +++ b/buildSrc/src/main/kotlin/org/sinytra/ffapi/task/MergeAccessTransformersTask.kt @@ -0,0 +1,29 @@ +package org.sinytra.ffapi.task + +import org.gradle.api.DefaultTask +import org.gradle.api.file.ConfigurableFileCollection +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.tasks.InputFiles +import org.gradle.api.tasks.OutputFile +import org.gradle.api.tasks.TaskAction + +abstract class MergeAccessTransformersTask : DefaultTask() { + @get:InputFiles + abstract val inputFiles: ConfigurableFileCollection + + @get:OutputFile + abstract val outputFile: RegularFileProperty + + @TaskAction + fun run() { + val builder = StringBuilder() + + inputFiles.forEach { f -> + val text = f.readText() + + builder.append(text).append("\n") + } + + outputFile.asFile.get().writeText(builder.toString()) + } +} diff --git a/buildSrc/src/main/kotlin/org/sinytra/ffapi/task/MergeInterfaceInjectionTask.kt b/buildSrc/src/main/kotlin/org/sinytra/ffapi/task/MergeInterfaceInjectionTask.kt new file mode 100644 index 0000000000..524e5c5fd9 --- /dev/null +++ b/buildSrc/src/main/kotlin/org/sinytra/ffapi/task/MergeInterfaceInjectionTask.kt @@ -0,0 +1,37 @@ +package org.sinytra.ffapi.task + +import com.google.gson.GsonBuilder +import com.google.gson.JsonArray +import com.google.gson.JsonObject +import com.google.gson.JsonParser +import org.gradle.api.DefaultTask +import org.gradle.api.file.ConfigurableFileCollection +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.tasks.InputFiles +import org.gradle.api.tasks.OutputFile +import org.gradle.api.tasks.TaskAction + +abstract class MergeInterfaceInjectionTask : DefaultTask() { + @get:InputFiles + abstract val inputFiles: ConfigurableFileCollection + + @get:OutputFile + abstract val outputFile: RegularFileProperty + + @TaskAction + fun run() { + val result = JsonObject() + + inputFiles.forEach { f -> + val content = f.reader().use(JsonParser::parseReader).asJsonObject + for ((key, values) in content.entrySet()) { + val combined = result.getAsJsonArray(key) ?: JsonArray().also { result.add(key, it) } + + combined.addAll(values.asJsonArray) + } + } + + val gson = GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create() + outputFile.asFile.get().writeText(gson.toJson(result)) + } +} diff --git a/checkstyle.xml b/checkstyle.xml deleted file mode 100644 index fd3878af0b..0000000000 --- a/checkstyle.xml +++ /dev/null @@ -1,327 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/crowdin.yaml b/crowdin.yaml new file mode 100644 index 0000000000..f6d86f441f --- /dev/null +++ b/crowdin.yaml @@ -0,0 +1,7 @@ +files: + - source: "/*/src/*/resources/assets/*/lang/en_us.json" + translation: "%original_path%/%locale_with_underscore%.json" + ignore: ["/*/src/test*/resources/assets/*/lang/en_us.json"] + translation_replace: {src/generated: src/main} +preserve_hierarchy: true +project_id: "647524" diff --git a/crowdin.yml b/crowdin.yml deleted file mode 100644 index 24dbf07d09..0000000000 --- a/crowdin.yml +++ /dev/null @@ -1,11 +0,0 @@ -files: - - source: fabric-resource-loader-v1/src/main/resources/assets/fabric-resource-loader-v1/lang/en_us.json - translation: /fabric-resource-loader-v1/src/main/resources/assets/fabric-resource-loader-v1/lang/%locale_with_underscore%.json - - source: fabric-creative-tab-api-v1/src/main/resources/assets/fabric/lang/en_us.json - translation: /fabric-creative-tab-api-v1/src/main/resources/assets/fabric/lang/%locale_with_underscore%.json - - source: fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/en_us.json - translation: /fabric-registry-sync-v0/src/main/resources/assets/fabric-registry-sync-v0/lang/%locale_with_underscore%.json - - source: fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json - translation: /fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/lang/%locale_with_underscore%.json - - source: fabric-data-attachment-api-v1/src/main/resources/assets/fabric-data-attachment-api-v1/lang/en_us.json - translation: /fabric-data-attachment-api-v1/src/main/resources/assets/fabric-data-attachment-api-v1/lang/%locale_with_underscore%.json diff --git a/deprecated/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ResourceManagerHelperImpl.java b/deprecated/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ResourceManagerHelperImpl.java index a11ac06182..8ef38db09d 100644 --- a/deprecated/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ResourceManagerHelperImpl.java +++ b/deprecated/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ResourceManagerHelperImpl.java @@ -16,9 +16,9 @@ package net.fabricmc.fabric.impl.resource.loader; -import java.util.HashMap; import java.util.Map; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; import java.util.function.Function; @@ -32,7 +32,7 @@ import net.fabricmc.fabric.api.resource.v1.ResourceLoader; public class ResourceManagerHelperImpl implements ResourceManagerHelper { - private static final Map registryMap = new HashMap<>(); + private static final Map registryMap = new ConcurrentHashMap<>(); private final ResourceLoader resourceLoader; diff --git a/fabric-api-base/build.gradle b/fabric-api-base/build.gradle index fc1eb105c5..015b7ba736 100644 --- a/fabric-api-base/build.gradle +++ b/fabric-api-base/build.gradle @@ -1,7 +1,7 @@ version = getSubprojectVersion(project) testDependencies(project, [ - ':fabric-command-api-v2', +// ':fabric-command-api-v2', ':fabric-lifecycle-events-v1', - ':fabric-screen-api-v1' +// ':fabric-screen-api-v1' ]) diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/util/Block2ObjectMap.java b/fabric-api-base/src/main/java/net/fabricmc/fabric/api/util/Block2ObjectMap.java similarity index 92% rename from fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/util/Block2ObjectMap.java rename to fabric-api-base/src/main/java/net/fabricmc/fabric/api/util/Block2ObjectMap.java index 36f35b739a..cfa3d35ea3 100644 --- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/util/Block2ObjectMap.java +++ b/fabric-api-base/src/main/java/net/fabricmc/fabric/api/util/Block2ObjectMap.java @@ -14,6 +14,7 @@ * limitations under the License. */ +// Moved from fabric-content-registries-v0 due to no split packages rule on Neo package net.fabricmc.fabric.api.util; import org.jspecify.annotations.NullMarked; diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/util/Item2ObjectMap.java b/fabric-api-base/src/main/java/net/fabricmc/fabric/api/util/Item2ObjectMap.java similarity index 93% rename from fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/util/Item2ObjectMap.java rename to fabric-api-base/src/main/java/net/fabricmc/fabric/api/util/Item2ObjectMap.java index 9f5ab001ff..1d9d052c70 100644 --- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/util/Item2ObjectMap.java +++ b/fabric-api-base/src/main/java/net/fabricmc/fabric/api/util/Item2ObjectMap.java @@ -14,6 +14,7 @@ * limitations under the License. */ +// Moved from fabric-content-registries-v0 due to no split packages rule on Neo package net.fabricmc.fabric.api.util; import org.jspecify.annotations.NullMarked; diff --git a/fabric-api-base/src/main/java/net/fabricmc/fabric/api/util/TriState.java b/fabric-api-base/src/main/java/net/fabricmc/fabric/api/util/TriState.java index c39ba48882..c0acd94d28 100644 --- a/fabric-api-base/src/main/java/net/fabricmc/fabric/api/util/TriState.java +++ b/fabric-api-base/src/main/java/net/fabricmc/fabric/api/util/TriState.java @@ -159,6 +159,14 @@ public static TriState fromSystemProperty(String property) { return DEFAULT; } + public static TriState fromVanilla(net.minecraft.util.TriState state) { + return switch (state) { + case TRUE -> TRUE; + case FALSE -> FALSE; + case DEFAULT -> DEFAULT; + }; + } + /** * Value of this enum as string. * diff --git a/fabric-api-base/src/main/java/net/fabricmc/fabric/impl/base/BaseModInitializer.java b/fabric-api-base/src/main/java/net/fabricmc/fabric/impl/base/BaseModInitializer.java new file mode 100644 index 0000000000..da2f0a86fd --- /dev/null +++ b/fabric-api-base/src/main/java/net/fabricmc/fabric/impl/base/BaseModInitializer.java @@ -0,0 +1,25 @@ +package net.fabricmc.fabric.impl.base; + +import net.fabricmc.fabric.impl.base.registry.EarlyRegistry; + +import net.minecraft.core.Registry; + +import net.neoforged.bus.api.EventPriority; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.common.Mod; +import net.neoforged.neoforge.registries.ModifyRegistriesEvent; +import org.sinytra.fabric.api_base.generated.GeneratedEntryPoint; + +@Mod(GeneratedEntryPoint.MOD_ID) +public class BaseModInitializer { + + public BaseModInitializer(IEventBus bus) { + bus.addListener(EventPriority.LOWEST, ModifyRegistriesEvent.class, e -> { + for (Registry registry : e.getRegistries()) { + if (registry instanceof EarlyRegistry er) { + er.applyCallbacks(); + } + } + }); + } +} diff --git a/fabric-api-base/src/main/java/net/fabricmc/fabric/impl/base/registry/AddData.java b/fabric-api-base/src/main/java/net/fabricmc/fabric/impl/base/registry/AddData.java new file mode 100644 index 0000000000..3739e55cfa --- /dev/null +++ b/fabric-api-base/src/main/java/net/fabricmc/fabric/impl/base/registry/AddData.java @@ -0,0 +1,6 @@ +package net.fabricmc.fabric.impl.base.registry; + +import net.minecraft.resources.ResourceKey; + +public record AddData(int id, ResourceKey key, T value) { +} diff --git a/fabric-api-base/src/main/java/net/fabricmc/fabric/impl/base/registry/EarlyRegistry.java b/fabric-api-base/src/main/java/net/fabricmc/fabric/impl/base/registry/EarlyRegistry.java new file mode 100644 index 0000000000..64c76ebeba --- /dev/null +++ b/fabric-api-base/src/main/java/net/fabricmc/fabric/impl/base/registry/EarlyRegistry.java @@ -0,0 +1,7 @@ +package net.fabricmc.fabric.impl.base.registry; + +public interface EarlyRegistry { + void gatherCallbacks(); + + void applyCallbacks(); +} diff --git a/fabric-api-base/src/main/java/net/fabricmc/fabric/mixin/base/BootstrapMixin.java b/fabric-api-base/src/main/java/net/fabricmc/fabric/mixin/base/BootstrapMixin.java new file mode 100644 index 0000000000..69a1d50f57 --- /dev/null +++ b/fabric-api-base/src/main/java/net/fabricmc/fabric/mixin/base/BootstrapMixin.java @@ -0,0 +1,25 @@ +package net.fabricmc.fabric.mixin.base; + +import net.fabricmc.fabric.impl.base.registry.EarlyRegistry; + +import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.server.Bootstrap; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(Bootstrap.class) +public class BootstrapMixin { + + @Inject(method = "bootStrap()V", at = @At("TAIL")) + private static void postBootstrap(CallbackInfo ci) { + for (Registry registry : BuiltInRegistries.REGISTRY) { + if (registry instanceof EarlyRegistry er) { + er.gatherCallbacks(); + } + } + } +} diff --git a/fabric-api-base/src/main/java/net/fabricmc/fabric/mixin/base/MappedRegistryMixin.java b/fabric-api-base/src/main/java/net/fabricmc/fabric/mixin/base/MappedRegistryMixin.java new file mode 100644 index 0000000000..5e74311d7d --- /dev/null +++ b/fabric-api-base/src/main/java/net/fabricmc/fabric/mixin/base/MappedRegistryMixin.java @@ -0,0 +1,57 @@ +package net.fabricmc.fabric.mixin.base; + +import java.util.ArrayList; +import java.util.List; + +import net.neoforged.neoforge.registries.BaseMappedRegistry; +import net.neoforged.neoforge.registries.callback.AddCallback; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.core.Holder; +import net.minecraft.core.MappedRegistry; +import net.minecraft.core.RegistrationInfo; +import net.minecraft.resources.ResourceKey; + +import net.fabricmc.fabric.impl.base.registry.AddData; +import net.fabricmc.fabric.impl.base.registry.EarlyRegistry; + +@Mixin(MappedRegistry.class) +public abstract class MappedRegistryMixin extends BaseMappedRegistry implements EarlyRegistry { + @Unique + private List> fabric_bufferedAddCallbacks = new ArrayList<>(); + @Unique + private boolean fabric_gatherCallbacks; + + @Override + public void gatherCallbacks() { + fabric_gatherCallbacks = true; + } + + @Override + public void applyCallbacks() { + for (AddData data : fabric_bufferedAddCallbacks) { + for (AddCallback callback : this.addCallbacks) { + callback.onAdd(this, data.id(), data.key(), data.value()); + } + } + + fabric_gatherCallbacks = false; + } + + @Inject( + method = "register(ILnet/minecraft/resources/ResourceKey;Ljava/lang/Object;Lnet/minecraft/core/RegistrationInfo;)Lnet/minecraft/core/Holder$Reference;", + at = @At( + value = "INVOKE", + target = "Ljava/util/List;forEach(Ljava/util/function/Consumer;)V" + ) + ) + private void beforeOnAddCallback(int id, ResourceKey key, T value, RegistrationInfo registrationInfo, CallbackInfoReturnable> cir) { + if (this.fabric_gatherCallbacks && this.addCallbacks.isEmpty()) { + this.fabric_bufferedAddCallbacks.add(new AddData<>(id, key, value)); + } + } +} diff --git a/fabric-crash-report-info-v1/src/main/resources/fabric-crash-report-info-v1.mixins.json b/fabric-api-base/src/main/resources/fabric-api-base.mixins.json similarity index 61% rename from fabric-crash-report-info-v1/src/main/resources/fabric-crash-report-info-v1.mixins.json rename to fabric-api-base/src/main/resources/fabric-api-base.mixins.json index aa427e9b30..fae81d60ca 100644 --- a/fabric-crash-report-info-v1/src/main/resources/fabric-crash-report-info-v1.mixins.json +++ b/fabric-api-base/src/main/resources/fabric-api-base.mixins.json @@ -1,10 +1,10 @@ { "required": true, - "package": "net.fabricmc.fabric.mixin.crash.report.info", + "package": "net.fabricmc.fabric.mixin.base", "compatibilityLevel": "JAVA_25", "mixins": [ - "ServerWatchdogMixin", - "SystemReportMixin" + "BootstrapMixin", + "MappedRegistryMixin" ], "injectors": { "defaultRequire": 1 diff --git a/fabric-api-base/src/main/resources/fabric.mod.json b/fabric-api-base/src/main/resources/fabric.mod.json index af4ceacda9..97502d84e9 100644 --- a/fabric-api-base/src/main/resources/fabric.mod.json +++ b/fabric-api-base/src/main/resources/fabric.mod.json @@ -21,5 +21,8 @@ "description": "Contains the essentials for Fabric API modules.", "custom": { "fabric-api:module-lifecycle": "stable" - } + }, + "mixins": [ + "fabric-api-base.mixins.json" + ] } diff --git a/fabric-api-base/src/test/java/net/fabricmc/fabric/test/base/MixinAuditTest.java b/fabric-api-base/src/test/java/net/fabricmc/fabric/test/base/MixinAuditTest.java index c6b8e55eef..9d49e6d83a 100644 --- a/fabric-api-base/src/test/java/net/fabricmc/fabric/test/base/MixinAuditTest.java +++ b/fabric-api-base/src/test/java/net/fabricmc/fabric/test/base/MixinAuditTest.java @@ -1,42 +1,42 @@ -/* - * 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.base; - -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.spongepowered.asm.mixin.MixinEnvironment; - -import net.minecraft.SharedConstants; -import net.minecraft.server.Bootstrap; - -/** - * A simple unit test that forces Mixin to load and apply all mixins. - * - *

This test is useful when porting to a new version as you don't need to wait for the game to load to check for mixin errors. - */ -public class MixinAuditTest { - @BeforeAll - static void beforeAll() { - SharedConstants.tryDetectVersion(); - Bootstrap.bootStrap(); - } - - @Test - void auditMixins() { - MixinEnvironment.getCurrentEnvironment().audit(); - } -} +///* +// * 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.base; +// +//import org.junit.jupiter.api.BeforeAll; +//import org.junit.jupiter.api.Test; +//import org.spongepowered.asm.mixin.MixinEnvironment; +// +//import net.minecraft.SharedConstants; +//import net.minecraft.server.Bootstrap; +// +///** +// * A simple unit test that forces Mixin to load and apply all mixins. +// * +// *

This test is useful when porting to a new version as you don't need to wait for the game to load to check for mixin errors. +// */ +//public class MixinAuditTest { +// @BeforeAll +// static void beforeAll() { +// SharedConstants.tryDetectVersion(); +// Bootstrap.bootStrap(); +// } +// +// @Test +// void auditMixins() { +// MixinEnvironment.getCurrentEnvironment().audit(); +// } +//} diff --git a/fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/FabricApiBaseGameTest.java b/fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/FabricApiBaseGameTest.java index 320ec1852f..6677e253ab 100644 --- a/fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/FabricApiBaseGameTest.java +++ b/fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/FabricApiBaseGameTest.java @@ -20,10 +20,10 @@ import net.minecraft.gametest.framework.GameTestHelper; -import net.fabricmc.fabric.api.gametest.v1.GameTest; +//import net.fabricmc.fabric.api.gametest.v1.GameTest; public class FabricApiBaseGameTest { - @GameTest +// @GameTest TODO public void auditMixins(GameTestHelper helper) { MixinEnvironment.getCurrentEnvironment().audit(); diff --git a/fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/FabricApiBaseTestInit.java b/fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/FabricApiBaseTestInit.java index 807b31c837..d2e9decfd9 100644 --- a/fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/FabricApiBaseTestInit.java +++ b/fabric-api-base/src/testmod/java/net/fabricmc/fabric/test/base/FabricApiBaseTestInit.java @@ -16,35 +16,28 @@ package net.fabricmc.fabric.test.base; -import static net.minecraft.commands.Commands.literal; - -import org.spongepowered.asm.mixin.MixinEnvironment; - -import net.minecraft.network.chat.Component; - import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; public class FabricApiBaseTestInit implements ModInitializer { @Override public void onInitialize() { // Command to call audit the mixin environment - CommandRegistrationCallback.EVENT.register((dispatcher, buildContext, environment) -> { - dispatcher.register(literal("audit_mixins").executes(context -> { - context.getSource().sendSuccess(() -> Component.literal("Auditing mixin environment"), false); - - try { - MixinEnvironment.getCurrentEnvironment().audit(); - } catch (Exception e) { - // Use an assertion error to bypass error checking in Commands - throw new AssertionError("Failed to audit mixin environment", e); - } - - context.getSource().sendSuccess(() -> Component.literal("Successfully audited mixin environment"), false); - - return 1; - })); - }); +// CommandRegistrationCallback.EVENT.register((dispatcher, buildContext, environment) -> { +// dispatcher.register(literal("audit_mixins").executes(context -> { +// context.getSource().sendSuccess(() -> Component.literal("Auditing mixin environment"), false); +// +// try { +// MixinEnvironment.getCurrentEnvironment().audit(); +// } catch (Exception e) { +// // Use an assertion error to bypass error checking in Commands +// throw new AssertionError("Failed to audit mixin environment", e); +// } +// +// context.getSource().sendSuccess(() -> Component.literal("Successfully audited mixin environment"), false); +// +// return 1; +// })); +// }); EventTests.run(); } diff --git a/fabric-api-catalog/build.gradle b/fabric-api-catalog/build.gradle index 18f4ce3888..d897f2f52c 100644 --- a/fabric-api-catalog/build.gradle +++ b/fabric-api-catalog/build.gradle @@ -39,6 +39,8 @@ def doConfigureCatalog() { catalogName = 'deprecated-fabric-api' } else if (catalogName == 'fabric-api') { catalogName = 'fabric-api' + } else if (catalogName == 'internal') { + catalogName = 'internal-forgified-fabric-api' } else { catalogName = catalogName.substring('fabric-'.length()) } @@ -47,6 +49,10 @@ def doConfigureCatalog() { catalogName = 'deprecated-' + catalogName } + if (proj.parent != null && proj.parent.name == 'internal') { + catalogName = 'internal-' + catalogName + } + catalog { versionCatalog { library(catalogName, "net.fabricmc.fabric-api:${proj.name}:${proj.version}") diff --git a/fabric-api-lookup-api-v1/build.gradle b/fabric-api-lookup-api-v1/build.gradle index 860d2b0801..0d77001ff9 100644 --- a/fabric-api-lookup-api-v1/build.gradle +++ b/fabric-api-lookup-api-v1/build.gradle @@ -6,7 +6,7 @@ moduleDependencies(project, [ ]) testDependencies(project, [ - ':fabric-rendering-v1', +// ':fabric-rendering-v1', ':fabric-object-builder-api-v1', - ':fabric-transitive-access-wideners-v1' +// ':fabric-transitive-access-wideners-v1' ]) diff --git a/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/block/BlockApiLookupImpl.java b/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/block/BlockApiLookupImpl.java index 7ddf1de6f4..d339691d71 100644 --- a/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/block/BlockApiLookupImpl.java +++ b/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/block/BlockApiLookupImpl.java @@ -36,7 +36,6 @@ import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup; import net.fabricmc.fabric.api.lookup.v1.custom.ApiLookupMap; import net.fabricmc.fabric.api.lookup.v1.custom.ApiProviderMap; -import net.fabricmc.fabric.mixin.lookup.BlockEntityTypeAccessor; public final class BlockApiLookupImpl implements BlockApiLookup { private static final Logger LOGGER = LoggerFactory.getLogger("fabric-api-lookup-api-v1/block"); @@ -110,7 +109,7 @@ public A find(Level level, BlockPos pos, @Nullable BlockState state, @Nullable B @Override public void registerSelf(BlockEntityType... blockEntityTypes) { for (BlockEntityType blockEntityType : blockEntityTypes) { - Block supportBlock = ((BlockEntityTypeAccessor) blockEntityType).getBlocks().iterator().next(); + Block supportBlock = blockEntityType.getValidBlocks().iterator().next(); Objects.requireNonNull(supportBlock, "Could not get a support block for block entity type."); BlockEntity blockEntity = blockEntityType.create(BlockPos.ZERO, supportBlock.defaultBlockState()); Objects.requireNonNull(blockEntity, "Instantiated block entity may not be null."); @@ -164,7 +163,7 @@ public void registerForBlockEntities(BlockEntityApiProvider provider, Bloc } }; - Block[] blocks = ((BlockEntityTypeAccessor) blockEntityType).getBlocks().toArray(new Block[0]); + Block[] blocks = blockEntityType.getValidBlocks().toArray(new Block[0]); registerForBlocks(nullCheckedProvider, blocks); } } diff --git a/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/custom/ApiLookupMapImpl.java b/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/custom/ApiLookupMapImpl.java index d47213c88f..40881c61aa 100644 --- a/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/custom/ApiLookupMapImpl.java +++ b/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/custom/ApiLookupMapImpl.java @@ -16,10 +16,10 @@ package net.fabricmc.fabric.impl.lookup.custom; -import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import net.minecraft.resources.Identifier; @@ -27,7 +27,7 @@ import net.fabricmc.fabric.api.lookup.v1.custom.ApiLookupMap; public final class ApiLookupMapImpl implements ApiLookupMap { - private final Map> lookups = new HashMap<>(); + private final Map> lookups = new ConcurrentHashMap<>(); private final LookupConstructor lookupConstructor; public ApiLookupMapImpl(LookupConstructor lookupConstructor) { diff --git a/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/mixin/lookup/BlockEntityTypeAccessor.java b/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/mixin/lookup/BlockEntityTypeAccessor.java deleted file mode 100644 index d5c21ac072..0000000000 --- a/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/mixin/lookup/BlockEntityTypeAccessor.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.mixin.lookup; - -import java.util.Set; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntityType; - -@Mixin(BlockEntityType.class) -public interface BlockEntityTypeAccessor { - @Accessor("validBlocks") - Set getBlocks(); -} diff --git a/fabric-api-lookup-api-v1/src/main/resources/fabric-api-lookup-api-v1.mixins.json b/fabric-api-lookup-api-v1/src/main/resources/fabric-api-lookup-api-v1.mixins.json index 6d34d27343..a3ebfb90ef 100644 --- a/fabric-api-lookup-api-v1/src/main/resources/fabric-api-lookup-api-v1.mixins.json +++ b/fabric-api-lookup-api-v1/src/main/resources/fabric-api-lookup-api-v1.mixins.json @@ -3,7 +3,6 @@ "package": "net.fabricmc.fabric.mixin.lookup", "compatibilityLevel": "JAVA_25", "mixins": [ - "BlockEntityTypeAccessor", "ServerLevelMixin" ], "injectors": { diff --git a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/FabricApiLookupTest.java b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/FabricApiLookupTest.java index 28a7e0b6ce..ec659d5b1e 100644 --- a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/FabricApiLookupTest.java +++ b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/FabricApiLookupTest.java @@ -26,6 +26,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.BlockEntityTypes; import net.minecraft.world.level.block.state.BlockBehaviour; import net.fabricmc.api.ModInitializer; @@ -75,8 +76,8 @@ public void onInitialize() { InventoryExtractableProvider extractableProvider = new InventoryExtractableProvider(); InventoryInsertableProvider insertableProvider = new InventoryInsertableProvider(); - ItemApis.INSERTABLE.registerForBlockEntities(insertableProvider, BlockEntityType.CHEST, BlockEntityType.DISPENSER, BlockEntityType.DROPPER, BlockEntityType.HOPPER); - ItemApis.EXTRACTABLE.registerForBlockEntities(extractableProvider, BlockEntityType.CHEST, BlockEntityType.DISPENSER, BlockEntityType.DROPPER, BlockEntityType.HOPPER); + ItemApis.INSERTABLE.registerForBlockEntities(insertableProvider, BlockEntityTypes.CHEST, BlockEntityTypes.DISPENSER, BlockEntityTypes.DROPPER, BlockEntityTypes.HOPPER); + ItemApis.EXTRACTABLE.registerForBlockEntities(extractableProvider, BlockEntityTypes.CHEST, BlockEntityTypes.DISPENSER, BlockEntityTypes.DROPPER, BlockEntityTypes.HOPPER); ItemApis.EXTRACTABLE.registerSelf(COBBLE_GEN_BLOCK_ENTITY_TYPE); testLookupRegistry(); diff --git a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/entity/FabricEntityApiLookupTest.java b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/entity/FabricEntityApiLookupTest.java index 26f9d05221..99c298d95f 100644 --- a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/entity/FabricEntityApiLookupTest.java +++ b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/entity/FabricEntityApiLookupTest.java @@ -22,39 +22,40 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.Identifier; import net.minecraft.resources.ResourceKey; -import net.minecraft.world.entity.EntityDimensions; import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.EntityTypes; import net.minecraft.world.entity.MobCategory; import net.minecraft.world.entity.animal.pig.Pig; import net.minecraft.world.entity.monster.Creeper; import net.fabricmc.fabric.api.lookup.v1.entity.EntityApiLookup; import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry; -import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; import net.fabricmc.fabric.test.lookup.FabricApiLookupTest; import net.fabricmc.fabric.test.lookup.api.Inspectable; +import net.neoforged.fml.ModLoadingContext; +import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; + public class FabricEntityApiLookupTest { public static final ResourceKey> INSPECTABLE_PIG_KEY = ResourceKey.create(Registries.ENTITY_TYPE, Identifier.fromNamespaceAndPath(FabricApiLookupTest.MOD_ID, "inspectable_pig")); public static final EntityApiLookup INSPECTABLE = EntityApiLookup.get(Identifier.fromNamespaceAndPath(FabricApiLookupTest.MOD_ID, "inspectable"), Inspectable.class, Void.class); - public static final EntityType INSPECTABLE_PIG = FabricEntityTypeBuilder.create() - .mobCategory(MobCategory.CREATURE) - .entityFactory(InspectablePig::new) - .dimensions(EntityDimensions.scalable(0.9F, 0.9F)) - .trackRangeChunks(10) + public static final EntityType INSPECTABLE_PIG = EntityType.Builder.of(InspectablePig::new, MobCategory.CREATURE) + .sized(0.9F, 0.9F) + .clientTrackingRange(10) .build(INSPECTABLE_PIG_KEY); public static void onInitialize() { - Registry.register(BuiltInRegistries.ENTITY_TYPE, INSPECTABLE_PIG_KEY, INSPECTABLE_PIG); - FabricDefaultAttributeRegistry.register(INSPECTABLE_PIG, Pig.createAttributes()); + Registry.register(BuiltInRegistries.ENTITY_TYPE, Identifier.fromNamespaceAndPath(FabricApiLookupTest.MOD_ID, "inspectable_pig"), INSPECTABLE_PIG); + ModLoadingContext.get().getActiveContainer().getEventBus() + .addListener(FMLCommonSetupEvent.class, e -> FabricDefaultAttributeRegistry.register(INSPECTABLE_PIG, Pig.createAttributes())); INSPECTABLE.registerSelf(INSPECTABLE_PIG); INSPECTABLE.registerForTypes( (entity, context) -> () -> Component.literal("registerForTypes: " + entity.getClass().getName()), - EntityType.PLAYER, - EntityType.COW); + EntityTypes.PLAYER, + EntityTypes.COW); INSPECTABLE.registerFallback((entity, context) -> { if (entity instanceof Creeper) { return () -> Component.literal("registerFallback: Creeper"); diff --git a/fabric-api-lookup-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/lookup/client/entity/FabricEntityApiLookupTestClient.java b/fabric-api-lookup-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/lookup/client/entity/FabricEntityApiLookupTestClient.java index dff6f840d5..f8c0782ab3 100644 --- a/fabric-api-lookup-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/lookup/client/entity/FabricEntityApiLookupTestClient.java +++ b/fabric-api-lookup-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/lookup/client/entity/FabricEntityApiLookupTestClient.java @@ -16,11 +16,17 @@ package net.fabricmc.fabric.test.lookup.client.entity; -import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.ModLoadingContext; +import net.neoforged.neoforge.client.event.EntityRenderersEvent; + import net.fabricmc.fabric.test.lookup.entity.FabricEntityApiLookupTest; public class FabricEntityApiLookupTestClient { public static void onInitializeClient() { - EntityRendererRegistry.register(FabricEntityApiLookupTest.INSPECTABLE_PIG, InspectablePigRenderer::new); + IEventBus bus = ModLoadingContext.get().getActiveContainer().getEventBus(); + bus.addListener(EntityRenderersEvent.RegisterRenderers.class, event -> { + event.registerEntityRenderer(FabricEntityApiLookupTest.INSPECTABLE_PIG, InspectablePigRenderer::new); + }); } } diff --git a/fabric-biome-api-v1/build.gradle b/fabric-biome-api-v1/build.gradle index a5903807f4..1bb8ece98f 100644 --- a/fabric-biome-api-v1/build.gradle +++ b/fabric-biome-api-v1/build.gradle @@ -8,20 +8,20 @@ testDependencies(project, [ ':fabric-api-base', ':fabric-resource-loader-v1', ':fabric-registry-sync-v0', - ':fabric-data-generation-api-v1' +// ':fabric-data-generation-api-v1' ]) -fabricApi { - configureDataGeneration { - outputDirectory = file("src/testmod/generated") - addToResources = false - strictValidation = true - } -} +//fabricApi { +// configureDataGeneration { +// outputDirectory = file("src/testmod/generated") +// addToResources = false +// strictValidation = true +// } +//} -runDatagen { - outputs.dir("src/testmod/generated") -} +//runDatagen { +// outputs.dir("src/testmod/generated") +//} sourceSets { testmod { @@ -33,14 +33,14 @@ sourceSets { } } -loom { - runs { - datagen { - name "Data Generation" - source sourceSets.testmod - ideConfigGenerated = true - } - } -} +//loom { +// runs { +// datagen { +// name "Data Generation" +// source sourceSets.testmod +// ideConfigGenerated = true +// } +// } +//} -generateResources.dependsOn runDatagen +//generateResources.dependsOn runDatagen diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/FabricBiomeApiV1.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/FabricBiomeApiV1.java new file mode 100644 index 0000000000..2c67b5b46b --- /dev/null +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/FabricBiomeApiV1.java @@ -0,0 +1,22 @@ +package net.fabricmc.fabric.impl.biome; + +import com.mojang.serialization.MapCodec; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.common.Mod; +import net.neoforged.neoforge.common.world.BiomeModifier; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; +import net.neoforged.neoforge.registries.NeoForgeRegistries; +import org.sinytra.fabric.biome_api.generated.GeneratedEntryPoint; + +import net.fabricmc.fabric.impl.biome.modification.BiomeModificationImpl; + +@Mod(GeneratedEntryPoint.MOD_ID) +public class FabricBiomeApiV1 { + public static final DeferredRegister> BIOME_MODIFIER_SERIALIZERS = DeferredRegister.create(NeoForgeRegistries.Keys.BIOME_MODIFIER_SERIALIZERS, GeneratedEntryPoint.MOD_ID); + public static final DeferredHolder, MapCodec> FABRIC_BIOME_MODIFIER = BIOME_MODIFIER_SERIALIZERS.register("fabric_biome_modifier", () -> MapCodec.unit(() -> new BiomeModificationImpl.FabricBiomeModifier(BiomeModificationImpl.INSTANCE.getSortedModifiers()))); + + public FabricBiomeApiV1(IEventBus bus) { + BIOME_MODIFIER_SERIALIZERS.register(bus); + } +} diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/NetherBiomeData.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/NetherBiomeData.java index 36ae389ebc..8bbe28bd4f 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/NetherBiomeData.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/NetherBiomeData.java @@ -18,10 +18,10 @@ import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import com.google.common.base.Preconditions; @@ -40,7 +40,7 @@ public final class NetherBiomeData { // for data packs (as those would be distinct biome sources). private static final Set> NETHER_BIOMES = new HashSet<>(); - private static final Map, Climate.ParameterPoint> NETHER_BIOME_NOISE_POINTS = new HashMap<>(); + private static final Map, Climate.ParameterPoint> NETHER_BIOME_NOISE_POINTS = new ConcurrentHashMap<>(); private NetherBiomeData() { } diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationContextImpl.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationContextImpl.java index c0f6b1219c..005f4013b9 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationContextImpl.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationContextImpl.java @@ -16,32 +16,24 @@ package net.fabricmc.fabric.impl.biome.modification; -import java.util.ArrayList; -import java.util.Collections; -import java.util.EnumMap; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.function.BiPredicate; -import java.util.stream.Collectors; -import com.google.common.base.Suppliers; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; +import net.neoforged.neoforge.common.world.BiomeGenerationSettingsBuilder; +import net.neoforged.neoforge.common.world.BiomeSpecialEffectsBuilder; +import net.neoforged.neoforge.common.world.ClimateSettingsBuilder; +import net.neoforged.neoforge.common.world.MobSpawnSettingsBuilder; +import net.neoforged.neoforge.common.world.ModifiableBiomeInfo; import org.jetbrains.annotations.UnmodifiableView; -import org.jspecify.annotations.Nullable; import net.minecraft.core.Holder; -import net.minecraft.core.HolderSet; import net.minecraft.core.Registry; import net.minecraft.core.RegistryAccess; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; -import net.minecraft.tags.FeatureTags; import net.minecraft.util.random.Weighted; -import net.minecraft.util.random.WeightedList; import net.minecraft.world.attribute.EnvironmentAttribute; import net.minecraft.world.attribute.EnvironmentAttributeMap; import net.minecraft.world.attribute.EnvironmentAttributes; @@ -49,7 +41,6 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.MobCategory; import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.biome.BiomeGenerationSettings; import net.minecraft.world.level.biome.BiomeSpecialEffects; import net.minecraft.world.level.biome.MobSpawnSettings; import net.minecraft.world.level.levelgen.GenerationStep; @@ -61,15 +52,17 @@ public class BiomeModificationContextImpl implements BiomeModificationContext { private final RegistryAccess registries; private final Biome biome; + private final ModifiableBiomeInfo.BiomeInfo.Builder builder; private final WeatherContext weather; private final AttributesContext attributes; - private final EffectsContext effects; + private final EffectsContextImpl effects; private final GenerationSettingsContextImpl generationSettings; private final SpawnSettingsContextImpl spawnSettings; - public BiomeModificationContextImpl(RegistryAccess registries, Biome biome) { + public BiomeModificationContextImpl(RegistryAccess registries, Biome biome, ModifiableBiomeInfo.BiomeInfo.Builder builder) { this.registries = registries; this.biome = biome; + this.builder = builder; this.weather = new WeatherContextImpl(); this.attributes = new AttributesContextImpl(); this.effects = new EffectsContextImpl(); @@ -102,37 +95,27 @@ public MobSpawnSettingsContext getMobSpawnSettings() { return spawnSettings; } - /** - * Re-freeze any immutable lists and perform general post-modification cleanup. - */ - void freeze() { - generationSettings.freeze(); - spawnSettings.freeze(); - } - - boolean shouldRebuildFeatures() { - return generationSettings.rebuildFeatures; - } - private class WeatherContextImpl implements WeatherContext { + ClimateSettingsBuilder climateSettings = builder.getClimateSettings(); + @Override public void setPrecipitation(boolean hasPrecipitation) { - biome.climateSettings = new Biome.ClimateSettings(hasPrecipitation, biome.climateSettings.temperature(), biome.climateSettings.temperatureModifier(), biome.climateSettings.downfall()); + climateSettings.setHasPrecipitation(hasPrecipitation); } @Override public void setTemperature(float temperature) { - biome.climateSettings = new Biome.ClimateSettings(biome.climateSettings.hasPrecipitation(), temperature, biome.climateSettings.temperatureModifier(), biome.climateSettings.downfall()); + climateSettings.setTemperature(temperature); } @Override public void setTemperatureModifier(Biome.TemperatureModifier temperatureModifier) { - biome.climateSettings = new Biome.ClimateSettings(biome.climateSettings.hasPrecipitation(), biome.climateSettings.temperature(), Objects.requireNonNull(temperatureModifier), biome.climateSettings.downfall()); + climateSettings.setTemperatureModifier(temperatureModifier); } @Override public void setDownfall(float downfall) { - biome.climateSettings = new Biome.ClimateSettings(biome.climateSettings.hasPrecipitation(), biome.climateSettings.temperature(), biome.climateSettings.temperatureModifier(), downfall); + climateSettings.setDownfall(downfall); } } @@ -160,7 +143,7 @@ public void setModifier(EnvironmentAttribute key, AttributeModifier> carvers = registries.lookupOrThrow(Registries.CONFIGURED_CARVER); private final Registry features = registries.lookupOrThrow(Registries.PLACED_FEATURE); - private final BiomeGenerationSettings generationSettings = biome.getGenerationSettings(); - - boolean rebuildFeatures; - - /** - * Unfreeze the immutable lists found in the generation settings, and make sure they're filled up to every - * possible step if they're dense lists. - */ - GenerationSettingsContextImpl() { - unfreezeFeatures(); - - rebuildFeatures = false; - } - - private void unfreezeFeatures() { - generationSettings.features = new ArrayList<>(generationSettings.features); - } - - /** - * Re-freeze the lists in the generation settings to immutable variants, also fixes the flower features. - */ - public void freeze() { - freezeFeatures(); - - if (rebuildFeatures) { - rebuildFlowerFeatures(); - } - } - - private void freezeFeatures() { - generationSettings.features = ImmutableList.copyOf(generationSettings.features); - // Replace the supplier to force a rebuild next time its called. - generationSettings.featureSet = Suppliers.memoize(() -> { - return generationSettings.features.stream().flatMap(HolderSet::stream).map(Holder::value).collect(Collectors.toSet()); - }); - } - - private void rebuildFlowerFeatures() { - // Replace the supplier to force a rebuild next time its called. - generationSettings.boneMealFeatures = Suppliers.memoize(() -> generationSettings.features.stream() - .flatMap(HolderSet::stream) - .flatMap((feature) -> feature.value().getFeatures()) - .filter((feature) -> feature.is(FeatureTags.CAN_SPAWN_FROM_BONE_MEAL)) - .map(Holder::value) - .collect(ImmutableList.toImmutableList())); - } + private final BiomeGenerationSettingsBuilder generationSettings = builder.getGenerationSettings(); @Override public boolean removeFeature(GenerationStep.Decoration step, ResourceKey placedFeatureKey) { PlacedFeature placedFeature = getHolder(features, placedFeatureKey).value(); - - int stepIndex = step.ordinal(); - List> featureSteps = generationSettings.features; - - if (stepIndex >= featureSteps.size()) { - return false; // The step was not populated with any features yet - } - - HolderSet featuresInStep = featureSteps.get(stepIndex); - List> features = new ArrayList<>(featuresInStep.stream().toList()); - - if (features.removeIf(feature -> feature.value() == placedFeature)) { - featureSteps.set(stepIndex, HolderSet.direct(features)); - rebuildFeatures = true; - - return true; - } - - return false; + List> featureSteps = generationSettings.getFeatures(step); + return featureSteps.removeIf(feature -> feature.value() == placedFeature); } @Override public void addFeature(GenerationStep.Decoration step, ResourceKey entry) { - List> featureSteps = generationSettings.features; - int index = step.ordinal(); - - // Add new empty lists for the generation steps that have no features yet - while (index >= featureSteps.size()) { - featureSteps.add(HolderSet.direct(Collections.emptyList())); - } - - Holder.Reference feature = getHolder(features, entry); - - // Don't add the feature if it's already present - if (featureSteps.get(index).contains(feature)) { - return; - } - - featureSteps.set(index, plus(featureSteps.get(index), feature)); - - // Ensure the list of flower features is up-to-date - rebuildFeatures = true; + generationSettings.addFeature(step, features.getOrThrow(entry)); } @Override public void addCarver(ResourceKey> entry) { // We do not need to delay evaluation of this since the registries are already fully built - generationSettings.carvers = plus(generationSettings.carvers, getHolder(carvers, entry)); + generationSettings.addCarver(getHolder(carvers, entry)); } @Override - public boolean removeCarver(ResourceKey> carverKey) { - ConfiguredWorldCarver carver = getHolder(carvers, carverKey).value(); - List>> genCarvers = new ArrayList<>(generationSettings.carvers.stream().toList()); - - if (genCarvers.removeIf(entry -> entry.value() == carver)) { - generationSettings.carvers = HolderSet.direct(genCarvers); - return true; - } - - return false; - } - - private HolderSet plus(@Nullable HolderSet values, Holder holder) { - if (values == null) return HolderSet.direct(holder); - - List> list = new ArrayList<>(values.stream().toList()); - list.add(holder); - return HolderSet.direct(list); + public boolean removeCarver(ResourceKey> configuredCarverKey) { + ConfiguredWorldCarver carver = getHolder(carvers, configuredCarverKey).value(); + return generationSettings.getCarvers().removeIf(holder -> holder.value() == carver); } } @@ -350,65 +238,18 @@ private static Holder.Reference getHolder(Registry registry, ResourceK } private class SpawnSettingsContextImpl implements MobSpawnSettingsContext { - private final MobSpawnSettings spawnSettings = biome.getMobSettings(); - private final EnumMap>> fabricSpawners = new EnumMap<>(MobCategory.class); - - SpawnSettingsContextImpl() { - unfreezeSpawners(); - unfreezeSpawnCost(); - } - - private void unfreezeSpawners() { - fabricSpawners.clear(); - - for (MobCategory mobCategory : MobCategory.values()) { - WeightedList entries = spawnSettings.spawners.get(mobCategory); - - if (entries != null) { - fabricSpawners.put(mobCategory, new ArrayList<>(entries.unwrap())); - } else { - fabricSpawners.put(mobCategory, new ArrayList<>()); - } - } - } - - private void unfreezeSpawnCost() { - spawnSettings.mobSpawnCosts = new HashMap<>(spawnSettings.mobSpawnCosts); - } - - public void freeze() { - freezeSpawners(); - freezeSpawnCosts(); - } - - private void freezeSpawners() { - Map> spawners = new HashMap<>(spawnSettings.spawners); - - for (Map.Entry>> entry : fabricSpawners.entrySet()) { - if (entry.getValue().isEmpty()) { - spawners.put(entry.getKey(), WeightedList.of()); - } else { - spawners.put(entry.getKey(), WeightedList.of(entry.getValue())); - } - } - - spawnSettings.spawners = ImmutableMap.copyOf(spawners); - } - - private void freezeSpawnCosts() { - spawnSettings.mobSpawnCosts = ImmutableMap.copyOf(spawnSettings.mobSpawnCosts); - } + private final MobSpawnSettingsBuilder spawnSettings = builder.getMobSpawnSettings(); @Override public void setCreatureGenerationProbability(float probability) { - spawnSettings.creatureGenerationProbability = probability; + spawnSettings.creatureGenerationProbability(probability); } @Override public @UnmodifiableView List> getMobs(MobCategory category) { Objects.requireNonNull(category); - return Collections.unmodifiableList(fabricSpawners.get(category)); + return spawnSettings.getSpawner(category).getList(); } @Override @@ -416,15 +257,17 @@ public void addSpawn(MobCategory category, MobSpawnSettings.SpawnerData data, in Objects.requireNonNull(category); Objects.requireNonNull(data); - fabricSpawners.get(category).add(new Weighted<>(data, weight)); + spawnSettings.addSpawn(category, weight, data); } @Override public boolean removeSpawns(BiPredicate predicate) { boolean anyRemoved = false; - for (MobCategory group : MobCategory.values()) { - if (fabricSpawners.get(group).removeIf(entry -> predicate.test(group, entry.value()))) { + for (MobCategory group : spawnSettings.getSpawnerTypes()) { + int oldSize = spawnSettings.getSpawner(group).getList().size(); + spawnSettings.getSpawner(group).removeIf(entry -> predicate.test(group, entry.value())); + if (oldSize > spawnSettings.getSpawner(group).getList().size()) { anyRemoved = true; } } @@ -435,12 +278,12 @@ public boolean removeSpawns(BiPredicate entityType, double charge, double energyBudget) { Objects.requireNonNull(entityType); - spawnSettings.mobSpawnCosts.put(entityType, new MobSpawnSettings.MobSpawnCost(energyBudget, charge)); + spawnSettings.addMobCharge(entityType, charge, energyBudget); } @Override public void clearMobCharge(EntityType entityType) { - spawnSettings.mobSpawnCosts.remove(entityType); + spawnSettings.removeSpawnCost(entityType); } } } diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationImpl.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationImpl.java index 5ccf3f2be6..afc6b2035e 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationImpl.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationImpl.java @@ -19,28 +19,24 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import java.util.Map; import java.util.Objects; -import java.util.Optional; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Predicate; -import com.google.common.base.Stopwatch; -import com.google.common.base.Suppliers; +import com.mojang.serialization.MapCodec; +import net.neoforged.neoforge.common.world.BiomeModifier; +import net.neoforged.neoforge.common.world.ModifiableBiomeInfo; +import net.neoforged.neoforge.server.ServerLifecycleHooks; import org.jetbrains.annotations.TestOnly; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.minecraft.core.MappedRegistry; -import net.minecraft.core.RegistrationInfo; -import net.minecraft.core.Registry; +import net.minecraft.core.Holder; import net.minecraft.core.RegistryAccess; -import net.minecraft.core.registries.Registries; import net.minecraft.resources.Identifier; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.biome.FeatureSorter; import net.fabricmc.fabric.api.biome.v1.BiomeModificationContext; import net.fabricmc.fabric.api.biome.v1.BiomeSelectionContext; @@ -95,7 +91,7 @@ void clearModifiers() { modifiersUnsorted = true; } - private List getSortedModifiers() { + public List getSortedModifiers() { if (modifiersUnsorted) { // Resort modifiers modifiers.sort(MODIFIER_ORDER_COMPARATOR); @@ -105,82 +101,32 @@ private List getSortedModifiers() { return modifiers; } - public void finalizeWorldGen(RegistryAccess impl) { - Stopwatch sw = Stopwatch.createStarted(); - - // Now that we apply biome modifications inside the MinecraftServer constructor, we should only ever do - // this once for a RegistryAccess. Marking the RegistryAccess as modified ensures a crash - // if the precondition is violated. - BiomeModificationMarker modificationTracker = (BiomeModificationMarker) impl; - modificationTracker.fabric_markModified(); - - Registry biomes = impl.lookupOrThrow(Registries.BIOME); - - // Build a list of all biome keys in ascending order of their raw-id to get a consistent result in case - // someone does something stupid. - List> keys = biomes.entrySet().stream() - .map(Map.Entry::getKey) - .sorted(Comparator.comparingInt(key -> biomes.getId(biomes.getValueOrThrow(key)))) - .toList(); - - List sortedModifiers = getSortedModifiers(); - - int biomesChanged = 0; - int biomesProcessed = 0; - int modifiersApplied = 0; - - for (ResourceKey key : keys) { - Biome biome = biomes.getValueOrThrow(key); - - biomesProcessed++; - - // Make a copy of the biome to allow selection contexts to see it unmodified, - // But do so only once it's known anything wants to modify the biome at all - BiomeSelectionContext context = new BiomeSelectionContextImpl(impl, key, biome); - BiomeModificationContextImpl modificationContext = null; - - for (ModifierRecord modifier : sortedModifiers) { - if (modifier.selector.test(context)) { - LOGGER.trace("Applying modifier {} to {}", modifier, key.identifier()); - - // Create the copy only if at least one modifier applies, since it's pretty costly - if (modificationContext == null) { - biomesChanged++; - modificationContext = new BiomeModificationContextImpl(impl, biome); - } - - modifier.apply(context, modificationContext); - modifiersApplied++; + public record FabricBiomeModifier(List modifiers) implements BiomeModifier { + @Override + public void modify(Holder biome, Phase phase, ModifiableBiomeInfo.BiomeInfo.Builder builder) { + RegistryAccess.Frozen registryAccess = ServerLifecycleHooks.getCurrentServer().registryAccess(); + ResourceKey key = biome.unwrapKey().orElseThrow(); + Biome biomeValue = biome.value(); + BiomeSelectionContext selectionContext = new BiomeSelectionContextImpl(registryAccess, key, biome); + BiomeModificationContextImpl modificationContext = new BiomeModificationContextImpl(registryAccess, biomeValue, builder); + for (ModifierRecord modifier : this.modifiers) { + if (isInPhase(phase, modifier.phase) && modifier.selector.test(selectionContext)) { + LOGGER.trace("Applying modifier {} to {}", modifier, key); + modifier.apply(selectionContext, modificationContext); } } + } - // Re-freeze and apply certain cleanup actions - if (modificationContext != null) { - modificationContext.freeze(); - - if (modificationContext.shouldRebuildFeatures()) { - impl.lookupOrThrow(Registries.LEVEL_STEM).stream().forEach(levelStem -> { - levelStem.generator().featuresPerStep = Suppliers.memoize( - () -> FeatureSorter.buildFeaturesPerStep( - List.copyOf(levelStem.generator().getBiomeSource().possibleBiomes()), - biomeHolder -> levelStem.generator().getBiomeGenerationSettings(biomeHolder).features(), - true - ) - ); - }); - } - - if (biomes instanceof MappedRegistry registry) { - RegistrationInfo info = registry.registrationInfos.get(key); - RegistrationInfo newInfo = new RegistrationInfo(Optional.empty(), info.lifecycle()); - registry.registrationInfos.put(key, newInfo); - } - } + @Override + public MapCodec codec() { + return MapCodec.unit(this); } - if (biomesProcessed > 0) { - LOGGER.info("Applied {} biome modifications to {} of {} new biomes in {}", modifiersApplied, biomesChanged, - biomesProcessed, sw); + private boolean isInPhase(Phase phase, ModificationPhase modificationPhase) { + return phase == Phase.ADD && modificationPhase == ModificationPhase.ADDITIONS + || phase == Phase.REMOVE && modificationPhase == ModificationPhase.REMOVALS + || phase == Phase.MODIFY && modificationPhase == ModificationPhase.REPLACEMENTS + || phase == Phase.AFTER_EVERYTHING && modificationPhase == ModificationPhase.POST_PROCESSING; } } diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeSelectionContextImpl.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeSelectionContextImpl.java index 345ea5656e..a90bc5c69a 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeSelectionContextImpl.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeSelectionContextImpl.java @@ -38,11 +38,11 @@ public class BiomeSelectionContextImpl implements BiomeSelectionContext { private final Biome biome; private final Holder entry; - public BiomeSelectionContextImpl(RegistryAccess dynamicRegistries, ResourceKey key, Biome biome) { + public BiomeSelectionContextImpl(RegistryAccess dynamicRegistries, ResourceKey key, Holder biome) { this.dynamicRegistries = dynamicRegistries; this.key = key; - this.biome = biome; - this.entry = dynamicRegistries.lookupOrThrow(Registries.BIOME).getOrThrow(this.key); + this.biome = biome.value(); + this.entry = biome; } @Override diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/TheEndBiomeSourceMixin.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/TheEndBiomeSourceMixin.java index 8af605916e..fb2122e5e9 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/TheEndBiomeSourceMixin.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/TheEndBiomeSourceMixin.java @@ -44,7 +44,7 @@ import net.fabricmc.fabric.impl.biome.TheEndBiomeData; -@Mixin(TheEndBiomeSource.class) +@Mixin(value = TheEndBiomeSource.class, priority = 1500) public class TheEndBiomeSourceMixin extends BiomeSourceMixin { @Shadow @Mutable diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/modification/RegistryAccessImmutableRegistryAccessMixin.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/modification/RegistryAccessImmutableRegistryAccessMixin.java deleted file mode 100644 index be154f7937..0000000000 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/modification/RegistryAccessImmutableRegistryAccessMixin.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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.mixin.biome.modification; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; - -import net.minecraft.core.RegistryAccess; - -import net.fabricmc.fabric.impl.biome.modification.BiomeModificationMarker; - -/** - * This Mixin allows us to keep backup copies of biomes for - * {@link net.fabricmc.fabric.impl.biome.modification.BiomeModificationImpl} on a per-RegistryAccess basis. - */ -@Mixin(RegistryAccess.ImmutableRegistryAccess.class) -public class RegistryAccessImmutableRegistryAccessMixin implements BiomeModificationMarker { - @Unique - private boolean modified; - - @Override - public void fabric_markModified() { - if (modified) { - throw new IllegalStateException("This dynamic registries instance has already been modified"); - } - - modified = true; - } -} diff --git a/fabric-biome-api-v1/src/main/resources/data/fabric_biome_api_v1/neoforge/biome_modifier/fabric_biome_modifier_instance.json b/fabric-biome-api-v1/src/main/resources/data/fabric_biome_api_v1/neoforge/biome_modifier/fabric_biome_modifier_instance.json new file mode 100644 index 0000000000..4e372789b0 --- /dev/null +++ b/fabric-biome-api-v1/src/main/resources/data/fabric_biome_api_v1/neoforge/biome_modifier/fabric_biome_modifier_instance.json @@ -0,0 +1,3 @@ +{ + "type": "fabric_biome_api_v1:fabric_biome_modifier" +} diff --git a/fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.classtweaker b/fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.classtweaker index a75a7da6f4..af80da0ce4 100644 --- a/fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.classtweaker +++ b/fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.classtweaker @@ -3,8 +3,6 @@ classTweaker v1 official accessible class net/minecraft/world/level/biome/Biome$ClimateSettings # Top-Level Biome Fields Access -accessible field net/minecraft/world/level/biome/Biome climateSettings Lnet/minecraft/world/level/biome/Biome$ClimateSettings; -mutable field net/minecraft/world/level/biome/Biome climateSettings Lnet/minecraft/world/level/biome/Biome$ClimateSettings; accessible field net/minecraft/world/level/biome/Biome attributes Lnet/minecraft/world/attribute/EnvironmentAttributeMap; mutable field net/minecraft/world/level/biome/Biome attributes Lnet/minecraft/world/attribute/EnvironmentAttributeMap; accessible field net/minecraft/world/level/biome/Biome generationSettings Lnet/minecraft/world/level/biome/BiomeGenerationSettings; @@ -14,16 +12,11 @@ accessible field net/minecraft/world/level/biome/Biome mobSettings Lnet/minecraf accessible method net/minecraft/world/level/biome/Biome$ClimateSettings (ZFLnet/minecraft/world/level/biome/Biome$TemperatureModifier;F)V # Biome Effects -accessible field net/minecraft/world/level/biome/BiomeSpecialEffects waterColor I -mutable field net/minecraft/world/level/biome/BiomeSpecialEffects waterColor I -accessible field net/minecraft/world/level/biome/BiomeSpecialEffects foliageColorOverride Ljava/util/Optional; -mutable field net/minecraft/world/level/biome/BiomeSpecialEffects foliageColorOverride Ljava/util/Optional; -accessible field net/minecraft/world/level/biome/BiomeSpecialEffects dryFoliageColorOverride Ljava/util/Optional; -mutable field net/minecraft/world/level/biome/BiomeSpecialEffects dryFoliageColorOverride Ljava/util/Optional; -accessible field net/minecraft/world/level/biome/BiomeSpecialEffects grassColorOverride Ljava/util/Optional; -mutable field net/minecraft/world/level/biome/BiomeSpecialEffects grassColorOverride Ljava/util/Optional; -accessible field net/minecraft/world/level/biome/BiomeSpecialEffects grassColorModifier Lnet/minecraft/world/level/biome/BiomeSpecialEffects$GrassColorModifier; -mutable field net/minecraft/world/level/biome/BiomeSpecialEffects grassColorModifier Lnet/minecraft/world/level/biome/BiomeSpecialEffects$GrassColorModifier; +accessible field net/minecraft/world/level/biome/BiomeSpecialEffects$Builder waterColor Ljava/util/OptionalInt; +accessible field net/minecraft/world/level/biome/BiomeSpecialEffects$Builder foliageColorOverride Ljava/util/Optional; +accessible field net/minecraft/world/level/biome/BiomeSpecialEffects$Builder dryFoliageColorOverride Ljava/util/Optional; +accessible field net/minecraft/world/level/biome/BiomeSpecialEffects$Builder grassColorOverride Ljava/util/Optional; +accessible field net/minecraft/world/level/biome/BiomeSpecialEffects$Builder grassColorModifier Lnet/minecraft/world/level/biome/BiomeSpecialEffects$GrassColorModifier; # Spawn Settings / Density accessible field net/minecraft/world/level/biome/MobSpawnSettings creatureGenerationProbability F diff --git a/fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.mixins.json b/fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.mixins.json index e4b00fedb7..855bdb8020 100644 --- a/fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.mixins.json +++ b/fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.mixins.json @@ -4,14 +4,11 @@ "compatibilityLevel": "JAVA_25", "mixins": [ "BiomeSourceMixin", - "NoiseChunkMixin", - "MultiNoiseBiomeSourceMixin", "ClimateSamplerMixin", "NetherBiomePresetMixin", + "NoiseChunkMixin", "RandomStateMixin", - "TheEndBiomeSourceMixin", - "modification.RegistryAccessImmutableRegistryAccessMixin", - "modification.MinecraftServerMixin" + "TheEndBiomeSourceMixin" ], "injectors": { "defaultRequire": 1 diff --git a/fabric-biome-api-v1/src/testmod/generated/data/fabric-biome-api-v1-testmod/dimension/test.json b/fabric-biome-api-v1/src/testmod/generated/data/fabric-biome-api-v1-testmod/dimension/test.json new file mode 100644 index 0000000000..d9937e28c4 --- /dev/null +++ b/fabric-biome-api-v1/src/testmod/generated/data/fabric-biome-api-v1-testmod/dimension/test.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:overworld", + "generator": { + "type": "minecraft:flat", + "settings": { + "biome": "minecraft:plains", + "features": false, + "lakes": false, + "layers": [ + { + "block": "minecraft:bedrock", + "height": 1 + }, + { + "block": "minecraft:dirt", + "height": 2 + }, + { + "block": "minecraft:grass_block", + "height": 1 + } + ], + "structure_overrides": [ + "minecraft:strongholds", + "minecraft:villages" + ] + } + } +} \ No newline at end of file diff --git a/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/DataGeneratorEntrypoint.java b/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/DataGeneratorEntrypoint.java index 2985315cd2..5172c5837d 100644 --- a/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/DataGeneratorEntrypoint.java +++ b/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/DataGeneratorEntrypoint.java @@ -26,21 +26,28 @@ import net.minecraft.resources.Identifier; import net.minecraft.resources.ResourceKey; import net.minecraft.tags.BlockTags; +import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.dimension.BuiltinDimensionTypes; +import net.minecraft.world.level.dimension.DimensionType; +import net.minecraft.world.level.dimension.LevelStem; +import net.minecraft.world.level.levelgen.FlatLevelSource; import net.minecraft.world.level.levelgen.VerticalAnchor; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; +import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings; import net.minecraft.world.level.levelgen.placement.BiomeFilter; import net.minecraft.world.level.levelgen.placement.CountPlacement; import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; import net.minecraft.world.level.levelgen.placement.InSquarePlacement; import net.minecraft.world.level.levelgen.placement.PlacedFeature; +import net.minecraft.world.level.levelgen.structure.StructureSet; import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; -import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +//import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; -public class DataGeneratorEntrypoint implements net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint { +public class DataGeneratorEntrypoint { public static final ResourceKey> COMMON_DESERT_WELL = ResourceKey.create( Registries.CONFIGURED_FEATURE, Identifier.fromNamespaceAndPath(FabricBiomeTest.MOD_ID, "fab_desert_well") @@ -57,45 +64,70 @@ public class DataGeneratorEntrypoint implements net.fabricmc.fabric.api.datagen. Registries.PLACED_FEATURE, Identifier.fromNamespaceAndPath(FabricBiomeTest.MOD_ID, "common_ore") ); + public static final ResourceKey TEST_LEVEL_STEM = ResourceKey.create( + Registries.LEVEL_STEM, + Identifier.fromNamespaceAndPath(FabricBiomeTest.MOD_ID, "test") + ); - @Override - public void onInitializeDataGenerator(FabricDataGenerator dataGenerator) { - FabricDataGenerator.Pack pack = dataGenerator.createPack(); - pack.addProvider(WorldgenProvider::new); - pack.addProvider(TestBiomeTagsProvider::new); - } - - @Override - public void buildRegistry(RegistrySetBuilder registryBuilder) { - registryBuilder.add(Registries.CONFIGURED_FEATURE, this::bootstrapConfiguredFeatures); - registryBuilder.add(Registries.PLACED_FEATURE, this::bootstrapPlacedFeatures); - registryBuilder.add(Registries.BIOME, TestBiomes::bootstrap); - } - - private void bootstrapConfiguredFeatures(BootstrapContext> context) { - FeatureUtils.register(context, COMMON_DESERT_WELL, Feature.DESERT_WELL); - - OreConfiguration featureConfig = new OreConfiguration(new TagMatchTest(BlockTags.STONE_ORE_REPLACEABLES), Blocks.DIAMOND_BLOCK.defaultBlockState(), 5); - FeatureUtils.register(context, COMMON_ORE, Feature.ORE, featureConfig); - } - - private void bootstrapPlacedFeatures(BootstrapContext context) { - HolderGetter> configuredFeatures = context.lookup(Registries.CONFIGURED_FEATURE); - Holder> commonDesertWell = configuredFeatures.getOrThrow(COMMON_DESERT_WELL); - - // The placement config is taken from the vanilla desert well, but no randomness - PlacementUtils.register(context, PLACED_COMMON_DESERT_WELL, commonDesertWell, - InSquarePlacement.spread(), - PlacementUtils.HEIGHTMAP, - BiomeFilter.biome() - ); - - PlacementUtils.register(context, PLACED_COMMON_ORE, configuredFeatures.getOrThrow(COMMON_ORE), - CountPlacement.of(25), - HeightRangePlacement.uniform( - VerticalAnchor.BOTTOM, - VerticalAnchor.TOP - ) - ); - } +// @Override +// public void onInitializeDataGenerator(FabricDataGenerator dataGenerator) { +// FabricDataGenerator.Pack pack = dataGenerator.createPack(); +// pack.addProvider(WorldgenProvider::new); +// pack.addProvider(TestBiomeTagsProvider::new); +// } +// +// @Override +// public void buildRegistry(RegistrySetBuilder registryBuilder) { +// registryBuilder.add(Registries.CONFIGURED_FEATURE, this::bootstrapConfiguredFeatures); +// registryBuilder.add(Registries.PLACED_FEATURE, this::bootstrapPlacedFeatures); +// registryBuilder.add(Registries.BIOME, TestBiomes::bootstrap); +// registryBuilder.add(Registries.LEVEL_STEM, this::bootstrapLevelStems); +// } +// +// private void bootstrapConfiguredFeatures(BootstrapContext> context) { +// FeatureUtils.register(context, COMMON_DESERT_WELL, Feature.DESERT_WELL); +// +// OreConfiguration featureConfig = new OreConfiguration(new TagMatchTest(BlockTags.STONE_ORE_REPLACEABLES), Blocks.DIAMOND_BLOCK.defaultBlockState(), 5); +// FeatureUtils.register(context, COMMON_ORE, Feature.ORE, featureConfig); +// } +// +// private void bootstrapPlacedFeatures(BootstrapContext context) { +// HolderGetter> configuredFeatures = context.lookup(Registries.CONFIGURED_FEATURE); +// Holder> commonDesertWell = configuredFeatures.getOrThrow(COMMON_DESERT_WELL); +// +// // The placement config is taken from the vanilla desert well, but no randomness +// PlacementUtils.register(context, PLACED_COMMON_DESERT_WELL, commonDesertWell, +// InSquarePlacement.spread(), +// PlacementUtils.HEIGHTMAP, +// BiomeFilter.biome() +// ); +// +// PlacementUtils.register(context, PLACED_COMMON_ORE, configuredFeatures.getOrThrow(COMMON_ORE), +// CountPlacement.of(25), +// HeightRangePlacement.uniform( +// VerticalAnchor.BOTTOM, +// VerticalAnchor.TOP +// ) +// ); +// } +// +// private void bootstrapLevelStems(BootstrapContext context) { +// HolderGetter dimensionTypes = context.lookup(Registries.DIMENSION_TYPE); +// HolderGetter biomes = context.lookup(Registries.BIOME); +// HolderGetter structureSets = context.lookup(Registries.STRUCTURE_SET); +// HolderGetter placedFeatures = context.lookup(Registries.PLACED_FEATURE); +// context.register( +// TEST_LEVEL_STEM, +// new LevelStem( +// dimensionTypes.getOrThrow(BuiltinDimensionTypes.OVERWORLD), +// new FlatLevelSource( +// FlatLevelGeneratorSettings.getDefault( +// biomes, +// structureSets, +// placedFeatures +// ) +// ) +// ) +// ); +// } } diff --git a/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/FabricBiomeTest.java b/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/FabricBiomeTest.java index 3fcc496cc8..cb04a92bd8 100644 --- a/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/FabricBiomeTest.java +++ b/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/FabricBiomeTest.java @@ -37,6 +37,8 @@ import net.fabricmc.fabric.api.biome.v1.NetherBiomes; import net.fabricmc.fabric.api.biome.v1.TheEndBiomes; +import net.neoforged.neoforge.data.loading.DatagenModLoader; + /** * NOTES FOR TESTING: * When running with this test-mod, also test this when running a dedicated server since there @@ -52,6 +54,10 @@ public class FabricBiomeTest implements ModInitializer { @Override public void onInitialize() { + if (DatagenModLoader.isRunningDataGen()) { + return; + } + Preconditions.checkArgument(NetherBiomes.canGenerateInNether(Biomes.NETHER_WASTES)); Preconditions.checkArgument(!NetherBiomes.canGenerateInNether(Biomes.END_HIGHLANDS)); diff --git a/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/TestBiomeTagsProvider.java b/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/TestBiomeTagsProvider.java index 8372bc716a..d4306ab218 100644 --- a/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/TestBiomeTagsProvider.java +++ b/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/TestBiomeTagsProvider.java @@ -1,47 +1,47 @@ -/* - * 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.biome; - -import java.util.concurrent.CompletableFuture; - -import net.minecraft.core.HolderLookup; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.Identifier; -import net.minecraft.tags.TagKey; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.biome.Biomes; - -import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagsProvider; - -public class TestBiomeTagsProvider extends FabricTagsProvider { - public TestBiomeTagsProvider(FabricPackOutput output, CompletableFuture registriesFuture) { - super(output, Registries.BIOME, registriesFuture); - } - - @Override - protected void addTags(HolderLookup.Provider registries) { - builder(TagKey.create(Registries.BIOME, Identifier.fromNamespaceAndPath(FabricBiomeTest.MOD_ID, "biome_tag_test"))) - .add(TestBiomes.CUSTOM_PLAINS) - .add(TestBiomes.TEST_END_HIGHLANDS); - builder(TagKey.create(Registries.BIOME, Identifier.fromNamespaceAndPath(FabricBiomeTest.MOD_ID, "tag_selector_test"))) - .add(Biomes.BEACH) - .add(Biomes.DESERT) - .add(Biomes.SAVANNA) - .add(Biomes.BADLANDS); - } -} +///* +// * 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.biome; +// +//import java.util.concurrent.CompletableFuture; +// +//import net.minecraft.core.HolderLookup; +//import net.minecraft.core.registries.Registries; +//import net.minecraft.resources.Identifier; +//import net.minecraft.tags.TagKey; +//import net.minecraft.world.level.biome.Biome; +//import net.minecraft.world.level.biome.Biomes; +// +//import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput; +//import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagsProvider; +// +//public class TestBiomeTagsProvider extends FabricTagsProvider { +// public TestBiomeTagsProvider(FabricPackOutput output, CompletableFuture registriesFuture) { +// super(output, Registries.BIOME, registriesFuture); +// } +// +// @Override +// protected void addTags(HolderLookup.Provider registries) { +// builder(TagKey.create(Registries.BIOME, Identifier.fromNamespaceAndPath(FabricBiomeTest.MOD_ID, "biome_tag_test"))) +// .add(TestBiomes.CUSTOM_PLAINS) +// .add(TestBiomes.TEST_END_HIGHLANDS); +// builder(TagKey.create(Registries.BIOME, Identifier.fromNamespaceAndPath(FabricBiomeTest.MOD_ID, "tag_selector_test"))) +// .add(Biomes.BEACH) +// .add(Biomes.DESERT) +// .add(Biomes.SAVANNA) +// .add(Biomes.BADLANDS); +// } +//} diff --git a/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/WorldgenProvider.java b/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/WorldgenProvider.java index 6ad5baf176..135fbac932 100644 --- a/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/WorldgenProvider.java +++ b/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/WorldgenProvider.java @@ -1,43 +1,44 @@ -/* - * 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.biome; - -import java.util.concurrent.CompletableFuture; - -import net.minecraft.core.HolderLookup; -import net.minecraft.core.registries.Registries; - -import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricDynamicRegistryProvider; - -public class WorldgenProvider extends FabricDynamicRegistryProvider { - public WorldgenProvider(FabricPackOutput output, CompletableFuture registriesFuture) { - super(output, registriesFuture); - } - - @Override - protected void configure(HolderLookup.Provider registries, Entries entries) { - entries.addAll(registries.lookupOrThrow(Registries.BIOME)); - entries.addAll(registries.lookupOrThrow(Registries.PLACED_FEATURE)); - entries.addAll(registries.lookupOrThrow(Registries.CONFIGURED_FEATURE)); - } - - @Override - public String getName() { - return "Fabric Biome Testmod"; - } -} +///* +// * 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.biome; +// +//import java.util.concurrent.CompletableFuture; +// +//import net.minecraft.core.HolderLookup; +//import net.minecraft.core.registries.Registries; +// +//import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput; +//import net.fabricmc.fabric.api.datagen.v1.provider.FabricDynamicRegistryProvider; +// +//public class WorldgenProvider extends FabricDynamicRegistryProvider { +// public WorldgenProvider(FabricPackOutput output, CompletableFuture registriesFuture) { +// super(output, registriesFuture); +// } +// +// @Override +// protected void configure(HolderLookup.Provider registries, Entries entries) { +// entries.addAll(registries.lookupOrThrow(Registries.BIOME)); +// entries.addAll(registries.lookupOrThrow(Registries.PLACED_FEATURE)); +// entries.addAll(registries.lookupOrThrow(Registries.CONFIGURED_FEATURE)); +// entries.addAll(registries.lookupOrThrow(Registries.LEVEL_STEM)); +// } +// +// @Override +// public String getName() { +// return "Fabric Biome Testmod"; +// } +//} diff --git a/fabric-block-api-v1/build.gradle b/fabric-block-api-v1/build.gradle index 1912cf8d41..a94d560adc 100644 --- a/fabric-block-api-v1/build.gradle +++ b/fabric-block-api-v1/build.gradle @@ -5,5 +5,5 @@ loom { } testDependencies(project, [ - ':fabric-rendering-v1', +// ':fabric-rendering-v1', ]) diff --git a/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/ChunkSectionBlockStateCounterMixin.java b/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/ChunkSectionBlockStateCounterMixin.java deleted file mode 100644 index 0d5537abaa..0000000000 --- a/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/ChunkSectionBlockStateCounterMixin.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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.mixin.block; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockState; - -@Mixin(targets = "net.minecraft.world.level.chunk.LevelChunkSection$1BlockCounter") -public class ChunkSectionBlockStateCounterMixin { - /** - * Makes Chunk Sections not have isAir = true modded blocks be replaced with AIR against their will. - * Mojang report: https://bugs.mojang.com/browse/MC-232360 - */ - @Redirect(method = "accept(Lnet/minecraft/world/level/block/state/BlockState;I)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;isAir()Z")) - private boolean modifyAirCheck(BlockState blockState) { - return blockState.is(Blocks.AIR) || blockState.is(Blocks.CAVE_AIR) || blockState.is(Blocks.VOID_AIR); - } -} diff --git a/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/IBlockExtensionMixin.java b/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/IBlockExtensionMixin.java new file mode 100644 index 0000000000..4119cfbc57 --- /dev/null +++ b/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/IBlockExtensionMixin.java @@ -0,0 +1,10 @@ +package net.fabricmc.fabric.mixin.block; + +import net.neoforged.neoforge.common.extensions.IBlockExtension; +import org.spongepowered.asm.mixin.Mixin; + +import net.fabricmc.fabric.api.block.v1.FabricBlock; + +@Mixin(IBlockExtension.class) +public interface IBlockExtensionMixin extends FabricBlock { +} diff --git a/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/BlockStateMixin.java b/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/IBlockStateExtensionMixin.java similarity index 81% rename from fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/BlockStateMixin.java rename to fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/IBlockStateExtensionMixin.java index 9d82d352f0..5306b6f4a2 100644 --- a/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/BlockStateMixin.java +++ b/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/IBlockStateExtensionMixin.java @@ -16,11 +16,11 @@ package net.fabricmc.fabric.mixin.block; +import net.neoforged.neoforge.common.extensions.IBlockStateExtension; import org.spongepowered.asm.mixin.Mixin; -import net.minecraft.world.level.block.state.BlockState; - import net.fabricmc.fabric.api.block.v1.FabricBlockState; -@Mixin(BlockState.class) -public class BlockStateMixin implements FabricBlockState { } +@Mixin(IBlockStateExtension.class) +public interface IBlockStateExtensionMixin extends FabricBlockState { +} diff --git a/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/LevelChunkSectionMixin.java b/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/LevelChunkSectionMixin.java deleted file mode 100644 index 8ab943d1f6..0000000000 --- a/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/LevelChunkSectionMixin.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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.mixin.block; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.chunk.LevelChunkSection; - -@Mixin(LevelChunkSection.class) -public class LevelChunkSectionMixin { - /** - * Makes Chunk Sections not have isAir = true modded blocks be replaced with AIR against their will. - * Mojang report: https://bugs.mojang.com/browse/MC-232360 - */ - @Redirect(method = "setBlockState(IIILnet/minecraft/world/level/block/state/BlockState;Z)Lnet/minecraft/world/level/block/state/BlockState;", - at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;isAir()Z")) - private boolean modifyAirCheck(BlockState blockState) { - return blockState.is(Blocks.AIR) || blockState.is(Blocks.CAVE_AIR) || blockState.is(Blocks.VOID_AIR); - } -} diff --git a/fabric-block-api-v1/src/main/resources/fabric-block-api-v1.classtweaker b/fabric-block-api-v1/src/main/resources/fabric-block-api-v1.classtweaker index 8ee71822cb..8bb0a40ca2 100644 --- a/fabric-block-api-v1/src/main/resources/fabric-block-api-v1.classtweaker +++ b/fabric-block-api-v1/src/main/resources/fabric-block-api-v1.classtweaker @@ -1,4 +1,4 @@ classTweaker v1 official -transitive-inject-interface net/minecraft/world/level/block/Block net/fabricmc/fabric/api/block/v1/FabricBlock +transitive-inject-interface net/neoforged/neoforge/common/extensions/IBlockExtension net/fabricmc/fabric/api/block/v1/FabricBlock transitive-inject-interface net/minecraft/world/level/block/state/BlockBehaviour$Properties net/fabricmc/fabric/api/block/v1/FabricBlock$FabricProperties -transitive-inject-interface net/minecraft/world/level/block/state/BlockState net/fabricmc/fabric/api/block/v1/FabricBlockState +transitive-inject-interface net/neoforged/neoforge/common/extensions/IBlockStateExtension net/fabricmc/fabric/api/block/v1/FabricBlockState diff --git a/fabric-block-api-v1/src/main/resources/fabric-block-api-v1.mixins.json b/fabric-block-api-v1/src/main/resources/fabric-block-api-v1.mixins.json index 4463416118..acfd5ec5d4 100644 --- a/fabric-block-api-v1/src/main/resources/fabric-block-api-v1.mixins.json +++ b/fabric-block-api-v1/src/main/resources/fabric-block-api-v1.mixins.json @@ -4,10 +4,8 @@ "compatibilityLevel": "JAVA_25", "mixins": [ "BlockBehaviourPropertiesMixin", - "BlockMixin", - "BlockStateMixin", - "ChunkSectionBlockStateCounterMixin", - "LevelChunkSectionMixin", + "IBlockExtensionMixin", + "IBlockStateExtensionMixin", "LivingEntityMixin" ], "injectors": { diff --git a/fabric-client-gametest-api-v1/build.gradle b/fabric-client-gametest-api-v1/build.gradle index da0c75e18a..4fecb33268 100644 --- a/fabric-client-gametest-api-v1/build.gradle +++ b/fabric-client-gametest-api-v1/build.gradle @@ -4,25 +4,33 @@ loom { accessWidenerPath = file('src/client/resources/fabric-client-gametest-api-v1.classtweaker') } +moduleDependencies(project, [ + ':fabric-networking-api-v1' +]) + +testDependencies(project, [ + ':fabric-screen-api-v1', +]) + sourceSets { - mixinConfig { - compileClasspath += configurations.loaderLibraries - } - client { - compileClasspath += mixinConfig.output - runtimeClasspath += mixinConfig.output + main { + java { + srcDir 'src/mixinConfig/java' + } } } -configurations { - clientImplementation.extendsFrom mixinConfigImplementation - clientRuntimeOnly.extendsFrom mixinConfigRuntimeOnly -} - -dependencies { - mixinConfigImplementation "net.fabricmc:fabric-loader:${project.loader_version}" +neoForge { + runs { + clientGametest { + client() + systemProperty 'fabric.client.gametest', 'true' + } + } } -jar { - from sourceSets.mixinConfig.output +neoForge.mods { + screenTestMod { + sourceSet project(':fabric-screen-api-v1').sourceSets.testmod + } } diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/TestInput.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/TestInput.java index fa776fcd9f..a33772fb4b 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/TestInput.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/TestInput.java @@ -24,9 +24,12 @@ import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; import net.minecraft.client.Options; +import net.minecraft.core.BlockPos; /** * The client gametest input handler used to simulate inputs to the client. + * + *

Unless otherwise specified, methods in this class can only be called on the client gametest thread. */ @ApiStatus.NonExtendable public interface TestInput { @@ -319,6 +322,23 @@ public interface TestInput { */ void holdMouseFor(int button, int ticks); + /** + * Sets the player view rotation to the given yaw and pitch. + * + * @param yaw The yaw to look at + * @param pitch The pitch to look at + * @see #lookAt(BlockPos) + */ + void lookAt(float yaw, float pitch); + + /** + * Sets the player view rotation to look at the center of the given block position. + * + * @param pos The block position to look at + * @see #lookAt(float, float) + */ + void lookAt(BlockPos pos); + /** * Types a code point (character). Useful for typing in text boxes. * diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/ClientGameTestContext.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/ClientGameTestContext.java index b2ed423c60..826324117c 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/ClientGameTestContext.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/ClientGameTestContext.java @@ -38,7 +38,7 @@ /** * Context for a client gametest containing various helpful functions and functions to access the game. * - *

Functions in this class can only be called on the client gametest thread. + *

Unless otherwise specified, methods in this class can only be called on the client gametest thread. */ @ApiStatus.NonExtendable public interface ClientGameTestContext { @@ -95,7 +95,7 @@ public interface ClientGameTestContext { * Opens a {@link Screen} on the client. * * @param screen The screen to open - * @see Minecraft#setScreen(Screen) + * @see net.minecraft.client.gui.Gui#setScreen(Screen) */ void setScreen(Supplier<@Nullable Screen> screen); @@ -179,6 +179,8 @@ default Vector2i assertScreenshotContains(String templateImage) { /** * Gets the input handler used to simulate inputs to the client. * + *

This method can be called from any thread. + * * @return The client gametest input handler */ TestInput getInput(); @@ -186,6 +188,8 @@ default Vector2i assertScreenshotContains(String templateImage) { /** * Creates a world builder for creating singleplayer worlds and dedicated servers. * + *

This method can be called from any thread. + * * @return A new world builder */ TestWorldBuilder worldBuilder(); @@ -198,7 +202,10 @@ default Vector2i assertScreenshotContains(String templateImage) { void restoreDefaultGameOptions(); /** - * Runs the given action on the render thread (client thread), and waits for it to complete. + * Runs the given action on the render thread (client thread), and waits for it to complete. If already on the + * render thread, the action is run directly. + * + *

This method can be called from the client gametest thread and the render thread. * * @param action The action to run on the render thread * @param The type of checked exception that the action throws @@ -207,7 +214,10 @@ default Vector2i assertScreenshotContains(String templateImage) { void runOnClient(FailableConsumer action) throws E; /** - * Runs the given function on the render thread (client thread), and returns the result. + * Runs the given function on the render thread (client thread), and returns the result. If already on the + * render thread, the function is run directly. + * + *

This method can be called from the client gametest thread and the render thread. * * @param function The function to run on the render thread * @return The result of the function @@ -215,5 +225,5 @@ default Vector2i assertScreenshotContains(String templateImage) { * @param The type of the checked exception that the function throws * @throws E When the function throws an exception */ - T computeOnClient(FailableFunction function) throws E; + T computeOnClient(FailableFunction function) throws E; } diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestClientLevelContext.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestClientLevelContext.java deleted file mode 100644 index c4a56cf968..0000000000 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestClientLevelContext.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * 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.api.client.gametest.v1.context; - -import org.jetbrains.annotations.ApiStatus; - -import net.minecraft.SharedConstants; -import net.minecraft.client.multiplayer.ClientLevel; -import net.minecraft.core.BlockPos; - -/** - * Context for a client gametest containing various helpful functions while a client level is open. - * - *

Functions in this class can only be called on the client gametest thread. - */ -@ApiStatus.NonExtendable -public interface TestClientLevelContext { - /** - * The default timeout in ticks to wait for chunks to load/render (1 minute). - */ - int DEFAULT_CHUNK_LOAD_TIMEOUT = SharedConstants.TICKS_PER_MINUTE; - - /** - * Waits for all chunks that will be downloaded from the server to be downloaded. Fails if the chunks haven't been - * downloaded after {@link #DEFAULT_CHUNK_LOAD_TIMEOUT} ticks. See {@link #waitForChunksDownload(int)} for details. - * - * @return The number of ticks waited - */ - default int waitForChunksDownload() { - return waitForChunksDownload(DEFAULT_CHUNK_LOAD_TIMEOUT); - } - - /** - * Waits for all chunks that will be downloaded from the server to be downloaded. After this, methods such as - * {@link ClientLevel#getChunk(int, int)} and {@link ClientLevel#getBlockState(BlockPos)} will return the expected - * value. However, the chunks may not yet be rendered and may not appear in screenshots, if you need this, use - * {@link #waitForChunksRender(int)} instead. Fails if the chunks haven't been downloaded after {@code timeout} - * ticks. - * - * @param timeout The number of ticks before timing out - * @return The number of ticks waited - */ - int waitForChunksDownload(int timeout); - - /** - * Waits for all chunks to be downloaded and rendered. After this, all chunks that will ever be visible are visible - * in screenshots. Fails if the chunks haven't been downloaded and rendered after - * {@link #DEFAULT_CHUNK_LOAD_TIMEOUT} ticks. - * - * @return The number of ticks waited - */ - default int waitForChunksRender() { - return waitForChunksRender(DEFAULT_CHUNK_LOAD_TIMEOUT); - } - - /** - * Waits for all chunks to be downloaded and rendered. After this, all chunks that will ever be visible are visible - * in screenshots. Fails if the chunks haven't been downloaded and rendered after {@code timeout} ticks. - * - * @param timeout The number of ticks before timing out - * @return The number of ticks waited - */ - default int waitForChunksRender(int timeout) { - return waitForChunksRender(true, timeout); - } - - /** - * Waits for all chunks to be rendered, optionally waiting for chunks to be downloaded first. After this, all chunks - * that are present in the client level will be visible in screenshots. Fails if the chunks haven't been rendered - * (and optionally downloaded) after {@link #DEFAULT_CHUNK_LOAD_TIMEOUT} ticks. - * - * @param waitForDownload Whether to wait for chunks to be downloaded - * @return The number of ticks waited - */ - default int waitForChunksRender(boolean waitForDownload) { - return waitForChunksRender(waitForDownload, DEFAULT_CHUNK_LOAD_TIMEOUT); - } - - /** - * Waits for all chunks to be rendered, optionally waiting for chunks to be downloaded first. After this, all chunks - * that are present in the client level will be visible in screenshots. Fails if the chunks haven't been rendered - * (and optionally downloaded) after {@code timeout} ticks. - * - * @param waitForDownload Whether to wait for chunks to be downloaded - * @param timeout The number of ticks before timing out - * @return The number of ticks waited - */ - int waitForChunksRender(boolean waitForDownload, int timeout); -} diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestDedicatedServerConnection.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestDedicatedServerConnection.java new file mode 100644 index 0000000000..29211c424d --- /dev/null +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestDedicatedServerConnection.java @@ -0,0 +1,35 @@ +/* + * 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.api.client.gametest.v1.context; + +import org.jetbrains.annotations.ApiStatus; + +/** + * Context for a client gametest containing various helpful functions while a connection to a dedicated server is open. + * This class implements {@link AutoCloseable} and is intended to be used in a try-with-resources statement. When + * closed, the client will be disconnected from the server. + * + *

Unless otherwise specified, methods in this class can only be called on the client gametest thread. + */ +@ApiStatus.NonExtendable +public interface TestDedicatedServerConnection extends TestServerConnection, AutoCloseable { + /** + * Disconnects the client from the dedicated server. + */ + @Override + void close(); +} diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestDedicatedServerContext.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestDedicatedServerContext.java index 8947665ee7..6e913a7fbc 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestDedicatedServerContext.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestDedicatedServerContext.java @@ -27,7 +27,7 @@ * the Minecraft EULA, you can write the file at build-time by setting * {@code fabricApi.configureTests { eula = true }} in your {@code build.gradle}. * - *

Functions in this class can only be called on the client gametest thread. + *

Unless otherwise specified, methods in this class can only be called on the client gametest thread. */ @ApiStatus.NonExtendable public interface TestDedicatedServerContext extends TestServerContext, AutoCloseable { @@ -37,7 +37,7 @@ public interface TestDedicatedServerContext extends TestServerContext, AutoClose * * @return The connection handle to the dedicated server */ - TestServerConnection connect(); + TestDedicatedServerConnection connect(); /** * Stops the dedicated server. diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestServerConnection.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestServerConnection.java index 1a4df8c77e..745cb08d36 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestServerConnection.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestServerConnection.java @@ -18,25 +18,166 @@ import org.jetbrains.annotations.ApiStatus; +import net.minecraft.SharedConstants; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.InterpolationHandler; + /** - * Context for a connection to a dedicated server containing various helpful functions while the connection is alive. - * This class implements {@link AutoCloseable} and is intended to be used in a try-with-resources statement. When - * closed, the client will be disconnected from the server. + * Context for a client gametest containing various helpful functions while a connection to a server is open. * - *

Functions in this class can only be called on the client gametest thread. + *

Unless otherwise specified, methods in this class can only be called on the client gametest thread. */ @ApiStatus.NonExtendable -public interface TestServerConnection extends AutoCloseable { +public interface TestServerConnection { + /** + * The default timeout in ticks to wait for chunks to load/render (1 minute). + */ + int DEFAULT_CHUNK_LOAD_TIMEOUT = SharedConstants.TICKS_PER_MINUTE; + + /** + * Waits for all chunks that will be downloaded from the server to be downloaded. Fails if the chunks haven't been + * downloaded after {@link #DEFAULT_CHUNK_LOAD_TIMEOUT} ticks. See {@link #waitForChunksDownload(int)} for details. + * + * @return The number of ticks waited + */ + default int waitForChunksDownload() { + return waitForChunksDownload(DEFAULT_CHUNK_LOAD_TIMEOUT); + } + + /** + * Waits for all chunks that will be downloaded from the server to be downloaded. After this, methods such as + * {@link ClientLevel#getChunk(int, int)} and {@link ClientLevel#getBlockState(BlockPos)} will return the expected + * value. However, the chunks may not yet be rendered and may not appear in screenshots, if you need this, use + * {@link #waitForChunksRender(int)} instead. Fails if the chunks haven't been downloaded after {@code timeout} + * ticks. + * + * @param timeout The number of ticks before timing out + * @return The number of ticks waited + */ + int waitForChunksDownload(int timeout); + + /** + * Waits for all chunks to be downloaded and rendered. After this, all chunks that will ever be visible are visible + * in screenshots. Fails if the chunks haven't been downloaded and rendered after + * {@link #DEFAULT_CHUNK_LOAD_TIMEOUT} ticks. + * + * @return The number of ticks waited + */ + default int waitForChunksRender() { + return waitForChunksRender(DEFAULT_CHUNK_LOAD_TIMEOUT); + } + + /** + * Waits for all chunks to be downloaded and rendered. After this, all chunks that will ever be visible are visible + * in screenshots. Fails if the chunks haven't been downloaded and rendered after {@code timeout} ticks. + * + * @param timeout The number of ticks before timing out + * @return The number of ticks waited + */ + default int waitForChunksRender(int timeout) { + return waitForChunksRender(true, timeout); + } + + /** + * Waits for all chunks to be rendered, optionally waiting for chunks to be downloaded first. After this, all chunks + * that are present in the client level will be visible in screenshots. Fails if the chunks haven't been rendered + * (and optionally downloaded) after {@link #DEFAULT_CHUNK_LOAD_TIMEOUT} ticks. + * + * @param waitForDownload Whether to wait for chunks to be downloaded + * @return The number of ticks waited + */ + default int waitForChunksRender(boolean waitForDownload) { + return waitForChunksRender(waitForDownload, DEFAULT_CHUNK_LOAD_TIMEOUT); + } + /** - * Gets the client level context for this connection. + * Waits for all chunks to be rendered, optionally waiting for chunks to be downloaded first. After this, all chunks + * that are present in the client level will be visible in screenshots. Fails if the chunks haven't been rendered + * (and optionally downloaded) after {@code timeout} ticks. * - * @return The client level context + * @param waitForDownload Whether to wait for chunks to be downloaded + * @param timeout The number of ticks before timing out + * @return The number of ticks waited */ - TestClientLevelContext getClientLevel(); + int waitForChunksRender(boolean waitForDownload, int timeout); /** - * Disconnects the client from the dedicated server. + * Waits for all packets that have already been sent on the server to be received and processed by the client. + * + *

Note that the server batches some updates, sending them later in the tick, so in some cases a wait may need + * to be added before calling this method to ensure the packets are sent. Notable examples include: + * + *

    + *
  • Block changes, which require a call to {@link ClientGameTestContext#waitTick()} before calling this method.
    • + *
  • Entity updates, which are batched less frequently. You can call {@link #waitForClientboundEntityUpdates} instead + * of this method to handle this case.
    • + *
+ * + *

It may be tempting to call {@link ClientGameTestContext#waitTick()} instead of this method. This often appears to work, + * especially in singleplayer, since packets can often take less than a tick to arrive. However it is not 100% reliable and + * will produce flaky tests. For a similar reason, forgetting to call {@link ClientGameTestContext#waitTick()} before this + * method for a block change often works anyway, since the packets sent by the server batching block updates can still arrive + * before control is returned to the client gametest thread, however this is not guaranteed. + */ + void waitForClientboundPackets(); + + /** + * Waits for all packets that have already been sent on the client to be received and processed by the server. + */ + void waitForServerboundPackets(); + + /** + * Waits for updates to entities of the specified types on the server to be sent, and received and processed by + * the client. This waits the maximum of all the update intervals of the specified entity types, then waits for + * the packets to be received. + * + *

Some entities interpolate on the client when they are moved, rather than snapping immediately to the right + * position. If you encounter issues with this, you may need to wait for the interpolation to finish after calling + * this method. Living entities interpolate for {@link InterpolationHandler#DEFAULT_INTERPOLATION_STEPS} ticks. + * + * @param entityType The entity type to wait for + * @param moreEntityTypes Additional entity types to wait for + */ + void waitForClientboundEntityUpdates(EntityType entityType, EntityType... moreEntityTypes); + + /** + * Gets the client player. + * + *

This method can only be called from the render (client) thread. + * + * @return The client player + */ + LocalPlayer getClientPlayer(); + + /** + * Gets the server player corresponding to the connected client. + * + *

This method can only be called from the server thread. + * + * @return The server player + */ + ServerPlayer getServerPlayer(); + + /** + * Gets the client level. + * + *

This method can only be called from the render (client) thread. + * + * @return The client level + */ + ClientLevel getClientLevel(); + + /** + * Gets the server level of the same dimension as the client level. + * + *

This method can only be called from the server thread. + * + * @return The server level */ - @Override - void close(); + ServerLevel getServerLevel(); } diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestServerContext.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestServerContext.java index 59a7767694..00270a4f5e 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestServerContext.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestServerContext.java @@ -16,9 +16,12 @@ package net.fabricmc.fabric.api.client.gametest.v1.context; +import java.util.function.Predicate; + import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableFunction; import org.jetbrains.annotations.ApiStatus; +import org.jspecify.annotations.Nullable; import net.minecraft.server.MinecraftServer; @@ -26,7 +29,7 @@ * Context for a client gametest containing various helpful functions while a server (integrated or dedicated) is * running. * - *

Functions in this class can only be called on the client gametest thread. + *

Unless otherwise specified, methods in this class can only be called on the client gametest thread. */ @ApiStatus.NonExtendable public interface TestServerContext { @@ -38,7 +41,10 @@ public interface TestServerContext { void runCommand(String command); /** - * Runs the given action on the server thread, and waits for it to complete. + * Runs the given action on the server thread, and waits for it to complete. If already on the server thread, + * this action is run directly. + * + *

This method can be called from the client gametest thread and the server thread. * * @param action The action to run on the server thread * @param The type of the checked exception that the action throws @@ -47,7 +53,10 @@ public interface TestServerContext { void runOnServer(FailableConsumer action) throws E; /** - * Runs the given function on the server thread, and returns the result. + * Runs the given function on the server thread, and returns the result. If already on the server thread, + * the function is run directly. + * + *

This method can be called from the client gametest thread and the server thread. * * @param function The function to run on the server thread * @return The result of the function @@ -55,5 +64,23 @@ public interface TestServerContext { * @param The type of the checked exception that the function throws * @throws E When the function throws an exception */ - T computeOnServer(FailableFunction function) throws E; + T computeOnServer(FailableFunction function) throws E; + + /** + * Waits for a predicate to be true. Fails if the predicate is not satisfied after {@link ClientGameTestContext#DEFAULT_TIMEOUT} ticks. + * + * @param predicate The predicate to check + * @return The number of ticks waited + */ + int waitFor(Predicate predicate); + + /** + * Waits for a predicate to be true. Fails if the predicate is not satisfied after {@code timeout} ticks. If + * {@code timeout} is {@link ClientGameTestContext#NO_TIMEOUT}, there is no timeout. + * + * @param predicate The predicate to check + * @param timeout The number of ticks before timing out + * @return The number of ticks waited + */ + int waitFor(Predicate predicate, int timeout); } diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestSingleplayerContext.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestSingleplayerContext.java index 1ec23f14b1..34b5093a20 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestSingleplayerContext.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestSingleplayerContext.java @@ -23,13 +23,15 @@ /** * Context for a client gametest containing various helpful functions while a singleplayer game is open. * - *

Functions in this class can only be called on the client gametest thread. + *

Unless otherwise specified, methods in this class can only be called on the client gametest thread. */ @ApiStatus.NonExtendable public interface TestSingleplayerContext extends AutoCloseable { /** * Gets the handle for the world save. * + *

This method can be called from any thread. + * * @return The handle for the world save */ TestWorldSave getWorldSave(); @@ -37,13 +39,17 @@ public interface TestSingleplayerContext extends AutoCloseable { /** * Gets the handle for the client level. * + *

This method can be called from any thread. + * * @return The handle for the client level */ - TestClientLevelContext getClientLevel(); + TestServerConnection getConnection(); /** * Gets the handle for the integrated server. * + *

This method can be called from any thread. + * * @return The handle for the integrated server */ TestServerContext getServer(); diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/package-info.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/package-info.java index e4f04f7d6b..26e0ec91f5 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/package-info.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/package-info.java @@ -41,15 +41,10 @@ * is exactly one server tick per client tick while a server is running (singleplayer or multiplayer). There is also a * limit of one client tick per frame. * - *

Network synchronization

- * - *

Network packets are internally tracked and managed so that they are always handled at a consistent time, always - * before the next tick. Calling {@code waitTick()} is always enough for a server packet to be handled on the client or - * vice versa. - * - *

If your mod interacts with the network code at a low level, such as by directly hooking into the Netty pipeline to - * send or handle packets, you may need to disable network synchronization. You can do this by setting the - * {@code fabric.client.gametest.disableNetworkSynchronizer} system property. + *

Network packets can take a variable number of ticks to arrive on the other side. To make consistent game tests, see + * {@link net.fabricmc.fabric.api.client.gametest.v1.context.TestServerConnection#waitForClientboundPackets() TestServerConnection.waitForClientboundPackets()}, + * {@link net.fabricmc.fabric.api.client.gametest.v1.context.TestServerConnection#waitForServerboundPackets() TestServerConnection.waitForServerboundPackets()}, + * and similar methods. * *

Default settings

* The client gametest API adjusts some default settings, usually for consistency of tests. These settings can always be @@ -77,6 +72,18 @@ * Consistency of tests * * + * {@linkplain net.minecraft.client.Options#maxAnisotropyBit() Anisotropic filtering} + * {@code 0} (disabled) + * {@code 2} + * Consistency of tests + * + * + * {@linkplain net.minecraft.client.Options#chunkSectionFadeInTime() Chunk fade} + * {@code 0} + * {@code 0.75} + * Consistency of tests + * + * * {@linkplain net.minecraft.client.Options#onboardAccessibility Onboard accessibility} * {@code false} * {@code true} @@ -87,7 +94,7 @@ * {@code 5} * {@code 10} * Speeds up loading of chunks, especially for functions such as - * {@link net.fabricmc.fabric.api.client.gametest.v1.context.TestClientLevelContext#waitForChunksRender() TestClientLevelContext.waitForChunksRender()} + * {@link net.fabricmc.fabric.api.client.gametest.v1.context.TestServerConnection#waitForChunksRender() TestServerConnection.waitForChunksRender()} * * * {@linkplain net.minecraft.client.Options#getSoundSourceOptionInstance(net.minecraft.sounds.SoundSource) Music volume} @@ -129,23 +136,29 @@ * Consistency of tests and creates cleaner tests * * - * {@linkplain net.minecraft.world.level.gamerules.GameRules#ADVANCE_TIME Do daylight cycle} + * {@linkplain net.minecraft.world.level.gamerules.GameRules#ADVANCE_TIME Advance time} * {@code false} * {@code true} * Consistency of tests * * - * {@linkplain net.minecraft.world.level.gamerules.GameRules#ADVANCE_WEATHER Do weather cycle} + * {@linkplain net.minecraft.world.level.gamerules.GameRules#ADVANCE_WEATHER Advance weather} * {@code false} * {@code true} * Consistency of tests * * - * {@linkplain net.minecraft.world.level.gamerules.GameRules#SPAWN_MOBS Do mob spawning} + * {@linkplain net.minecraft.world.level.gamerules.GameRules#SPAWN_MOBS Spawn mobs} * {@code false} * {@code true} * Consistency of tests * + * + * {@linkplain net.minecraft.world.level.gamerules.GameRules#RESPAWN_RADIUS Respawn radius} + * {@code 0} + * {@code 10} + * Consistency of tests + * * * *

Dedicated server properties

diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/world/TestWorldBuilder.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/world/TestWorldBuilder.java index f8f94f7058..eab5d31645 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/world/TestWorldBuilder.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/world/TestWorldBuilder.java @@ -30,14 +30,14 @@ * A builder used for creating singleplayer worlds and dedicated servers. * *

Worlds from this builder default to being flat worlds with settings and game rules designed for consistency of - * tests, see the package documentation for details. To disable this, use {@link #setUseConsistentSettings}. If you need + * tests, see the module documentation for details. To disable this, use {@link #setUseConsistentSettings}. If you need * to re-enable a particular setting, you can override it using {@link #adjustSettings}. */ @ApiStatus.NonExtendable public interface TestWorldBuilder { /** * Sets whether to use consistent world settings. Consistent settings are designed for consistency of tests. See the - * package documentation for details on what the consistent settings are. + * module documentation for details on what the consistent settings are. * *

If disabled, the world builder will default to creating worlds with the default world preset in survival mode, * as if clicking straight through the create world screen without changing any settings. diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/FabricClientGameTestImpl.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/FabricClientGameTestImpl.java new file mode 100644 index 0000000000..aeb586e576 --- /dev/null +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/FabricClientGameTestImpl.java @@ -0,0 +1,44 @@ +/* + * 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.impl.client.gametest; + +import net.minecraft.client.Minecraft; + +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.fabricmc.fabric.impl.client.gametest.threading.ThreadingImpl; +import net.fabricmc.fabric.impl.client.gametest.util.GameTestSyncPayload; + +public class FabricClientGameTestImpl implements ClientModInitializer { + public static final String MOD_ID = "fabric-client-gametest-api-v1"; + + @Override + public void onInitializeClient() { + if (!TestSystemProperties.ENABLED) { + return; + } + + ThreadingImpl.unsafeClientInstance = Minecraft.getInstance(); + + PayloadTypeRegistry.serverboundPlay().register(GameTestSyncPayload.TYPE, GameTestSyncPayload.CODEC); + PayloadTypeRegistry.clientboundPlay().register(GameTestSyncPayload.TYPE, GameTestSyncPayload.CODEC); + ClientPlayNetworking.registerGlobalReceiver(GameTestSyncPayload.TYPE, (_, _) -> ThreadingImpl.networkSyncReceived = true); + ServerPlayNetworking.registerGlobalReceiver(GameTestSyncPayload.TYPE, (_, _) -> ThreadingImpl.networkSyncReceived = true); + } +} diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/FabricClientGameTestRunner.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/FabricClientGameTestRunner.java index 18855e00e1..459b7f1975 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/FabricClientGameTestRunner.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/FabricClientGameTestRunner.java @@ -114,8 +114,8 @@ private static void setupAndCheckFinalGameTestState(ClientGameTestContextImpl co throw new AssertionError("Client gametest %s finished while still connected to a server".formatted(currentlyRunningGameTest.getDefinition())); } - if (!(client.screen instanceof TitleScreen)) { - throw new AssertionError("Client gametest %s did not finish on the title screen. Current screen %s".formatted(currentlyRunningGameTest.getDefinition(), client.screen.getClass().getName())); + if (!(client.gui.screen() instanceof TitleScreen)) { + throw new AssertionError("Client gametest %s did not finish on the title screen. Current screen %s".formatted(currentlyRunningGameTest.getDefinition(), client.gui.screen().getClass().getName())); } }); } diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/TestInputImpl.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/TestInputImpl.java index cea6f6f096..62325d33e8 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/TestInputImpl.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/TestInputImpl.java @@ -31,13 +31,15 @@ import net.minecraft.client.input.CharacterEvent; import net.minecraft.client.input.KeyEvent; import net.minecraft.client.input.MouseButtonInfo; +import net.minecraft.commands.arguments.EntityAnchorArgument; +import net.minecraft.core.BlockPos; import net.minecraft.util.Util; +import net.minecraft.world.phys.Vec3; import net.fabricmc.fabric.api.client.gametest.v1.TestInput; import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext; import net.fabricmc.fabric.impl.client.gametest.threading.ThreadingImpl; import net.fabricmc.fabric.impl.client.gametest.util.WindowHooks; -import net.fabricmc.fabric.mixin.client.gametest.input.KeyMappingAccessor; import net.fabricmc.fabric.mixin.client.gametest.input.KeyboardHandlerAccessor; import net.fabricmc.fabric.mixin.client.gametest.input.MouseHandlerAccessor; @@ -279,6 +281,30 @@ public void holdMouseFor(int button, int ticks) { holdKeyFor(InputConstants.Type.MOUSE.getOrCreate(button), ticks); } + @Override + public void lookAt(float yaw, float pitch) { + ThreadingImpl.checkOnGametestThread("lookAt"); + Preconditions.checkArgument(Float.isFinite(yaw), "yaw must be finite"); + Preconditions.checkArgument(Float.isFinite(pitch), "pitch must be finite"); + + context.runOnClient(client -> { + Preconditions.checkState(client.player != null, "player must be present to look"); + client.player.setYRot(yaw); + client.player.setXRot(pitch); + }); + } + + @Override + public void lookAt(BlockPos pos) { + ThreadingImpl.checkOnGametestThread("lookAt"); + Preconditions.checkNotNull(pos, "pos"); + + context.runOnClient(client -> { + Preconditions.checkState(client.player != null, "player must be present to look"); + client.player.lookAt(EntityAnchorArgument.Anchor.EYES, Vec3.atCenterOf(pos)); + }); + } + @Override public void typeChar(int codePoint) { ThreadingImpl.checkOnGametestThread("typeChar"); @@ -339,7 +365,7 @@ public void resizeWindow(int width, int height) { } private static InputConstants.Key getBoundKey(KeyMapping keyMapping, String action) { - InputConstants.Key boundKey = ((KeyMappingAccessor) keyMapping).getKey(); + InputConstants.Key boundKey = keyMapping.getKey(); if (boundKey == InputConstants.UNKNOWN) { throw new AssertionError("Cannot %s binding '%s' because it isn't bound to a key".formatted(action, keyMapping.getName())); diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/TestSystemProperties.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/TestSystemProperties.java index 68254f10cd..bfa29d913f 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/TestSystemProperties.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/TestSystemProperties.java @@ -30,9 +30,6 @@ private TestSystemProperties() { @Nullable public static final String TEST_MOD_RESOURCES_PATH = System.getProperty("fabric.client.gametest.testModResourcesPath"); - // Disable the network (packet) synchronizer. (Disabled by default) - public static final boolean DISABLE_NETWORK_SYNCHRONIZER = !"false".equals(System.getProperty("fabric.client.gametest.disableNetworkSynchronizer", "true")); - // Disable the joining of async stack traces in ThreadingImpl. public static final boolean DISABLE_JOIN_ASYNC_STACK_TRACES = System.getProperty("fabric.client.gametest.disableJoinAsyncStackTraces") != null; diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/ClientGameTestContextImpl.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/ClientGameTestContextImpl.java index a856d12883..6bbd7fc9b0 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/ClientGameTestContextImpl.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/ClientGameTestContextImpl.java @@ -32,6 +32,7 @@ import com.google.common.base.Preconditions; import com.mojang.blaze3d.platform.NativeImage; +import com.mojang.blaze3d.systems.RenderSystem; import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableFunction; import org.apache.commons.lang3.mutable.MutableBoolean; @@ -90,9 +91,13 @@ public final class ClientGameTestContextImpl implements ClientGameTestContext { private static final Map DEFAULT_GAME_OPTIONS = new HashMap<>(); public static void initGameOptions(Options options) { + // When adding to the list of default game options, remember to update the list in module documentation + // Messes with the consistency of gametests options.tutorialStep = TutorialSteps.NONE; options.cloudStatus().set(CloudStatus.OFF); + options.maxAnisotropyBit().set(0); + options.chunkSectionFadeInTime().set(0D); // Messes with game tests starting options.onboardAccessibility = false; @@ -103,11 +108,7 @@ public static void initGameOptions(Options options) { // Just annoying options.getSoundSourceOptionInstance(SoundSource.MUSIC).set(0.0); - // Disable Anisotropic Filtering - options.maxAnisotropyBit().set(0); - - // Disable chunk fade - options.chunkSectionFadeInTime().set(0D); + // When adding to the list of default game options, remember to update the list in module documentation ((OptionsAccessor) options).invokeProcessOptions(new Options.FieldAccess() { @Override @@ -208,16 +209,16 @@ public int waitForScreen(@Nullable Class screenClass) { ThreadingImpl.checkOnGametestThread("waitForScreen"); if (screenClass == null) { - return waitFor(client -> client.screen == null); + return waitFor(client -> client.gui.screen() == null); } else { - return waitFor(client -> screenClass.isInstance(client.screen)); + return waitFor(client -> screenClass.isInstance(client.gui.screen())); } } @Override public void setScreen(Supplier<@Nullable Screen> screen) { ThreadingImpl.checkOnGametestThread("setScreen"); - runOnClient(client -> client.setScreen(screen.get())); + runOnClient(client -> client.gui.setScreen(screen.get())); } @Override @@ -226,10 +227,10 @@ public void clickScreenButton(String translationKey) { Preconditions.checkNotNull(translationKey, "translationKey"); runOnClient(client -> { - if (!tryClickScreenButtonImpl(client.screen, translationKey)) { + if (!tryClickScreenButtonImpl(client.gui.screen(), translationKey)) { throw new AssertionError("Could not find button '%s' in screen '%s'".formatted( translationKey, - Optionull.map(client.screen, screen -> screen.getClass().getName()) + Optionull.map(client.gui.screen(), screen -> screen.getClass().getName()) )); } }); @@ -240,7 +241,7 @@ public boolean tryClickScreenButton(String translationKey) { ThreadingImpl.checkOnGametestThread("tryClickScreenButton"); Preconditions.checkNotNull(translationKey, "translationKey"); - return computeOnClient(client -> tryClickScreenButtonImpl(client.screen, translationKey)); + return computeOnClient(client -> tryClickScreenButtonImpl(client.gui.screen(), translationKey)); } private static boolean tryClickScreenButtonImpl(@Nullable Screen screen, String translationKey) { @@ -388,7 +389,7 @@ private T doTakeScreenshot(TestScreenshotCommonOptionsImpl options, Funct if (options.size != null) { client.getWindow().setWidth(options.size.x); client.getWindow().setHeight(options.size.y); - client.getMainRenderTarget().resize(options.size.x, options.size.y); + client.gameRenderer.mainRenderTarget().resize(options.size.x, options.size.y); } return new Vector2i(prevWidth, prevHeight); @@ -397,11 +398,13 @@ private T doTakeScreenshot(TestScreenshotCommonOptionsImpl options, Funct try { CompletableFuture future = computeOnClient(client -> { DeltaTracker.DefaultValue deltaTracker = DeltaTrackerDefaultValueAccessor.create(options.deltaTicks); + client.gameRenderer.update(deltaTracker); client.gameRenderer.extract(deltaTracker, true); client.gameRenderer.render(deltaTracker, true); + RenderSystem.getDevice().createCommandEncoder().submit(); CompletableFuture resultFuture = new CompletableFuture<>(); - Screenshot.takeScreenshot(client.getMainRenderTarget(), screenshot -> { + Screenshot.takeScreenshot(client.gameRenderer.mainRenderTarget(), screenshot -> { try { resultFuture.complete(screenshotConsumer.apply(screenshot)); } catch (Throwable e) { @@ -425,7 +428,7 @@ private T doTakeScreenshot(TestScreenshotCommonOptionsImpl options, Funct computeOnClient(client -> { client.getWindow().setWidth(prevSize.x); client.getWindow().setHeight(prevSize.y); - client.getMainRenderTarget().resize(prevSize.x, prevSize.y); + client.gameRenderer.mainRenderTarget().resize(prevSize.x, prevSize.y); return null; }); } @@ -524,19 +527,27 @@ public void process(String key, OptionInstance option) { @Override public void runOnClient(FailableConsumer action) throws E { - ThreadingImpl.checkOnGametestThread("runOnClient"); + ThreadingImpl.checkOnGametestOrClientThread("runOnClient"); Preconditions.checkNotNull(action, "action"); - ThreadingImpl.runOnClient(() -> action.accept(Minecraft.getInstance())); + if (ThreadingImpl.unsafeClientInstance.isSameThread()) { + action.accept(Minecraft.getInstance()); + } else { + ThreadingImpl.runOnClient(() -> action.accept(Minecraft.getInstance())); + } } @Override public T computeOnClient(FailableFunction function) throws E { - ThreadingImpl.checkOnGametestThread("computeOnClient"); + ThreadingImpl.checkOnGametestOrClientThread("computeOnClient"); Preconditions.checkNotNull(function, "function"); - MutableObject result = new MutableObject<>(); - ThreadingImpl.runOnClient(() -> result.setValue(function.apply(Minecraft.getInstance()))); - return result.getValue(); + if (ThreadingImpl.unsafeClientInstance.isSameThread()) { + return function.apply(Minecraft.getInstance()); + } else { + MutableObject result = new MutableObject<>(); + ThreadingImpl.runOnClient(() -> result.setValue(function.apply(Minecraft.getInstance()))); + return result.getValue(); + } } } diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestClientLevelContextImpl.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestClientLevelContextImpl.java deleted file mode 100644 index 27d59d7c1f..0000000000 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestClientLevelContextImpl.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * 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.impl.client.gametest.context; - -import java.util.Objects; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientChunkCache; -import net.minecraft.client.multiplayer.ClientLevel; -import net.minecraft.world.level.chunk.status.ChunkStatus; - -import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext; -import net.fabricmc.fabric.api.client.gametest.v1.context.TestClientLevelContext; -import net.fabricmc.fabric.impl.client.gametest.threading.ThreadingImpl; -import net.fabricmc.fabric.mixin.client.gametest.ClientChunkCacheAccessor; -import net.fabricmc.fabric.mixin.client.gametest.ClientChunkCacheStorageAccessor; -import net.fabricmc.fabric.mixin.client.gametest.ClientLevelAccessor; - -public class TestClientLevelContextImpl implements TestClientLevelContext { - private final ClientGameTestContext context; - - public TestClientLevelContextImpl(ClientGameTestContext context) { - this.context = context; - } - - @Override - public int waitForChunksDownload(int timeout) { - ThreadingImpl.checkOnGametestThread("waitForChunksDownload"); - - return context.waitFor(TestClientLevelContextImpl::areChunksLoaded, timeout); - } - - @Override - public int waitForChunksRender(boolean waitForDownload, int timeout) { - ThreadingImpl.checkOnGametestThread("waitForChunksRender"); - - return context.waitFor(client -> (!waitForDownload || areChunksLoaded(client)) && areChunksRendered(client), timeout); - } - - private static boolean areChunksLoaded(Minecraft client) { - int renderDistance = client.options.getEffectiveRenderDistance(); - ClientLevel level = Objects.requireNonNull(client.level); - ClientChunkCache.Storage chunks = ((ClientChunkCacheAccessor) level.getChunkSource()).getStorage(); - ClientChunkCacheStorageAccessor chunksAccessor = (ClientChunkCacheStorageAccessor) (Object) chunks; - int viewCenterX = chunksAccessor.getViewCenterX(); - int viewCenterZ = chunksAccessor.getViewCenterZ(); - - for (int dz = -renderDistance; dz <= renderDistance; dz++) { - for (int dx = -renderDistance; dx <= renderDistance; dx++) { - if (level.getChunk(viewCenterX + dx, viewCenterZ + dz, ChunkStatus.FULL, false) == null) { - return false; - } - } - } - - return true; - } - - private static boolean areChunksRendered(Minecraft client) { - ClientLevel level = Objects.requireNonNull(client.level); - return ((ClientLevelAccessor) level).getLightUpdateQueue().isEmpty() && client.levelRenderer.hasRenderedAllSections(); - } -} diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestDedicatedServerConnectionImpl.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestDedicatedServerConnectionImpl.java new file mode 100644 index 0000000000..e415275154 --- /dev/null +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestDedicatedServerConnectionImpl.java @@ -0,0 +1,48 @@ +/* + * 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.impl.client.gametest.context; + +import net.minecraft.client.gui.screens.TitleScreen; +import net.minecraft.network.chat.Component; + +import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext; +import net.fabricmc.fabric.api.client.gametest.v1.context.TestDedicatedServerConnection; +import net.fabricmc.fabric.impl.client.gametest.threading.ThreadingImpl; + +public class TestDedicatedServerConnectionImpl extends TestServerConnectionImpl implements TestDedicatedServerConnection { + public TestDedicatedServerConnectionImpl(ClientGameTestContext context, TestServerContextImpl serverContext) { + super(context, serverContext); + } + + @Override + public void close() { + ThreadingImpl.checkOnGametestThread("close"); + + context.runOnClient(client -> { + if (client.level == null) { + throw new AssertionError("Disconnected from server before closing the test server connection"); + } + + client.level.disconnect(Component.literal("Disconnecting")); + client.disconnectWithSavingScreen(); + }); + + context.waitFor(client -> client.level == null); + context.waitTicks(2); + context.setScreen(TitleScreen::new); + } +} diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestDedicatedServerContextImpl.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestDedicatedServerContextImpl.java index 78ba846348..edcaf1ccd7 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestDedicatedServerContextImpl.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestDedicatedServerContextImpl.java @@ -22,9 +22,8 @@ import net.minecraft.server.dedicated.DedicatedServer; import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext; -import net.fabricmc.fabric.api.client.gametest.v1.context.TestClientLevelContext; +import net.fabricmc.fabric.api.client.gametest.v1.context.TestDedicatedServerConnection; import net.fabricmc.fabric.api.client.gametest.v1.context.TestDedicatedServerContext; -import net.fabricmc.fabric.api.client.gametest.v1.context.TestServerConnection; import net.fabricmc.fabric.impl.client.gametest.threading.ThreadingImpl; import net.fabricmc.fabric.impl.client.gametest.util.ClientGameTestImpl; @@ -37,18 +36,17 @@ public TestDedicatedServerContextImpl(ClientGameTestContext context, DedicatedSe } @Override - public TestServerConnection connect() { + public TestDedicatedServerConnection connect() { ThreadingImpl.checkOnGametestThread("connect"); context.runOnClient(client -> { final var serverInfo = new ServerData("localhost", getConnectionAddress(), ServerData.Type.OTHER); - ConnectScreen.startConnecting(client.screen, client, ServerAddress.parseString(getConnectionAddress()), serverInfo, false, null); + ConnectScreen.startConnecting(client.gui.screen(), client, ServerAddress.parseString(getConnectionAddress()), serverInfo, false, null); }); ClientGameTestImpl.waitForWorldLoad(context); - TestClientLevelContext clientLevel = new TestClientLevelContextImpl(context); - return new TestServerConnectionImpl(context, clientLevel); + return new TestDedicatedServerConnectionImpl(context, this); } private String getConnectionAddress() { diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestServerConnectionImpl.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestServerConnectionImpl.java index 5698424e2c..2663907a81 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestServerConnectionImpl.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestServerConnectionImpl.java @@ -16,43 +16,150 @@ package net.fabricmc.fabric.impl.client.gametest.context; -import net.minecraft.client.gui.screens.TitleScreen; -import net.minecraft.network.chat.Component; +import java.util.Objects; +import java.util.UUID; + +import com.google.common.base.Preconditions; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientChunkCache; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.level.chunk.status.ChunkStatus; import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext; -import net.fabricmc.fabric.api.client.gametest.v1.context.TestClientLevelContext; import net.fabricmc.fabric.api.client.gametest.v1.context.TestServerConnection; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.fabricmc.fabric.impl.client.gametest.threading.ThreadingImpl; +import net.fabricmc.fabric.impl.client.gametest.util.GameTestSyncPayload; +import net.fabricmc.fabric.mixin.client.gametest.ClientChunkCacheAccessor; +import net.fabricmc.fabric.mixin.client.gametest.ClientChunkCacheStorageAccessor; +import net.fabricmc.fabric.mixin.client.gametest.ClientLevelAccessor; public class TestServerConnectionImpl implements TestServerConnection { - private final ClientGameTestContext context; - private final TestClientLevelContext clientLevel; + protected final ClientGameTestContext context; + private final TestServerContextImpl serverContext; - public TestServerConnectionImpl(ClientGameTestContext context, TestClientLevelContext clientLevel) { + public TestServerConnectionImpl(ClientGameTestContext context, TestServerContextImpl serverContext) { this.context = context; - this.clientLevel = clientLevel; + this.serverContext = serverContext; } @Override - public TestClientLevelContext getClientLevel() { - return clientLevel; + public int waitForChunksDownload(int timeout) { + ThreadingImpl.checkOnGametestThread("waitForChunksDownload"); + + return context.waitFor(TestServerConnectionImpl::areChunksLoaded, timeout); } @Override - public void close() { - ThreadingImpl.checkOnGametestThread("close"); + public int waitForChunksRender(boolean waitForDownload, int timeout) { + ThreadingImpl.checkOnGametestThread("waitForChunksRender"); + + return context.waitFor(client -> (!waitForDownload || areChunksLoaded(client)) && areChunksRendered(client), timeout); + } - context.runOnClient(client -> { - if (client.level == null) { - throw new AssertionError("Disconnected from server before closing the test server connection"); + private static boolean areChunksLoaded(Minecraft client) { + int renderDistance = client.options.getEffectiveRenderDistance(); + ClientLevel level = Objects.requireNonNull(client.level); + ClientChunkCache.Storage chunks = ((ClientChunkCacheAccessor) level.getChunkSource()).getStorage(); + ClientChunkCacheStorageAccessor chunksAccessor = (ClientChunkCacheStorageAccessor) (Object) chunks; + int viewCenterX = chunksAccessor.getViewCenterX(); + int viewCenterZ = chunksAccessor.getViewCenterZ(); + + for (int dz = -renderDistance; dz <= renderDistance; dz++) { + for (int dx = -renderDistance; dx <= renderDistance; dx++) { + if (level.getChunk(viewCenterX + dx, viewCenterZ + dz, ChunkStatus.FULL, false) == null) { + return false; + } } + } + + return true; + } + + private static boolean areChunksRendered(Minecraft client) { + ClientLevel level = Objects.requireNonNull(client.level); + return ((ClientLevelAccessor) level).getLightUpdateQueue().isEmpty() && client.levelRenderer.hasRenderedAllSections(); + } + + @Override + public void waitForClientboundPackets() { + ThreadingImpl.checkOnGametestThread("waitForClientboundPackets"); + + serverContext.runOnServer(server -> ServerPlayNetworking.send(getServerPlayer(), GameTestSyncPayload.INSTANCE)); + + try { + context.waitFor(_ -> ThreadingImpl.networkSyncReceived); + } finally { + ThreadingImpl.networkSyncReceived = false; + } + } + + @Override + public void waitForServerboundPackets() { + ThreadingImpl.checkOnGametestThread("waitForServerboundPackets"); + + context.runOnClient(_ -> ClientPlayNetworking.send(GameTestSyncPayload.INSTANCE)); + + try { + serverContext.waitFor(_ -> ThreadingImpl.networkSyncReceived); + } finally { + ThreadingImpl.networkSyncReceived = false; + } + } - client.level.disconnect(Component.literal("Disconnecting")); - client.disconnectWithSavingScreen(); - }); + @Override + public void waitForClientboundEntityUpdates(EntityType entityType, EntityType... moreEntityTypes) { + ThreadingImpl.checkOnGametestThread("waitForClientboundEntityUpdates"); + Preconditions.checkNotNull(entityType, "entityType"); + Preconditions.checkNotNull(moreEntityTypes, "moreEntityTypes"); + + for (int i = 0; i < moreEntityTypes.length; i++) { + Preconditions.checkNotNull(moreEntityTypes[i], "moreEntityTypes[" + i + "]"); + } + + int maxUpdateInterval = Math.max(0, entityType.updateInterval()); + + for (EntityType et : moreEntityTypes) { + maxUpdateInterval = Math.max(maxUpdateInterval, et.updateInterval()); + } + + context.waitTicks(maxUpdateInterval); + waitForClientboundPackets(); + } + + @Override + public LocalPlayer getClientPlayer() { + ThreadingImpl.checkOnClientThread("getClientPlayer"); + + return Objects.requireNonNull(Minecraft.getInstance().player, "Not in world!"); + } + + @Override + public ClientLevel getClientLevel() { + ThreadingImpl.checkOnClientThread("getClientLevel"); + + return Objects.requireNonNull(Minecraft.getInstance().level, "Not in world!"); + } + + @Override + public ServerPlayer getServerPlayer() { + ThreadingImpl.checkOnServerThread("getServerPlayer", serverContext.server); + + UUID uuid = Minecraft.getInstance().getGameProfile().id(); + return Objects.requireNonNull(serverContext.server.getPlayerList().getPlayer(uuid), "No corresponding player on server!"); + } + + @Override + public ServerLevel getServerLevel() { + ThreadingImpl.checkOnServerThread("getServerLevel", serverContext.server); - context.waitFor(client -> client.level == null); - context.waitTicks(2); - context.setScreen(TitleScreen::new); + ClientLevel clientLevel = Objects.requireNonNull(Minecraft.getInstance().level, "Not in world!"); + return Objects.requireNonNull(serverContext.server.getLevel(clientLevel.dimension()), "No corresponding level on server!"); } } diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestServerContextImpl.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestServerContextImpl.java index fe1dd344b7..edaf3db783 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestServerContextImpl.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestServerContextImpl.java @@ -16,6 +16,8 @@ package net.fabricmc.fabric.impl.client.gametest.context; +import java.util.function.Predicate; + import com.google.common.base.Preconditions; import org.apache.commons.lang3.function.FailableConsumer; import org.apache.commons.lang3.function.FailableFunction; @@ -23,6 +25,7 @@ import net.minecraft.server.MinecraftServer; +import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext; import net.fabricmc.fabric.api.client.gametest.v1.context.TestServerContext; import net.fabricmc.fabric.impl.client.gametest.threading.ThreadingImpl; @@ -43,19 +46,67 @@ public void runCommand(String command) { @Override public void runOnServer(FailableConsumer action) throws E { - ThreadingImpl.checkOnGametestThread("runOnServer"); + ThreadingImpl.checkOnGametestOrServerThread("runOnServer", server); Preconditions.checkNotNull(action, "action"); - ThreadingImpl.runOnServer(() -> action.accept(server)); + if (server.isSameThread()) { + action.accept(server); + } else { + ThreadingImpl.runOnServer(() -> action.accept(server)); + } } @Override public T computeOnServer(FailableFunction function) throws E { - ThreadingImpl.checkOnGametestThread("computeOnServer"); + ThreadingImpl.checkOnGametestOrServerThread("computeOnServer", server); Preconditions.checkNotNull(function, "function"); - MutableObject result = new MutableObject<>(); - ThreadingImpl.runOnServer(() -> result.setValue(function.apply(server))); - return result.getValue(); + if (server.isSameThread()) { + return function.apply(server); + } else { + MutableObject result = new MutableObject<>(); + ThreadingImpl.runOnServer(() -> result.setValue(function.apply(server))); + return result.getValue(); + } + } + + @Override + public int waitFor(Predicate predicate) { + ThreadingImpl.checkOnGametestThread("waitFor"); + Preconditions.checkNotNull(predicate, "predicate"); + return waitFor(predicate, ClientGameTestContext.DEFAULT_TIMEOUT); + } + + @Override + public int waitFor(Predicate predicate, int timeout) { + ThreadingImpl.checkOnGametestThread("waitFor"); + Preconditions.checkNotNull(predicate, "predicate"); + + if (timeout == ClientGameTestContext.NO_TIMEOUT) { + int ticksWaited = 0; + + while (!computeOnServer(predicate::test)) { + ticksWaited++; + ThreadingImpl.runTick(); + } + + return ticksWaited; + } else { + Preconditions.checkArgument(timeout > 0, "timeout must be positive"); + + for (int i = 0; i < timeout; i++) { + if (computeOnServer(predicate::test)) { + return i; + } + + ThreadingImpl.runTick(); + } + + if (!computeOnServer(predicate::test)) { + throw new AssertionError("Timed out waiting for predicate"); + } + + return timeout; + } } } diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestSingleplayerContextImpl.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestSingleplayerContextImpl.java index 814e283944..d926327c22 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestSingleplayerContextImpl.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/context/TestSingleplayerContextImpl.java @@ -23,7 +23,7 @@ import net.minecraft.server.MinecraftServer; import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext; -import net.fabricmc.fabric.api.client.gametest.v1.context.TestClientLevelContext; +import net.fabricmc.fabric.api.client.gametest.v1.context.TestServerConnection; import net.fabricmc.fabric.api.client.gametest.v1.context.TestServerContext; import net.fabricmc.fabric.api.client.gametest.v1.context.TestSingleplayerContext; import net.fabricmc.fabric.api.client.gametest.v1.world.TestWorldSave; @@ -32,14 +32,14 @@ public class TestSingleplayerContextImpl implements TestSingleplayerContext { private final ClientGameTestContext context; private final TestWorldSave worldSave; - private final TestClientLevelContext clientLevel; - private final TestServerContext server; + private final TestServerContextImpl server; + private final TestServerConnection connection; public TestSingleplayerContextImpl(ClientGameTestContext context, TestWorldSave worldSave, MinecraftServer server) { this.context = context; this.worldSave = worldSave; - this.clientLevel = new TestClientLevelContextImpl(context); this.server = new TestServerContextImpl(server); + this.connection = new TestServerConnectionImpl(context, this.server); } @Override @@ -48,8 +48,8 @@ public TestWorldSave getWorldSave() { } @Override - public TestClientLevelContext getClientLevel() { - return clientLevel; + public TestServerConnection getConnection() { + return connection; } @Override diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/threading/NetworkSynchronizer.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/threading/NetworkSynchronizer.java deleted file mode 100644 index e03cab27b0..0000000000 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/threading/NetworkSynchronizer.java +++ /dev/null @@ -1,211 +0,0 @@ -/* - * 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.impl.client.gametest.threading; - -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.locks.Condition; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import com.google.common.collect.ConcurrentHashMultiset; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import net.minecraft.util.Unit; -import net.minecraft.util.thread.BlockableEventLoop; - -import net.fabricmc.fabric.impl.client.gametest.TestSystemProperties; - -/** - * Ensures packets are always handled by the end of the task loop on the receiving thread. - * - *

Implementation notes

- * - *
    - *
  • A packet can be either "in-flight", which is between the time it is sent and the time it is handled on the - * Netty thread on the receiving side, or it can be queued for handling on the receiving main thread, which is - * between when it is handled on the Netty thread and it is removed from the main thread task queue. - *
      - *
    • Some packets are handled directly on the Netty thread and never enter the second stage. The - * {@code NetworkSynchronizer} is careful not to assume that all packets must be added to the task - * queue.
      • - *
    - *
    • - *
  • Once the packets are tracked in this way, the key change is that the client and server now continue running - * their task loops until there are no in-flight packets and no packets waiting to be handled in the vanilla - * task queues.
    • - *
  • Network synchronization can be disabled via a system property, which is useful for mods which directly - * interface with the Netty pipeline, which would desynchronize the in-flight packet counter.
    • - *
- */ -public final class NetworkSynchronizer { - private static final Logger LOGGER = LoggerFactory.getLogger("fabric-client-gametest-api-v1"); - - public static final NetworkSynchronizer CLIENTBOUND = new NetworkSynchronizer(); - public static final NetworkSynchronizer SERVERBOUND = new NetworkSynchronizer(); - - private final ThreadLocal isNettyThread = new ThreadLocal<>(); - private final AtomicInteger inFlightPackets = new AtomicInteger(); - private final ConcurrentHashMultiset mainThreadPacketHandlers = ConcurrentHashMultiset.create(); - private final Lock morePacketsLock = new ReentrantLock(); - private final Condition morePacketsCondition = morePacketsLock.newCondition(); - private final AtomicBoolean invalid = new AtomicBoolean(); - private boolean isRunningNetworkTasks = false; - - public void preSendPacket() { - if (TestSystemProperties.DISABLE_NETWORK_SYNCHRONIZER) { - return; - } - - inFlightPackets.incrementAndGet(); - } - - public void preNettyHandlePacket() { - if (TestSystemProperties.DISABLE_NETWORK_SYNCHRONIZER) { - return; - } - - isNettyThread.set(Unit.INSTANCE); - } - - public void postNettyHandlePacket() { - if (TestSystemProperties.DISABLE_NETWORK_SYNCHRONIZER) { - return; - } - - int remainingInFlightPackets = inFlightPackets.decrementAndGet(); - - if (remainingInFlightPackets < 0) { - markInvalid(); - return; - } - - isNettyThread.remove(); - - if (remainingInFlightPackets == 0) { - signalMorePackets(); - } - } - - public void preTaskAdded(Runnable task) { - if (TestSystemProperties.DISABLE_NETWORK_SYNCHRONIZER) { - return; - } - - if (isNettyThread.get() != null) { - mainThreadPacketHandlers.add(new RunnableBox(task)); - signalMorePackets(); - } - } - - public void postTaskRun(Runnable task) { - if (TestSystemProperties.DISABLE_NETWORK_SYNCHRONIZER) { - return; - } - - checkInvalid(); - mainThreadPacketHandlers.remove(new RunnableBox(task)); - } - - public void waitForPacketHandlers(BlockableEventLoop executor) { - if (TestSystemProperties.DISABLE_NETWORK_SYNCHRONIZER) { - return; - } - - while (inFlightPackets.get() > 0 || !mainThreadPacketHandlers.isEmpty()) { - while (inFlightPackets.get() > 0 && mainThreadPacketHandlers.isEmpty()) { - morePacketsLock.lock(); - - try { - if (!morePacketsCondition.await(10, TimeUnit.SECONDS)) { - markInvalid(); - checkInvalid(); - } - } catch (InterruptedException e) { - throw new RuntimeException(e); - } finally { - morePacketsLock.unlock(); - } - } - - isRunningNetworkTasks = true; - - long startTime = System.nanoTime(); - - try { - executor.managedBlock(() -> { - if (System.nanoTime() - startTime > 10_000_000_000L) { - markInvalid(); - checkInvalid(); - } - - return mainThreadPacketHandlers.isEmpty(); - }); - } finally { - isRunningNetworkTasks = false; - } - } - } - - public void reset() { - inFlightPackets.set(0); - mainThreadPacketHandlers.clear(); - signalMorePackets(); - } - - public boolean isRunningNetworkTasks() { - return isRunningNetworkTasks; - } - - private void signalMorePackets() { - morePacketsLock.lock(); - morePacketsCondition.signal(); - morePacketsLock.unlock(); - } - - private void markInvalid() { - if (!invalid.getAndSet(true)) { - LOGGER.error("Detected interfacing with packets at a lower level. Please disable network synchronization by setting the fabric.client.gametest.disableNetworkSynchronizer system property"); - signalMorePackets(); - } - } - - private void checkInvalid() { - if (invalid.get()) { - throw new AssertionError("Network synchronizer in invalid state, see earlier log messages"); - } - } - - // Wraps a runnable to always use identity hashCode and equals - private record RunnableBox(Runnable runnable) { - @Override - public boolean equals(Object other) { - if (!(other instanceof RunnableBox(Runnable otherRunnable))) { - return false; - } - - return otherRunnable == this.runnable; - } - - @Override - public int hashCode() { - return System.identityHashCode(this.runnable); - } - } -} diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/threading/ThreadingImpl.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/threading/ThreadingImpl.java index 30cb898bc9..98ad9689f8 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/threading/ThreadingImpl.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/threading/ThreadingImpl.java @@ -27,18 +27,17 @@ import org.slf4j.LoggerFactory; import net.minecraft.client.Minecraft; +import net.minecraft.server.MinecraftServer; import net.fabricmc.fabric.impl.client.gametest.TestSystemProperties; /** *

Implementation notes

* - *

When a client test is running, ticks are run in a much more controlled way than in vanilla. A tick is split into 4 + *

When a client test is running, ticks are run in a much more controlled way than in vanilla. A tick is split into 2 * phases: *

    *
  1. {@linkplain #PHASE_TICK} - The client and server threads run a single tick in parallel, if they exist. The test thread waits.
    2. - *
  2. {@linkplain #PHASE_SERVER_TASKS} - The server runs its task queue, if the server exists. The other threads wait.
    3. - *
  3. {@linkplain #PHASE_CLIENT_TASKS} - The client runs its task queue, if the client exists. The other threads wait.
    4. *
  4. {@linkplain #PHASE_TEST} - The test thread runs test code while the client and server threads wait for tasks to be handed off.
    5. *
* @@ -51,13 +50,8 @@ * released while leaving {@linkplain #taskToRun} as {@code null}, which they will interpret to mean they are to * continue into {@linkplain #PHASE_TICK}. * - *

The reason these phases were chosen are to make client-server communication as consistent as possible. The task - * queues are when most packets are handled, and without them being run in sequence it would be unspecified whether a - * packet would be handled on the current tick until the next one. The server task queue is before the client so that - * changes on the server appear on the client more readily. The test phase is run after the task queues rather than at - * the end of the physical tick (i.e. {@code Minecraft}'s and {@code MinecraftServer}'s {@code tick} methods), for - * no particular reason other than to avoid needing a 5th phase, and having a power of 2 number of phases is convenient - * when using {@linkplain Phaser}, as it doesn't break when the phase counter overflows. + *

Having a power of 2 number of phases is convenient when using {@linkplain Phaser}, as it doesn't break when the + * phase counter overflows. * *

Other challenges include that a client or server can be started during {@linkplain #PHASE_TEST} but haven't * reached their semaphore code yet meaning they are unable to accept tasks. This is solved by setting a flag to true @@ -77,10 +71,8 @@ private ThreadingImpl() { private static final String TASK_ON_OTHER_THREAD_METHOD_NAME = "runTaskOnOtherThread"; public static final int PHASE_TICK = 0; - public static final int PHASE_SERVER_TASKS = 1; - public static final int PHASE_CLIENT_TASKS = 2; - public static final int PHASE_TEST = 3; - private static final int PHASE_MASK = 3; + public static final int PHASE_TEST = 1; + private static final int PHASE_MASK = 1; public static final Phaser PHASER = new Phaser(); private static volatile boolean enablePhases = true; @@ -104,6 +96,11 @@ private ThreadingImpl() { private static volatile boolean gameCrashed = false; + public static volatile boolean networkSyncReceived = false; + + // Reference to Minecraft instance to avoid calling Minecraft.getInstance() on gametest thread (which has a check against doing that) + public static Minecraft unsafeClientInstance; + public static void enterPhase(int phase) { while (enablePhases && getNextPhase() != phase) { PHASER.arriveAndAwaitAdvance(); @@ -178,6 +175,22 @@ public static void checkOnGametestThread(String methodName) { Preconditions.checkState(Thread.currentThread() == testThread, "%s can only be called from the client gametest thread", methodName); } + public static void checkOnClientThread(String methodName) { + Preconditions.checkState(unsafeClientInstance.isSameThread(), "%s can only be called from the client thread", methodName); + } + + public static void checkOnGametestOrClientThread(String methodName) { + Preconditions.checkState(Thread.currentThread() == testThread || unsafeClientInstance.isSameThread(), "%s can only be called from the client gametest thread or the client thread", methodName); + } + + public static void checkOnServerThread(String methodName, MinecraftServer server) { + Preconditions.checkState(server.isSameThread(), "%s can only be called from the server thread", methodName); + } + + public static void checkOnGametestOrServerThread(String methodName, MinecraftServer server) { + Preconditions.checkState(Thread.currentThread() == testThread || server.isSameThread(), "%s can only be called from the client gametest thread or the server thread", methodName); + } + public static void runOnClient(FailableRunnable action) throws E { Preconditions.checkNotNull(action, "action"); checkOnGametestThread("runOnClient"); diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/util/ClientGameTestImpl.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/util/ClientGameTestImpl.java index d89ebf223b..0ce8ebd726 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/util/ClientGameTestImpl.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/util/ClientGameTestImpl.java @@ -37,11 +37,11 @@ private ClientGameTestImpl() { public static void waitForWorldLoad(ClientGameTestContext context) { for (int i = 0; i < SharedConstants.TICKS_PER_MINUTE; i++) { - if (context.computeOnClient(client -> isExperimentalWarningScreen(client.screen))) { + if (context.computeOnClient(client -> isExperimentalWarningScreen(client.gui.screen()))) { context.clickScreenButton("gui.yes"); } - if (context.computeOnClient(client -> client.screen instanceof BackupConfirmScreen)) { + if (context.computeOnClient(client -> client.gui.screen() instanceof BackupConfirmScreen)) { context.clickScreenButton("selectWorld.backupJoinSkipButton"); } @@ -70,7 +70,7 @@ private static boolean isExperimentalWarningScreen(Screen screen) { } private static boolean isWorldLoadingFinished(Minecraft client) { - LOGGER.info("World loading finished: {} screen: {}", client.level, client.screen); - return client.level != null && !(client.screen instanceof LevelLoadingScreen); + LOGGER.info("World loading finished: {} screen: {}", client.level, client.gui.screen()); + return client.level != null && !(client.gui.screen() instanceof LevelLoadingScreen); } } diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/util/DedicatedServerImplUtil.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/util/DedicatedServerImplUtil.java index d3621ba42f..bd4e38b0a1 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/util/DedicatedServerImplUtil.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/util/DedicatedServerImplUtil.java @@ -40,6 +40,8 @@ public final class DedicatedServerImplUtil { private static final Logger LOGGER = LoggerFactory.getLogger("fabric-client-gametest-api-v1"); private static final Properties DEFAULT_SERVER_PROPERTIES = Util.make(new Properties(), properties -> { + // When adding to the list of default server options, remember to update the list in module documentation + // allow non-authenticated connections from localhost properties.setProperty("online-mode", "false"); @@ -51,6 +53,8 @@ public final class DedicatedServerImplUtil { // stops other players from joining the server and interfering with the tests properties.setProperty("max-players", "1"); + + // When adding to the list of default server options, remember to update the list in module documentation }); // If this field is set, it causes the create world screen to write the level.dat file to the specified folder @@ -58,6 +62,7 @@ public final class DedicatedServerImplUtil { public static Path saveLevelDataTo = null; @Nullable public static CompletableFuture serverFuture = null; + public static boolean isRunningServer = false; private DedicatedServerImplUtil() { } @@ -66,6 +71,7 @@ public static DedicatedServer start(ClientGameTestContext context, Properties se setupServer(serverProperties); serverFuture = new CompletableFuture<>(); + isRunningServer = true; new Thread(() -> Main.main(new String[]{})).start(); DedicatedServer server; diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/SyncCompletePayload.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/util/GameTestSyncPayload.java similarity index 60% rename from fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/SyncCompletePayload.java rename to fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/util/GameTestSyncPayload.java index 9ed475d6af..a7747cc60f 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/SyncCompletePayload.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/util/GameTestSyncPayload.java @@ -14,22 +14,24 @@ * limitations under the License. */ -package net.fabricmc.fabric.impl.registry.sync; +package net.fabricmc.fabric.impl.client.gametest.util; + +import io.netty.buffer.ByteBuf; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.resources.Identifier; -public class SyncCompletePayload implements CustomPacketPayload { - public static final SyncCompletePayload INSTANCE = new SyncCompletePayload(); - public static final CustomPacketPayload.Type ID = new CustomPacketPayload.Type<>(Identifier.fromNamespaceAndPath("fabric", "registry/sync/complete")); - public static final StreamCodec CODEC = StreamCodec.unit(INSTANCE); +import net.fabricmc.fabric.impl.client.gametest.FabricClientGameTestImpl; + +public enum GameTestSyncPayload implements CustomPacketPayload { + INSTANCE; - private SyncCompletePayload() { } + public static final Type TYPE = new Type<>(Identifier.fromNamespaceAndPath(FabricClientGameTestImpl.MOD_ID, "gametest_sync")); + public static final StreamCodec CODEC = StreamCodec.unit(INSTANCE); @Override public Type type() { - return ID; + return TYPE; } } diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/world/TestWorldBuilderImpl.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/world/TestWorldBuilderImpl.java index f0782a57c5..7a2cfbf591 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/world/TestWorldBuilderImpl.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/world/TestWorldBuilderImpl.java @@ -111,10 +111,10 @@ public TestDedicatedServerContext createServer(Properties serverProperties) { private Path navigateCreateWorldScreen() { Path saveDirectory = context.computeOnClient(client -> { - Screen oldScreen = client.screen; - CreateWorldScreen.openFresh(client, () -> client.setScreen(oldScreen)); + Screen oldScreen = client.gui.screen(); + CreateWorldScreen.openFresh(client, () -> client.gui.setScreen(oldScreen)); - if (!(client.screen instanceof CreateWorldScreen createWorldScreen)) { + if (!(client.gui.screen() instanceof CreateWorldScreen createWorldScreen)) { throw new AssertionError("CreateWorldScreen.show did not set the current screen"); } @@ -135,6 +135,7 @@ private Path navigateCreateWorldScreen() { } private static void setConsistentSettings(WorldCreationUiState creator) { + // When adding to the list of default world creation options, remember to update the list in module documentation Holder flatPreset = creator.getSettings().worldgenLoadContext().lookupOrThrow(Registries.WORLD_PRESET).getOrThrow(WorldPresets.FLAT); creator.setWorldType(new WorldCreationUiState.WorldTypeEntry(flatPreset)); creator.setSeed("1"); @@ -142,5 +143,7 @@ private static void setConsistentSettings(WorldCreationUiState creator) { creator.getGameRules().set(GameRules.ADVANCE_TIME, false, null); creator.getGameRules().set(GameRules.ADVANCE_WEATHER, false, null); creator.getGameRules().set(GameRules.SPAWN_MOBS, false, null); + creator.getGameRules().set(GameRules.RESPAWN_RADIUS, 0, null); + // When adding to the list of default world creation options, remember to update the list in module documentation } } diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/MainMixin.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/MainMixin.java new file mode 100644 index 0000000000..392a739601 --- /dev/null +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/MainMixin.java @@ -0,0 +1,21 @@ +package net.fabricmc.fabric.mixin.client.gametest; + +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +import net.minecraft.server.Main; + +import net.fabricmc.fabric.impl.client.gametest.util.DedicatedServerImplUtil; + +@Mixin(Main.class) +public class MainMixin { + @WrapOperation(method = "main", at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/server/loading/ServerModLoader;load(Z)V")) + private static void skipServerModLoading(boolean isGameTest, Operation original) { + if (DedicatedServerImplUtil.isRunningServer) { + return; + } + original.call(isGameTest); + } +} diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/gui/ScreenMixin.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/gui/ScreenMixin.java index dff0e97e59..6710e1d4b8 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/gui/ScreenMixin.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/gui/ScreenMixin.java @@ -16,16 +16,18 @@ package net.fabricmc.fabric.mixin.client.gametest.gui; -import com.llamalad7.mixinextras.injector.ModifyReturnValue; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; @Mixin(Screen.class) public class ScreenMixin { - @ModifyReturnValue(method = "panoramaShouldSpin", at = @At("RETURN")) - private boolean disableRotatingPanoramaForClientGameTests(boolean original) { - return false; + @Inject(method = "extractPanorama", at = @At("HEAD")) + private void disableRotatingPanoramaForClientGameTests(CallbackInfo ci) { + Minecraft.getInstance().gameRenderer.panorama().holdSpin(); } } diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/GlCommandEncoderMixin.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/GlCommandEncoderMixin.java index 6aeaaa3730..7b23cfc967 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/GlCommandEncoderMixin.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/GlCommandEncoderMixin.java @@ -32,8 +32,9 @@ public class GlCommandEncoderMixin { @WrapOperation(method = "presentTexture", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/opengl/DirectStateAccess;blitFrameBuffers(IIIIIIIIIIII)V")) private void blitFrameBuffer(DirectStateAccess manager, int readFramebuffer, int drawFramebuffer, int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, int mask, int filter, Operation original, @Local(argsOnly = true) GpuTextureView gpuTextureView) { - if (gpuTextureView.texture() == Minecraft.getInstance().getMainRenderTarget().getColorTexture()) { + if (gpuTextureView.texture() == Minecraft.getInstance().gameRenderer.mainRenderTarget().getColorTexture()) { WindowHooks window = ((WindowHooks) (Object) Minecraft.getInstance().getWindow()); + dstY0 = 0; dstX1 = window.fabric_getRealFramebufferWidth(); dstY1 = window.fabric_getRealFramebufferHeight(); } diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/ScreenManagerMixin.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/MonitorManagerMixin.java similarity index 93% rename from fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/ScreenManagerMixin.java rename to fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/MonitorManagerMixin.java index 823c129563..a327142042 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/ScreenManagerMixin.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/MonitorManagerMixin.java @@ -17,15 +17,15 @@ package net.fabricmc.fabric.mixin.client.gametest.input; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; -import com.mojang.blaze3d.platform.ScreenManager; +import com.mojang.blaze3d.platform.MonitorManager; import com.mojang.blaze3d.platform.Window; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import net.fabricmc.fabric.impl.client.gametest.util.WindowHooks; -@Mixin(ScreenManager.class) -public class ScreenManagerMixin { +@Mixin(MonitorManager.class) +public class MonitorManagerMixin { @ModifyExpressionValue(method = "findBestMonitor(Lcom/mojang/blaze3d/platform/Window;)Lcom/mojang/blaze3d/platform/Monitor;", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/Window;getScreenWidth()I")) private int getRealWidth(int original, Window window) { return ((WindowHooks) (Object) window).fabric_getRealWidth(); diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/VulkanGpuSurfaceMixin.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/VulkanGpuSurfaceMixin.java new file mode 100644 index 0000000000..1b32b223bf --- /dev/null +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/VulkanGpuSurfaceMixin.java @@ -0,0 +1,47 @@ +/* + * 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.mixin.client.gametest.input; + +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import com.llamalad7.mixinextras.sugar.Local; +import com.mojang.blaze3d.textures.GpuTextureView; +import org.lwjgl.vulkan.VkImageBlit; +import org.lwjgl.vulkan.VkOffset3D; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +import net.minecraft.client.Minecraft; + +import net.fabricmc.fabric.impl.client.gametest.util.WindowHooks; + +@Mixin(targets = "com.mojang.blaze3d.vulkan.VulkanGpuSurface") +public class VulkanGpuSurfaceMixin { + @WrapOperation(method = "blitFromTexture", at = @At(value = "INVOKE", target = "Lorg/lwjgl/vulkan/VkImageBlit$Buffer;dstOffsets(Lorg/lwjgl/vulkan/VkOffset3D$Buffer;)Lorg/lwjgl/vulkan/VkImageBlit$Buffer;")) + private VkImageBlit.Buffer blitFrameBuffer(VkImageBlit.Buffer blitRegion, VkOffset3D.Buffer dstOffsets, Operation original, @Local(argsOnly = true) GpuTextureView gpuTextureView) { + if (gpuTextureView.texture() == Minecraft.getInstance().gameRenderer.mainRenderTarget().getColorTexture()) { + WindowHooks window = ((WindowHooks) (Object) Minecraft.getInstance().getWindow()); + dstOffsets.position(0); + dstOffsets.x(0).y(window.fabric_getRealFramebufferHeight()).z(0); + dstOffsets.position(1); + dstOffsets.x(window.fabric_getRealFramebufferWidth()).y(0).z(1); + dstOffsets.position(0); + } + + return original.call(blitRegion, dstOffsets); + } +} diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/WindowMixin.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/WindowMixin.java index 18a20d6458..52f0d87b58 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/WindowMixin.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/WindowMixin.java @@ -22,7 +22,7 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.mojang.blaze3d.platform.DisplayData; import com.mojang.blaze3d.platform.Monitor; -import com.mojang.blaze3d.platform.ScreenManager; +import com.mojang.blaze3d.platform.MonitorManager; import com.mojang.blaze3d.platform.VideoMode; import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.platform.WindowEventHandler; @@ -66,7 +66,7 @@ public abstract class WindowMixin implements WindowHooks { private WindowEventHandler eventHandler; @Shadow @Final - private ScreenManager screenManager; + private MonitorManager monitorManager; @Shadow private Optional preferredFullscreenVideoMode; @@ -89,7 +89,7 @@ public abstract class WindowMixin implements WindowHooks { private int realFramebufferHeight; @Inject(method = "", at = @At("RETURN")) - private void onInit(WindowEventHandler eventHandler, DisplayData displayData, String fullscreenVideoModeString, String title, GpuBackend backend, CallbackInfo ci) { + private void onInit(WindowEventHandler eventHandler, DisplayData displayData, String fullscreenVideoModeString, boolean exclusiveFullscreen, String title, MonitorManager monitorManager, GpuBackend backend, CallbackInfo ci) { this.defaultWidth = displayData.width(); this.defaultHeight = displayData.height(); this.realWidth = this.width; @@ -178,7 +178,7 @@ public void fabric_resize(int width, int height) { // Move the top left corner of the window so that the window expands/contracts from its center, while also // trying to keep the window within the monitor's bounds - Monitor monitor = this.screenManager.findBestMonitor((Window) (Object) this); + Monitor monitor = this.monitorManager.findBestMonitor((Window) (Object) this); if (monitor != null) { VideoMode videoMode = monitor.getPreferredVidMode(this.preferredFullscreenVideoMode); @@ -186,20 +186,20 @@ public void fabric_resize(int width, int height) { this.x += (this.windowedWidth - width) / 2; this.y += (this.windowedHeight - height) / 2; - if (this.x + width > monitor.getX() + videoMode.getWidth()) { - this.x = monitor.getX() + videoMode.getWidth() - width; + if (this.x + width > monitor.x() + videoMode.getWidth()) { + this.x = monitor.x() + videoMode.getWidth() - width; } - if (this.x < monitor.getX()) { - this.x = monitor.getX(); + if (this.x < monitor.x()) { + this.x = monitor.x(); } - if (this.y + height > monitor.getY() + videoMode.getHeight()) { - this.y = monitor.getY() + videoMode.getHeight() - height; + if (this.y + height > monitor.y() + videoMode.getHeight()) { + this.y = monitor.y() + videoMode.getHeight() - height; } - if (this.y < monitor.getY()) { - this.y = monitor.getY(); + if (this.y < monitor.y()) { + this.y = monitor.y(); } this.windowedX = this.x; diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/lifecycle/MinecraftMixin.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/lifecycle/MinecraftMixin.java index d5417deb4b..d70d3d2c32 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/lifecycle/MinecraftMixin.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/lifecycle/MinecraftMixin.java @@ -16,7 +16,7 @@ package net.fabricmc.fabric.mixin.client.gametest.lifecycle; -import org.jspecify.annotations.Nullable; +import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; @@ -25,7 +25,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screens.Overlay; +import net.minecraft.client.gui.Gui; import net.fabricmc.fabric.impl.client.gametest.FabricClientGameTestRunner; @@ -35,12 +35,12 @@ public class MinecraftMixin { private boolean startedClientGametests = false; @Shadow - @Nullable - private Overlay overlay; + @Final + public Gui gui; @Inject(method = "tick", at = @At("HEAD")) private void onTick(CallbackInfo ci) { - if (!startedClientGametests && overlay == null) { + if (!startedClientGametests && gui.overlay() == null) { startedClientGametests = true; FabricClientGameTestRunner.start(); } diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/threading/BlockableEventLoopMixin.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/threading/BlockableEventLoopMixin.java deleted file mode 100644 index 836a052abe..0000000000 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/threading/BlockableEventLoopMixin.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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.mixin.client.gametest.threading; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import net.minecraft.client.Minecraft; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.thread.BlockableEventLoop; - -import net.fabricmc.fabric.impl.client.gametest.threading.NetworkSynchronizer; - -@Mixin(BlockableEventLoop.class) -public class BlockableEventLoopMixin { - @Inject(method = "schedule", at = @At("HEAD")) - private void onPacketHandlerSchedule(Runnable task, CallbackInfo ci) { - switch ((Object) this) { - case Minecraft $ -> NetworkSynchronizer.CLIENTBOUND.preTaskAdded(task); - case MinecraftServer $ -> NetworkSynchronizer.SERVERBOUND.preTaskAdded(task); - default -> { - } - } - } - - @Inject(method = "doRunTask", at = @At(value = "INVOKE", target = "Ljava/lang/Runnable;run()V", shift = At.Shift.AFTER)) - private void onPacketHandlerRun(Runnable task, CallbackInfo ci) { - switch ((Object) this) { - case Minecraft $ -> NetworkSynchronizer.CLIENTBOUND.postTaskRun(task); - case MinecraftServer $ -> NetworkSynchronizer.SERVERBOUND.postTaskRun(task); - default -> { - } - } - } -} diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/threading/ConnectionMixin.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/threading/ConnectionMixin.java deleted file mode 100644 index 48e575d983..0000000000 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/threading/ConnectionMixin.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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.mixin.client.gametest.threading; - -import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod; -import com.llamalad7.mixinextras.injector.wrapoperation.Operation; -import io.netty.channel.ChannelHandlerContext; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import net.minecraft.network.Connection; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.PacketFlow; - -import net.fabricmc.fabric.impl.client.gametest.threading.NetworkSynchronizer; - -@Mixin(Connection.class) -public class ConnectionMixin { - @Shadow - @Final - private PacketFlow receiving; - - @WrapMethod(method = "channelRead0(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/protocol/Packet;)V") - private void onNettyReceivePacket(ChannelHandlerContext context, Packet packet, Operation original) { - NetworkSynchronizer synchronizer = receiving == PacketFlow.CLIENTBOUND ? NetworkSynchronizer.CLIENTBOUND : NetworkSynchronizer.SERVERBOUND; - synchronizer.preNettyHandlePacket(); - - try { - original.call(context, packet); - } finally { - synchronizer.postNettyHandlePacket(); - } - } - - @Inject(method = "sendPacket", at = @At("HEAD")) - private void onSendPacket(CallbackInfo ci) { - NetworkSynchronizer synchronizer = receiving == PacketFlow.CLIENTBOUND ? NetworkSynchronizer.SERVERBOUND : NetworkSynchronizer.CLIENTBOUND; - synchronizer.preSendPacket(); - } -} diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/threading/MinecraftMixin.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/threading/MinecraftMixin.java index b747625ae5..dd7fa08ae3 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/threading/MinecraftMixin.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/threading/MinecraftMixin.java @@ -35,18 +35,13 @@ import net.minecraft.client.gui.screens.Screen; import net.minecraft.server.WorldStem; import net.minecraft.server.packs.repository.PackRepository; -import net.minecraft.util.thread.BlockableEventLoop; import net.minecraft.world.level.gamerules.GameRules; import net.minecraft.world.level.storage.LevelStorageSource; -import net.fabricmc.fabric.impl.client.gametest.TestSystemProperties; -import net.fabricmc.fabric.impl.client.gametest.threading.NetworkSynchronizer; import net.fabricmc.fabric.impl.client.gametest.threading.ThreadingImpl; @Mixin(Minecraft.class) public class MinecraftMixin { - @Unique - private boolean inMergedRunTasksLoop = false; @Unique private Runnable deferredTask = null; @@ -88,25 +83,11 @@ private int captureTicksPerFrame(int capturedTicksPerFrame, @Share("ticksPerFram return capturedTicksPerFrame; } - @Inject(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;runAllTasks()V")) - private void preRunTasksHook(CallbackInfo ci) { - // "merge" multiple possible iterations of runAllTasks into one block from the point of view of locking - if (!inMergedRunTasksLoop) { - inMergedRunTasksLoop = true; - preRunTasks(); - } - - // we still allow runAllTasks() to go ahead even when ticksPerFrame is 0, as the results of these tasks won't be - // observable until the next tick or gametest thread unlock anyway - } - @Inject(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;runAllTasks()V", shift = At.Shift.AFTER)) private void postRunTasksHook(CallbackInfo ci, @Share("ticksPerFrame") LocalIntRef ticksPerFrame) { - // end our "merged" runAllTasks block if there is going to be a tick this frame + // allow the test code to run if there is going to be a tick this frame if (ticksPerFrame.get() > 0) { - NetworkSynchronizer.CLIENTBOUND.waitForPacketHandlers((BlockableEventLoop) (Object) this); postRunTasks(); - inMergedRunTasksLoop = false; } } @@ -122,7 +103,6 @@ private void deferStartIntegratedServer(LevelStorageSource.LevelStorageAccess st @Inject(method = "doWorldLoad", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;managedBlock(Ljava/util/function/BooleanSupplier;)V")) private void onStartIntegratedServerBusyWait(CallbackInfo ci) { // give the server a chance to tick too - preRunTasks(); postRunTasks(); } @@ -135,31 +115,12 @@ private void deferDisconnect(Screen disconnectionScreen, boolean transferring, C } } - @Inject(method = "disconnect(Lnet/minecraft/client/gui/screens/Screen;ZZ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;dropAllTasks()V")) - private void onDisconnectCancelTasks(CallbackInfo ci) { - NetworkSynchronizer.CLIENTBOUND.reset(); - } - @Inject(method = "disconnect(Lnet/minecraft/client/gui/screens/Screen;ZZ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;renderFrame(Z)V", shift = At.Shift.AFTER)) private void onDisconnectBusyWait(CallbackInfo ci) { // give the server a chance to tick too - preRunTasks(); postRunTasks(); } - @Unique - private void preRunTasks() { - if (ThreadingImpl.getCurrentPhase() == ThreadingImpl.PHASE_CLIENT_TASKS) { - postRunTasks(); - } - - if (!TestSystemProperties.DISABLE_NETWORK_SYNCHRONIZER) { - ThreadingImpl.enterPhase(ThreadingImpl.PHASE_SERVER_TASKS); - // server tasks happen here - ThreadingImpl.enterPhase(ThreadingImpl.PHASE_CLIENT_TASKS); - } - } - @Unique private void postRunTasks() { ThreadingImpl.clientCanAcceptTasks = true; diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/threading/MinecraftServerMixin.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/threading/MinecraftServerMixin.java index a9a7248406..8bca159ff2 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/threading/MinecraftServerMixin.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/threading/MinecraftServerMixin.java @@ -23,14 +23,10 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import net.minecraft.client.Minecraft; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.thread.BlockableEventLoop; -import net.fabricmc.fabric.impl.client.gametest.TestSystemProperties; -import net.fabricmc.fabric.impl.client.gametest.threading.NetworkSynchronizer; import net.fabricmc.fabric.impl.client.gametest.threading.ThreadingImpl; @Mixin(MinecraftServer.class) @@ -62,23 +58,8 @@ protected void onCrash(CallbackInfo ci) { deregisterServer(); } - @Inject(method = "runServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;waitUntilNextTick()V")) - private void preRunTasks(CallbackInfo ci) { - if (!TestSystemProperties.DISABLE_NETWORK_SYNCHRONIZER) { - ThreadingImpl.enterPhase(ThreadingImpl.PHASE_SERVER_TASKS); - } - } - @Inject(method = "runServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;waitUntilNextTick()V", shift = At.Shift.AFTER)) private void postRunTasks(CallbackInfo ci) { - NetworkSynchronizer.SERVERBOUND.waitForPacketHandlers((BlockableEventLoop) (Object) this); - - if (!TestSystemProperties.DISABLE_NETWORK_SYNCHRONIZER) { - ThreadingImpl.enterPhase(ThreadingImpl.PHASE_CLIENT_TASKS); - } - - // client tasks happen here - ThreadingImpl.serverCanAcceptTasks = true; ThreadingImpl.enterPhase(ThreadingImpl.PHASE_TEST); @@ -101,21 +82,10 @@ private void postRunTasks(CallbackInfo ci) { ThreadingImpl.enterPhase(ThreadingImpl.PHASE_TICK); } - @Inject(method = "shouldRun(Lnet/minecraft/server/TickTask;)Z", at = @At("HEAD"), cancellable = true) - private void alwaysExecuteNetworkTask(CallbackInfoReturnable cir) { - if (NetworkSynchronizer.SERVERBOUND.isRunningNetworkTasks()) { - cir.setReturnValue(true); - } - } - @Unique private void deregisterServer() { ThreadingImpl.serverCanAcceptTasks = false; ThreadingImpl.PHASER.arriveAndDeregister(); ThreadingImpl.isServerRunning = false; - - if (!ThreadingImpl.isGameCrashed()) { - NetworkSynchronizer.SERVERBOUND.reset(); - } } } diff --git a/fabric-client-gametest-api-v1/src/client/resources/fabric-client-gametest-api-v1.mixins.json b/fabric-client-gametest-api-v1/src/client/resources/fabric-client-gametest-api-v1.mixins.json index ae77cc466e..676728ec1e 100644 --- a/fabric-client-gametest-api-v1/src/client/resources/fabric-client-gametest-api-v1.mixins.json +++ b/fabric-client-gametest-api-v1/src/client/resources/fabric-client-gametest-api-v1.mixins.json @@ -6,28 +6,26 @@ "ClientChunkCacheAccessor", "ClientChunkCacheStorageAccessor", "ClientLevelAccessor", + "MainMixin", "gui.CycleButtonAccessor", "gui.ScreenAccessor", "gui.ScreenMixin", "input.GlCommandEncoderMixin", "input.InputConstantsMixin", - "input.KeyMappingAccessor", "input.KeyboardHandlerAccessor", - "input.MinecraftMixin", - "input.ScreenManagerMixin", + "input.MonitorManagerMixin", "input.MouseHandlerAccessor", + "input.VulkanGpuSurfaceMixin", "input.WindowMixin", + "lifecycle.DedicatedServerMixin", + "lifecycle.MinecraftMixin", "lifecycle.OptionsAccessor", "lifecycle.OptionsMixin", - "lifecycle.MinecraftMixin", - "lifecycle.DedicatedServerMixin", - "screenshot.NativeImageMixin", "screenshot.DeltaTrackerDefaultValueAccessor", - "threading.ConnectionMixin", + "screenshot.NativeImageMixin", "threading.MainMixin", "threading.MinecraftMixin", "threading.MinecraftServerMixin", - "threading.BlockableEventLoopMixin", "world.CreateWorldScreenMixin", "world.GameRulesAccessor" ], diff --git a/fabric-client-gametest-api-v1/src/client/resources/fabric.mod.json b/fabric-client-gametest-api-v1/src/client/resources/fabric.mod.json index 5bb9565607..26e11a4422 100644 --- a/fabric-client-gametest-api-v1/src/client/resources/fabric.mod.json +++ b/fabric-client-gametest-api-v1/src/client/resources/fabric.mod.json @@ -17,9 +17,14 @@ ], "depends": { "fabricloader": ">=0.18.4", - "fabric-resource-loader-v1": "*" + "fabric-networking-api-v1": "*" }, "description": "Allows registration of client game tests.", + "entrypoints": { + "client": [ + "net.fabricmc.fabric.impl.client.gametest.FabricClientGameTestImpl" + ] + }, "mixins": [ "fabric-client-gametest-api-v1.mixins.json" ], diff --git a/fabric-client-gametest-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/client/gametest/ClientGameTestTest.java b/fabric-client-gametest-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/client/gametest/ClientGameTestTest.java index ed9a2257a2..cd21c7b0b9 100644 --- a/fabric-client-gametest-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/client/gametest/ClientGameTestTest.java +++ b/fabric-client-gametest-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/client/gametest/ClientGameTestTest.java @@ -29,13 +29,21 @@ import net.minecraft.client.CameraType; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.inventory.ContainerScreen; import net.minecraft.client.gui.screens.multiplayer.ServerReconfigScreen; import net.minecraft.client.gui.screens.worldselection.WorldCreationUiState; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityTypes; +import net.minecraft.world.entity.InterpolationHandler; +import net.minecraft.world.entity.animal.cow.Cow; +import net.minecraft.world.level.block.Blocks; import net.fabricmc.fabric.api.client.gametest.v1.FabricClientGameTest; import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext; +import net.fabricmc.fabric.api.client.gametest.v1.context.TestDedicatedServerConnection; import net.fabricmc.fabric.api.client.gametest.v1.context.TestDedicatedServerContext; -import net.fabricmc.fabric.api.client.gametest.v1.context.TestServerConnection; import net.fabricmc.fabric.api.client.gametest.v1.context.TestSingleplayerContext; import net.fabricmc.fabric.api.client.gametest.v1.screenshot.TestScreenshotComparisonOptions; import net.fabricmc.fabric.api.client.gametest.v1.world.TestWorldSave; @@ -68,15 +76,28 @@ public void runTest(ClientGameTestContext context) { { setDebugOverlay(context, true); - singleplayer.getClientLevel().waitForChunksRender(); + singleplayer.getConnection().waitForChunksRender(); context.takeScreenshot("in_game_overworld"); } + { + BlockPos chestPos = context.computeOnClient(client -> BlockPos.containing(client.player.position()).east().east().above().above()); + singleplayer.getServer().runCommand("setblock %d %d %d minecraft:chest".formatted(chestPos.getX(), chestPos.getY(), chestPos.getZ())); + context.waitFor(client -> client.level.getBlockState(chestPos).is(Blocks.CHEST)); + context.getInput().lookAt(chestPos); + context.waitTick(); + context.getInput().pressKey(options -> options.keyUse); + context.waitForScreen(ContainerScreen.class); + context.setScreen(() -> null); + } + { context.getInput().pressKey(options -> options.keyChat); context.getInput().typeChars("Hello, World!"); context.getInput().holdKeyFor(InputConstants.KEY_RETURN, 0); // press without delay, enter not a keybind - context.waitTick(); // wait for the server to receive the chat message + // wait for round trip of chat message to server and back to client + singleplayer.getConnection().waitForServerboundPackets(); + singleplayer.getConnection().waitForClientboundPackets(); context.takeScreenshot("chat_message_sent"); } @@ -91,20 +112,59 @@ public void runTest(ClientGameTestContext context) { { context.getInput().pressKey(options -> options.keyInventory); - context.waitTick(); // wait for the server to receive the request + context.waitTick(); // wait for the client to process the keybind context.takeScreenshot("in_game_inventory"); context.setScreen(() -> null); } + + { + Cow serverCow = singleplayer.getServer().computeOnServer(_ -> { + ServerLevel level = singleplayer.getConnection().getServerLevel(); + Cow cow = new Cow(EntityTypes.COW, level); + cow.snapTo(singleplayer.getConnection().getServerPlayer().position().add(2, 0, 0)); + cow.setNoAi(true); + level.addFreshEntity(cow); + return cow; + }); + singleplayer.getConnection().waitForClientboundEntityUpdates(EntityTypes.COW); + + Cow clientCow = context.computeOnClient(_ -> { + Entity entity = singleplayer.getConnection().getClientLevel().getEntity(serverCow.getUUID()); + + if (!(entity instanceof Cow cow)) { + throw new AssertionError("Expected cow to exist on client"); + } + + return cow; + }); + + singleplayer.getServer().runOnServer(_ -> serverCow.snapTo(clientCow.position().add(2, 0, 0))); + singleplayer.getConnection().waitForClientboundEntityUpdates(EntityTypes.COW); + context.waitTicks(InterpolationHandler.DEFAULT_INTERPOLATION_STEPS); // allow the cow to interpolate to the right position + context.runOnClient(_ -> { + if (clientCow.position().distanceToSqr(serverCow.position()) >= 1e-7) { + throw new AssertionError("Expected cow to move to server position"); + } + }); + + singleplayer.getServer().runOnServer(_ -> serverCow.remove(Entity.RemovalReason.DISCARDED)); + singleplayer.getConnection().waitForClientboundEntityUpdates(EntityTypes.COW); + context.runOnClient(_ -> { + if (!clientCow.isRemoved()) { + throw new AssertionError("Expected cow to be removed from client"); + } + }); + } } try (TestSingleplayerContext singleplayer = spWorldSave.open()) { - singleplayer.getClientLevel().waitForChunksRender(); + singleplayer.getConnection().waitForChunksRender(); context.takeScreenshot("in_game_overworld_2"); } try (TestDedicatedServerContext server = context.worldBuilder().createServer()) { - try (TestServerConnection connection = server.connect()) { - connection.getClientLevel().waitForChunksRender(); + try (TestDedicatedServerConnection connection = server.connect()) { + connection.waitForChunksRender(); context.takeScreenshot("server_in_game"); { // Test that we can enter and exit configuration @@ -124,7 +184,7 @@ public void runTest(ClientGameTestContext context) { private static void waitForTitleScreenFade(ClientGameTestContext context) { context.waitFor(client -> { - return (client.screen instanceof TitleScreenAccessor titleScreen) && !titleScreen.isFading(); + return (client.gui.screen() instanceof TitleScreenAccessor titleScreen) && !titleScreen.isFading(); }); } diff --git a/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/api/client/command/v2/ClientCommands.java b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/api/client/command/v2/ClientCommands.java index babd4b5b49..c33c33a5db 100644 --- a/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/api/client/command/v2/ClientCommands.java +++ b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/api/client/command/v2/ClientCommands.java @@ -50,6 +50,10 @@ * The aim is to make commands from the server take precedence over client-sided commands * in a future version of this API. * + *

Commands that may perform destructive or privileged operations should generally + * require {@link FabricClientCommandSource#attended()} so they only run when explicitly + * entered by the user, and not when triggered from a server-provided text component. + * *

Example command

* 
  * {@code
diff --git a/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/api/client/command/v2/FabricClientCommandSource.java b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/api/client/command/v2/FabricClientCommandSource.java
index c60c434601..0457905283 100644
--- a/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/api/client/command/v2/FabricClientCommandSource.java
+++ b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/api/client/command/v2/FabricClientCommandSource.java
@@ -104,4 +104,18 @@ default Vec2 getRotation() {
 	default @Nullable Object getMeta(String key) {
 		return null;
 	}
+
+	/**
+	 * Returns whether the command was explicitly entered by the user.
+	 *
+	 * 
This should be used for commands that may perform destructive or
+	 * privileged operations, so they can require direct user intent via
+	 * {@code .requires(FabricClientCommandSource::attended)}.
+	 *
+	 * 
This is {@code false} when the command is invoked via a text
+	 * component from the server.
+	 *
+	 * @return whether the command execution is attended
+	 */
+	boolean attended();
 }
diff --git a/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/impl/command/client/ClientCommandInternals.java b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/impl/command/client/ClientCommandInternals.java
index ad12d72d77..9bb0ad1dc2 100644
--- a/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/impl/command/client/ClientCommandInternals.java
+++ b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/impl/command/client/ClientCommandInternals.java
@@ -16,43 +16,14 @@
 
 package net.fabricmc.fabric.impl.command.client;
 
-import static net.fabricmc.fabric.api.client.command.v2.ClientCommands.argument;
-import static net.fabricmc.fabric.api.client.command.v2.ClientCommands.literal;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.Iterables;
-import com.mojang.brigadier.AmbiguityConsumer;
 import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.ParseResults;
-import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.context.ParsedCommandNode;
-import com.mojang.brigadier.exceptions.BuiltInExceptionProvider;
-import com.mojang.brigadier.exceptions.CommandExceptionType;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.mojang.brigadier.tree.CommandNode;
 import org.jspecify.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.ComponentUtils;
 import net.minecraft.network.protocol.game.ClientboundCommandsPacket;
-import net.minecraft.util.profiling.Profiler;
 
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-import net.fabricmc.fabric.mixin.command.HelpCommandAccessor;
 
 public final class ClientCommandInternals {
-	private static final Logger LOGGER = LoggerFactory.getLogger(ClientCommandInternals.class);
-	private static final String API_COMMAND_NAME = "fabric-command-api-v2:client";
-	private static final String SHORT_API_COMMAND_NAME = "fcc";
 	private static @Nullable CommandDispatcher activeDispatcher;
 
 	public static void setActiveDispatcher(@Nullable CommandDispatcher dispatcher) {
@@ -63,168 +34,6 @@ public static void setActiveDispatcher(@Nullable CommandDispatcher help = literal("help");
-			help.executes(ClientCommandInternals::executeRootHelp);
-			help.then(argument("command", StringArgumentType.greedyString()).executes(ClientCommandInternals::executeArgumentHelp));
-
-			CommandNode mainNode = activeDispatcher.register(literal(API_COMMAND_NAME).then(help));
-			activeDispatcher.register(literal(SHORT_API_COMMAND_NAME).redirect(mainNode));
-		}
-
-		// noinspection CodeBlock2Expr
-		activeDispatcher.findAmbiguities((parent, child, sibling, inputs) -> {
-			LOGGER.warn("Ambiguity between arguments {} and {} with inputs: {}", activeDispatcher.getPath(child), activeDispatcher.getPath(sibling), inputs);
-		});
-	}
-
-	private static int executeRootHelp(CommandContext context) {
-		return executeHelp(activeDispatcher.getRoot(), context);
-	}
-
-	private static int executeArgumentHelp(CommandContext context) throws CommandSyntaxException {
-		ParseResults parseResults = activeDispatcher.parse(StringArgumentType.getString(context, "command"), context.getSource());
-		List> nodes = parseResults.getContext().getNodes();
-
-		if (nodes.isEmpty()) {
-			throw HelpCommandAccessor.getFailedException().create();
-		}
-
-		return executeHelp(Iterables.getLast(nodes).getNode(), context);
-	}
-
-	private static int executeHelp(CommandNode startNode, CommandContext context) {
-		Map, String> commands = activeDispatcher.getSmartUsage(startNode, context.getSource());
-
-		for (String command : commands.values()) {
-			context.getSource().sendFeedback(Component.literal("/" + command));
-		}
-
-		return commands.size();
-	}
-
-	public static void addCommands(CommandDispatcher target, FabricClientCommandSource source) {
-		Map, CommandNode> nodes = new HashMap<>();
-		nodes.put(activeDispatcher.getRoot(), target.getRoot());
-		copyChildren(activeDispatcher.getRoot(), target.getRoot(), source, nodes);
-	}
-
-	/**
-	 * Copies the child commands from root to newRoot, filtered by {@code child.canUse(source)}.
-	 * Mimics vanilla's Commands.fillUsableCommands.
-	 *
-	 * @param root           the root command node
-	 * @param newRoot        the new root command node
-	 * @param source         the command source
-	 * @param nodes          a mutable map from original command nodes to their copies, used for redirects;
-	 *                       should contain a mapping from root to newRoot
-	 */
-	private static void copyChildren(
-			CommandNode root,
-			CommandNode newRoot,
-			FabricClientCommandSource source,
-			Map, CommandNode> nodes
-	) {
-		for (CommandNode child : root.getChildren()) {
-			if (!child.canUse(source)) continue;
-
-			ArgumentBuilder builder = child.createBuilder();
-
-			// Reset the unnecessary non-completion stuff from the builder
-			builder.requires(s -> true); // This is checked with the if check above.
-
-			if (builder.getCommand() != null) {
-				builder.executes(context -> 0);
-			}
-
-			// Set up redirects
-			if (builder.getRedirect() != null) {
-				builder.redirect(nodes.get(builder.getRedirect()));
-			}
-
-			CommandNode result = builder.build();
-			nodes.put(child, result);
-			newRoot.addChild(result);
-
-			if (!child.getChildren().isEmpty()) {
-				copyChildren(child, result, source, nodes);
-			}
-		}
-	}
-
 	public interface LastReceivedCommandsPacketAccessor {
 		@Nullable ClientboundCommandsPacket fabric_api$getLastReceivedCommandsPacket();
 	}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/SpecialLogicAccess.java b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/impl/command/client/ClientSuggestionProviderExtensions.java
similarity index 79%
rename from fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/SpecialLogicAccess.java
rename to fabric-command-api-v2/src/client/java/net/fabricmc/fabric/impl/command/client/ClientSuggestionProviderExtensions.java
index b647c694b8..21812df90d 100644
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/SpecialLogicAccess.java
+++ b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/impl/command/client/ClientSuggestionProviderExtensions.java
@@ -14,10 +14,8 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.transfer.item;
+package net.fabricmc.fabric.impl.command.client;
 
-public interface SpecialLogicAccess {
-	default boolean fabric_shouldSuppressSpecialLogic() {
-		return false;
-	}
+public interface ClientSuggestionProviderExtensions {
+	void fabric_markAttended();
 }
diff --git a/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/impl/command/client/FabricCommandApiV2Client.java b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/impl/command/client/FabricCommandApiV2Client.java
new file mode 100644
index 0000000000..0c5b8bc3e4
--- /dev/null
+++ b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/impl/command/client/FabricCommandApiV2Client.java
@@ -0,0 +1,22 @@
+package net.fabricmc.fabric.impl.command.client;
+
+import com.mojang.brigadier.CommandDispatcher;
+import net.neoforged.neoforge.client.event.RegisterClientCommandsEvent;
+import net.neoforged.neoforge.common.NeoForge;
+
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+
+public class FabricCommandApiV2Client implements ClientModInitializer {
+
+    @Override
+    public void onInitializeClient() {
+        NeoForge.EVENT_BUS.addListener(RegisterClientCommandsEvent.class, event -> {
+            //noinspection unchecked
+            ClientCommandInternals.setActiveDispatcher((CommandDispatcher) (Object) event.getDispatcher());
+            ClientCommandRegistrationCallback.EVENT.invoker().register(ClientCommandInternals.getActiveDispatcher(), event.getBuildContext());
+        });
+    }
+}
+
diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/CuboidModelAccessor.java b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/mixin/command/client/ClientPacketListenerAccessor.java
similarity index 65%
rename from fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/CuboidModelAccessor.java
rename to fabric-command-api-v2/src/client/java/net/fabricmc/fabric/mixin/command/client/ClientPacketListenerAccessor.java
index 3af9b81bd3..bb304ac86d 100644
--- a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/CuboidModelAccessor.java
+++ b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/mixin/command/client/ClientPacketListenerAccessor.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.client.model.loading;
+package net.fabricmc.fabric.mixin.command.client;
 
-import com.google.gson.Gson;
+import com.mojang.brigadier.ParseResults;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
 
-import net.minecraft.client.resources.model.cuboid.CuboidModel;
+import net.minecraft.client.multiplayer.ClientPacketListener;
 
-@Mixin(CuboidModel.class)
-public interface CuboidModelAccessor {
-	@Accessor("GSON")
-	static Gson fabric_getGson() {
+@Mixin(ClientPacketListener.class)
+public interface ClientPacketListenerAccessor {
+	@Invoker
+	static boolean invokeIsValidCommand(final ParseResults parseResults) {
 		throw new AssertionError();
 	}
 }
diff --git a/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/mixin/command/client/ClientPacketListenerMixin.java b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/mixin/command/client/ClientPacketListenerMixin.java
index cbe27c445e..8dec73dd60 100644
--- a/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/mixin/command/client/ClientPacketListenerMixin.java
+++ b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/mixin/command/client/ClientPacketListenerMixin.java
@@ -16,7 +16,6 @@
 
 package net.fabricmc.fabric.mixin.command.client;
 
-import com.mojang.brigadier.CommandDispatcher;
 import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -26,55 +25,28 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.client.multiplayer.ClientSuggestionProvider;
-import net.minecraft.commands.CommandBuildContext;
-import net.minecraft.commands.SharedSuggestionProvider;
-import net.minecraft.core.RegistryAccess;
+import net.minecraft.client.multiplayer.CommonListenerCookie;
+import net.minecraft.network.Connection;
 import net.minecraft.network.protocol.game.ClientboundCommandsPacket;
-import net.minecraft.network.protocol.game.ClientboundLoginPacket;
-import net.minecraft.world.flag.FeatureFlagSet;
 
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
-import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.fabricmc.fabric.impl.command.client.ClientCommandInternals;
+import net.fabricmc.fabric.impl.command.client.ClientSuggestionProviderExtensions;
 
 @Mixin(ClientPacketListener.class)
 abstract class ClientPacketListenerMixin implements ClientCommandInternals.LastReceivedCommandsPacketAccessor {
-	@Shadow
-	private CommandDispatcher commands;
-
 	@Shadow
 	@Final
 	private ClientSuggestionProvider suggestionsProvider;
 
-	@Final
-	@Shadow
-	private FeatureFlagSet enabledFeatures;
-
-	@Final
-	@Shadow
-	private RegistryAccess.Frozen registryAccess;
-
 	@Unique
 	private @Nullable ClientboundCommandsPacket lastReceivedCommandsPacket = null;
 
-	@Inject(method = "handleLogin", at = @At("RETURN"))
-	private void onGameJoin(ClientboundLoginPacket packet, CallbackInfo info) {
-		final CommandDispatcher dispatcher = new CommandDispatcher<>();
-		ClientCommandInternals.setActiveDispatcher(dispatcher);
-		ClientCommandRegistrationCallback.EVENT.invoker().register(dispatcher, CommandBuildContext.simple(this.registryAccess, this.enabledFeatures));
-		ClientCommandInternals.finalizeInit();
-	}
-
-	@SuppressWarnings({"unchecked", "rawtypes"})
-	@Inject(method = "handleCommands", at = @At("RETURN"))
-	private void onOnCommandTree(ClientboundCommandsPacket packet, CallbackInfo info) {
-		// Add the commands to the vanilla dispatcher for completion.
-		// It's done here because both the server and the client commands have
-		// to be in the same dispatcher and completion results.
-		ClientCommandInternals.addCommands((CommandDispatcher) commands, (FabricClientCommandSource) suggestionsProvider);
+	@Inject(method = "", at = @At("RETURN"))
+	private void init(Minecraft minecraft, Connection connection, CommonListenerCookie cookie, CallbackInfo ci) {
+		((ClientSuggestionProviderExtensions) this.suggestionsProvider).fabric_markAttended();
 	}
 
 	@Inject(method = "handleCommands", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/PacketUtils;ensureRunningOnSameThread(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/PacketListener;Lnet/minecraft/network/PacketProcessor;)V", shift = At.Shift.AFTER))
@@ -82,20 +54,6 @@ private void setLastReceivedCommandsPacket(ClientboundCommandsPacket packet, Cal
 		this.lastReceivedCommandsPacket = packet;
 	}
 
-	@Inject(method = "sendUnattendedCommand", at = @At("HEAD"), cancellable = true)
-	private void onSendCommand(String command, Screen screen, CallbackInfo info) {
-		if (ClientCommandInternals.executeCommand(command)) {
-			info.cancel();
-		}
-	}
-
-	@Inject(method = "sendCommand", at = @At("HEAD"), cancellable = true)
-	private void onSendCommand(String command, CallbackInfo info) {
-		if (ClientCommandInternals.executeCommand(command)) {
-			info.cancel();
-		}
-	}
-
 	@Override
 	public @Nullable ClientboundCommandsPacket fabric_api$getLastReceivedCommandsPacket() {
 		return this.lastReceivedCommandsPacket;
diff --git a/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/mixin/command/client/ClientSuggestionProviderMixin.java b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/mixin/command/client/ClientSuggestionProviderMixin.java
index cd51e6d929..e78f77de40 100644
--- a/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/mixin/command/client/ClientSuggestionProviderMixin.java
+++ b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/mixin/command/client/ClientSuggestionProviderMixin.java
@@ -16,9 +16,9 @@
 
 package net.fabricmc.fabric.mixin.command.client;
 
-import org.spongepowered.asm.mixin.Final;
+import net.neoforged.neoforge.client.ClientCommandSourceStack;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
@@ -28,17 +28,17 @@
 import net.minecraft.network.chat.Component;
 
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import net.fabricmc.fabric.impl.command.client.ClientSuggestionProviderExtensions;
 
-@Mixin(ClientSuggestionProvider.class)
-abstract class ClientSuggestionProviderMixin implements FabricClientCommandSource {
-	@Shadow
-	@Final
-	private Minecraft minecraft;
+@Mixin({ClientSuggestionProvider.class, ClientCommandSourceStack.class})
+abstract class ClientSuggestionProviderMixin implements FabricClientCommandSource, ClientSuggestionProviderExtensions {
+	@Unique
+	private boolean attended = false;
 
 	@Override
 	public void sendFeedback(Component message) {
-		this.minecraft.gui.getChat().addClientSystemMessage(message);
-		this.minecraft.getNarrator().saySystemChatQueued(message);
+		getClient().gui.hud.getChat().addClientSystemMessage(message);
+		getClient().getNarrator().saySystemChatQueued(message);
 	}
 
 	@Override
@@ -48,16 +48,26 @@ public void sendError(Component message) {
 
 	@Override
 	public Minecraft getClient() {
-		return minecraft;
+		return Minecraft.getInstance();
 	}
 
 	@Override
 	public LocalPlayer getPlayer() {
-		return minecraft.player;
+		return getClient().player;
 	}
 
 	@Override
 	public ClientLevel getLevel() {
-		return minecraft.level;
+		return getClient().level;
+	}
+
+	@Override
+	public boolean attended() {
+		return attended;
+	}
+
+	@Override
+	public void fabric_markAttended() {
+		this.attended = true;
 	}
 }
diff --git a/fabric-command-api-v2/src/client/resources/fabric-command-api-v2.client.mixins.json b/fabric-command-api-v2/src/client/resources/fabric-command-api-v2.client.mixins.json
index e4a864776e..78f2cc0d67 100644
--- a/fabric-command-api-v2/src/client/resources/fabric-command-api-v2.client.mixins.json
+++ b/fabric-command-api-v2/src/client/resources/fabric-command-api-v2.client.mixins.json
@@ -3,8 +3,9 @@
   "package": "net.fabricmc.fabric.mixin.command.client",
   "compatibilityLevel": "JAVA_25",
   "client": [
-    "ClientSuggestionProviderMixin",
-    "ClientPacketListenerMixin"
+    "ClientPacketListenerAccessor",
+    "ClientPacketListenerMixin",
+    "ClientSuggestionProviderMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/api/command/v2/ArgumentTypeRegistry.java b/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/api/command/v2/ArgumentTypeRegistry.java
index df5fde0114..ccc747fc38 100644
--- a/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/api/command/v2/ArgumentTypeRegistry.java
+++ b/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/api/command/v2/ArgumentTypeRegistry.java
@@ -19,11 +19,9 @@
 import com.mojang.brigadier.arguments.ArgumentType;
 
 import net.minecraft.commands.synchronization.ArgumentTypeInfo;
-import net.minecraft.core.Registry;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.Identifier;
 
-import net.fabricmc.fabric.mixin.command.ArgumentTypeInfosAccessor;
+import net.fabricmc.fabric.impl.command.FabricCommandApiV2;
 
 public final class ArgumentTypeRegistry {
 	/**
@@ -37,8 +35,7 @@ public final class ArgumentTypeRegistry {
 	 */
 	public static , T extends ArgumentTypeInfo.Template> void registerArgumentType(
 			Identifier id, Class clazz, ArgumentTypeInfo serializer) {
-		ArgumentTypeInfosAccessor.fabric_getClassMap().put(clazz, serializer);
-		Registry.register(BuiltInRegistries.COMMAND_ARGUMENT_TYPE, id, serializer);
+		FabricCommandApiV2.registerArgumentType(id, clazz, serializer);
 	}
 
 	private ArgumentTypeRegistry() {
diff --git a/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/api/command/v2/EntitySelectorOptionRegistry.java b/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/api/command/v2/EntitySelectorOptionRegistry.java
index 38146d3000..8e74360f7a 100644
--- a/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/api/command/v2/EntitySelectorOptionRegistry.java
+++ b/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/api/command/v2/EntitySelectorOptionRegistry.java
@@ -23,8 +23,6 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
 
-import net.fabricmc.fabric.mixin.command.EntitySelectorOptionsAccessor;
-
 /**
  * Contains a function to register an entity selector option.
  */
@@ -64,7 +62,7 @@ private EntitySelectorOptionRegistry() {
 	 * @param canUse the predicate that checks whether the option is syntactically valid
 	 */
 	public static void register(Identifier id, Component description, EntitySelectorOptions.Modifier modifier, Predicate canUse) {
-		EntitySelectorOptionsAccessor.callPutOption(id.toDebugFileName(), modifier, canUse, description);
+		EntitySelectorOptions.register(id.toDebugFileName(), modifier, canUse, description);
 	}
 
 	/**
diff --git a/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/impl/command/FabricCommandApiV2.java b/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/impl/command/FabricCommandApiV2.java
new file mode 100644
index 0000000000..ab25afa134
--- /dev/null
+++ b/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/impl/command/FabricCommandApiV2.java
@@ -0,0 +1,48 @@
+package net.fabricmc.fabric.impl.command;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.mojang.brigadier.arguments.ArgumentType;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.RegisterCommandsEvent;
+import net.neoforged.neoforge.registries.RegisterEvent;
+
+import net.minecraft.commands.synchronization.ArgumentTypeInfo;
+import net.minecraft.commands.synchronization.ArgumentTypeInfos;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.Identifier;
+
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
+
+public class FabricCommandApiV2 implements ModInitializer {
+	@SuppressWarnings("rawtypes")
+	private static final Map> ARGUMENT_TYPE_CLASSES = new ConcurrentHashMap<>();
+	private static final Map> ARGUMENT_TYPES = new ConcurrentHashMap<>();
+
+	@Override
+	public void onInitialize() {
+		IEventBus bus = ModLoadingContext.get().getActiveContainer().getEventBus();
+		bus.addListener(RegisterEvent.class, event ->
+				event.register(Registries.COMMAND_ARGUMENT_TYPE, helper -> {
+					ARGUMENT_TYPE_CLASSES.forEach(ArgumentTypeInfos::registerByClass);
+					ARGUMENT_TYPES.forEach(helper::register);
+
+					ARGUMENT_TYPE_CLASSES.clear();
+					ARGUMENT_TYPES.clear();
+				}));
+		NeoForge.EVENT_BUS.addListener(
+				RegisterCommandsEvent.class,
+				event -> CommandRegistrationCallback.EVENT.invoker()
+						.register(event.getDispatcher(), event.getBuildContext(), event.getCommandSelection())
+		);
+	}
+
+	public static , T extends ArgumentTypeInfo.Template> void registerArgumentType(Identifier id, Class clazz, ArgumentTypeInfo serializer) {
+		ARGUMENT_TYPE_CLASSES.put(clazz, serializer);
+		ARGUMENT_TYPES.put(id, serializer);
+	}
+}
diff --git a/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/mixin/command/ArgumentTypeInfosAccessor.java b/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/mixin/command/ArgumentTypeInfosAccessor.java
deleted file mode 100644
index dc1724d282..0000000000
--- a/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/mixin/command/ArgumentTypeInfosAccessor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.mixin.command;
-
-import java.util.Map;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import net.minecraft.commands.synchronization.ArgumentTypeInfo;
-import net.minecraft.commands.synchronization.ArgumentTypeInfos;
-
-@Mixin(ArgumentTypeInfos.class)
-public interface ArgumentTypeInfosAccessor {
-	@Accessor("BY_CLASS")
-	static Map, ArgumentTypeInfo> fabric_getClassMap() {
-		throw new AssertionError("");
-	}
-}
diff --git a/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/mixin/command/CommandsMixin.java b/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/mixin/command/CommandsMixin.java
deleted file mode 100644
index 1c36e9b813..0000000000
--- a/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/mixin/command/CommandsMixin.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.mixin.command;
-
-import com.mojang.brigadier.CommandDispatcher;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.commands.CommandBuildContext;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-
-import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
-
-@Mixin(Commands.class)
-public abstract class CommandsMixin {
-	@Shadow
-	@Final
-	private CommandDispatcher dispatcher;
-
-	/**
-	 * Wait an inject in a constructor?
-	 * This is a new addition to Fabric's fork of mixin.
-	 * If you are not using fabric's fork of mixin this will fail.
-	 *
-	 * @reason Add commands before ambiguities are calculated.
-	 */
-	@Inject(at = @At(value = "INVOKE", target = "Lcom/mojang/brigadier/CommandDispatcher;setConsumer(Lcom/mojang/brigadier/ResultConsumer;)V"), method = "")
-	private void fabric_addCommands(Commands.CommandSelection selection, CommandBuildContext buildContext, CallbackInfo ci) {
-		CommandRegistrationCallback.EVENT.invoker().register(this.dispatcher, buildContext, selection);
-	}
-}
diff --git a/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/mixin/command/EntitySelectorOptionsAccessor.java b/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/mixin/command/EntitySelectorOptionsAccessor.java
deleted file mode 100644
index 425442fc10..0000000000
--- a/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/mixin/command/EntitySelectorOptionsAccessor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.mixin.command;
-
-import java.util.function.Predicate;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-import net.minecraft.commands.arguments.selector.EntitySelectorParser;
-import net.minecraft.commands.arguments.selector.options.EntitySelectorOptions;
-import net.minecraft.network.chat.Component;
-
-@Mixin(EntitySelectorOptions.class)
-public interface EntitySelectorOptionsAccessor {
-	@Invoker("register")
-	static void callPutOption(String id, EntitySelectorOptions.Modifier modifier, Predicate condition, Component description) {
-	}
-}
diff --git a/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/mixin/command/HelpCommandAccessor.java b/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/mixin/command/HelpCommandAccessor.java
deleted file mode 100644
index 58eb11b635..0000000000
--- a/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/mixin/command/HelpCommandAccessor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.mixin.command;
-
-import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import net.minecraft.server.commands.HelpCommand;
-
-@Mixin(HelpCommand.class)
-public interface HelpCommandAccessor {
-	@Accessor("ERROR_FAILED")
-	static SimpleCommandExceptionType getFailedException() {
-		throw new AssertionError("mixin");
-	}
-}
diff --git a/fabric-command-api-v2/src/main/resources/fabric-command-api-v2.mixins.json b/fabric-command-api-v2/src/main/resources/fabric-command-api-v2.mixins.json
index c7c0b78612..17a8f8075c 100644
--- a/fabric-command-api-v2/src/main/resources/fabric-command-api-v2.mixins.json
+++ b/fabric-command-api-v2/src/main/resources/fabric-command-api-v2.mixins.json
@@ -3,11 +3,7 @@
   "package": "net.fabricmc.fabric.mixin.command",
   "compatibilityLevel": "JAVA_25",
   "mixins": [
-    "ArgumentTypeInfosAccessor",
-    "CommandsMixin",
-    "EntitySelectorOptionsAccessor",
-    "EntitySelectorParserMixin",
-    "HelpCommandAccessor"
+    "EntitySelectorParserMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-command-api-v2/src/main/resources/fabric.mod.json b/fabric-command-api-v2/src/main/resources/fabric.mod.json
index 3bfb608bbf..3d92538250 100644
--- a/fabric-command-api-v2/src/main/resources/fabric.mod.json
+++ b/fabric-command-api-v2/src/main/resources/fabric.mod.json
@@ -29,6 +29,14 @@
       "environment": "client"
     }
   ],
+  "entrypoints": {
+      "main": [
+        "net.fabricmc.fabric.impl.command.FabricCommandApiV2"
+      ],
+      "client": [
+        "net.fabricmc.fabric.impl.command.client.FabricCommandApiV2Client"
+      ]
+    },
   "custom": {
     "fabric-api:module-lifecycle": "stable"
   }
diff --git a/fabric-command-api-v2/src/testmod/java/net/fabricmc/fabric/test/command/CommandTest.java b/fabric-command-api-v2/src/testmod/java/net/fabricmc/fabric/test/command/CommandTest.java
index b7ef31e749..6c5e3e6fba 100644
--- a/fabric-command-api-v2/src/testmod/java/net/fabricmc/fabric/test/command/CommandTest.java
+++ b/fabric-command-api-v2/src/testmod/java/net/fabricmc/fabric/test/command/CommandTest.java
@@ -23,6 +23,7 @@
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 import com.mojang.brigadier.tree.CommandNode;
 import com.mojang.brigadier.tree.RootCommandNode;
+import net.neoforged.neoforge.gametest.GameTestHooks;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -61,7 +62,7 @@ public void onInitialize() {
 
 		ServerLifecycleEvents.SERVER_STARTED.register(server -> {
 			// Verify the commands actually exist in the command dispatcher.
-			final boolean dedicated = server.isDedicatedServer();
+			final boolean dedicated = server.isDedicatedServer() || GameTestHooks.isGametestEnabled();
 			final RootCommandNode rootNode = server.getCommands().getDispatcher().getRoot();
 
 			// Now we climb the tree
diff --git a/fabric-command-api-v2/src/testmod/java/net/fabricmc/fabric/test/command/EntitySelectorGameTest.java b/fabric-command-api-v2/src/testmod/java/net/fabricmc/fabric/test/command/EntitySelectorGameTest.java
index 638abcae4f..dc4bf6463a 100644
--- a/fabric-command-api-v2/src/testmod/java/net/fabricmc/fabric/test/command/EntitySelectorGameTest.java
+++ b/fabric-command-api-v2/src/testmod/java/net/fabricmc/fabric/test/command/EntitySelectorGameTest.java
@@ -21,14 +21,14 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.gametest.framework.GameTestHelper;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EntityTypes;
 import net.minecraft.world.entity.Mob;
 
 import net.fabricmc.fabric.api.gametest.v1.GameTest;
 
 public class EntitySelectorGameTest {
 	private void spawn(GameTestHelper helper, float health) {
-		Mob entity = helper.spawnWithNoFreeWill(EntityType.CREEPER, BlockPos.ZERO);
+		Mob entity = helper.spawnWithNoFreeWill(EntityTypes.CREEPER, BlockPos.ZERO);
 		entity.setNoAi(true);
 		entity.setHealth(health);
 	}
@@ -50,11 +50,11 @@ public void testEntitySelector(GameTestHelper helper) {
 				CommandTest.SELECTOR_ID.toDebugFileName()
 		);
 
-		helper.assertEntitiesPresent(EntityType.CREEPER, BlockPos.ZERO, 3, 2.0);
+		helper.assertEntitiesPresent(EntityTypes.CREEPER, BlockPos.ZERO, 3, 2.0);
 		MinecraftServer server = helper.getLevel().getServer();
 		server.getCommands().performPrefixedCommand(server.createCommandSourceStack(), command);
 		//helper.assertTrue(result == 2, "Expected 2 entities killed, got " + result);
-		helper.assertEntitiesPresent(EntityType.CREEPER, BlockPos.ZERO, 1, 2.0);
+		helper.assertEntitiesPresent(EntityTypes.CREEPER, BlockPos.ZERO, 1, 2.0);
 		helper.succeed();
 	}
 }
diff --git a/fabric-command-api-v2/src/testmodClient/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
index 14a94e84a0..54d11725cb 100644
--- a/fabric-command-api-v2/src/testmodClient/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
@@ -29,6 +29,7 @@
 import net.minecraft.client.multiplayer.ClientSuggestionProvider;
 import net.minecraft.commands.arguments.item.ItemArgument;
 import net.minecraft.commands.arguments.item.ItemInput;
+import net.minecraft.network.chat.ClickEvent;
 import net.minecraft.network.chat.Component;
 
 import net.fabricmc.api.ClientModInitializer;
@@ -117,6 +118,16 @@ public void onInitializeClient() {
 				return Command.SINGLE_SUCCESS;
 			}));
 
+			dispatcher.register(ClientCommands.literal("test_client_command_confirmation").requires(FabricClientCommandSource::attended).executes(context -> {
+				context.getSource().sendFeedback(Component.literal("This command required user ineraction"));
+				return 0;
+			}));
+
+			dispatcher.register(ClientCommands.literal("test_client_command_confirmation_trigger").executes(context -> {
+				context.getSource().sendFeedback(Component.literal("[Run Command]").withStyle(style -> style.withClickEvent(new ClickEvent.RunCommand("/test_client_command_confirmation"))));
+				return 0;
+			}));
+
 			// Tests
 
 			RootCommandNode rootNode = dispatcher.getRoot();
diff --git a/fabric-content-registries-v0/build.gradle b/fabric-content-registries-v0/build.gradle
index 29381d306e..b4ca10dac9 100644
--- a/fabric-content-registries-v0/build.gradle
+++ b/fabric-content-registries-v0/build.gradle
@@ -9,3 +9,7 @@ moduleDependencies(project, [
 	'fabric-lifecycle-events-v1',
 	'fabric-resource-loader-v1'
 ])
+
+testDependencies(project, [
+	'internal:ffapi-fluid-types'
+])
diff --git a/fabric-content-registries-v0/src/client/java/net/fabricmc/fabric/mixin/content/registry/client/fluid/LocalPlayerMixin.java b/fabric-content-registries-v0/src/client/java/net/fabricmc/fabric/mixin/content/registry/client/fluid/LocalPlayerMixin.java
new file mode 100644
index 0000000000..50f6933195
--- /dev/null
+++ b/fabric-content-registries-v0/src/client/java/net/fabricmc/fabric/mixin/content/registry/client/fluid/LocalPlayerMixin.java
@@ -0,0 +1,47 @@
+/*
+ * 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.mixin.content.registry.client.fluid;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.material.Fluid;
+
+import net.fabricmc.fabric.impl.content.registry.fluid.EntityFluidInteractionRegistryImpl;
+import net.fabricmc.fabric.impl.content.registry.fluid.InternalEntityFluidExtension;
+
+@Mixin(LocalPlayer.class)
+public class LocalPlayerMixin {
+	@ModifyExpressionValue(method = "aiStep", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;isInWater()Z"))
+	private boolean handleCustomDownSwimmableFluids(boolean original) {
+		if (original) {
+			return true;
+		}
+
+		for (TagKey tagKey : ((InternalEntityFluidExtension) this).fabric_api$getTouchedCustomFluids()) {
+			if (EntityFluidInteractionRegistryImpl.getFluidBehavior(tagKey).canMoveDownInFluid(tagKey, (Entity) (Object) this)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/fabric-content-registries-v0/src/client/resources/fabric-content-registries-v0.client.mixins.json b/fabric-content-registries-v0/src/client/resources/fabric-content-registries-v0.client.mixins.json
new file mode 100644
index 0000000000..775494089d
--- /dev/null
+++ b/fabric-content-registries-v0/src/client/resources/fabric-content-registries-v0.client.mixins.json
@@ -0,0 +1,16 @@
+{
+  "required": true,
+  "package": "net.fabricmc.fabric.mixin.content.registry.client.fluid",
+  "compatibilityLevel": "JAVA_25",
+  "client": [
+    "LocalPlayerMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "overwrites": {
+    "requireAnnotations": true
+  },
+  "mixins": [
+  ]
+}
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/DecoratedPotPatternRegistry.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/DecoratedPotPatternRegistry.java
new file mode 100644
index 0000000000..62c7cbb998
--- /dev/null
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/DecoratedPotPatternRegistry.java
@@ -0,0 +1,41 @@
+/*
+ * 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.api.registry;
+
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.entity.DecoratedPotPattern;
+
+import net.fabricmc.fabric.impl.content.registry.DecoratedPotPatternRegistryImpl;
+
+/**
+ * Provides a way to register decorated pot patterns for sherd-like items.
+ */
+public final class DecoratedPotPatternRegistry {
+	private DecoratedPotPatternRegistry() {
+	}
+
+	/**
+	 * Registers a decorated pot pattern for a sherd-like item.
+	 *
+	 * @param sherd the sherd-like item
+	 * @param pattern the pattern resource key
+	 */
+	public static void registerPattern(ResourceKey sherd, ResourceKey pattern) {
+		DecoratedPotPatternRegistryImpl.registerPattern(sherd, pattern);
+	}
+}
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/OxidizableBlocksRegistry.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/OxidizableBlocksRegistry.java
index ebaf789873..03d84e5790 100644
--- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/OxidizableBlocksRegistry.java
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/OxidizableBlocksRegistry.java
@@ -17,7 +17,7 @@
 package net.fabricmc.fabric.api.registry;
 
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.WeatheringCopperBlocks;
+import net.minecraft.world.level.block.WeatheringCopperCollection;
 
 import net.fabricmc.fabric.impl.content.registry.OxidizableBlocksRegistryImpl;
 
@@ -49,11 +49,11 @@ public static void registerWaxable(Block unwaxed, Block waxed) {
 	}
 
 	/**
-	 * Registers a {@link WeatheringCopperBlocks} and its oxidizing and waxing variants.
+	 * Registers a {@link WeatheringCopperCollection} and its oxidizing and waxing variants.
 	 *
-	 * @param copperBlocks the {@code WeatheringCopperBlocks} to register
+	 * @param copperBlocks the {@code WeatheringCopperCollection} to register
 	 */
-	public static void registerWeatheringCopperBlocks(WeatheringCopperBlocks copperBlocks) {
+	public static void registerWeatheringCopperBlocks(WeatheringCopperCollection copperBlocks) {
 		OxidizableBlocksRegistryImpl.registerWeatheringCopperBlocks(copperBlocks);
 	}
 }
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/TillableBlockRegistry.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/TillableBlockRegistry.java
index ddc833a4b3..3ae4059164 100644
--- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/TillableBlockRegistry.java
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/TillableBlockRegistry.java
@@ -16,24 +16,33 @@
 
 package net.fabricmc.fabric.api.registry;
 
+import java.util.IdentityHashMap;
+import java.util.Map;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 import com.mojang.datafixers.util.Pair;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.common.ItemAbilities;
+import net.neoforged.neoforge.event.level.BlockEvent;
 
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.item.HoeItem;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 
-import net.fabricmc.fabric.mixin.content.registry.HoeItemAccessor;
-
 /**
  * A registry for hoe tilling interactions. A vanilla example is turning dirt to dirt paths.
  */
+@EventBusSubscriber
 public final class TillableBlockRegistry {
+	private static final Map, Consumer>> TILLABLES = new IdentityHashMap<>();
+
 	private TillableBlockRegistry() {
 	}
 
@@ -55,7 +64,7 @@ private TillableBlockRegistry() {
 	 */
 	public static void register(Block input, Predicate usagePredicate, Consumer tillingAction) {
 		Objects.requireNonNull(input, "input block cannot be null");
-		HoeItemAccessor.getTillables().put(input, Pair.of(usagePredicate, tillingAction));
+		TILLABLES.put(input, Pair.of(usagePredicate, tillingAction));
 	}
 
 	/**
@@ -83,4 +92,31 @@ public static void register(Block input, Predicate usagePredicate,
 		Objects.requireNonNull(droppedItem, "dropped item cannot be null");
 		register(input, usagePredicate, HoeItem.changeIntoStateAndDropItem(tilled, droppedItem));
 	}
+
+	@SubscribeEvent
+	static void modify(BlockEvent.BlockToolModificationEvent event) {
+		if (event.getItemAbility() == ItemAbilities.HOE_TILL
+				&& event.getHeldItemStack().canPerformAction(ItemAbilities.HOE_TILL)
+		) {
+			var modified = TILLABLES.get(event.getState().getBlock());
+			if (modified != null && modified.getFirst().test(event.getContext())) {
+				if (!event.isSimulated() && !event.getLevel().isClientSide()) {
+					modified.getSecond().accept(event.getContext());
+					if (event.getContext().getPlayer() != null) {
+						event.getContext().getItemInHand()
+								.hurtAndBreak(
+										1,
+										event.getPlayer(),
+										getSlotForHand(event.getContext().getHand())
+								);
+					}
+				}
+				event.setCanceled(true);
+			}
+		}
+	}
+
+	private static EquipmentSlot getSlotForHand(InteractionHand arg) {
+		return arg == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND;
+	}
 }
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/VillagerInteractionRegistries.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/VillagerInteractionRegistries.java
index 6d6459591c..abc8c6b65c 100644
--- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/VillagerInteractionRegistries.java
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/VillagerInteractionRegistries.java
@@ -16,6 +16,8 @@
 
 package net.fabricmc.fabric.api.registry;
 
+import java.util.IdentityHashMap;
+import java.util.Map;
 import java.util.Objects;
 
 import org.slf4j.Logger;
@@ -35,6 +37,8 @@
  */
 public final class VillagerInteractionRegistries {
 	private static final Logger LOGGER = LoggerFactory.getLogger(VillagerInteractionRegistries.class);
+	
+	public static final Map, ResourceKey> MODIFIED_GIFTS = new IdentityHashMap<>();
 
 	private VillagerInteractionRegistries() {
 	}
@@ -83,10 +87,12 @@ public static void registerFood(ItemLike item, int foodValue) {
 	public static void registerGiftLootTable(ResourceKey profession, ResourceKey lootTable) {
 		Objects.requireNonNull(profession, "Profession cannot be null!");
 		Objects.requireNonNull(lootTable, "Loot table identifier cannot be null!");
-		ResourceKey oldValue = GiveGiftToHeroAccessor.fabric_getGifts().put(profession, lootTable);
+		ResourceKey oldValue = GiveGiftToHeroAccessor.fabric_getGifts().get(profession);
 
 		if (oldValue != null) {
 			LOGGER.info("Overriding previous gift loot table of {} profession, was: {}, now: {}", profession.identifier(), oldValue, lootTable);
 		}
+		
+		MODIFIED_GIFTS.put(profession, lootTable);
 	}
 }
diff --git a/fabric-particles-v1/src/client/java/net/fabricmc/fabric/impl/client/particle/ExtendedBlockParticleOptionSyncClient.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/fluid/EntityFluidExtension.java
similarity index 52%
rename from fabric-particles-v1/src/client/java/net/fabricmc/fabric/impl/client/particle/ExtendedBlockParticleOptionSyncClient.java
rename to fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/fluid/EntityFluidExtension.java
index 6810570b79..b2e35c677f 100644
--- a/fabric-particles-v1/src/client/java/net/fabricmc/fabric/impl/client/particle/ExtendedBlockParticleOptionSyncClient.java
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/fluid/EntityFluidExtension.java
@@ -14,19 +14,23 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.client.particle;
+package net.fabricmc.fabric.api.registry.fluid;
 
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationNetworking;
-import net.fabricmc.fabric.impl.particle.ExtendedBlockParticleOptionSync;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.level.material.Fluid;
 
-public class ExtendedBlockParticleOptionSyncClient implements ClientModInitializer {
-	@Override
-	public void onInitializeClient() {
-		// Register a receiver so ExtendedBlockStateParticleEffectSync#shouldEncodeFallback can detect that this client
-		// supports extended data
-		ClientConfigurationNetworking.registerGlobalReceiver(
-				ExtendedBlockParticleOptionSync.DummyPayload.ID, (_, _) -> {
-			});
+/**
+ * Entity extensions related to fluid interaction handling.
+ */
+public interface EntityFluidExtension {
+	/**
+	 * Checks if entity is in a specific fluid type.
+	 * The fluid must be fist registered within the {@link EntityFluidInteractionRegistry}.
+	 *
+	 * @param type tag representing the fluid type
+	 * @return true if entity is in specific fluid, false otherwise
+	 */
+	default boolean isInFluid(TagKey type) {
+		throw new AssertionError("Implemented in Mixin");
 	}
 }
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/fluid/EntityFluidInteractionRegistry.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/fluid/EntityFluidInteractionRegistry.java
new file mode 100644
index 0000000000..8e5e22c236
--- /dev/null
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/fluid/EntityFluidInteractionRegistry.java
@@ -0,0 +1,73 @@
+/*
+ * 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.api.registry.fluid;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Objects;
+
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityFluidInteraction;
+import net.minecraft.world.level.material.Fluid;
+
+import net.fabricmc.fabric.impl.content.registry.fluid.EntityFluidInteractionRegistryImpl;
+
+/**
+ * A registry for fluid tags, that should be tracked by {@link Entity}'s {@link EntityFluidInteraction}.
+ */
+public final class EntityFluidInteractionRegistry {
+	private EntityFluidInteractionRegistry() {
+	}
+
+	/**
+	 * Registers a tracked fluid tag.
+	 *
+	 * @param fluid tag representing a fluid type that should be tracked.
+	 * @param behavior an instance defining the behavior of the fluid
+	 */
+	public static void register(TagKey fluid, FluidBehavior behavior) {
+		Objects.requireNonNull(fluid, "fluid can't be null!");
+		Objects.requireNonNull(behavior, "behavior can't be null!");
+
+		EntityFluidInteractionRegistryImpl.register(fluid, behavior);
+	}
+
+	/**
+	 * Returns the custom registered fluid behavior.
+	 *
+	 * @param fluid  tag representing a fluid type
+	 * @return connected fluid behavior instance or null if not set
+	 */
+	@Nullable
+	public static FluidBehavior getFluidBehavior(TagKey fluid) {
+		Objects.requireNonNull(fluid, "fluid can't be null!");
+
+		return EntityFluidInteractionRegistryImpl.getFluidBehavior(fluid);
+	}
+
+	/**
+	 * Returns a collection of registered fluid tags with custom behavior.
+	 *
+	 * @return a collection of fluid tags
+	 */
+	public static Collection> getCustomInteractableFluids() {
+		return Collections.unmodifiableCollection(EntityFluidInteractionRegistryImpl.getTrackedFluids());
+	}
+}
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/fluid/FluidBehavior.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/fluid/FluidBehavior.java
new file mode 100644
index 0000000000..8b6529ec13
--- /dev/null
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/fluid/FluidBehavior.java
@@ -0,0 +1,369 @@
+/*
+ * 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.api.registry.fluid;
+
+import java.util.function.BiPredicate;
+import java.util.function.Predicate;
+
+import org.jetbrains.annotations.ApiStatus;
+
+import net.minecraft.tags.TagKey;
+import net.minecraft.util.ToFloatFunction;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityFluidInteraction;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.MoverType;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.world.phys.Vec3;
+
+import net.fabricmc.fabric.impl.content.registry.fluid.SimpleConfiguredFluidBehavior;
+
+/**
+ * Interface for handling common entity fluid interactions.
+ */
+public interface FluidBehavior {
+	/**
+	 * A simple fluid behavior that acts similarly to water.
+	 */
+	FluidBehavior WATER_LIKE = SimpleConfiguredFluidBehavior.WATER_LIKE;
+
+	/**
+	 * Called when fluid pushing should be applied to an entity.
+	 *
+	 * @param fluid         a tag key representing the fluid type
+	 * @param entity        entity that fluid interaction update is processed for
+	 * @param interaction   entity's fluid interaction tracker, can be used to query values or apply fluid current
+	 * @param canPushEntity controls whatever entity can be pushed
+	 */
+	void handleFluidInteractionUpdate(TagKey fluid, Entity entity, EntityFluidInteraction interaction, boolean canPushEntity);
+
+	/**
+	 * Used to apply fluid movement logic for the entity.
+	 * For implementing this method, you should look into how vanilla handles,
+	 * movement in fluids at {@link LivingEntity#travelInWater(Vec3, double, boolean, double)}
+	 * and {@link LivingEntity#travelInLava(Vec3, double, boolean, double)}.
+	 *
+	 * @param fluid  a tag key representing the fluid type
+	 * @param entity entity that is moving through a fluid
+	 * @param input entity's movement input
+	 * @param baseGravity entity's gravity
+	 * @param isFalling whatever entity is currently falling or not
+	 * @param oldY old y position value
+	 */
+	void travelInFluid(TagKey fluid, LivingEntity entity, Vec3 input, double baseGravity, boolean isFalling, double oldY);
+
+	/**
+	 * Used to apply fluid movement logic for the entity when flying.
+	 * For implementing this method, you should look into how vanilla handles,
+	 * movement in fluids at {@link LivingEntity#travelFlying(Vec3, float, float, float)}
+	 * By default, this implementation mimics water behavior.
+	 *
+	 * @param fluid  a tag key representing the fluid type
+	 * @param entity entity that is moving through a fluid
+	 * @param input entity's movement input
+	 * @param waterSpeed flying speed in water
+	 * @param lavaSpeed flying speed in lava
+	 * @param airSpeed flying speed in air
+	 */
+	default void travelFlyingInFluid(TagKey fluid, LivingEntity entity, Vec3 input, float waterSpeed, float lavaSpeed, float airSpeed) {
+		entity.moveRelative(waterSpeed, input);
+		entity.move(MoverType.SELF, entity.getDeltaMovement());
+		entity.setDeltaMovement(entity.getDeltaMovement().scale(0.8f));
+	}
+
+	/**
+	 * Used to determine whatever player or entity can sprint-swim in a fluid (like in water).
+	 *
+	 * @param fluid  a tag key representing the fluid type
+	 * @param entity entity that fluid interaction update is processed for
+	 */
+	default boolean canSwimInFluid(TagKey fluid, Entity entity) {
+		return false;
+	}
+
+	/**
+	 * Used to determine whatever entity should try floating/jumping in fluid (think mobs in water/lava).
+	 *
+	 * @param fluid  a tag key representing the fluid type
+	 * @param entity entity that fluid interaction update is processed for
+	 */
+	default boolean shouldTryFloatingInFluid(TagKey fluid, Entity entity) {
+		return true;
+	}
+
+	/**
+	 * Checks if player can controllably go down faster by sneaking while in fluid.
+	 *
+	 * @param fluid  a tag key representing the fluid type
+	 * @param entity entity that is moving through a fluid
+	 */
+	default boolean canMoveDownInFluid(TagKey fluid, Entity entity) {
+		return false;
+	}
+
+	/**
+	 * Checks if entity should drown while submerged in fluid.
+	 *
+	 * @param fluid  a tag key representing the fluid type
+	 * @param entity entity to check against
+	 */
+	default boolean canDrownInFluid(TagKey fluid, LivingEntity entity) {
+		return false;
+	}
+
+	/**
+	 * Checks if boat-like entity should be able to float on this fluid.
+	 *
+	 * @param fluid  a tag key representing the fluid type
+	 * @param entity entity that is moving through a fluid
+	 */
+	default boolean canSupportBoat(TagKey fluid, Entity entity) {
+		return false;
+	}
+
+	/**
+	 * Checks if entity should be able to sprint in this fluid.
+	 *
+	 * @param fluid  a tag key representing the fluid type
+	 * @param entity entity that is moving through a fluid
+	 */
+	default boolean canSprintInFluid(TagKey fluid, LivingEntity entity) {
+		return true;
+	}
+
+	/**
+	 * Called when entity enters a fluid.
+	 *
+	 * @param fluid  a tag key representing the fluid type
+	 * @param entity entity that is entered the fluid
+	 * @param firstTick indicates this is first time entity ticked
+	 */
+	default void onFluidEntered(TagKey fluid, Entity entity, boolean firstTick) { }
+
+	/**
+	 * Called when entity exits a fluid.
+	 *
+	 * @param fluid  a tag key representing the fluid type
+	 * @param entity entity that is entered the fluid
+	 */
+	default void onFluidExited(TagKey fluid, Entity entity) { }
+
+	static Builder simple() {
+		return new SimpleConfiguredFluidBehavior.Builder();
+	}
+
+	@ApiStatus.NonExtendable
+	interface Builder {
+		/**
+		 * Controls the movement speed multiplier (applied speed when moving).
+		 * Defaults to 0.02.
+		 *
+		 * @param value value to set
+		 * @return this builder
+		 */
+		Builder movementSpeed(float value);
+
+		/**
+		 * Controls the movement speed multiplier (applied speed when moving).
+		 * Defaults to 0.02.
+		 *
+		 * @param function source of the multiplier
+		 * @return this builder
+		 */
+		Builder movementSpeed(ToFloatFunction function);
+
+		/**
+		 * Controls the movement slowdown multiplier (applied to stored speed).
+		 * Defaults to 0.65 horizontally and 0.8 vertically.
+		 *
+		 * @param value value to set
+		 * @return this builder
+		 */
+		Builder movementSlowdown(float value);
+
+		/**
+		 * Controls the movement slowdown multiplier (applied to stored speed).
+		 * Defaults to 0.65 horizontally and 0.8 vertically.
+		 *
+		 * @param horizontal horizontal multiplier value to set
+		 * @param vertical horizontal multiplier value to set
+		 * @return this builder
+		 */
+		Builder movementSlowdown(float horizontal, float vertical);
+
+		/**
+		 * Controls the movement slowdown multiplier (applied to stored speed).
+		 * Defaults to 0.65 horizontally and 0.8 vertically.
+		 *
+		 * @param function source of the multiplier
+		 * @return this builder
+		 */
+		Builder movementSlowdown(ToFloatFunction function);
+
+		/**
+		 * Controls the movement slowdown multiplier (applied to stored speed).
+		 * Defaults to 0.65 horizontally and 0.8 vertically.
+		 *
+		 * @param function source of the multiplier
+		 * @return this builder
+		 */
+		Builder movementSlowdown(MovementSlowdownFunction function);
+
+		/**
+		 * Modifies the applied fall distance when falling or entirely clears it at 0.
+		 * Defaults to 0.
+		 *
+		 * @param value value to set
+		 * @return this builder
+		 */
+		Builder fallDistanceModifier(float value);
+
+		/**
+		 * Sets the gravity multiplier.
+		 * Defaults to 1 / 16f
+		 *
+		 * @param value value to set
+		 * @return this builder
+		 */
+		Builder gravityMultiplier(float value);
+
+		/**
+		 * Sets the flowing fluid pushing strength.
+		 * Defaults to 0.014 (water push strength)
+		 *
+		 * @param value value to set
+		 * @return this builder
+		 */
+		Builder flowingPushScale(double value);
+
+		/**
+		 * Toggles ability to move down faster in fluid when pressing shift.
+		 * Defaults to false.
+		 *
+		 * @param value value to set
+		 * @return this builder
+		 */
+		Builder allowMovingDown(boolean value);
+
+		/**
+		 * Allows boats to float on this fluid.
+		 * Defaults to false.
+		 *
+		 * @param value value to set
+		 * @return this builder
+		 */
+		Builder allowBoats(boolean value);
+
+		/**
+		 * Allows players to sprint-swim in this fluid.
+		 * Defaults to false.
+		 *
+		 * @param value value to set
+		 * @return this builder
+		 */
+		Builder allowSwimming(boolean value);
+
+		/**
+		 * Allows players to sprint in this fluid.
+		 * Defaults to true.
+		 *
+		 * @param value value to set
+		 * @return this builder
+		 */
+		Builder allowSprinting(boolean value);
+
+		/**
+		 * Allows players to sprint in this fluid.
+		 * Defaults to true.
+		 *
+		 * @param predicate value to set
+		 * @return this builder
+		 */
+		Builder allowSprinting(Predicate predicate);
+
+		/**
+		 * Allows players to sprint in this fluid.
+		 * Defaults to true.
+		 *
+		 * @param predicate value to set
+		 * @return this builder
+		 */
+		Builder allowSprinting(BiPredicate, LivingEntity> predicate);
+
+		/**
+		 * Allows mobs to float in fluid.
+		 * Defaults to true.
+		 *
+		 * @param value value to set
+		 * @return this builder
+		 */
+		Builder makeMobsFloat(boolean value);
+
+		/**
+		 * Allows ridden mobs to float in fluid.
+		 * Defaults to false.
+		 *
+		 * @param value value to set
+		 * @return this builder
+		 */
+		Builder makeRiddenMobsFloat(boolean value);
+
+		/**
+		 * Allows mobs to drown in fluid.
+		 * Defaults to false.
+		 *
+		 * @param value value to set
+		 * @return this builder
+		 */
+		Builder enableDrowning(boolean value);
+
+		/**
+		 * Callback to execute when entity enters a fluid.
+		 *
+		 * @param callback a callback to execute
+		 * @return this builder
+		 */
+		Builder onEnteredFluid(OnEnter callback);
+
+		/**
+		 * Callback to execute when entity exits a fluid.
+		 *
+		 * @param callback a callback to execute
+		 * @return this builder
+		 */
+		Builder onExitedFluid(OnExit callback);
+
+		/**
+		 * Builds the fluid behavior.
+		 *
+		 * @return a new fluid behavior
+		 */
+		FluidBehavior build();
+
+		interface MovementSlowdownFunction {
+			Vec3 apply(LivingEntity entity, Vec3 movementDelta, boolean isBelowJumpThreshold, double baseGravity, boolean isFalling);
+		}
+
+		interface OnEnter {
+			void onFluidEntered(Entity entity, boolean firstTick);
+		}
+
+		interface OnExit {
+			void onFluidExited(Entity entity);
+		}
+	}
+}
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/CompostableRegistryImpl.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/CompostableRegistryImpl.java
index 19b14d804a..e6ca48dcd6 100644
--- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/CompostableRegistryImpl.java
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/CompostableRegistryImpl.java
@@ -16,22 +16,33 @@
 
 package net.fabricmc.fabric.impl.content.registry;
 
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+import net.neoforged.neoforge.registries.datamaps.builtin.NeoForgeDataMaps;
+
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.ItemLike;
-import net.minecraft.world.level.block.ComposterBlock;
 
 import net.fabricmc.fabric.api.registry.CompostableRegistry;
 
 public class CompostableRegistryImpl implements CompostableRegistry {
+	static final Map CUSTOM = new IdentityHashMap<>();
+
 	@Override
 	public Float get(ItemLike item) {
-		return ComposterBlock.COMPOSTABLES.getOrDefault(item.asItem(), 0.0F);
+		var fromCustom = CUSTOM.get(item.asItem());
+		if (fromCustom == null) {
+			var dmap = item.asItem().builtInRegistryHolder().getData(NeoForgeDataMaps.COMPOSTABLES);
+			return dmap == null ? 0 : dmap.chance();
+		}
+		return fromCustom < 0 ? 0 : fromCustom;
 	}
 
 	@Override
 	public void add(ItemLike item, Float chance) {
-		ComposterBlock.COMPOSTABLES.put(item.asItem(), chance);
+		CUSTOM.put(item.asItem(), chance);
 	}
 
 	@Override
@@ -41,7 +52,7 @@ public void add(TagKey tag, Float chance) {
 
 	@Override
 	public void remove(ItemLike item) {
-		ComposterBlock.COMPOSTABLES.removeFloat(item.asItem());
+		CUSTOM.put(item.asItem(), -1f);
 	}
 
 	@Override
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/ContentRegistriesImpl.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/ContentRegistriesImpl.java
new file mode 100644
index 0000000000..14844fc1a1
--- /dev/null
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/ContentRegistriesImpl.java
@@ -0,0 +1,54 @@
+package net.fabricmc.fabric.impl.content.registry;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.StreamSupport;
+
+import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.fluids.FluidType;
+import org.sinytra.fabric.content_registries.generated.GeneratedEntryPoint;
+
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityFluidInteraction;
+import net.minecraft.world.level.material.Fluid;
+
+@Mod(GeneratedEntryPoint.MOD_ID)
+public class ContentRegistriesImpl {
+	private static final Map, Collection> FLUID_TYPE_CACHE = new HashMap<>();
+
+	public static boolean isInFluid(EntityFluidInteraction interaction, TagKey tagKey) {
+		return getFluidTypes(tagKey).stream().anyMatch(interaction::isInFluid);
+	}
+
+	public static boolean isEyeInFluid(EntityFluidInteraction interaction, TagKey tagKey) {
+		return getFluidTypes(tagKey).stream().anyMatch(interaction::isEyeInFluid);
+	}
+
+	public static void applyCurrentTo(EntityFluidInteraction interaction, TagKey fluid, Entity entity, double scale) {
+		for (FluidType type : getFluidTypes(fluid)) {
+			interaction.applyCurrentTo(type, entity, scale);
+			return;
+		}
+	}
+
+	public static double getFluidHeight(EntityFluidInteraction interaction, TagKey fluid) {
+		for (FluidType type : getFluidTypes(fluid)) {
+			return interaction.getFluidHeight(type);
+		}
+		return 0;
+	}
+
+	public static Collection getFluidTypes(TagKey tagKey) {
+		return FLUID_TYPE_CACHE.computeIfAbsent(tagKey, ContentRegistriesImpl::computeFluidTypes);
+	}
+
+	private static Collection computeFluidTypes(TagKey tagKey) {
+		return StreamSupport.stream(BuiltInRegistries.FLUID.getTagOrEmpty(tagKey).spliterator(), false)
+				.map(f -> f.value().getFluidType())
+				.distinct()
+				.toList();
+	}
+}
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/DataMapModifications.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/DataMapModifications.java
new file mode 100644
index 0000000000..c1d7e78a69
--- /dev/null
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/DataMapModifications.java
@@ -0,0 +1,37 @@
+package net.fabricmc.fabric.impl.content.registry;
+
+import net.neoforged.neoforge.registries.datamaps.DataMapType;
+import net.neoforged.neoforge.registries.datamaps.builtin.Compostable;
+import net.neoforged.neoforge.registries.datamaps.builtin.NeoForgeDataMaps;
+import net.neoforged.neoforge.registries.datamaps.builtin.RaidHeroGift;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceKey;
+
+import net.fabricmc.fabric.api.registry.VillagerInteractionRegistries;
+
+public class DataMapModifications {
+	@SuppressWarnings("unchecked")
+	public static  void modify(Registry registry, DataMapType type, ResourceKey key, CallbackInfoReturnable cir) {
+		if (type == NeoForgeDataMaps.COMPOSTABLES) {
+			registry.get(key).ifPresent(holder -> {
+				var fromCustom = CompostableRegistryImpl.CUSTOM.get(holder.value());
+				if (fromCustom != null) {
+					if (fromCustom < 0) {
+						cir.setReturnValue(null);
+					} else {
+						cir.setReturnValue((A) new Compostable(fromCustom));
+					}
+				}
+			});
+		} else if (type == NeoForgeDataMaps.RAID_HERO_GIFTS) {
+			registry.get(key).ifPresent(holder -> {
+				var fromCustom = VillagerInteractionRegistries.MODIFIED_GIFTS.get(holder.value());
+				if (fromCustom != null) {
+					cir.setReturnValue((A) new RaidHeroGift(fromCustom));
+				}
+			});
+		}
+	}
+}
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/DecoratedPotPatternRegistryImpl.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/DecoratedPotPatternRegistryImpl.java
new file mode 100644
index 0000000000..3f451bad33
--- /dev/null
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/DecoratedPotPatternRegistryImpl.java
@@ -0,0 +1,51 @@
+/*
+ * 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.impl.content.registry;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BiConsumer;
+
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.entity.DecoratedPotPattern;
+
+public class DecoratedPotPatternRegistryImpl {
+	private static final Map, ResourceKey> DECORATED_POT_PATTERNS = new HashMap<>();
+	private static final AtomicBoolean LOCKED = new AtomicBoolean(false);
+
+	private DecoratedPotPatternRegistryImpl() {
+	}
+
+	public static void registerPattern(ResourceKey sherd, ResourceKey pattern) {
+		Objects.requireNonNull(sherd, "Sherd item cannot be null!");
+		Objects.requireNonNull(pattern, "Pattern key cannot be null!");
+
+		if (LOCKED.get()) {
+			throw new IllegalStateException("Cannot register decorated pot pattern after registry has been locked!");
+		}
+
+		DECORATED_POT_PATTERNS.put(sherd, pattern);
+	}
+
+	public static void apply(BiConsumer, ResourceKey> consumer) {
+		LOCKED.set(true);
+		DECORATED_POT_PATTERNS.forEach(consumer);
+	}
+}
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FlammableBlockRegistryImpl.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FlammableBlockRegistryImpl.java
index c545cce0e9..ff70f0a571 100644
--- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FlammableBlockRegistryImpl.java
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FlammableBlockRegistryImpl.java
@@ -19,6 +19,7 @@
 import java.util.HashMap;
 import java.util.IdentityHashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -30,7 +31,7 @@
 
 public class FlammableBlockRegistryImpl implements FlammableBlockRegistry {
 	private static final FlammableBlockRegistry.Entry REMOVED = new FlammableBlockRegistry.Entry(0, 0);
-	private static final Map REGISTRIES = new HashMap<>();
+	private static final Map REGISTRIES = new ConcurrentHashMap<>();
 
 	private final Map registeredEntriesBlock = new HashMap<>();
 	private final Map, FlammableBlockRegistry.Entry> registeredEntriesTag = new HashMap<>();
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/OxidizableBlocksRegistryImpl.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/OxidizableBlocksRegistryImpl.java
index 59fe6e7d9e..2889b886c4 100644
--- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/OxidizableBlocksRegistryImpl.java
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/OxidizableBlocksRegistryImpl.java
@@ -21,7 +21,7 @@
 import net.minecraft.world.item.HoneycombItem;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.WeatheringCopper;
-import net.minecraft.world.level.block.WeatheringCopperBlocks;
+import net.minecraft.world.level.block.WeatheringCopperCollection;
 
 public final class OxidizableBlocksRegistryImpl {
 	private OxidizableBlocksRegistryImpl() {
@@ -42,10 +42,10 @@ public static void registerWaxable(Block unwaxed, Block waxed) {
 		HoneycombItem.WAXABLES.get().put(unwaxed, waxed);
 	}
 
-	public static void registerWeatheringCopperBlocks(WeatheringCopperBlocks copperBlocks) {
+	public static void registerWeatheringCopperBlocks(WeatheringCopperCollection copperBlocks) {
 		Objects.requireNonNull(copperBlocks, "copperBlocks cannot be null!");
-		copperBlocks.weatheringMapping().forEach(OxidizableBlocksRegistryImpl::registerNextStage);
-		copperBlocks.waxedMapping().forEach(OxidizableBlocksRegistryImpl::registerWaxable);
+		copperBlocks.weathering().progressMapping(OxidizableBlocksRegistryImpl::registerNextStage);
+		copperBlocks.zipUnwaxedWaxed(OxidizableBlocksRegistryImpl::registerWaxable);
 	}
 
 	private static void refreshRandomTickCache(Block block) {
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/fluid/EntityFluidInteractionRegistryImpl.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/fluid/EntityFluidInteractionRegistryImpl.java
new file mode 100644
index 0000000000..2a5c655d9b
--- /dev/null
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/fluid/EntityFluidInteractionRegistryImpl.java
@@ -0,0 +1,43 @@
+/*
+ * 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.impl.content.registry.fluid;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.level.material.Fluid;
+
+import net.fabricmc.fabric.api.registry.fluid.FluidBehavior;
+
+public final class EntityFluidInteractionRegistryImpl {
+	private static final Map, FluidBehavior> TRACKED_FLUIDS = new ConcurrentHashMap<>();
+
+	public static void register(TagKey fluidTagKey, FluidBehavior behaviour) {
+		TRACKED_FLUIDS.put(fluidTagKey, behaviour);
+	}
+
+	public static Collection> getTrackedFluids() {
+		return TRACKED_FLUIDS.keySet();
+	}
+
+	public static FluidBehavior getFluidBehavior(TagKey tagKey) {
+		return Objects.requireNonNull(TRACKED_FLUIDS.get(tagKey));
+	}
+}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/FabricCustomPayloadStreamCodec.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/fluid/InternalEntityFluidExtension.java
similarity index 66%
rename from fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/FabricCustomPayloadStreamCodec.java
rename to fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/fluid/InternalEntityFluidExtension.java
index 3cbd6f8f56..9eda9c3d10 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/FabricCustomPayloadStreamCodec.java
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/fluid/InternalEntityFluidExtension.java
@@ -14,10 +14,16 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.networking;
+package net.fabricmc.fabric.impl.content.registry.fluid;
 
-import net.minecraft.network.FriendlyByteBuf;
+import java.util.Set;
 
-public interface FabricCustomPayloadStreamCodec {
-	void fabric_setCustomPayloadTypeProvider(CustomPayloadTypeProvider customPayloadTypeProvider);
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.level.material.Fluid;
+
+/**
+ * Internal fluid extension.
+ */
+public interface InternalEntityFluidExtension {
+	Set> fabric_api$getTouchedCustomFluids();
 }
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/fluid/SimpleConfiguredFluidBehavior.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/fluid/SimpleConfiguredFluidBehavior.java
new file mode 100644
index 0000000000..51e8bc57d7
--- /dev/null
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/fluid/SimpleConfiguredFluidBehavior.java
@@ -0,0 +1,318 @@
+/*
+ * 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.impl.content.registry.fluid;
+
+import java.util.function.BiPredicate;
+import java.util.function.Predicate;
+
+import net.fabricmc.fabric.impl.content.registry.ContentRegistriesImpl;
+
+import net.minecraft.tags.EntityTypeTags;
+import net.minecraft.tags.TagKey;
+import net.minecraft.util.ToFloatFunction;
+import net.minecraft.world.effect.MobEffects;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityFluidInteraction;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.MoverType;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.world.phys.Vec3;
+
+import net.fabricmc.fabric.api.registry.fluid.FluidBehavior;
+import net.fabricmc.fabric.mixin.content.registry.fluid.EntityAccessor;
+import net.fabricmc.fabric.mixin.content.registry.fluid.LivingEntityAccessor;
+
+public record SimpleConfiguredFluidBehavior(ToFloatFunction movementSpeed,
+											FluidBehavior.Builder.MovementSlowdownFunction movementSlowdown,
+											float gravityMultiplier, float fallDistanceMultiplier,
+											double flowingPushScale,
+											boolean allowMovingDown, boolean allowBoats,
+											boolean allowSwimming, boolean makeMobsFloat,
+											boolean makeRiddenMobsFloat, boolean drowning,
+											BiPredicate, LivingEntity> allowSprinting,
+											FluidBehavior.Builder.OnEnter onEnter,
+											FluidBehavior.Builder.OnExit onExit) implements FluidBehavior {
+	public static final FluidBehavior WATER_LIKE = new Builder()
+			.movementSpeed(entity -> {
+				float speed = 0.02F;
+				float waterWalker = (float) entity.getAttributeValue(Attributes.WATER_MOVEMENT_EFFICIENCY);
+
+				if (!entity.onGround()) {
+					waterWalker *= 0.5F;
+				}
+
+				if (waterWalker > 0.0F) {
+					speed += (entity.getSpeed() - speed) * waterWalker;
+				}
+
+				return speed;
+			}).movementSlowdown((entity, movement, _, baseGravity, isFalling) -> {
+				float slowDown = entity.isSprinting() ? 0.9F : ((LivingEntityAccessor) entity).callGetWaterSlowDown();
+				float waterWalker = (float) entity.getAttributeValue(Attributes.WATER_MOVEMENT_EFFICIENCY);
+
+				if (!entity.onGround()) {
+					waterWalker *= 0.5F;
+				}
+
+				if (waterWalker > 0.0F) {
+					slowDown += (0.54600006F - slowDown) * waterWalker;
+				}
+
+				if (entity.hasEffect(MobEffects.DOLPHINS_GRACE)) {
+					slowDown = 0.96F;
+				}
+
+				if (entity.horizontalCollision && entity.onClimbable()) {
+					movement = new Vec3(movement.x, 0.2, movement.z);
+				}
+
+				movement = movement.multiply(slowDown, 0.8F, slowDown);
+				// This also applies the gravity multiplier
+				return entity.getFluidFallingAdjustedMovement(baseGravity, isFalling, movement);
+			}).fallDistanceModifier(0).flowingPushScale(0.014).gravityMultiplier(0).makeMobsFloat(true)
+			.makeRiddenMobsFloat(true).enableDrowning(true).allowSwimming(true).allowMovingDown(true)
+			.allowBoats(true).allowSprinting((fluid, entity) -> ContentRegistriesImpl.isEyeInFluid(entity.getFluidInteraction(), fluid))
+			.onEnteredFluid((entity, firstTick) -> {
+				if (!firstTick) ((EntityAccessor) entity).callDoWaterSplashEffect();
+			}).build();
+
+	@Override
+	public void handleFluidInteractionUpdate(TagKey fluid, Entity entity, EntityFluidInteraction interaction, boolean canPushEntity) {
+		if (canPushEntity) {
+			ContentRegistriesImpl.applyCurrentTo(interaction, fluid, entity, this.flowingPushScale);
+		}
+
+		entity.fallDistance *= this.fallDistanceMultiplier;
+	}
+
+	@Override
+	public boolean canSwimInFluid(TagKey fluid, Entity entity) {
+		return this.allowSwimming;
+	}
+
+	@Override
+	public boolean shouldTryFloatingInFluid(TagKey fluid, Entity entity) {
+		return this.makeMobsFloat;
+	}
+
+	@Override
+	public void travelInFluid(TagKey fluid, LivingEntity entity, Vec3 input, double baseGravity, boolean isFalling, double oldY) {
+		float speed = this.movementSpeed.applyAsFloat(entity);
+		entity.moveRelative(speed, input);
+		entity.move(MoverType.SELF, entity.getDeltaMovement());
+		entity.setDeltaMovement(this.movementSlowdown.apply(entity, entity.getDeltaMovement(), ContentRegistriesImpl.getFluidHeight(entity.getFluidInteraction(), fluid) <= entity.getFluidJumpThreshold(), baseGravity, isFalling));
+
+		if (baseGravity != 0.0F && this.gravityMultiplier != 0.0F) {
+			entity.setDeltaMovement(entity.getDeltaMovement().add(0.0F, -baseGravity * this.gravityMultiplier, 0.0F));
+		}
+
+		((LivingEntityAccessor) entity).callJumpOutOfFluid(oldY);
+
+		if (this.makeRiddenMobsFloat) {
+			boolean canEntityFloatInWater = entity.is(EntityTypeTags.CAN_FLOAT_WHILE_RIDDEN);
+
+			if (canEntityFloatInWater && entity.isVehicle() && ContentRegistriesImpl.getFluidHeight(entity.getFluidInteraction(), fluid) > entity.getFluidJumpThreshold()) {
+				entity.setDeltaMovement(entity.getDeltaMovement().add(0.0F, 0.04F, 0.0F));
+			}
+		}
+	}
+
+	@Override
+	public void travelFlyingInFluid(TagKey fluid, LivingEntity entity, Vec3 input, float waterSpeed, float lavaSpeed, float airSpeed) {
+		float speed = this.movementSpeed.applyAsFloat(entity);
+
+		entity.moveRelative(speed, input);
+		entity.move(MoverType.SELF, entity.getDeltaMovement());
+		entity.setDeltaMovement(this.movementSlowdown.apply(entity, entity.getDeltaMovement(), false, 0, false));
+	}
+
+	@Override
+	public boolean canMoveDownInFluid(TagKey fluid, Entity entity) {
+		return this.allowMovingDown;
+	}
+
+	@Override
+	public boolean canDrownInFluid(TagKey fluid, LivingEntity entity) {
+		return this.drowning;
+	}
+
+	@Override
+	public boolean canSupportBoat(TagKey fluid, Entity entity) {
+		return this.allowBoats;
+	}
+
+	@Override
+	public boolean canSprintInFluid(TagKey fluid, LivingEntity entity) {
+		return this.allowSprinting.test(fluid, entity);
+	}
+
+	@Override
+	public void onFluidEntered(TagKey fluid, Entity entity, boolean firstTick) {
+		this.onEnter.onFluidEntered(entity, firstTick);
+	}
+
+	@Override
+	public void onFluidExited(TagKey fluid, Entity entity) {
+		this.onExit.onFluidExited(entity);
+	}
+
+	public static class Builder implements FluidBehavior.Builder {
+		private ToFloatFunction movementSpeed = _ -> 0.02f;
+		private MovementSlowdownFunction movementSlowdown = (_, m, isBelowJumpThreshold, _, _) -> isBelowJumpThreshold ? m.scale(0.65f) : m.multiply(0.65f, 0.8f, 0.65f);
+		private float gravityMultiplier = 1 / 16f;
+		private double flowingPushScale = 0.014f;
+		private boolean allowMovingDown = false;
+		private boolean allowBoats = false;
+		private boolean allowSwimming = false;
+		private boolean makeMobsFloat = true;
+		private boolean makeRiddenMobsFloat = false;
+		private boolean drowning = false;
+		private float fallDistanceModifier = 0;
+		private BiPredicate, LivingEntity> allowSprinting = (_, _) -> true;
+		private OnEnter onEnter = (_, _) -> { };
+		private OnExit onExit = _ -> { };
+
+		@Override
+		public FluidBehavior.Builder movementSpeed(float value) {
+			this.movementSpeed = _ -> value;
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder movementSpeed(ToFloatFunction function) {
+			this.movementSpeed = function;
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder movementSlowdown(float value) {
+			this.movementSlowdown = (_, m, _, _, _) -> m.scale(value);
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder movementSlowdown(float horizontal, float vertical) {
+			this.movementSlowdown = (_, m, _, _, _) -> m.multiply(horizontal, vertical, horizontal);
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder movementSlowdown(ToFloatFunction function) {
+			this.movementSlowdown = (e, m, _, _, _) -> m.scale(function.applyAsFloat(e));
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder movementSlowdown(MovementSlowdownFunction function) {
+			this.movementSlowdown = function;
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder fallDistanceModifier(float value) {
+			this.fallDistanceModifier = value;
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder gravityMultiplier(float value) {
+			this.gravityMultiplier = value;
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder flowingPushScale(double value) {
+			this.flowingPushScale = value;
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder allowMovingDown(boolean value) {
+			this.allowMovingDown = value;
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder allowBoats(boolean value) {
+			this.allowBoats = value;
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder allowSwimming(boolean value) {
+			this.allowSwimming = value;
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder allowSprinting(boolean value) {
+			this.allowSprinting = (_, _) -> value;
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder allowSprinting(Predicate value) {
+			this.allowSprinting = (_, e) -> value.test(e);
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder allowSprinting(BiPredicate, LivingEntity> value) {
+			this.allowSprinting = value;
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder makeMobsFloat(boolean value) {
+			this.makeMobsFloat = value;
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder makeRiddenMobsFloat(boolean value) {
+			this.makeRiddenMobsFloat = value;
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder enableDrowning(boolean value) {
+			this.drowning = value;
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder onEnteredFluid(OnEnter callback) {
+			this.onEnter = callback;
+			return this;
+		}
+
+		@Override
+		public FluidBehavior.Builder onExitedFluid(OnExit callback) {
+			this.onExit = callback;
+			return this;
+		}
+
+		@Override
+		public FluidBehavior build() {
+			return new SimpleConfiguredFluidBehavior(this.movementSpeed, this.movementSlowdown,
+					this.gravityMultiplier, this.fallDistanceModifier, this.flowingPushScale, this.allowMovingDown, this.allowBoats, this.allowSwimming,
+					this.makeMobsFloat, this.makeRiddenMobsFloat, this.drowning, this.allowSprinting,
+					this.onEnter, this.onExit);
+		}
+	}
+}
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/AxeItemMixin.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/AxeItemMixin.java
index 9d609e637d..9640c8017a 100644
--- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/AxeItemMixin.java
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/AxeItemMixin.java
@@ -19,9 +19,12 @@
 import java.util.function.Function;
 
 import com.llamalad7.mixinextras.sugar.Local;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import net.minecraft.world.item.AxeItem;
 import net.minecraft.world.level.block.Block;
@@ -42,4 +45,13 @@ private Function handleCustomStrippingBehavior(Function cir, @Local Block block) {
+		StrippableBlockRegistry.StrippingTransformer transformer = StrippableBlockRegistryImpl.getTransformer(state.getBlock());
+
+		if (transformer != null) {
+			cir.setReturnValue(transformer.getStrippedBlockState(block, state));
+		}
+	}
 }
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/BaseRegistryMixin.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/BaseRegistryMixin.java
new file mode 100644
index 0000000000..504a6a8f68
--- /dev/null
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/BaseRegistryMixin.java
@@ -0,0 +1,19 @@
+package net.fabricmc.fabric.mixin.content.registry;
+
+import net.fabricmc.fabric.impl.content.registry.DataMapModifications;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceKey;
+import net.neoforged.neoforge.registries.BaseMappedRegistry;
+import net.neoforged.neoforge.registries.datamaps.DataMapType;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(BaseMappedRegistry.class)
+public abstract class BaseRegistryMixin {
+    @Inject(at = @At("HEAD"), method = "getData", cancellable = true)
+    private  void getDataMapConsideringFAPI(DataMapType type, ResourceKey key, CallbackInfoReturnable cir) {
+        DataMapModifications.modify((Registry) this, type, key, cir);
+    }
+}
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/DataMapHooksMixin.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/DataMapHooksMixin.java
new file mode 100644
index 0000000000..769268d478
--- /dev/null
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/DataMapHooksMixin.java
@@ -0,0 +1,28 @@
+package net.fabricmc.fabric.mixin.content.registry;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import net.neoforged.neoforge.common.DataMapHooks;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.world.flag.FeatureFlagSet;
+import net.minecraft.world.level.block.entity.FuelValues;
+
+import net.fabricmc.fabric.api.registry.FuelValueEvents;
+import net.fabricmc.fabric.impl.content.registry.FuelRegistryEventsContextImpl;
+
+@Mixin(DataMapHooks.class)
+public class DataMapHooksMixin {
+
+	@Inject(method = "populateFuelValues", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/entity/FuelValues$Builder;build()Lnet/minecraft/world/level/block/entity/FuelValues;"))
+	private static void modifyFuelBurnTimes(RegistryAccess registries, FeatureFlagSet features, CallbackInfoReturnable cit, @Local FuelValues.Builder builder) {
+		final var context = new FuelRegistryEventsContextImpl(registries, features, 200);
+
+		FuelValueEvents.BUILD.invoker().build(builder, context);
+
+		FuelValueEvents.EXCLUSIONS.invoker().buildExclusions(builder, context);
+	}
+}
diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/modification/MinecraftServerMixin.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/DecoratedPotPatternsMixin.java
similarity index 53%
rename from fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/modification/MinecraftServerMixin.java
rename to fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/DecoratedPotPatternsMixin.java
index c6cecff415..afddb16087 100644
--- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/modification/MinecraftServerMixin.java
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/DecoratedPotPatternsMixin.java
@@ -14,26 +14,26 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.biome.modification;
+package net.fabricmc.fabric.mixin.content.registry;
+
+import java.util.function.BiConsumer;
 
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.server.MinecraftServer;
-
-import net.fabricmc.fabric.impl.biome.modification.BiomeModificationImpl;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.entity.DecoratedPotPattern;
+import net.minecraft.world.level.block.entity.DecoratedPotPatterns;
 
-@Mixin(MinecraftServer.class)
-public abstract class MinecraftServerMixin {
-	@Shadow
-	public abstract RegistryAccess.Frozen registryAccess();
+import net.fabricmc.fabric.impl.content.registry.DecoratedPotPatternRegistryImpl;
 
-	@Inject(method = "", at = @At(value = "RETURN"))
-	private void finalizeWorldGen(CallbackInfo ci) {
-		BiomeModificationImpl.INSTANCE.finalizeWorldGen(registryAccess());
+@Mixin(DecoratedPotPatterns.class)
+public class DecoratedPotPatternsMixin {
+	@Inject(method = "itemToPatternMappings", at = @At("RETURN"))
+	private static void makeItemToPatternMappingsMutable(BiConsumer, ResourceKey> itemToPattern, CallbackInfo ci) {
+		DecoratedPotPatternRegistryImpl.apply(itemToPattern);
 	}
 }
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/FuelValuesMixin.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/FuelValuesMixin.java
deleted file mode 100644
index 57da5804d3..0000000000
--- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/FuelValuesMixin.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.mixin.content.registry;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.core.HolderLookup;
-import net.minecraft.tags.TagKey;
-import net.minecraft.world.flag.FeatureFlagSet;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.entity.FuelValues;
-
-import net.fabricmc.fabric.api.registry.FuelValueEvents;
-import net.fabricmc.fabric.impl.content.registry.FuelRegistryEventsContextImpl;
-
-/**
- * Implements the invocation of {@link FabricFuelRegistryBuilder} callbacks.
- */
-@Mixin(FuelValues.class)
-public abstract class FuelValuesMixin {
-	/**
-	 * Handles invoking both pre- and post-exclusion events.
-	 *
-	 * 
Vanilla currently uses a single exclusion for non-flammable wood; if more builder calls for exclusions are added, this mixin method must be split accordingly.
-	 */
-	@WrapOperation(
-			method = "vanillaBurnTimes(Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/world/flag/FeatureFlagSet;I)Lnet/minecraft/world/level/block/entity/FuelValues;",
-			at = @At(
-					value = "INVOKE",
-					target = "Lnet/minecraft/world/level/block/entity/FuelValues$Builder;remove(Lnet/minecraft/tags/TagKey;)Lnet/minecraft/world/level/block/entity/FuelValues$Builder;"
-			),
-			allow = 1
-	)
-	private static FuelValues.Builder build(FuelValues.Builder builder, TagKey tag, Operation operation, @Local(argsOnly = true) HolderLookup.Provider registries, @Local(argsOnly = true) FeatureFlagSet features, @Local(argsOnly = true) int baseSmeltTime) {
-		final var context = new FuelRegistryEventsContextImpl(registries, features, baseSmeltTime);
-
-		FuelValueEvents.BUILD.invoker().build(builder, context);
-
-		operation.call(builder, tag);
-		FuelValueEvents.EXCLUSIONS.invoker().buildExclusions(builder, context);
-
-		return builder;
-	}
-}
diff --git a/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/BlockMixin.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/EntityAccessor.java
similarity index 72%
rename from fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/BlockMixin.java
rename to fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/EntityAccessor.java
index e611538197..10746f4723 100644
--- a/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/BlockMixin.java
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/EntityAccessor.java
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.block;
+package net.fabricmc.fabric.mixin.content.registry.fluid;
 
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
 
-import net.minecraft.world.level.block.Block;
+import net.minecraft.world.entity.Entity;
 
-import net.fabricmc.fabric.api.block.v1.FabricBlock;
-
-@Mixin(Block.class)
-public class BlockMixin implements FabricBlock { }
+@Mixin(Entity.class)
+public interface EntityAccessor {
+	@Invoker
+	void callDoWaterSplashEffect();
+}
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/EntityMixin.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/EntityMixin.java
new file mode 100644
index 0000000000..8e9e4eafef
--- /dev/null
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/EntityMixin.java
@@ -0,0 +1,117 @@
+/*
+ * 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.mixin.content.registry.fluid;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+import net.minecraft.tags.FluidTags;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityFluidInteraction;
+import net.minecraft.world.level.material.Fluid;
+
+import net.fabricmc.fabric.api.registry.fluid.EntityFluidExtension;
+import net.fabricmc.fabric.api.registry.fluid.FluidBehavior;
+import net.fabricmc.fabric.impl.content.registry.ContentRegistriesImpl;
+import net.fabricmc.fabric.impl.content.registry.fluid.EntityFluidInteractionRegistryImpl;
+import net.fabricmc.fabric.impl.content.registry.fluid.InternalEntityFluidExtension;
+
+@Mixin(Entity.class)
+public abstract class EntityMixin implements EntityFluidExtension, InternalEntityFluidExtension {
+	@Shadow
+	@Final
+	private EntityFluidInteraction fluidInteraction;
+
+	@Shadow
+	public abstract boolean isPushedByFluid();
+
+	@Shadow
+	protected boolean firstTick;
+
+	@Shadow
+	public abstract boolean isInWater();
+
+	@Shadow
+	public abstract boolean isInLava();
+
+	@Unique
+	private final Set> wasTouchingCustomFluid = new HashSet<>();
+
+	@ModifyArg(method = "", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/EntityFluidInteraction;(Ljava/util/Set;)V"))
+	private Set> addCustomTags(Set> fluids) {
+		var result = new HashSet<>(fluids);
+		result.addAll(EntityFluidInteractionRegistryImpl.getTrackedFluids());
+		return result;
+	}
+
+	@ModifyReturnValue(method = "isInLiquid", at = @At("RETURN"))
+	private boolean checkForCustomFluids(boolean original) {
+		return original || !this.wasTouchingCustomFluid.isEmpty();
+	}
+
+	@ModifyReturnValue(method = "updateFluidInteraction", at = @At("RETURN"))
+	private boolean handleCustomFluidInteractionUpdates(boolean hasInteracted) {
+		final boolean isPushedByFluid = this.isPushedByFluid();
+
+		for (TagKey tagKey : EntityFluidInteractionRegistryImpl.getTrackedFluids()) {
+			boolean inFluid = ContentRegistriesImpl.isInFluid(this.fluidInteraction, tagKey);
+			boolean wasInFluid = this.wasTouchingCustomFluid.contains(tagKey);
+
+			if (inFluid) {
+				FluidBehavior fluidBehavior = EntityFluidInteractionRegistryImpl.getFluidBehavior(tagKey);
+
+				if (!wasInFluid) {
+					fluidBehavior.onFluidEntered(tagKey, (Entity) (Object) this, this.firstTick);
+					this.wasTouchingCustomFluid.add(tagKey);
+				}
+
+				hasInteracted = true;
+				fluidBehavior.handleFluidInteractionUpdate(tagKey, (Entity) (Object) this, this.fluidInteraction, isPushedByFluid);
+			} else if (wasInFluid) {
+				this.wasTouchingCustomFluid.remove(tagKey);
+				EntityFluidInteractionRegistryImpl.getFluidBehavior(tagKey).onFluidExited(tagKey, (Entity) (Object) this);
+			}
+		}
+
+		return hasInteracted;
+	}
+
+	@Override
+	public boolean isInFluid(TagKey fluid) {
+		if (fluid == FluidTags.WATER) {
+			return this.isInWater();
+		} else if (fluid == FluidTags.LAVA) {
+			return this.isInLava();
+		}
+
+		return this.wasTouchingCustomFluid.contains(fluid);
+	}
+
+	@Override
+	public Set> fabric_api$getTouchedCustomFluids() {
+		return this.wasTouchingCustomFluid;
+	}
+}
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/FloatGoalMixin.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/FloatGoalMixin.java
new file mode 100644
index 0000000000..1b473cee68
--- /dev/null
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/FloatGoalMixin.java
@@ -0,0 +1,53 @@
+/*
+ * 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.mixin.content.registry.fluid;
+
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.ai.goal.FloatGoal;
+import net.minecraft.world.level.material.Fluid;
+
+import net.fabricmc.fabric.impl.content.registry.fluid.EntityFluidInteractionRegistryImpl;
+import net.fabricmc.fabric.impl.content.registry.fluid.InternalEntityFluidExtension;
+
+@Mixin(FloatGoal.class)
+public class FloatGoalMixin {
+	@Shadow
+	@Final
+	private Mob mob;
+
+	@ModifyReturnValue(method = "canUse", at = @At("RETURN"))
+	private boolean floatInCustomFluids(boolean original) {
+		if (original) {
+			return true;
+		}
+
+		for (TagKey tagKey : ((InternalEntityFluidExtension) mob).fabric_api$getTouchedCustomFluids()) {
+			if (EntityFluidInteractionRegistryImpl.getFluidBehavior(tagKey).shouldTryFloatingInFluid(tagKey, this.mob)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/buildSrc/src/main/java/net/fabricmc/fabric/impl/build/GitBranchValueSource.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/LivingEntityAccessor.java
similarity index 65%
rename from buildSrc/src/main/java/net/fabricmc/fabric/impl/build/GitBranchValueSource.java
rename to fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/LivingEntityAccessor.java
index a5d1a95f99..7d5eb68cb8 100644
--- a/buildSrc/src/main/java/net/fabricmc/fabric/impl/build/GitBranchValueSource.java
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/LivingEntityAccessor.java
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.build;
+package net.fabricmc.fabric.mixin.content.registry.fluid;
 
-import org.gradle.api.provider.ValueSourceParameters;
+import org.spongepowered.asm.mixin.gen.Invoker;
 
-public abstract class GitBranchValueSource extends AbstractGitValueSource {
-	@Override
-	public String obtain() {
-		return git("rev-parse", "--abbrev-ref", "HEAD");
-	}
+@org.spongepowered.asm.mixin.Mixin(net.minecraft.world.entity.LivingEntity.class)
+public interface LivingEntityAccessor {
+	@Invoker
+	void callJumpOutOfFluid(double oldY);
+
+	@Invoker
+	float callGetWaterSlowDown();
 }
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/LivingEntityMixin.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/LivingEntityMixin.java
new file mode 100644
index 0000000000..acc30e27e7
--- /dev/null
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/LivingEntityMixin.java
@@ -0,0 +1,48 @@
+/*
+ * 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.mixin.content.registry.fluid;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.world.phys.Vec3;
+
+import net.fabricmc.fabric.impl.content.registry.fluid.EntityFluidInteractionRegistryImpl;
+import net.fabricmc.fabric.impl.content.registry.fluid.InternalEntityFluidExtension;
+
+@Mixin(LivingEntity.class)
+public abstract class LivingEntityMixin extends Entity {
+	public LivingEntityMixin(EntityType type, Level level) {
+		super(type, level);
+	}
+
+	@Inject(method = "travelFlying(Lnet/minecraft/world/phys/Vec3;FFF)V", at = @At("HEAD"), cancellable = true)
+	private void travelFlyingInCustomFluid(Vec3 input, float waterSpeed, float lavaSpeed, float airSpeed, CallbackInfo ci) {
+		for (TagKey tagKey : ((InternalEntityFluidExtension) this).fabric_api$getTouchedCustomFluids()) {
+			EntityFluidInteractionRegistryImpl.getFluidBehavior(tagKey).travelFlyingInFluid(tagKey, (LivingEntity) (Object) this, input, waterSpeed, lavaSpeed, airSpeed);
+			ci.cancel();
+		}
+	}
+}
diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/SwimMixin.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/SwimMixin.java
new file mode 100644
index 0000000000..c281bf67c0
--- /dev/null
+++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/fluid/SwimMixin.java
@@ -0,0 +1,48 @@
+/*
+ * 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.mixin.content.registry.fluid;
+
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import com.llamalad7.mixinextras.sugar.Local;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.ai.behavior.Swim;
+import net.minecraft.world.level.material.Fluid;
+
+import net.fabricmc.fabric.impl.content.registry.fluid.EntityFluidInteractionRegistryImpl;
+import net.fabricmc.fabric.impl.content.registry.fluid.InternalEntityFluidExtension;
+
+@Mixin(Swim.class)
+public class SwimMixin {
+	@ModifyReturnValue(method = "shouldSwim", at = @At("RETURN"))
+	private static boolean floatInCustomFluids(boolean original, @Local(argsOnly = true) Mob mob) {
+		if (original) {
+			return true;
+		}
+
+		for (TagKey tagKey : ((InternalEntityFluidExtension) mob).fabric_api$getTouchedCustomFluids()) {
+			if (EntityFluidInteractionRegistryImpl.getFluidBehavior(tagKey).shouldTryFloatingInFluid(tagKey, mob)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.classtweaker b/fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.classtweaker
index eaeb23653d..952320bfe8 100644
--- a/fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.classtweaker
+++ b/fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.classtweaker
@@ -1,3 +1,5 @@
 classTweaker	v1	official
+accessible  class   net/minecraft/world/item/alchemy/PotionBrewing$Mix
 accessible	method	net/minecraft/world/item/alchemy/PotionBrewing$Mix		(Lnet/minecraft/core/Holder;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/core/Holder;)V
 transitive-inject-interface	net/minecraft/world/item/alchemy/PotionBrewing$Builder	net/fabricmc/fabric/api/registry/FabricPotionBrewingBuilder
+transitive-inject-interface	net/minecraft/world/entity/Entity	net/fabricmc/fabric/api/registry/fluid/EntityFluidExtension
diff --git a/fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.mapping b/fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.mapping
index 70c4e8b199..395e394d3b 100644
--- a/fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.mapping
+++ b/fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.mapping
@@ -1,2 +1,4 @@
 CLASS net/minecraft/world/level/block/WeatheringCopper
 	COMMENT @see net.fabricmc.fabric.api.registry.OxidizableBlocksRegistry registry for modded oxidizable blocks
+CLASS net/minecraft/world/level/block/entity/DecoratedPotPatterns
+    COMMENT @see net.fabricmc.fabric.api.registry.DecoratedPotPatternRegistry registry for modded sherd items
diff --git a/fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.mixins.json b/fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.mixins.json
index 1c12e05352..b1e82a49ef 100644
--- a/fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.mixins.json
+++ b/fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.mixins.json
@@ -2,25 +2,36 @@
   "required": true,
   "package": "net.fabricmc.fabric.mixin.content.registry",
   "compatibilityLevel": "JAVA_25",
+  "mixinextras": {
+    "minVersion": "0.5.0"
+  },
   "mixins": [
-    "BlockBehaviourBlockStateBaseMixin",
-    "BlockBehaviourAccessor",
     "AxeItemAccessor",
     "AxeItemMixin",
-    "PotionBrewingBuilderMixin",
-    "WorkAtComposterAccessor",
+    "BaseRegistryMixin",
+    "BlockBehaviourAccessor",
+    "BlockBehaviourBlockStateBaseMixin",
+    "DataMapHooksMixin",
+    "DecoratedPotPatternsMixin",
     "FireBlockMixin",
-    "FuelValuesMixin",
     "GiveGiftToHeroAccessor",
     "GiveGiftToHeroMixin",
     "HoeItemAccessor",
     "HoneycombItemMixin",
-    "WalkNodeEvaluatorMixin",
-    "WeatheringCopperMixin",
     "PathfindingContextMixin",
+    "PotionBrewingBuilderMixin",
     "ShovelItemAccessor",
     "VillagerAccessor",
-    "VillagerMixin"
+    "VillagerMixin",
+    "WalkNodeEvaluatorMixin",
+    "WeatheringCopperMixin",
+    "WorkAtComposterAccessor",
+    "fluid.EntityAccessor",
+    "fluid.EntityMixin",
+    "fluid.FloatGoalMixin",
+    "fluid.LivingEntityAccessor",
+    "fluid.LivingEntityMixin",
+    "fluid.SwimMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-content-registries-v0/src/main/resources/fabric.mod.json b/fabric-content-registries-v0/src/main/resources/fabric.mod.json
index 335dcd0415..6986a71bb0 100644
--- a/fabric-content-registries-v0/src/main/resources/fabric.mod.json
+++ b/fabric-content-registries-v0/src/main/resources/fabric.mod.json
@@ -23,7 +23,11 @@
   },
   "description": "Adds registries for vanilla mechanics that are missing them.",
   "mixins": [
-    "fabric-content-registries-v0.mixins.json"
+    "fabric-content-registries-v0.mixins.json",
+    {
+      "config": "fabric-content-registries-v0.client.mixins.json",
+      "environment": "client"
+    }
   ],
   "accessWidener" : "fabric-content-registries-v0.classtweaker",
   "custom": {
diff --git a/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/ContentRegistryGameTest.java b/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/ContentRegistryGameTest.java
index 79b556c5f0..e78586b43f 100644
--- a/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/ContentRegistryGameTest.java
+++ b/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/ContentRegistryGameTest.java
@@ -16,6 +16,9 @@
 
 package net.fabricmc.fabric.test.content.registry;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -24,22 +27,34 @@
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.gametest.framework.GameTestHelper;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.EntityTypes;
+import net.minecraft.world.entity.decoration.Mannequin;
+import net.minecraft.world.entity.npc.villager.Villager;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.alchemy.PotionContents;
 import net.minecraft.world.item.alchemy.Potions;
 import net.minecraft.world.level.GameType;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.ComposterBlock;
 import net.minecraft.world.level.block.HopperBlock;
+import net.minecraft.world.level.block.LiquidBlock;
 import net.minecraft.world.level.block.StairBlock;
 import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
 import net.minecraft.world.level.block.entity.BrewingStandBlockEntity;
+import net.minecraft.world.level.block.entity.DecoratedPotBlockEntity;
+import net.minecraft.world.level.block.entity.DecoratedPotPattern;
+import net.minecraft.world.level.block.entity.DecoratedPotPatterns;
 import net.minecraft.world.level.block.entity.HopperBlockEntity;
+import net.minecraft.world.level.block.entity.PotDecorations;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.Half;
+import net.minecraft.world.phys.AABB;
 
 import net.fabricmc.fabric.api.gametest.v1.GameTest;
 
@@ -61,12 +76,12 @@ public void testCompostingChanceRegistry(GameTestHelper helper) {
 	@GameTest
 	public void testFlattenableBlockRegistry(GameTestHelper helper) {
 		BlockPos pos = new BlockPos(0, 1, 0);
-		helper.setBlock(pos, Blocks.RED_WOOL);
+		helper.setBlock(pos, Blocks.WOOL.red());
 		ItemStack shovel = new ItemStack(Items.NETHERITE_SHOVEL);
 		Player player = helper.makeMockPlayer(GameType.SURVIVAL);
 		player.setItemInHand(InteractionHand.MAIN_HAND, shovel);
 		helper.useBlock(pos, player);
-		helper.assertBlockPresent(Blocks.YELLOW_WOOL, pos);
+		helper.assertBlockPresent(Blocks.WOOL.yellow(), pos);
 		helper.assertValueEqual(shovel.getDamageValue(), 1, Component.literal("shovel damage"));
 		helper.succeed();
 	}
@@ -140,11 +155,11 @@ public void testSmeltingFuelExcludedByTag(GameTestHelper helper) {
 		smeltFailed(helper, new ItemStack(ContentRegistryTest.SMELTING_FUEL_EXCLUDED_BY_TAG));
 	}
 
-	@GameTest(maxTicks = 110)
-	public void testSmeltingFuelExcludedByVanillaTag(GameTestHelper helper) {
-		// Item is in both the smelting fuel tag and vanilla's excluded non-flammable wood tag
-		smeltFailed(helper, new ItemStack(ContentRegistryTest.SMELTING_FUEL_EXCLUDED_BY_VANILLA_TAG));
-	}
+//	@GameTest(maxTicks = 110) FIXME
+//	public void testSmeltingFuelExcludedByVanillaTag(GameTestHelper helper) {
+//		// Item is in both the smelting fuel tag and vanilla's excluded non-flammable wood tag
+//		smeltFailed(helper, new ItemStack(ContentRegistryTest.SMELTING_FUEL_EXCLUDED_BY_VANILLA_TAG));
+//	}
 
 	@GameTest
 	public void testStrippableBlockRegistry(GameTestHelper helper) {
@@ -168,12 +183,12 @@ public void testStrippableBlockRegistry(GameTestHelper helper) {
 	@GameTest
 	public void testTillableBlockRegistry(GameTestHelper helper) {
 		BlockPos pos = new BlockPos(0, 1, 0);
-		helper.setBlock(pos, Blocks.GREEN_WOOL);
+		helper.setBlock(pos, Blocks.WOOL.green());
 		ItemStack hoe = new ItemStack(Items.NETHERITE_HOE);
 		Player player = helper.makeMockPlayer(GameType.SURVIVAL);
 		player.setItemInHand(InteractionHand.MAIN_HAND, hoe);
 		helper.useBlock(pos, player);
-		helper.assertBlockPresent(Blocks.LIME_WOOL, pos);
+		helper.assertBlockPresent(Blocks.WOOL.lime(), pos);
 		helper.assertValueEqual(hoe.getDamageValue(), 1, Component.literal("hoe damage"));
 		helper.succeed();
 	}
@@ -196,6 +211,26 @@ public void testOxidizableBlocksRegistry(GameTestHelper helper) {
 		helper.succeed();
 	}
 
+	@GameTest
+	public void testDecoratedPotPatternRegistry(GameTestHelper helper) {
+		BlockPos pos = new BlockPos(0, 1, 0);
+		helper.setBlock(pos, Blocks.DECORATED_POT);
+		helper.getBlockEntity(pos, DecoratedPotBlockEntity.class).applyComponentsFromItemStack(DecoratedPotBlockEntity.createDecoratedPotInstance(new PotDecorations(
+				Optional.of(Items.PAPER), Optional.empty(),
+				Optional.empty(), Optional.empty()
+		)));
+
+		Map, ResourceKey> patterns = new HashMap<>();
+		DecoratedPotPatterns.itemToPatternMappings(patterns::put);
+
+		helper.assertBlockEntityData(
+				pos, DecoratedPotBlockEntity.class,
+				be -> patterns.get(be.getDecorations().back().orElseThrow().builtInRegistryHolder().key()) == ContentRegistryTest.POT_PATTERN_FABRIC,
+				() -> Component.literal("Decorated Pot Pattern for paper item is wrong")
+		);
+		helper.succeed();
+	}
+
 	@GameTest
 	public void testWaxableBlocksRegistry(GameTestHelper helper) {
 		Player player = helper.makeMockPlayer(GameType.SURVIVAL);
@@ -243,4 +278,164 @@ public void testBrewingDirt(GameTestHelper helper) {
 			helper.succeed();
 		});
 	}
+
+	private void setupFluidTestBoxAndEntities(GameTestHelper helper, Block block, boolean jump) {
+		BlockState state = block.defaultBlockState();
+		BlockState wall = Blocks.GLASS.defaultBlockState();
+
+		int fluidHeight = jump ? 4 : 8;
+
+		for (int x = 0; x <= 8; x++) {
+			for (int z = 0; z <= 8; z++) {
+				helper.setBlock(x, 0, z, wall);
+				BlockState inner = x == 0 || x == 8 || z == 0 || z == 8 ? wall : state;
+
+				for (int y = 1; y < fluidHeight; y++) {
+					helper.setBlock(x, y, z, inner);
+				}
+			}
+		}
+
+		helper.spawn(EntityTypes.ACACIA_BOAT, 2, 5, 2);
+		Mannequin mannequin = helper.spawn(EntityTypes.MANNEQUIN, 4, 5, 4);
+		Villager villager = helper.spawn(EntityTypes.VILLAGER, 5, 5, 4);
+		helper.spawn(EntityTypes.ARMOR_STAND, 7, 1, 7);
+
+		if (jump) {
+			helper.onEachTick(() -> {
+				mannequin.setJumping(true);
+				villager.setJumping(true);
+			});
+		} else {
+			villager.removeFreeWill();
+		}
+	}
+
+	@GameTest(maxTicks = 110)
+	public void entityFloatInWater(GameTestHelper helper) {
+		setupFluidTestBoxAndEntities(helper, Blocks.WATER, true);
+
+		var box = new AABB(0, 4, 0, 8, 6, 8);
+
+		helper.runAtTickTime(100, () -> {
+			helper.assertEntityPresent(EntityTypes.ACACIA_BOAT, box);
+			helper.assertEntityPresent(EntityTypes.MANNEQUIN, box);
+			helper.assertEntityPresent(EntityTypes.VILLAGER, box);
+			helper.assertEntityNotPresent(EntityTypes.ARMOR_STAND, box);
+			helper.succeed();
+		});
+	}
+
+	@GameTest(maxTicks = 110)
+	public void entityFloatInWaterLike(GameTestHelper helper) {
+		setupFluidTestBoxAndEntities(helper, ContentRegistryTest.WATER_LIKE_FLUID_BLOCK, true);
+
+		var box = new AABB(0, 4, 0, 8, 6, 8);
+
+		helper.runAtTickTime(100, () -> {
+			helper.assertEntityPresent(EntityTypes.ACACIA_BOAT, box);
+			helper.assertEntityPresent(EntityTypes.MANNEQUIN, box);
+			helper.assertEntityPresent(EntityTypes.VILLAGER, box);
+			helper.assertEntityNotPresent(EntityTypes.ARMOR_STAND, box);
+			helper.succeed();
+		});
+	}
+
+	@GameTest(maxTicks = 110)
+	public void entityFloatInCustom(GameTestHelper helper) {
+		setupFluidTestBoxAndEntities(helper, ContentRegistryTest.TEST_FLUID_BLOCK, true);
+		var box = new AABB(0, 4, 0, 8, 6, 8);
+
+		helper.runAtTickTime(100, () -> {
+			helper.assertEntityPresent(EntityTypes.ACACIA_BOAT, box);
+			helper.assertEntityPresent(EntityTypes.MANNEQUIN, box);
+			helper.assertEntityPresent(EntityTypes.VILLAGER, box);
+			helper.assertEntityPresent(EntityTypes.ARMOR_STAND, box);
+			helper.succeed();
+		});
+	}
+
+	@GameTest(maxTicks = 800)
+	public void entityDrownsInWater(GameTestHelper helper) {
+		setupFluidTestBoxAndEntities(helper, Blocks.WATER, false);
+
+		helper.runAtTickTime(700, () -> {
+			helper.assertEntityNotPresent(EntityTypes.MANNEQUIN);
+			helper.assertEntityNotPresent(EntityTypes.VILLAGER);
+			helper.succeed();
+		});
+	}
+
+	@GameTest(maxTicks = 800)
+	public void entityDrownsInWaterLike(GameTestHelper helper) {
+		setupFluidTestBoxAndEntities(helper, ContentRegistryTest.WATER_LIKE_FLUID_BLOCK, false);
+
+		helper.runAtTickTime(700, () -> {
+			helper.assertEntityNotPresent(EntityTypes.MANNEQUIN);
+			helper.assertEntityNotPresent(EntityTypes.VILLAGER);
+			helper.succeed();
+		});
+	}
+
+	@GameTest(maxTicks = 800)
+	public void entityDrownsInCustom(GameTestHelper helper) {
+		setupFluidTestBoxAndEntities(helper, ContentRegistryTest.TEST_FLUID_BLOCK, false);
+
+		helper.runAtTickTime(700, () -> {
+			helper.assertEntityPresent(EntityTypes.MANNEQUIN);
+			helper.assertEntityPresent(EntityTypes.VILLAGER);
+			helper.succeed();
+		});
+	}
+
+	private void setupPushAndMove(GameTestHelper helper, Block block) {
+		BlockState state = block.defaultBlockState();
+		BlockState wall = Blocks.GLASS.defaultBlockState();
+
+		helper.setBlock(0, 1, 4, wall);
+		helper.setBlock(0, 2, 4, wall);
+
+		for (int x = 1; x < 8; x++) {
+			helper.setBlock(x, 1, 4, state.setValue(LiquidBlock.LEVEL, 8 - x));
+			helper.setBlock(x, 0, 4, wall);
+			helper.setBlock(x, 1, 5, wall);
+			helper.setBlock(x, 1, 3, wall);
+			helper.setBlock(x, 2, 5, wall);
+			helper.setBlock(x, 2, 3, wall);
+		}
+
+		helper.setBlock(1, 1, 4, state.setValue(LiquidBlock.LEVEL, 0));
+
+		helper.setBlock(8, 1, 4, wall);
+		helper.setBlock(8, 2, 4, wall);
+
+		helper.spawn(EntityTypes.MANNEQUIN, 4, 1, 4);
+	}
+
+	@GameTest(maxTicks = 110)
+	public void entityPushingAndMovementInWater(GameTestHelper helper) {
+		setupPushAndMove(helper, Blocks.WATER);
+		helper.runAtTickTime(100, () -> {
+			helper.assertEntityPresent(EntityTypes.MANNEQUIN, 7, 1, 4);
+			helper.succeed();
+		});
+	}
+
+	@GameTest(maxTicks = 110)
+	public void entityPushingAndMovementInWaterLike(GameTestHelper helper) {
+		setupPushAndMove(helper, ContentRegistryTest.WATER_LIKE_FLUID_BLOCK);
+		helper.runAtTickTime(100, () -> {
+			helper.assertEntityPresent(EntityTypes.MANNEQUIN, 7, 1, 4);
+			helper.succeed();
+		});
+	}
+
+	@GameTest(maxTicks = 110)
+	public void entityPushingAndMovementInCustom(GameTestHelper helper) {
+		setupPushAndMove(helper, ContentRegistryTest.TEST_FLUID_BLOCK);
+		helper.runAtTickTime(100, () -> {
+			helper.assertEntityPresent(EntityTypes.MANNEQUIN, new BlockPos(1, 1, 4), 1f);
+			helper.succeed();
+		});
+	}
 }
diff --git a/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/ContentRegistryTest.java b/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/ContentRegistryTest.java
index 1c0852c0b3..64e82916f2 100644
--- a/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/ContentRegistryTest.java
+++ b/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/ContentRegistryTest.java
@@ -16,6 +16,8 @@
 
 package net.fabricmc.fabric.test.content.registry;
 
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariantAttributes;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,8 +27,10 @@
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
+import net.minecraft.references.ItemIds;
 import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.tags.BlockItemTags;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.TagKey;
@@ -44,16 +48,21 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.LiquidBlock;
 import net.minecraft.world.level.block.WeatheringCopper;
 import net.minecraft.world.level.block.WeatheringCopperFullBlock;
+import net.minecraft.world.level.block.entity.DecoratedPotPattern;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.gameevent.GameEvent;
+import net.minecraft.world.level.material.FlowingFluid;
+import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.pathfinder.PathType;
 import net.minecraft.world.phys.BlockHitResult;
 
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.registry.CompostableRegistry;
+import net.fabricmc.fabric.api.registry.DecoratedPotPatternRegistry;
 import net.fabricmc.fabric.api.registry.FabricPotionBrewingBuilder;
 import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
 import net.fabricmc.fabric.api.registry.FlattenableBlockRegistry;
@@ -64,11 +73,15 @@
 import net.fabricmc.fabric.api.registry.TillableBlockRegistry;
 import net.fabricmc.fabric.api.registry.VibrationFrequencyRegistry;
 import net.fabricmc.fabric.api.registry.VillagerInteractionRegistries;
+import net.fabricmc.fabric.api.registry.fluid.EntityFluidInteractionRegistry;
+import net.fabricmc.fabric.api.registry.fluid.FluidBehavior;
 
 public final class ContentRegistryTest implements ModInitializer {
 	public static final String MOD_ID = "fabric-content-registries-v0-testmod";
 	public static final Logger LOGGER = LoggerFactory.getLogger(ContentRegistryTest.class);
 
+	public static final ResourceKey POT_PATTERN_FABRIC = ResourceKey.create(Registries.DECORATED_POT_PATTERN, id("fabric"));
+
 	public static final Item SMELTING_FUEL_INCLUDED_BY_ITEM = registerItem("smelting_fuel_included_by_item");
 	public static final Item SMELTING_FUEL_INCLUDED_BY_TAG = registerItem("smelting_fuel_included_by_tag");
 	public static final Item SMELTING_FUEL_EXCLUDED_BY_TAG = registerItem("smelting_fuel_excluded_by_tag");
@@ -84,6 +97,20 @@ public final class ContentRegistryTest implements ModInitializer {
 	public static final ResourceKey TEST_OXIDIZING_BLOCK_KEY = ResourceKey.create(Registries.BLOCK, id("test_oxidizing"));
 	public static final ResourceKey EXPOSED_TEST_OXIDIZING_BLOCK_KEY = ResourceKey.create(Registries.BLOCK, id("exposed_test_oxidizing"));
 
+	public static final FlowingFluid TEST_FLUID = Registry.register(BuiltInRegistries.FLUID, id("test_fluid"), new TestFluid.Still());
+	public static final FlowingFluid TEST_FLUID_FLOWING = Registry.register(BuiltInRegistries.FLUID, id("test_fluid_flowing"), new TestFluid.Flowing());
+	public static final LiquidBlock TEST_FLUID_BLOCK = Registry.register(BuiltInRegistries.BLOCK, id("test_fluid"), new LiquidBlock(TEST_FLUID, BlockBehaviour.Properties.ofFullCopy(Blocks.WATER).setId(ResourceKey.create(Registries.BLOCK, id("test_fluid")))) {
+	});
+
+	public static final TagKey TEST_FLUID_KEY = TagKey.create(Registries.FLUID, id("test_fluid"));
+
+	public static final FlowingFluid WATER_LIKE_FLUID = Registry.register(BuiltInRegistries.FLUID, id("water_like_fluid"), new WaterLikeFluid.Still());
+	public static final FlowingFluid WATER_LIKE_FLUID_FLOWING = Registry.register(BuiltInRegistries.FLUID, id("water_like_fluid_flowing"), new WaterLikeFluid.Flowing());
+	public static final LiquidBlock WATER_LIKE_FLUID_BLOCK = Registry.register(BuiltInRegistries.BLOCK, id("water_like_fluid"), new LiquidBlock(WATER_LIKE_FLUID, BlockBehaviour.Properties.ofFullCopy(Blocks.WATER).setId(ResourceKey.create(Registries.BLOCK, id("test_fluid")))) {
+	});
+
+	public static final TagKey WATER_LIKE_FLUID_KEY = TagKey.create(Registries.FLUID, id("water_like"));
+
 	@Override
 	public void onInitialize() {
 		// Expected behavior:
@@ -100,6 +127,7 @@ public void onInitialize() {
 		//  - copper ore, iron ore, gold ore, and diamond ore can be waxed into their deepslate variants and scraped back again
 		//  - aforementioned ores can be scraped from diamond -> gold -> iron -> copper
 		//  - the 'test_oxidizing' block will randomly tick to oxidize into an 'exposed_test_oxidizing' block
+		//  - paper item now has a fabric icon decorated pot pattern
 		//  - villagers can now collect, consume (at the same level of bread) and compost apples
 		//  - villagers can now collect oak saplings
 		//  - assign a loot table to the nitwit villager type
@@ -107,11 +135,12 @@ public void onInitialize() {
 		//  - instant health potions can be brewed from awkward potions with any item in the 'minecraft:small_flowers' tag
 		//  - if Redstone Experiments experiment is enabled, luck potions can be brewed from awkward potions with a bundle
 		//  - dirty potions can be brewed by adding any item in the 'minecraft:dirt' tag to any standard potion
+		//  - new test fluids acts as a proper liquid like water / lava
 
 		CompostableRegistry.INSTANCE.add(Items.OBSIDIAN, 0.5F);
 		FlammableBlockRegistry.getDefaultInstance().add(Blocks.DIAMOND_BLOCK, 4, 4);
 		FlammableBlockRegistry.getDefaultInstance().add(BlockTags.SAND, 4, 4);
-		FlattenableBlockRegistry.register(Blocks.RED_WOOL, Blocks.YELLOW_WOOL.defaultBlockState());
+		FlattenableBlockRegistry.register(Blocks.WOOL.red(), Blocks.WOOL.yellow().defaultBlockState());
 
 		FuelValueEvents.BUILD.register((builder, context) -> {
 			builder.add(SMELTING_FUEL_INCLUDED_BY_ITEM, context.baseSmeltTime() / 4);
@@ -127,7 +156,7 @@ public void onInitialize() {
 		StrippableBlockRegistry.register(Blocks.HAY_BLOCK, Blocks.TNT);
 		StrippableBlockRegistry.registerCopyState(Blocks.OAK_STAIRS, Blocks.SPRUCE_STAIRS);
 
-		TillableBlockRegistry.register(Blocks.GREEN_WOOL, context -> true, HoeItem.changeIntoState(Blocks.LIME_WOOL.defaultBlockState()));
+		TillableBlockRegistry.register(Blocks.WOOL.green(), context -> true, HoeItem.changeIntoState(Blocks.WOOL.lime().defaultBlockState()));
 
 		OxidizableBlocksRegistry.registerNextStage(Blocks.COPPER_ORE, Blocks.IRON_ORE);
 		OxidizableBlocksRegistry.registerNextStage(Blocks.IRON_ORE, Blocks.GOLD_ORE);
@@ -152,8 +181,22 @@ public void onInitialize() {
 			LOGGER.info("OxidizableBlocksRegistry null test passed!");
 		}
 
-		Block testOxidizingBlock = Registry.register(BuiltInRegistries.BLOCK, TEST_OXIDIZING_BLOCK_KEY, new WeatheringCopperFullBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.ofFullCopy(Blocks.COPPER_BLOCK).setId(TEST_OXIDIZING_BLOCK_KEY)));
-		Block exposedTestOxidizingBlock = Registry.register(BuiltInRegistries.BLOCK, EXPOSED_TEST_OXIDIZING_BLOCK_KEY, new WeatheringCopperFullBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.ofFullCopy(Blocks.EXPOSED_COPPER).setId(EXPOSED_TEST_OXIDIZING_BLOCK_KEY)));
+		Registry.register(BuiltInRegistries.DECORATED_POT_PATTERN, POT_PATTERN_FABRIC, new DecoratedPotPattern(id("fabric_pottery_pattern")));
+		DecoratedPotPatternRegistry.registerPattern(ItemIds.PAPER, POT_PATTERN_FABRIC);
+
+		// assert that DecoratedPotPatternRegistry throws for null values
+		try {
+			DecoratedPotPatternRegistry.registerPattern(null, POT_PATTERN_FABRIC);
+			DecoratedPotPatternRegistry.registerPattern(ItemIds.PAPER, null);
+
+			throw new AssertionError("DecoratedPotPatternRegistry didn't throw when values were null!");
+		} catch (NullPointerException e) {
+			// expected behavior
+			LOGGER.info("DecoratedPotPatternRegistry null test passed!");
+		}
+
+		Block testOxidizingBlock = Registry.register(BuiltInRegistries.BLOCK, TEST_OXIDIZING_BLOCK_KEY, new WeatheringCopperFullBlock(WeatheringCopper.WeatherState.UNAFFECTED, BlockBehaviour.Properties.ofFullCopy(Blocks.COPPER_BLOCK.weathering().unaffected()).setId(TEST_OXIDIZING_BLOCK_KEY)));
+		Block exposedTestOxidizingBlock = Registry.register(BuiltInRegistries.BLOCK, EXPOSED_TEST_OXIDIZING_BLOCK_KEY, new WeatheringCopperFullBlock(WeatheringCopper.WeatherState.EXPOSED, BlockBehaviour.Properties.ofFullCopy(Blocks.COPPER_BLOCK.weathering().unaffected()).setId(EXPOSED_TEST_OXIDIZING_BLOCK_KEY)));
 
 		OxidizableBlocksRegistry.registerNextStage(testOxidizingBlock, exposedTestOxidizingBlock);
 
@@ -189,12 +232,24 @@ public void onInitialize() {
 		FabricPotionBrewingBuilder.BUILD.register(builder -> {
 			builder.addContainer(dirtyPotion);
 			builder.registerItemRecipe(Items.POTION, Ingredient.of(BuiltInRegistries.ITEM.getOrThrow(ItemTags.DIRT)), dirtyPotion);
-			builder.registerPotionRecipe(Potions.AWKWARD, Ingredient.of(BuiltInRegistries.ITEM.getOrThrow(ItemTags.SMALL_FLOWERS)), Potions.HEALING);
+			builder.registerPotionRecipe(Potions.AWKWARD, Ingredient.of(BuiltInRegistries.ITEM.getOrThrow(BlockItemTags.SMALL_FLOWERS.item())), Potions.HEALING);
 
 			if (builder.getEnabledFeatures().contains(FeatureFlags.REDSTONE_EXPERIMENTS)) {
 				builder.registerPotionRecipe(Potions.AWKWARD, Ingredient.of(Items.BUNDLE), Potions.LUCK);
 			}
 		});
+
+		FluidVariantAttributes.register(TEST_FLUID, FluidVariantAttributes.DEFAULT_HANDLER);
+		FluidVariantAttributes.register(TEST_FLUID_FLOWING, FluidVariantAttributes.DEFAULT_HANDLER);
+		FluidVariantAttributes.register(WATER_LIKE_FLUID, FluidVariantAttributes.DEFAULT_HANDLER);
+		FluidVariantAttributes.register(WATER_LIKE_FLUID_FLOWING, FluidVariantAttributes.DEFAULT_HANDLER);
+
+		EntityFluidInteractionRegistry.register(TEST_FLUID_KEY, FluidBehavior.simple()
+				.allowBoats(true).allowMovingDown(true).allowSwimming(false).enableDrowning(false)
+				.gravityMultiplier(-0.25f).makeMobsFloat(true).flowingPushScale(-0.02f)
+				.movementSpeed(0.02f).movementSlowdown(0.8f, 0.6f).fallDistanceModifier(0.8f).build());
+
+		EntityFluidInteractionRegistry.register(WATER_LIKE_FLUID_KEY, FluidBehavior.WATER_LIKE);
 	}
 
 	public static class TestEventBlock extends Block {
diff --git a/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/TestFluid.java b/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/TestFluid.java
new file mode 100644
index 0000000000..a646456be4
--- /dev/null
+++ b/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/TestFluid.java
@@ -0,0 +1,145 @@
+/*
+ * 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.content.registry;
+
+import java.util.Optional;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.LiquidBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.world.level.material.FlowingFluid;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.world.level.material.FluidState;
+
+public abstract class TestFluid extends FlowingFluid {
+	public TestFluid() {
+	}
+
+	@Override
+	public Fluid getFlowing() {
+		return ContentRegistryTest.TEST_FLUID_FLOWING;
+	}
+
+	@Override
+	public Fluid getSource() {
+		return ContentRegistryTest.TEST_FLUID;
+	}
+
+	@Override
+	public Item getBucket() {
+		return Items.WATER_BUCKET;
+	}
+
+	@Override
+	protected boolean canConvertToSource(ServerLevel level) {
+		return true;
+	}
+
+	@Override
+	protected void beforeDestroyingBlock(LevelAccessor level, BlockPos pos, BlockState state) {
+		BlockEntity blockEntity = state.hasBlockEntity() ? level.getBlockEntity(pos) : null;
+		Block.dropResources(state, level, pos, blockEntity);
+	}
+
+	@Override
+	public int getSlopeFindDistance(LevelReader level) {
+		return 4;
+	}
+
+	@Override
+	public BlockState createLegacyBlock(FluidState state) {
+		return ContentRegistryTest.TEST_FLUID_BLOCK.defaultBlockState().setValue(LiquidBlock.LEVEL, getLegacyLevel(state));
+	}
+
+	@Override
+	public boolean isSame(Fluid fluid) {
+		return fluid.is(ContentRegistryTest.TEST_FLUID_KEY);
+	}
+
+	@Override
+	public int getDropOff(LevelReader level) {
+		return 1;
+	}
+
+	@Override
+	public int getTickDelay(LevelReader level) {
+		return 5;
+	}
+
+	@Override
+	public boolean canBeReplacedWith(FluidState state, BlockGetter level, BlockPos pos, Fluid fluid, Direction direction) {
+		return direction == Direction.DOWN;
+	}
+
+	@Override
+	protected float getExplosionResistance() {
+		return 100.0F;
+	}
+
+	@Override
+	public Optional getPickupSound() {
+		return Optional.of(SoundEvents.BUCKET_FILL);
+	}
+
+	public static class Flowing extends TestFluid {
+		public Flowing() {
+		}
+
+		@Override
+		protected void createFluidStateDefinition(StateDefinition.Builder builder) {
+			super.createFluidStateDefinition(builder);
+			builder.add(LEVEL);
+		}
+
+		@Override
+		public int getAmount(FluidState state) {
+			return state.getValue(LEVEL);
+		}
+
+		@Override
+		public boolean isSource(FluidState state) {
+			return false;
+		}
+	}
+
+	public static class Still extends TestFluid {
+		public Still() {
+		}
+
+		@Override
+		public int getAmount(FluidState state) {
+			return 8;
+		}
+
+		@Override
+		public boolean isSource(FluidState state) {
+			return true;
+		}
+	}
+}
diff --git a/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/WaterLikeFluid.java b/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/WaterLikeFluid.java
new file mode 100644
index 0000000000..a05afb8621
--- /dev/null
+++ b/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/WaterLikeFluid.java
@@ -0,0 +1,100 @@
+/*
+ * 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.content.registry;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.LiquidBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.material.WaterFluid;
+
+public abstract class WaterLikeFluid extends WaterFluid {
+	public WaterLikeFluid() {
+	}
+
+	@Override
+	public Fluid getFlowing() {
+		return ContentRegistryTest.WATER_LIKE_FLUID_FLOWING;
+	}
+
+	@Override
+	public Fluid getSource() {
+		return ContentRegistryTest.WATER_LIKE_FLUID;
+	}
+
+	@Override
+	public Item getBucket() {
+		return Items.WATER_BUCKET;
+	}
+
+	@Override
+	public BlockState createLegacyBlock(FluidState state) {
+		return ContentRegistryTest.WATER_LIKE_FLUID_BLOCK.defaultBlockState().setValue(LiquidBlock.LEVEL, getLegacyLevel(state));
+	}
+
+	@Override
+	public boolean isSame(Fluid fluid) {
+		return fluid.is(ContentRegistryTest.WATER_LIKE_FLUID_KEY);
+	}
+
+	@Override
+	public boolean canBeReplacedWith(FluidState state, BlockGetter level, BlockPos pos, Fluid fluid, Direction direction) {
+		return direction == Direction.DOWN;
+	}
+
+	public static class Flowing extends WaterLikeFluid {
+		public Flowing() {
+		}
+
+		@Override
+		protected void createFluidStateDefinition(StateDefinition.Builder builder) {
+			super.createFluidStateDefinition(builder);
+			builder.add(LEVEL);
+		}
+
+		@Override
+		public int getAmount(FluidState state) {
+			return state.getValue(LEVEL);
+		}
+
+		@Override
+		public boolean isSource(FluidState state) {
+			return false;
+		}
+	}
+
+	public static class Still extends WaterLikeFluid {
+		public Still() {
+		}
+
+		@Override
+		public int getAmount(FluidState state) {
+			return 8;
+		}
+
+		@Override
+		public boolean isSource(FluidState state) {
+			return true;
+		}
+	}
+}
diff --git a/fabric-content-registries-v0/src/testmod/resources/assets/fabric-content-registries-v0-testmod/textures/entity/decorated_pot/fabric_pottery_pattern.png b/fabric-content-registries-v0/src/testmod/resources/assets/fabric-content-registries-v0-testmod/textures/entity/decorated_pot/fabric_pottery_pattern.png
new file mode 100644
index 0000000000..a600ac9537
Binary files /dev/null and b/fabric-content-registries-v0/src/testmod/resources/assets/fabric-content-registries-v0-testmod/textures/entity/decorated_pot/fabric_pottery_pattern.png differ
diff --git a/fabric-content-registries-v0/src/testmod/resources/data/fabric-content-registries-v0-testmod/tags/fluid/test_fluid.json b/fabric-content-registries-v0/src/testmod/resources/data/fabric-content-registries-v0-testmod/tags/fluid/test_fluid.json
new file mode 100644
index 0000000000..9580933407
--- /dev/null
+++ b/fabric-content-registries-v0/src/testmod/resources/data/fabric-content-registries-v0-testmod/tags/fluid/test_fluid.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "fabric-content-registries-v0-testmod:test_fluid",
+    "fabric-content-registries-v0-testmod:test_fluid_flowing"
+  ]
+}
diff --git a/fabric-content-registries-v0/src/testmod/resources/data/fabric-content-registries-v0-testmod/tags/fluid/water_like.json b/fabric-content-registries-v0/src/testmod/resources/data/fabric-content-registries-v0-testmod/tags/fluid/water_like.json
new file mode 100644
index 0000000000..bf771b418b
--- /dev/null
+++ b/fabric-content-registries-v0/src/testmod/resources/data/fabric-content-registries-v0-testmod/tags/fluid/water_like.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "fabric-content-registries-v0-testmod:water_like_fluid",
+    "fabric-content-registries-v0-testmod:water_like_fluid_flowing"
+  ]
+}
diff --git a/fabric-content-registries-v0/src/testmod/resources/data/minecraft/tags/item/decorated_pot_ingredients.json b/fabric-content-registries-v0/src/testmod/resources/data/minecraft/tags/item/decorated_pot_ingredients.json
new file mode 100644
index 0000000000..14e3a32b1c
--- /dev/null
+++ b/fabric-content-registries-v0/src/testmod/resources/data/minecraft/tags/item/decorated_pot_ingredients.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:paper"
+  ]
+}
diff --git a/fabric-convention-tags-v2/build.gradle b/fabric-convention-tags-v2/build.gradle
index 131ee71c83..ddb2730ae9 100644
--- a/fabric-convention-tags-v2/build.gradle
+++ b/fabric-convention-tags-v2/build.gradle
@@ -13,26 +13,32 @@ testDependencies(project, [
 	':fabric-lifecycle-events-v1',
 ])
 
-fabricApi {
-	configureDataGeneration {
-		outputDirectory = file("src/generated/resources")
-		strictValidation = true
-		createSourceSet = true
-		modId = "fabric-convention-tags-v2-datagen"
+sourceSets {
+	main {
+		resources.srcDir 'src/generated/resources'
 	}
 }
 
+//fabricApi {
+//	configureDataGeneration {
+//		outputDirectory = file("src/generated/resources")
+//		strictValidation = true
+//		createSourceSet = true
+//		modId = "fabric-convention-tags-v2-datagen"
+//	}
+//}
+
 dependencies {
-	datagenImplementation project(path: ":fabric-data-generation-api-v1")
+//	datagenImplementation project(path: ":fabric-data-generation-api-v1")
 }
 
 loom {
-	runs {
-		datagen {
-			name "Data Generation"
-			ideConfigGenerated = true
-		}
-	}
+//	runs {
+//		datagen {
+//			name "Data Generation"
+//			ideConfigGenerated = true
+//		}
+//	}
 }
 
-generateResources.dependsOn runDatagen
+//generateResources.dependsOn runDatagen
diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java
index eb47d532ae..7657b1d0b1 100644
--- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java
+++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java
@@ -25,6 +25,7 @@
 import net.fabricmc.fabric.impl.tag.convention.datagen.generators.EntityTypeTagsGenerator;
 import net.fabricmc.fabric.impl.tag.convention.datagen.generators.FluidTagsGenerator;
 import net.fabricmc.fabric.impl.tag.convention.datagen.generators.ItemTagsGenerator;
+import net.fabricmc.fabric.impl.tag.convention.datagen.generators.PotionTagsGenerator;
 import net.fabricmc.fabric.impl.tag.convention.datagen.generators.StructureTagsGenerator;
 
 public class DatagenEntrypoint implements DataGeneratorEntrypoint {
@@ -36,6 +37,7 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
 		pack.addProvider((output, registriesFuture) -> new ItemTagsGenerator(output, registriesFuture, blockTags));
 		pack.addProvider(FluidTagsGenerator::new);
 		pack.addProvider(EnchantmentTagsGenerator::new);
+		pack.addProvider(PotionTagsGenerator::new);
 		pack.addProvider(BiomeTagsGenerator::new);
 		pack.addProvider(StructureTagsGenerator::new);
 		pack.addProvider(EntityTypeTagsGenerator::new);
diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagsGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagsGenerator.java
index af5051d947..1921af83b7 100644
--- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagsGenerator.java
+++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagsGenerator.java
@@ -128,9 +128,10 @@ private void generateOtherBiomeTypes() {
 		builder(ConventionalBiomeTags.IS_BADLANDS)
 				.addOptionalTag(BiomeTags.IS_BADLANDS);
 		builder(ConventionalBiomeTags.IS_CAVE)
-				.add(Biomes.DEEP_DARK)
+				.add(Biomes.LUSH_CAVES)
 				.add(Biomes.DRIPSTONE_CAVES)
-				.add(Biomes.LUSH_CAVES);
+				.add(Biomes.SULFUR_CAVES)
+				.add(Biomes.DEEP_DARK);
 		builder(ConventionalBiomeTags.IS_VOID)
 				.add(Biomes.THE_VOID);
 		builder(ConventionalBiomeTags.IS_DEEP_OCEAN)
@@ -238,7 +239,8 @@ private void generateClimateAndVegetationTags() {
 				.add(Biomes.SPARSE_JUNGLE)
 				.add(Biomes.BEACH)
 				.add(Biomes.LUSH_CAVES)
-				.add(Biomes.DRIPSTONE_CAVES);
+				.add(Biomes.DRIPSTONE_CAVES)
+				.add(Biomes.SULFUR_CAVES);
 		builder(ConventionalBiomeTags.IS_WET_NETHER);
 		builder(ConventionalBiomeTags.IS_WET_END);
 		builder(ConventionalBiomeTags.IS_WET)
diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagsGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagsGenerator.java
index 4b9665a1cf..bdf124a601 100644
--- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagsGenerator.java
+++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagsGenerator.java
@@ -20,32 +20,39 @@
 import java.util.concurrent.CompletableFuture;
 
 import net.minecraft.core.HolderLookup;
+import net.minecraft.references.BlockIds;
+import net.minecraft.references.BlockItemId;
+import net.minecraft.references.BlockItemIds;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.tags.BlockItemTags;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
 
 import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagsProvider;
 import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags;
 
 public final class BlockTagsGenerator extends FabricTagsProvider.BlockTagsProvider {
-	static List VILLAGER_JOB_SITE_BLOCKS = List.of(
-			Blocks.BARREL,
-			Blocks.BLAST_FURNACE,
-			Blocks.BREWING_STAND,
-			Blocks.CARTOGRAPHY_TABLE,
-			Blocks.CAULDRON,
-			Blocks.LAVA_CAULDRON,
-			Blocks.WATER_CAULDRON,
-			Blocks.POWDER_SNOW_CAULDRON,
-			Blocks.COMPOSTER,
-			Blocks.FLETCHING_TABLE,
-			Blocks.GRINDSTONE,
-			Blocks.LECTERN,
-			Blocks.LOOM,
-			Blocks.SMITHING_TABLE,
-			Blocks.SMOKER,
-			Blocks.STONECUTTER
+	static List VILLAGER_JOB_SITE_BLOCKS = List.of(
+			BlockItemIds.BARREL,
+			BlockItemIds.BLAST_FURNACE,
+			BlockItemIds.BREWING_STAND,
+			BlockItemIds.CARTOGRAPHY_TABLE,
+			BlockItemIds.CAULDRON,
+			BlockItemIds.COMPOSTER,
+			BlockItemIds.FLETCHING_TABLE,
+			BlockItemIds.GRINDSTONE,
+			BlockItemIds.LECTERN,
+			BlockItemIds.LOOM,
+			BlockItemIds.SMITHING_TABLE,
+			BlockItemIds.SMOKER,
+			BlockItemIds.STONECUTTER
+	);
+
+	static List> VILLAGER_JOB_SITE_BLOCKS_WITHOUT_ITEMS = List.of(
+			BlockIds.LAVA_CAULDRON,
+			BlockIds.WATER_CAULDRON,
+			BlockIds.POWDER_SNOW_CAULDRON
 	);
 
 	public BlockTagsGenerator(FabricPackOutput output, CompletableFuture registriesFuture) {
@@ -54,61 +61,65 @@ public BlockTagsGenerator(FabricPackOutput output, CompletableFuture chains = valueLookupBuilder(ConventionalItemTags.CHAINS)
-				.add(Items.IRON_CHAIN);
-		Items.COPPER_CHAIN.forEach(chains::add);
+		TagAppender chains = builder(ConventionalItemTags.CHAINS)
+				.add(BlockItemIds.IRON_CHAIN);
+		BlockItemIds.COPPER_CHAIN.asList().stream().map(BlockItemId::item).forEach(chains::add);
 
-		valueLookupBuilder(ConventionalItemTags.ENDER_PEARLS)
-				.add(Items.ENDER_PEARL);
+		builder(ConventionalItemTags.ENDER_PEARLS)
+				.add(ItemIds.ENDER_PEARL);
 
-		valueLookupBuilder(ConventionalItemTags.SLIME_BALLS)
-				.add(Items.SLIME_BALL);
+		builder(ConventionalItemTags.SLIME_BALLS)
+				.add(ItemIds.SLIME_BALL);
 
-		valueLookupBuilder(ConventionalItemTags.FERTILIZERS)
-				.add(Items.BONE_MEAL);
+		builder(ConventionalItemTags.FERTILIZERS)
+				.add(ItemIds.BONE_MEAL);
 
-		valueLookupBuilder(ConventionalItemTags.HIDDEN_FROM_RECIPE_VIEWERS); // Generate tag so others can see it exists through JSON.
+		builder(ConventionalItemTags.HIDDEN_FROM_RECIPE_VIEWERS); // Generate tag so others can see it exists through JSON.
 	}
 
 	private void generateDyedTags() {
 		// Cannot pull entries from block tag because Wall Banners do not have an item form
-		valueLookupBuilder(ConventionalItemTags.BLACK_DYED)
-				.add(Items.BLACK_BANNER).add(Items.BLACK_BED).add(Items.BLACK_CANDLE).add(Items.BLACK_CARPET)
-				.add(Items.BLACK_CONCRETE).add(Items.BLACK_CONCRETE_POWDER).add(Items.BLACK_GLAZED_TERRACOTTA)
-				.add(Items.BLACK_SHULKER_BOX).add(Items.BLACK_STAINED_GLASS).add(Items.BLACK_STAINED_GLASS_PANE)
-				.add(Items.BLACK_TERRACOTTA).add(Items.BLACK_WOOL).add(Items.BLACK_BUNDLE).add(Items.BLACK_HARNESS);
-
-		valueLookupBuilder(ConventionalItemTags.BLUE_DYED)
-				.add(Items.BLUE_BANNER).add(Items.BLUE_BED).add(Items.BLUE_CANDLE).add(Items.BLUE_CARPET)
-				.add(Items.BLUE_CONCRETE).add(Items.BLUE_CONCRETE_POWDER).add(Items.BLUE_GLAZED_TERRACOTTA)
-				.add(Items.BLUE_SHULKER_BOX).add(Items.BLUE_STAINED_GLASS).add(Items.BLUE_STAINED_GLASS_PANE)
-				.add(Items.BLUE_TERRACOTTA).add(Items.BLUE_WOOL).add(Items.BLUE_BUNDLE).add(Items.BLUE_HARNESS);
-
-		valueLookupBuilder(ConventionalItemTags.BROWN_DYED)
-				.add(Items.BROWN_BANNER).add(Items.BROWN_BED).add(Items.BROWN_CANDLE).add(Items.BROWN_CARPET)
-				.add(Items.BROWN_CONCRETE).add(Items.BROWN_CONCRETE_POWDER).add(Items.BROWN_GLAZED_TERRACOTTA)
-				.add(Items.BROWN_SHULKER_BOX).add(Items.BROWN_STAINED_GLASS).add(Items.BROWN_STAINED_GLASS_PANE)
-				.add(Items.BROWN_TERRACOTTA).add(Items.BROWN_WOOL).add(Items.BROWN_BUNDLE).add(Items.BROWN_HARNESS);
-
-		valueLookupBuilder(ConventionalItemTags.CYAN_DYED)
-				.add(Items.CYAN_BANNER).add(Items.CYAN_BED).add(Items.CYAN_CANDLE).add(Items.CYAN_CARPET)
-				.add(Items.CYAN_CONCRETE).add(Items.CYAN_CONCRETE_POWDER).add(Items.CYAN_GLAZED_TERRACOTTA)
-				.add(Items.CYAN_SHULKER_BOX).add(Items.CYAN_STAINED_GLASS).add(Items.CYAN_STAINED_GLASS_PANE)
-				.add(Items.CYAN_TERRACOTTA).add(Items.CYAN_WOOL).add(Items.CYAN_BUNDLE).add(Items.CYAN_HARNESS);
-
-		valueLookupBuilder(ConventionalItemTags.GRAY_DYED)
-				.add(Items.GRAY_BANNER).add(Items.GRAY_BED).add(Items.GRAY_CANDLE).add(Items.GRAY_CARPET)
-				.add(Items.GRAY_CONCRETE).add(Items.GRAY_CONCRETE_POWDER).add(Items.GRAY_GLAZED_TERRACOTTA)
-				.add(Items.GRAY_SHULKER_BOX).add(Items.GRAY_STAINED_GLASS).add(Items.GRAY_STAINED_GLASS_PANE)
-				.add(Items.GRAY_TERRACOTTA).add(Items.GRAY_WOOL).add(Items.GRAY_BUNDLE).add(Items.GRAY_HARNESS);
-
-		valueLookupBuilder(ConventionalItemTags.GREEN_DYED)
-				.add(Items.GREEN_BANNER).add(Items.GREEN_BED).add(Items.GREEN_CANDLE).add(Items.GREEN_CARPET)
-				.add(Items.GREEN_CONCRETE).add(Items.GREEN_CONCRETE_POWDER).add(Items.GREEN_GLAZED_TERRACOTTA)
-				.add(Items.GREEN_SHULKER_BOX).add(Items.GREEN_STAINED_GLASS).add(Items.GREEN_STAINED_GLASS_PANE)
-				.add(Items.GREEN_TERRACOTTA).add(Items.GREEN_WOOL).add(Items.GREEN_BUNDLE).add(Items.GREEN_HARNESS);
-
-		valueLookupBuilder(ConventionalItemTags.LIGHT_BLUE_DYED)
-				.add(Items.LIGHT_BLUE_BANNER).add(Items.LIGHT_BLUE_BED).add(Items.LIGHT_BLUE_CANDLE).add(Items.LIGHT_BLUE_CARPET)
-				.add(Items.LIGHT_BLUE_CONCRETE).add(Items.LIGHT_BLUE_CONCRETE_POWDER).add(Items.LIGHT_BLUE_GLAZED_TERRACOTTA)
-				.add(Items.LIGHT_BLUE_SHULKER_BOX).add(Items.LIGHT_BLUE_STAINED_GLASS).add(Items.LIGHT_BLUE_STAINED_GLASS_PANE)
-				.add(Items.LIGHT_BLUE_TERRACOTTA).add(Items.LIGHT_BLUE_WOOL).add(Items.LIGHT_BLUE_BUNDLE).add(Items.LIGHT_BLUE_HARNESS);
-
-		valueLookupBuilder(ConventionalItemTags.LIGHT_GRAY_DYED)
-				.add(Items.LIGHT_GRAY_BANNER).add(Items.LIGHT_GRAY_BED).add(Items.LIGHT_GRAY_CANDLE).add(Items.LIGHT_GRAY_CARPET)
-				.add(Items.LIGHT_GRAY_CONCRETE).add(Items.LIGHT_GRAY_CONCRETE_POWDER).add(Items.LIGHT_GRAY_GLAZED_TERRACOTTA)
-				.add(Items.LIGHT_GRAY_SHULKER_BOX).add(Items.LIGHT_GRAY_STAINED_GLASS).add(Items.LIGHT_GRAY_STAINED_GLASS_PANE)
-				.add(Items.LIGHT_GRAY_TERRACOTTA).add(Items.LIGHT_GRAY_WOOL).add(Items.LIGHT_GRAY_BUNDLE).add(Items.LIGHT_GRAY_HARNESS);
-
-		valueLookupBuilder(ConventionalItemTags.LIME_DYED)
-				.add(Items.LIME_BANNER).add(Items.LIME_BED).add(Items.LIME_CANDLE).add(Items.LIME_CARPET)
-				.add(Items.LIME_CONCRETE).add(Items.LIME_CONCRETE_POWDER).add(Items.LIME_GLAZED_TERRACOTTA)
-				.add(Items.LIME_SHULKER_BOX).add(Items.LIME_STAINED_GLASS).add(Items.LIME_STAINED_GLASS_PANE)
-				.add(Items.LIME_TERRACOTTA).add(Items.LIME_WOOL).add(Items.LIME_BUNDLE).add(Items.LIME_HARNESS);
-
-		valueLookupBuilder(ConventionalItemTags.MAGENTA_DYED)
-				.add(Items.MAGENTA_BANNER).add(Items.MAGENTA_BED).add(Items.MAGENTA_CANDLE).add(Items.MAGENTA_CARPET)
-				.add(Items.MAGENTA_CONCRETE).add(Items.MAGENTA_CONCRETE_POWDER).add(Items.MAGENTA_GLAZED_TERRACOTTA)
-				.add(Items.MAGENTA_SHULKER_BOX).add(Items.MAGENTA_STAINED_GLASS).add(Items.MAGENTA_STAINED_GLASS_PANE)
-				.add(Items.MAGENTA_TERRACOTTA).add(Items.MAGENTA_WOOL).add(Items.MAGENTA_BUNDLE).add(Items.MAGENTA_HARNESS);
-
-		valueLookupBuilder(ConventionalItemTags.ORANGE_DYED)
-				.add(Items.ORANGE_BANNER).add(Items.ORANGE_BED).add(Items.ORANGE_CANDLE).add(Items.ORANGE_CARPET)
-				.add(Items.ORANGE_CONCRETE).add(Items.ORANGE_CONCRETE_POWDER).add(Items.ORANGE_GLAZED_TERRACOTTA)
-				.add(Items.ORANGE_SHULKER_BOX).add(Items.ORANGE_STAINED_GLASS).add(Items.ORANGE_STAINED_GLASS_PANE)
-				.add(Items.ORANGE_TERRACOTTA).add(Items.ORANGE_WOOL).add(Items.ORANGE_BUNDLE).add(Items.ORANGE_HARNESS);
-
-		valueLookupBuilder(ConventionalItemTags.PINK_DYED)
-				.add(Items.PINK_BANNER).add(Items.PINK_BED).add(Items.PINK_CANDLE).add(Items.PINK_CARPET)
-				.add(Items.PINK_CONCRETE).add(Items.PINK_CONCRETE_POWDER).add(Items.PINK_GLAZED_TERRACOTTA)
-				.add(Items.PINK_SHULKER_BOX).add(Items.PINK_STAINED_GLASS).add(Items.PINK_STAINED_GLASS_PANE)
-				.add(Items.PINK_TERRACOTTA).add(Items.PINK_WOOL).add(Items.PINK_BUNDLE).add(Items.PINK_HARNESS);
-
-		valueLookupBuilder(ConventionalItemTags.PURPLE_DYED)
-				.add(Items.PURPLE_BANNER).add(Items.PURPLE_BED).add(Items.PURPLE_CANDLE).add(Items.PURPLE_CARPET)
-				.add(Items.PURPLE_CONCRETE).add(Items.PURPLE_CONCRETE_POWDER).add(Items.PURPLE_GLAZED_TERRACOTTA)
-				.add(Items.PURPLE_SHULKER_BOX).add(Items.PURPLE_STAINED_GLASS).add(Items.PURPLE_STAINED_GLASS_PANE)
-				.add(Items.PURPLE_TERRACOTTA).add(Items.PURPLE_WOOL).add(Items.PURPLE_BUNDLE).add(Items.PURPLE_HARNESS);
-
-		valueLookupBuilder(ConventionalItemTags.RED_DYED)
-				.add(Items.RED_BANNER).add(Items.RED_BED).add(Items.RED_CANDLE).add(Items.RED_CARPET)
-				.add(Items.RED_CONCRETE).add(Items.RED_CONCRETE_POWDER).add(Items.RED_GLAZED_TERRACOTTA)
-				.add(Items.RED_SHULKER_BOX).add(Items.RED_STAINED_GLASS).add(Items.RED_STAINED_GLASS_PANE)
-				.add(Items.RED_TERRACOTTA).add(Items.RED_WOOL).add(Items.RED_BUNDLE).add(Items.RED_HARNESS);
-
-		valueLookupBuilder(ConventionalItemTags.WHITE_DYED)
-				.add(Items.WHITE_BANNER).add(Items.WHITE_BED).add(Items.WHITE_CANDLE).add(Items.WHITE_CARPET)
-				.add(Items.WHITE_CONCRETE).add(Items.WHITE_CONCRETE_POWDER).add(Items.WHITE_GLAZED_TERRACOTTA)
-				.add(Items.WHITE_SHULKER_BOX).add(Items.WHITE_STAINED_GLASS).add(Items.WHITE_STAINED_GLASS_PANE)
-				.add(Items.WHITE_TERRACOTTA).add(Items.WHITE_WOOL).add(Items.WHITE_BUNDLE).add(Items.WHITE_HARNESS);
-
-		valueLookupBuilder(ConventionalItemTags.YELLOW_DYED)
-				.add(Items.YELLOW_BANNER).add(Items.YELLOW_BED).add(Items.YELLOW_CANDLE).add(Items.YELLOW_CARPET)
-				.add(Items.YELLOW_CONCRETE).add(Items.YELLOW_CONCRETE_POWDER).add(Items.YELLOW_GLAZED_TERRACOTTA)
-				.add(Items.YELLOW_SHULKER_BOX).add(Items.YELLOW_STAINED_GLASS).add(Items.YELLOW_STAINED_GLASS_PANE)
-				.add(Items.YELLOW_TERRACOTTA).add(Items.YELLOW_WOOL).add(Items.YELLOW_BUNDLE).add(Items.YELLOW_HARNESS);
-
-		valueLookupBuilder(ConventionalItemTags.DYED)
+		builder(ConventionalItemTags.BLACK_DYED)
+				.add(BlockItemIds.BANNER.black()).add(BlockItemIds.BED.black()).add(BlockItemIds.DYED_CANDLE.black()).add(BlockItemIds.CARPET.black())
+				.add(BlockItemIds.CONCRETE.black()).add(BlockItemIds.CONCRETE_POWDER.black()).add(BlockItemIds.GLAZED_TERRACOTTA.black())
+				.add(BlockItemIds.DYED_SHULKER_BOX.black()).add(BlockItemIds.STAINED_GLASS.black()).add(BlockItemIds.STAINED_GLASS_PANE.black())
+				.add(BlockItemIds.DYED_TERRACOTTA.black()).add(BlockItemIds.WOOL.black()).add(ItemIds.DYED_BUNDLE.black()).add(ItemIds.HARNESS.black());
+
+		builder(ConventionalItemTags.BLUE_DYED)
+				.add(BlockItemIds.BANNER.blue()).add(BlockItemIds.BED.blue()).add(BlockItemIds.DYED_CANDLE.blue()).add(BlockItemIds.CARPET.blue())
+				.add(BlockItemIds.CONCRETE.blue()).add(BlockItemIds.CONCRETE_POWDER.blue()).add(BlockItemIds.GLAZED_TERRACOTTA.blue())
+				.add(BlockItemIds.DYED_SHULKER_BOX.blue()).add(BlockItemIds.STAINED_GLASS.blue()).add(BlockItemIds.STAINED_GLASS_PANE.blue())
+				.add(BlockItemIds.DYED_TERRACOTTA.blue()).add(BlockItemIds.WOOL.blue()).add(ItemIds.DYED_BUNDLE.blue()).add(ItemIds.HARNESS.blue());
+
+		builder(ConventionalItemTags.BROWN_DYED)
+				.add(BlockItemIds.BANNER.brown()).add(BlockItemIds.BED.brown()).add(BlockItemIds.DYED_CANDLE.brown()).add(BlockItemIds.CARPET.brown())
+				.add(BlockItemIds.CONCRETE.brown()).add(BlockItemIds.CONCRETE_POWDER.brown()).add(BlockItemIds.GLAZED_TERRACOTTA.brown())
+				.add(BlockItemIds.DYED_SHULKER_BOX.brown()).add(BlockItemIds.STAINED_GLASS.brown()).add(BlockItemIds.STAINED_GLASS_PANE.brown())
+				.add(BlockItemIds.DYED_TERRACOTTA.brown()).add(BlockItemIds.WOOL.brown()).add(ItemIds.DYED_BUNDLE.brown()).add(ItemIds.HARNESS.brown());
+
+		builder(ConventionalItemTags.CYAN_DYED)
+				.add(BlockItemIds.BANNER.cyan()).add(BlockItemIds.BED.cyan()).add(BlockItemIds.DYED_CANDLE.cyan()).add(BlockItemIds.CARPET.cyan())
+				.add(BlockItemIds.CONCRETE.cyan()).add(BlockItemIds.CONCRETE_POWDER.cyan()).add(BlockItemIds.GLAZED_TERRACOTTA.cyan())
+				.add(BlockItemIds.DYED_SHULKER_BOX.cyan()).add(BlockItemIds.STAINED_GLASS.cyan()).add(BlockItemIds.STAINED_GLASS_PANE.cyan())
+				.add(BlockItemIds.DYED_TERRACOTTA.cyan()).add(BlockItemIds.WOOL.cyan()).add(ItemIds.DYED_BUNDLE.cyan()).add(ItemIds.HARNESS.cyan());
+
+		builder(ConventionalItemTags.GRAY_DYED)
+				.add(BlockItemIds.BANNER.gray()).add(BlockItemIds.BED.gray()).add(BlockItemIds.DYED_CANDLE.gray()).add(BlockItemIds.CARPET.gray())
+				.add(BlockItemIds.CONCRETE.gray()).add(BlockItemIds.CONCRETE_POWDER.gray()).add(BlockItemIds.GLAZED_TERRACOTTA.gray())
+				.add(BlockItemIds.DYED_SHULKER_BOX.gray()).add(BlockItemIds.STAINED_GLASS.gray()).add(BlockItemIds.STAINED_GLASS_PANE.gray())
+				.add(BlockItemIds.DYED_TERRACOTTA.gray()).add(BlockItemIds.WOOL.gray()).add(ItemIds.DYED_BUNDLE.gray()).add(ItemIds.HARNESS.gray());
+
+		builder(ConventionalItemTags.GREEN_DYED)
+				.add(BlockItemIds.BANNER.green()).add(BlockItemIds.BED.green()).add(BlockItemIds.DYED_CANDLE.green()).add(BlockItemIds.CARPET.green())
+				.add(BlockItemIds.CONCRETE.green()).add(BlockItemIds.CONCRETE_POWDER.green()).add(BlockItemIds.GLAZED_TERRACOTTA.green())
+				.add(BlockItemIds.DYED_SHULKER_BOX.green()).add(BlockItemIds.STAINED_GLASS.green()).add(BlockItemIds.STAINED_GLASS_PANE.green())
+				.add(BlockItemIds.DYED_TERRACOTTA.green()).add(BlockItemIds.WOOL.green()).add(ItemIds.DYED_BUNDLE.green()).add(ItemIds.HARNESS.green());
+
+		builder(ConventionalItemTags.LIGHT_BLUE_DYED)
+				.add(BlockItemIds.BANNER.lightBlue()).add(BlockItemIds.BED.lightBlue()).add(BlockItemIds.DYED_CANDLE.lightBlue()).add(BlockItemIds.CARPET.lightBlue())
+				.add(BlockItemIds.CONCRETE.lightBlue()).add(BlockItemIds.CONCRETE_POWDER.lightBlue()).add(BlockItemIds.GLAZED_TERRACOTTA.lightBlue())
+				.add(BlockItemIds.DYED_SHULKER_BOX.lightBlue()).add(BlockItemIds.STAINED_GLASS.lightBlue()).add(BlockItemIds.STAINED_GLASS_PANE.lightBlue())
+				.add(BlockItemIds.DYED_TERRACOTTA.lightBlue()).add(BlockItemIds.WOOL.lightBlue()).add(ItemIds.DYED_BUNDLE.lightBlue()).add(ItemIds.HARNESS.lightBlue());
+
+		builder(ConventionalItemTags.LIGHT_GRAY_DYED)
+				.add(BlockItemIds.BANNER.lightGray()).add(BlockItemIds.BED.lightGray()).add(BlockItemIds.DYED_CANDLE.lightGray()).add(BlockItemIds.CARPET.lightGray())
+				.add(BlockItemIds.CONCRETE.lightGray()).add(BlockItemIds.CONCRETE_POWDER.lightGray()).add(BlockItemIds.GLAZED_TERRACOTTA.lightGray())
+				.add(BlockItemIds.DYED_SHULKER_BOX.lightGray()).add(BlockItemIds.STAINED_GLASS.lightGray()).add(BlockItemIds.STAINED_GLASS_PANE.lightGray())
+				.add(BlockItemIds.DYED_TERRACOTTA.lightGray()).add(BlockItemIds.WOOL.lightGray()).add(ItemIds.DYED_BUNDLE.lightGray()).add(ItemIds.HARNESS.lightGray());
+
+		builder(ConventionalItemTags.LIME_DYED)
+				.add(BlockItemIds.BANNER.lime()).add(BlockItemIds.BED.lime()).add(BlockItemIds.DYED_CANDLE.lime()).add(BlockItemIds.CARPET.lime())
+				.add(BlockItemIds.CONCRETE.lime()).add(BlockItemIds.CONCRETE_POWDER.lime()).add(BlockItemIds.GLAZED_TERRACOTTA.lime())
+				.add(BlockItemIds.DYED_SHULKER_BOX.lime()).add(BlockItemIds.STAINED_GLASS.lime()).add(BlockItemIds.STAINED_GLASS_PANE.lime())
+				.add(BlockItemIds.DYED_TERRACOTTA.lime()).add(BlockItemIds.WOOL.lime()).add(ItemIds.DYED_BUNDLE.lime()).add(ItemIds.HARNESS.lime());
+
+		builder(ConventionalItemTags.MAGENTA_DYED)
+				.add(BlockItemIds.BANNER.magenta()).add(BlockItemIds.BED.magenta()).add(BlockItemIds.DYED_CANDLE.magenta()).add(BlockItemIds.CARPET.magenta())
+				.add(BlockItemIds.CONCRETE.magenta()).add(BlockItemIds.CONCRETE_POWDER.magenta()).add(BlockItemIds.GLAZED_TERRACOTTA.magenta())
+				.add(BlockItemIds.DYED_SHULKER_BOX.magenta()).add(BlockItemIds.STAINED_GLASS.magenta()).add(BlockItemIds.STAINED_GLASS_PANE.magenta())
+				.add(BlockItemIds.DYED_TERRACOTTA.magenta()).add(BlockItemIds.WOOL.magenta()).add(ItemIds.DYED_BUNDLE.magenta()).add(ItemIds.HARNESS.magenta());
+
+		builder(ConventionalItemTags.ORANGE_DYED)
+				.add(BlockItemIds.BANNER.orange()).add(BlockItemIds.BED.orange()).add(BlockItemIds.DYED_CANDLE.orange()).add(BlockItemIds.CARPET.orange())
+				.add(BlockItemIds.CONCRETE.orange()).add(BlockItemIds.CONCRETE_POWDER.orange()).add(BlockItemIds.GLAZED_TERRACOTTA.orange())
+				.add(BlockItemIds.DYED_SHULKER_BOX.orange()).add(BlockItemIds.STAINED_GLASS.orange()).add(BlockItemIds.STAINED_GLASS_PANE.orange())
+				.add(BlockItemIds.DYED_TERRACOTTA.orange()).add(BlockItemIds.WOOL.orange()).add(ItemIds.DYED_BUNDLE.orange()).add(ItemIds.HARNESS.orange());
+
+		builder(ConventionalItemTags.PINK_DYED)
+				.add(BlockItemIds.BANNER.pink()).add(BlockItemIds.BED.pink()).add(BlockItemIds.DYED_CANDLE.pink()).add(BlockItemIds.CARPET.pink())
+				.add(BlockItemIds.CONCRETE.pink()).add(BlockItemIds.CONCRETE_POWDER.pink()).add(BlockItemIds.GLAZED_TERRACOTTA.pink())
+				.add(BlockItemIds.DYED_SHULKER_BOX.pink()).add(BlockItemIds.STAINED_GLASS.pink()).add(BlockItemIds.STAINED_GLASS_PANE.pink())
+				.add(BlockItemIds.DYED_TERRACOTTA.pink()).add(BlockItemIds.WOOL.pink()).add(ItemIds.DYED_BUNDLE.pink()).add(ItemIds.HARNESS.pink());
+
+		builder(ConventionalItemTags.PURPLE_DYED)
+				.add(BlockItemIds.BANNER.purple()).add(BlockItemIds.BED.purple()).add(BlockItemIds.DYED_CANDLE.purple()).add(BlockItemIds.CARPET.purple())
+				.add(BlockItemIds.CONCRETE.purple()).add(BlockItemIds.CONCRETE_POWDER.purple()).add(BlockItemIds.GLAZED_TERRACOTTA.purple())
+				.add(BlockItemIds.DYED_SHULKER_BOX.purple()).add(BlockItemIds.STAINED_GLASS.purple()).add(BlockItemIds.STAINED_GLASS_PANE.purple())
+				.add(BlockItemIds.DYED_TERRACOTTA.purple()).add(BlockItemIds.WOOL.purple()).add(ItemIds.DYED_BUNDLE.purple()).add(ItemIds.HARNESS.purple());
+
+		builder(ConventionalItemTags.RED_DYED)
+				.add(BlockItemIds.BANNER.red()).add(BlockItemIds.BED.red()).add(BlockItemIds.DYED_CANDLE.red()).add(BlockItemIds.CARPET.red())
+				.add(BlockItemIds.CONCRETE.red()).add(BlockItemIds.CONCRETE_POWDER.red()).add(BlockItemIds.GLAZED_TERRACOTTA.red())
+				.add(BlockItemIds.DYED_SHULKER_BOX.red()).add(BlockItemIds.STAINED_GLASS.red()).add(BlockItemIds.STAINED_GLASS_PANE.red())
+				.add(BlockItemIds.DYED_TERRACOTTA.red()).add(BlockItemIds.WOOL.red()).add(ItemIds.DYED_BUNDLE.red()).add(ItemIds.HARNESS.red());
+
+		builder(ConventionalItemTags.WHITE_DYED)
+				.add(BlockItemIds.BANNER.white()).add(BlockItemIds.BED.white()).add(BlockItemIds.DYED_CANDLE.white()).add(BlockItemIds.CARPET.white())
+				.add(BlockItemIds.CONCRETE.white()).add(BlockItemIds.CONCRETE_POWDER.white()).add(BlockItemIds.GLAZED_TERRACOTTA.white())
+				.add(BlockItemIds.DYED_SHULKER_BOX.white()).add(BlockItemIds.STAINED_GLASS.white()).add(BlockItemIds.STAINED_GLASS_PANE.white())
+				.add(BlockItemIds.DYED_TERRACOTTA.white()).add(BlockItemIds.WOOL.white()).add(ItemIds.DYED_BUNDLE.white()).add(ItemIds.HARNESS.white());
+
+		builder(ConventionalItemTags.YELLOW_DYED)
+				.add(BlockItemIds.BANNER.yellow()).add(BlockItemIds.BED.yellow()).add(BlockItemIds.DYED_CANDLE.yellow()).add(BlockItemIds.CARPET.yellow())
+				.add(BlockItemIds.CONCRETE.yellow()).add(BlockItemIds.CONCRETE_POWDER.yellow()).add(BlockItemIds.GLAZED_TERRACOTTA.yellow())
+				.add(BlockItemIds.DYED_SHULKER_BOX.yellow()).add(BlockItemIds.STAINED_GLASS.yellow()).add(BlockItemIds.STAINED_GLASS_PANE.yellow())
+				.add(BlockItemIds.DYED_TERRACOTTA.yellow()).add(BlockItemIds.WOOL.yellow()).add(ItemIds.DYED_BUNDLE.yellow()).add(ItemIds.HARNESS.yellow());
+
+		builder(ConventionalItemTags.DYED)
 				.addTag(ConventionalItemTags.WHITE_DYED)
 				.addTag(ConventionalItemTags.ORANGE_DYED)
 				.addTag(ConventionalItemTags.MAGENTA_DYED)
@@ -927,11 +905,13 @@ private void generateTagAlias() {
 		aliasGroup("ores/lapis").add(ItemTags.LAPIS_ORES, ConventionalItemTags.LAPIS_ORES);
 		aliasGroup("ores/redstone").add(ItemTags.REDSTONE_ORES, ConventionalItemTags.REDSTONE_ORES);
 
-		aliasGroup("fences").add(ItemTags.FENCES, ConventionalItemTags.FENCES);
+		aliasGroup("fences").add(BlockItemTags.FENCES.item(), ConventionalItemTags.FENCES);
 		aliasGroup("fences/wooden").add(ItemTags.WOODEN_FENCES, ConventionalItemTags.WOODEN_FENCES);
 		aliasGroup("fence_gates").add(ItemTags.FENCE_GATES, ConventionalItemTags.FENCE_GATES);
 
-		aliasGroup("flowers/small").add(ItemTags.SMALL_FLOWERS, ConventionalItemTags.SMALL_FLOWERS);
+		aliasGroup("bars").add(BlockItemTags.BARS.item(), ConventionalItemTags.BARS);
+
+		aliasGroup("flowers/small").add(BlockItemTags.SMALL_FLOWERS.item(), ConventionalItemTags.SMALL_FLOWERS);
 		aliasGroup("dyes").add(ItemTags.DYES, ConventionalItemTags.DYES);
 	}
 }
diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/PotionTagsGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/PotionTagsGenerator.java
new file mode 100644
index 0000000000..07de65047b
--- /dev/null
+++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/PotionTagsGenerator.java
@@ -0,0 +1,38 @@
+/*
+ * 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.impl.tag.convention.datagen.generators;
+
+import java.util.concurrent.CompletableFuture;
+
+import net.minecraft.core.HolderLookup;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.world.item.alchemy.Potion;
+
+import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagsProvider;
+import net.fabricmc.fabric.api.tag.convention.v2.ConventionalPotionTags;
+
+public final class PotionTagsGenerator extends FabricTagsProvider {
+	public PotionTagsGenerator(FabricPackOutput output, CompletableFuture registriesFuture) {
+		super(output, Registries.POTION, registriesFuture);
+	}
+
+	@Override
+	protected void addTags(HolderLookup.Provider registries) {
+		builder(ConventionalPotionTags.HIDDEN_FROM_RECIPE_VIEWERS); // Generate tag so others can see it exists through JSON.
+	}
+}
diff --git a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json
index 2d6f8afa73..de8833bfcf 100644
--- a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json
+++ b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json
@@ -1,6 +1,9 @@
 {
   "tag.block.c.barrels": "Barrels",
   "tag.block.c.barrels.wooden": "Wooden Barrels",
+  "tag.block.c.bars": "Bars",
+  "tag.block.c.bars.copper": "Copper Bars",
+  "tag.block.c.bars.iron": "Iron Bars",
   "tag.block.c.bookshelves": "Bookshelves",
   "tag.block.c.budding_blocks": "Budding Blocks",
   "tag.block.c.buds": "Buds",
@@ -42,6 +45,7 @@
   "tag.block.c.flowers": "Flowers",
   "tag.block.c.flowers.small": "Small Flowers",
   "tag.block.c.flowers.tall": "Tall Flowers",
+  "tag.block.c.froglights": "Froglights",
   "tag.block.c.glass_blocks": "Glass Blocks",
   "tag.block.c.glass_blocks.cheap": "Cheap Glass Blocks",
   "tag.block.c.glass_blocks.colorless": "Colorless Glass Blocks",
@@ -125,6 +129,7 @@
   "tag.enchantment.c.entity_auxiliary_movement_enhancements": "Entity Auxiliary Movement Enhancements",
   "tag.enchantment.c.entity_defense_enhancements": "Entity Defense Enhancements",
   "tag.enchantment.c.entity_speed_enhancements": "Entity Speed Enhancements",
+  "tag.enchantment.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers",
   "tag.enchantment.c.increase_block_drops": "Increases Block Drops",
   "tag.enchantment.c.increase_entity_drops": "Increases Entity Drops",
   "tag.enchantment.c.weapon_damage_enhancements": "Weapon Damage Enhancements",
@@ -154,6 +159,9 @@
   "tag.item.c.armors.wolf": "Wolf Armors",
   "tag.item.c.barrels": "Barrels",
   "tag.item.c.barrels.wooden": "Wooden Barrels",
+  "tag.item.c.bars": "Bars",
+  "tag.item.c.bars.copper": "Copper Bars",
+  "tag.item.c.bars.iron": "Iron Bars",
   "tag.item.c.bones": "Bones",
   "tag.item.c.bookshelves": "Bookshelves",
   "tag.item.c.bricks": "Bricks",
@@ -162,6 +170,7 @@
   "tag.item.c.bricks.resin": "Resin Bricks",
   "tag.item.c.buckets": "Buckets",
   "tag.item.c.buckets.empty": "Empty Buckets",
+  "tag.item.c.buckets.entity_dry": "Entity Dry Buckets",
   "tag.item.c.buckets.entity_water": "Entity Water Buckets",
   "tag.item.c.buckets.lava": "Lava Buckets",
   "tag.item.c.buckets.milk": "Milk Buckets",
@@ -273,6 +282,7 @@
   "tag.item.c.foods.raw_meat": "Raw Meats",
   "tag.item.c.foods.soup": "Soups",
   "tag.item.c.foods.vegetable": "Vegetables",
+  "tag.item.c.froglights": "Froglights",
   "tag.item.c.gems": "Gems",
   "tag.item.c.gems.amethyst": "Amethyst Gems",
   "tag.item.c.gems.diamond": "Diamond Gems",
@@ -406,6 +416,7 @@
   "tag.item.c.tools.trident": "Tridents",
   "tag.item.c.tools.wrench": "Wrenches",
   "tag.item.c.villager_job_sites": "Villager Job Sites",
+  "tag.potion.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers",
   "tag.worldgen.biome.c.hidden_from_locator_selection": "Hidden From Locator Selection",
   "tag.worldgen.biome.c.is_aquatic": "Aquatic",
   "tag.worldgen.biome.c.is_aquatic_icy": "Icy Aquatic",
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/bars.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/bars.json
new file mode 100644
index 0000000000..d5542de65b
--- /dev/null
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/bars.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "#c:bars/iron",
+    "#c:bars/copper"
+  ]
+}
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/bars/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/bars/copper.json
new file mode 100644
index 0000000000..f11b169128
--- /dev/null
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/bars/copper.json
@@ -0,0 +1,12 @@
+{
+  "values": [
+    "minecraft:copper_bars",
+    "minecraft:exposed_copper_bars",
+    "minecraft:weathered_copper_bars",
+    "minecraft:oxidized_copper_bars",
+    "minecraft:waxed_copper_bars",
+    "minecraft:waxed_exposed_copper_bars",
+    "minecraft:waxed_weathered_copper_bars",
+    "minecraft:waxed_oxidized_copper_bars"
+  ]
+}
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/bars/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/bars/iron.json
new file mode 100644
index 0000000000..ba12ec6f5a
--- /dev/null
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/bars/iron.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:iron_bars"
+  ]
+}
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chains.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chains.json
index 58c2b30a5a..daba291fc0 100644
--- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chains.json
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chains.json
@@ -2,12 +2,12 @@
   "values": [
     "minecraft:iron_chain",
     "minecraft:copper_chain",
-    "minecraft:waxed_copper_chain",
     "minecraft:exposed_copper_chain",
-    "minecraft:waxed_exposed_copper_chain",
     "minecraft:weathered_copper_chain",
-    "minecraft:waxed_weathered_copper_chain",
     "minecraft:oxidized_copper_chain",
+    "minecraft:waxed_copper_chain",
+    "minecraft:waxed_exposed_copper_chain",
+    "minecraft:waxed_weathered_copper_chain",
     "minecraft:waxed_oxidized_copper_chain"
   ]
 }
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/concretes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/concretes.json
index a3e28485cf..99c8ab401a 100644
--- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/concretes.json
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/concretes.json
@@ -14,7 +14,7 @@
     "minecraft:blue_concrete",
     "minecraft:brown_concrete",
     "minecraft:green_concrete",
-    "minecraft:black_concrete",
-    "minecraft:red_concrete"
+    "minecraft:red_concrete",
+    "minecraft:black_concrete"
   ]
 }
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/froglights.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/froglights.json
new file mode 100644
index 0000000000..ca83c5dc0a
--- /dev/null
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/froglights.json
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "minecraft:ochre_froglight",
+    "minecraft:pearlescent_froglight",
+    "minecraft:verdant_froglight"
+  ]
+}
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glass_blocks/cheap.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glass_blocks/cheap.json
index e44bc541c0..3465b3884b 100644
--- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glass_blocks/cheap.json
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glass_blocks/cheap.json
@@ -15,7 +15,7 @@
     "minecraft:blue_stained_glass",
     "minecraft:brown_stained_glass",
     "minecraft:green_stained_glass",
-    "minecraft:black_stained_glass",
-    "minecraft:red_stained_glass"
+    "minecraft:red_stained_glass",
+    "minecraft:black_stained_glass"
   ]
 }
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glass_panes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glass_panes.json
index b914112f3b..6bd6b7ea32 100644
--- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glass_panes.json
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glass_panes.json
@@ -14,8 +14,8 @@
     "minecraft:blue_stained_glass_pane",
     "minecraft:brown_stained_glass_pane",
     "minecraft:green_stained_glass_pane",
-    "minecraft:black_stained_glass_pane",
     "minecraft:red_stained_glass_pane",
+    "minecraft:black_stained_glass_pane",
     {
       "id": "#c:glass_panes/colorless",
       "required": false
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glazed_terracottas.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glazed_terracottas.json
index c1afe11c71..26cb2df258 100644
--- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glazed_terracottas.json
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glazed_terracottas.json
@@ -14,7 +14,7 @@
     "minecraft:blue_glazed_terracotta",
     "minecraft:brown_glazed_terracotta",
     "minecraft:green_glazed_terracotta",
-    "minecraft:black_glazed_terracotta",
-    "minecraft:red_glazed_terracotta"
+    "minecraft:red_glazed_terracotta",
+    "minecraft:black_glazed_terracotta"
   ]
 }
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/villager_job_sites.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/villager_job_sites.json
index 4500ef7a85..8fdf435dfe 100644
--- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/villager_job_sites.json
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/villager_job_sites.json
@@ -5,9 +5,6 @@
     "minecraft:brewing_stand",
     "minecraft:cartography_table",
     "minecraft:cauldron",
-    "minecraft:lava_cauldron",
-    "minecraft:water_cauldron",
-    "minecraft:powder_snow_cauldron",
     "minecraft:composter",
     "minecraft:fletching_table",
     "minecraft:grindstone",
@@ -15,6 +12,9 @@
     "minecraft:loom",
     "minecraft:smithing_table",
     "minecraft:smoker",
-    "minecraft:stonecutter"
+    "minecraft:stonecutter",
+    "minecraft:lava_cauldron",
+    "minecraft:water_cauldron",
+    "minecraft:powder_snow_cauldron"
   ]
 }
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/hidden_from_recipe_viewers.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/hidden_from_recipe_viewers.json
new file mode 100644
index 0000000000..f72d209df7
--- /dev/null
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/hidden_from_recipe_viewers.json
@@ -0,0 +1,3 @@
+{
+  "values": []
+}
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/bars.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/bars.json
new file mode 100644
index 0000000000..d5542de65b
--- /dev/null
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/bars.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "#c:bars/iron",
+    "#c:bars/copper"
+  ]
+}
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/bars/copper.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/bars/copper.json
new file mode 100644
index 0000000000..f11b169128
--- /dev/null
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/bars/copper.json
@@ -0,0 +1,12 @@
+{
+  "values": [
+    "minecraft:copper_bars",
+    "minecraft:exposed_copper_bars",
+    "minecraft:weathered_copper_bars",
+    "minecraft:oxidized_copper_bars",
+    "minecraft:waxed_copper_bars",
+    "minecraft:waxed_exposed_copper_bars",
+    "minecraft:waxed_weathered_copper_bars",
+    "minecraft:waxed_oxidized_copper_bars"
+  ]
+}
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/bars/iron.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/bars/iron.json
new file mode 100644
index 0000000000..ba12ec6f5a
--- /dev/null
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/bars/iron.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:iron_bars"
+  ]
+}
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/buckets.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/buckets.json
index ecaacd29cc..0a6a2e1679 100644
--- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/buckets.json
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/buckets.json
@@ -23,6 +23,10 @@
     {
       "id": "#c:buckets/entity_water",
       "required": false
+    },
+    {
+      "id": "#c:buckets/entity_dry",
+      "required": false
     }
   ]
 }
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/buckets/entity_dry.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/buckets/entity_dry.json
new file mode 100644
index 0000000000..3a37bd7c6c
--- /dev/null
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/buckets/entity_dry.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:sulfur_cube_bucket"
+  ]
+}
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concretes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concretes.json
index a3e28485cf..99c8ab401a 100644
--- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concretes.json
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concretes.json
@@ -14,7 +14,7 @@
     "minecraft:blue_concrete",
     "minecraft:brown_concrete",
     "minecraft:green_concrete",
-    "minecraft:black_concrete",
-    "minecraft:red_concrete"
+    "minecraft:red_concrete",
+    "minecraft:black_concrete"
   ]
 }
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/froglights.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/froglights.json
new file mode 100644
index 0000000000..ca83c5dc0a
--- /dev/null
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/froglights.json
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "minecraft:ochre_froglight",
+    "minecraft:pearlescent_froglight",
+    "minecraft:verdant_froglight"
+  ]
+}
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glass_blocks/cheap.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glass_blocks/cheap.json
index e44bc541c0..3465b3884b 100644
--- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glass_blocks/cheap.json
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glass_blocks/cheap.json
@@ -15,7 +15,7 @@
     "minecraft:blue_stained_glass",
     "minecraft:brown_stained_glass",
     "minecraft:green_stained_glass",
-    "minecraft:black_stained_glass",
-    "minecraft:red_stained_glass"
+    "minecraft:red_stained_glass",
+    "minecraft:black_stained_glass"
   ]
 }
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glass_panes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glass_panes.json
index b914112f3b..6bd6b7ea32 100644
--- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glass_panes.json
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glass_panes.json
@@ -14,8 +14,8 @@
     "minecraft:blue_stained_glass_pane",
     "minecraft:brown_stained_glass_pane",
     "minecraft:green_stained_glass_pane",
-    "minecraft:black_stained_glass_pane",
     "minecraft:red_stained_glass_pane",
+    "minecraft:black_stained_glass_pane",
     {
       "id": "#c:glass_panes/colorless",
       "required": false
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glazed_terracottas.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glazed_terracottas.json
index c1afe11c71..26cb2df258 100644
--- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glazed_terracottas.json
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glazed_terracottas.json
@@ -14,7 +14,7 @@
     "minecraft:blue_glazed_terracotta",
     "minecraft:brown_glazed_terracotta",
     "minecraft:green_glazed_terracotta",
-    "minecraft:black_glazed_terracotta",
-    "minecraft:red_glazed_terracotta"
+    "minecraft:red_glazed_terracotta",
+    "minecraft:black_glazed_terracotta"
   ]
 }
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/music_discs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/music_discs.json
index c0f8778802..3dd007351c 100644
--- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/music_discs.json
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/music_discs.json
@@ -20,6 +20,7 @@
     "minecraft:music_disc_creator_music_box",
     "minecraft:music_disc_precipice",
     "minecraft:music_disc_tears",
-    "minecraft:music_disc_lava_chicken"
+    "minecraft:music_disc_lava_chicken",
+    "minecraft:music_disc_bounce"
   ]
 }
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/potion/hidden_from_recipe_viewers.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/potion/hidden_from_recipe_viewers.json
new file mode 100644
index 0000000000..f72d209df7
--- /dev/null
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/potion/hidden_from_recipe_viewers.json
@@ -0,0 +1,3 @@
+{
+  "values": []
+}
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cave.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cave.json
index ce959e39e7..8b6329fb6d 100644
--- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cave.json
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cave.json
@@ -1,7 +1,8 @@
 {
   "values": [
-    "minecraft:deep_dark",
+    "minecraft:lush_caves",
     "minecraft:dripstone_caves",
-    "minecraft:lush_caves"
+    "minecraft:sulfur_caves",
+    "minecraft:deep_dark"
   ]
 }
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/overworld.json
index ee6eef2723..15a4f13e1f 100644
--- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/overworld.json
+++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet/overworld.json
@@ -7,6 +7,7 @@
     "minecraft:sparse_jungle",
     "minecraft:beach",
     "minecraft:lush_caves",
-    "minecraft:dripstone_caves"
+    "minecraft:dripstone_caves",
+    "minecraft:sulfur_caves"
   ]
 }
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/fabric-convention-tags-v2/fabric/tag_aliases/block/bars.json b/fabric-convention-tags-v2/src/generated/resources/data/fabric-convention-tags-v2/fabric/tag_aliases/block/bars.json
new file mode 100644
index 0000000000..d5383e5847
--- /dev/null
+++ b/fabric-convention-tags-v2/src/generated/resources/data/fabric-convention-tags-v2/fabric/tag_aliases/block/bars.json
@@ -0,0 +1,6 @@
+{
+  "tags": [
+    "minecraft:bars",
+    "c:bars"
+  ]
+}
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/fabric-convention-tags-v2/fabric/tag_aliases/item/bars.json b/fabric-convention-tags-v2/src/generated/resources/data/fabric-convention-tags-v2/fabric/tag_aliases/item/bars.json
new file mode 100644
index 0000000000..d5383e5847
--- /dev/null
+++ b/fabric-convention-tags-v2/src/generated/resources/data/fabric-convention-tags-v2/fabric/tag_aliases/item/bars.json
@@ -0,0 +1,6 @@
+{
+  "tags": [
+    "minecraft:bars",
+    "c:bars"
+  ]
+}
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java
index ff718ff1e3..68c17801a7 100644
--- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java
+++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java
@@ -16,6 +16,7 @@
 
 package net.fabricmc.fabric.api.tag.convention.v2;
 
+import net.minecraft.tags.BlockItemTags;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.block.Block;
@@ -50,13 +51,15 @@ private ConventionalBlockTags() {
 	 */
 	public static final TagKey NORMAL_OBSIDIANS = register("obsidians/normal");
 	public static final TagKey CRYING_OBSIDIANS = register("obsidians/crying");
+	/// Light-emitting blocks created when a Frog eats a Magma Cube.
+	public static final TagKey FROGLIGHTS = register("froglights");
 
 	// Ores - broad categories
 	public static final TagKey ORES = register("ores");
 
 	// Ores - vanilla instances (All ores consolidated here for consistency)
 	/**
-	 * Aliased with {@link BlockTags#COAL_ORES}.
+	 * Aliased with {@link BlockItemTags#COAL_ORES}.
 	 */
 	public static final TagKey COAL_ORES = register("ores/coal");
 	/**
@@ -64,11 +67,11 @@ private ConventionalBlockTags() {
 	 */
 	public static final TagKey COPPER_ORES = register("ores/copper");
 	/**
-	 * Aliased with {@link BlockTags#DIAMOND_ORES}.
+	 * Aliased with {@link BlockItemTags#DIAMOND_ORES}.
 	 */
 	public static final TagKey DIAMOND_ORES = register("ores/diamond");
 	/**
-	 * Aliased with {@link BlockTags#EMERALD_ORES}.
+	 * Aliased with {@link BlockItemTags#EMERALD_ORES}.
 	 */
 	public static final TagKey EMERALD_ORES = register("ores/emerald");
 	/**
@@ -80,13 +83,13 @@ private ConventionalBlockTags() {
 	 */
 	public static final TagKey IRON_ORES = register("ores/iron");
 	/**
-	 * Aliased with {@link BlockTags#LAPIS_ORES}.
+	 * Aliased with {@link BlockItemTags#LAPIS_ORES}.
 	 */
 	public static final TagKey LAPIS_ORES = register("ores/lapis");
 	public static final TagKey NETHERITE_SCRAP_ORES = register("ores/netherite_scrap");
 	public static final TagKey QUARTZ_ORES = register("ores/quartz");
 	/**
-	 * Aliased with {@link BlockTags#REDSTONE_ORES}.
+	 * Aliased with {@link BlockItemTags#REDSTONE_ORES}.
 	 */
 	public static final TagKey REDSTONE_ORES = register("ores/redstone");
 
@@ -176,6 +179,14 @@ private ConventionalBlockTags() {
 	public static final TagKey FENCE_GATES = register("fence_gates");
 	public static final TagKey WOODEN_FENCE_GATES = register("fence_gates/wooden");
 
+	// Bars
+	/**
+	 * Aliased with {@link BlockTags#BARS}.
+	 */
+	public static final TagKey BARS = register("bars");
+	public static final TagKey IRON_BARS = register("bars/iron");
+	public static final TagKey COPPER_BARS = register("bars/copper");
+
 	// Pumpkins
 	public static final TagKey PUMPKINS = register("pumpkins");
 	/**
diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java
index afb8de344c..3ef452c462 100644
--- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java
+++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEnchantmentTags.java
@@ -52,6 +52,11 @@ private ConventionalEnchantmentTags() {
 	 * For enchantments that decrease damage taken or otherwise benefit, in regard to damage, the entity wearing armor enchanted with it.
 	 */
 	public static final TagKey ENTITY_DEFENSE_ENHANCEMENTS = register("entity_defense_enhancements");
+	/**
+	 * Tag that holds all enchantments that recipe viewers should not show to users.
+	 * Recipe viewers may use this to automatically find the corresponding Enchanted Book to hide.
+	 */
+	public static final TagKey HIDDEN_FROM_RECIPE_VIEWERS = register("hidden_from_recipe_viewers");
 
 	private static TagKey register(String tagId) {
 		return TagRegistration.ENCHANTMENT_TAG.registerC(tagId);
diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java
index 3b112a552a..0cab2be453 100644
--- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java
+++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java
@@ -16,6 +16,7 @@
 
 package net.fabricmc.fabric.api.tag.convention.v2;
 
+import net.minecraft.tags.BlockItemTags;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.TagKey;
@@ -50,6 +51,8 @@ private ConventionalItemTags() {
 	 */
 	public static final TagKey NORMAL_OBSIDIANS = register("obsidians/normal");
 	public static final TagKey CRYING_OBSIDIANS = register("obsidians/crying");
+	/// Light-emitting blocks created when a Frog eats a Magma Cube.
+	public static final TagKey FROGLIGHTS = register("froglights");
 
 	// Tool tags
 	public static final TagKey TOOLS = register("tools");
@@ -338,6 +341,7 @@ private ConventionalItemTags() {
 	public static final TagKey MILK_BUCKETS = register("buckets/milk");
 	public static final TagKey POWDER_SNOW_BUCKETS = register("buckets/powder_snow");
 	public static final TagKey ENTITY_WATER_BUCKETS = register("buckets/entity_water");
+	public static final TagKey ENTITY_DRY_BUCKETS = register("buckets/entity_dry");
 
 	public static final TagKey BARRELS = register("barrels");
 	public static final TagKey WOODEN_BARRELS = register("barrels/wooden");
@@ -362,7 +366,7 @@ private ConventionalItemTags() {
 	public static final TagKey GLAZED_TERRACOTTAS = register("glazed_terracottas");
 	public static final TagKey CONCRETES = register("concretes");
 	/**
-	 * Block tag equivalent is {@link BlockTags#CONCRETE_POWDER}.
+	 * Block tag equivalent is {@link BlockTags#CONCRETE_POWDERS}.
 	 */
 	public static final TagKey CONCRETE_POWDERS = register("concrete_powders");
 
@@ -393,7 +397,7 @@ private ConventionalItemTags() {
 	/**
 	 * Contains living ground-based flowers that are 1 block tall such as Dandelions or Poppy.
 	 * Equivalent to the {@code minecraft:small_flowers} item tag.
-	 * Aliased with {@link ItemTags#SMALL_FLOWERS}.
+	 * Aliased with {@link BlockItemTags#SMALL_FLOWERS}.
 	 */
 	public static final TagKey SMALL_FLOWERS = register("flowers/small");
 	/**
@@ -409,7 +413,7 @@ private ConventionalItemTags() {
 
 	// Fences and Fence Gates
 	/**
-	 * Aliased with {@link ItemTags#FENCES}.
+	 * Aliased with {@link BlockItemTags#FENCES}.
 	 */
 	public static final TagKey FENCES = register("fences");
 	/**
@@ -423,6 +427,14 @@ private ConventionalItemTags() {
 	public static final TagKey FENCE_GATES = register("fence_gates");
 	public static final TagKey WOODEN_FENCE_GATES = register("fence_gates/wooden");
 
+	// Bars
+	/**
+	 * Aliased with {@link BlockItemTags#BARS}.
+	 */
+	public static final TagKey BARS = register("bars");
+	public static final TagKey IRON_BARS = register("bars/iron");
+	public static final TagKey COPPER_BARS = register("bars/copper");
+
 	// Pumpkins
 	public static final TagKey PUMPKINS = register("pumpkins");
 	/**
diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalPotionTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalPotionTags.java
new file mode 100644
index 0000000000..285343993c
--- /dev/null
+++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalPotionTags.java
@@ -0,0 +1,37 @@
+/*
+ * 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.api.tag.convention.v2;
+
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.item.alchemy.Potion;
+
+import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration;
+
+public final class ConventionalPotionTags {
+	private ConventionalPotionTags() {
+	}
+
+	/**
+	 * Tag that holds all enchantments that recipe viewers should not show to users.
+	 * Recipe viewers may use this to automatically find the corresponding Potion items to hide.
+	 */
+	public static final TagKey HIDDEN_FROM_RECIPE_VIEWERS = register("hidden_from_recipe_viewers");
+
+	private static TagKey register(String tagId) {
+		return TagRegistration.POTION_TAG.registerC(tagId);
+	}
+}
diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java
index 761e7213a9..c37287ad16 100644
--- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java
+++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/impl/tag/convention/v2/TagRegistration.java
@@ -23,6 +23,7 @@
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.item.Item;
+import net.minecraft.world.item.alchemy.Potion;
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.Block;
@@ -39,6 +40,7 @@ public record TagRegistration(ResourceKey> registryKey) {
 	public static final TagRegistration FLUID_TAG = new TagRegistration<>(Registries.FLUID);
 	public static final TagRegistration> ENTITY_TYPE_TAG = new TagRegistration<>(Registries.ENTITY_TYPE);
 	public static final TagRegistration ENCHANTMENT_TAG = new TagRegistration<>(Registries.ENCHANTMENT);
+	public static final TagRegistration POTION_TAG = new TagRegistration<>(Registries.POTION);
 
 	public TagKey registerFabric(String tagId) {
 		return TagKey.create(registryKey, Identifier.fromNamespaceAndPath(TagUtil.FABRIC_TAG_NAMESPACE, tagId));
diff --git a/fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/lang/it_it.json b/fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/lang/it_it.json
index 4539d2c708..263da29980 100644
--- a/fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/lang/it_it.json
+++ b/fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/lang/it_it.json
@@ -1,460 +1,453 @@
 {
   "tag.block.c.barrels": "Barili",
-  "tag.block.c.barrels.wooden": "Barili di Legno",
-  "tag.block.c.bookshelves": "Scaffali",
-  "tag.block.c.budding_blocks": "Blocchi Gemmanti",
+  "tag.block.c.barrels.wooden": "Barili di legno",
+  "tag.block.c.bars": "Sbarre",
+  "tag.block.c.bars.copper": "Sbarre di rame",
+  "tag.block.c.bars.iron": "Sbarre di ferro",
+  "tag.block.c.bookshelves": "Librerie",
+  "tag.block.c.budding_blocks": "Blocchi gemmanti",
   "tag.block.c.buds": "Gemme",
   "tag.block.c.chains": "Catene",
   "tag.block.c.chests": "Bauli",
-  "tag.block.c.chests.ender": "Bauli di Ender",
-  "tag.block.c.chests.trapped": "Bauli Trappola",
-  "tag.block.c.chests.wooden": "Bauli di Legno",
+  "tag.block.c.chests.ender": "Bauli di ender",
+  "tag.block.c.chests.trapped": "Bauli trappola",
+  "tag.block.c.chests.wooden": "Bauli di legno",
   "tag.block.c.clusters": "Aggregati",
-  "tag.block.c.cobblestones": "Ciottoli",
-  "tag.block.c.cobblestones.deepslate": "Ciottoli di Ardesia Profonda",
-  "tag.block.c.cobblestones.infested": "Pietrischi Infestati",
-  "tag.block.c.cobblestones.mossy": "Pietrischi Muschiosi",
-  "tag.block.c.cobblestones.normal": "Pietrischi Normali",
-  "tag.block.c.concrete": "Calcestruzzo",
+  "tag.block.c.cobblestones": "Pietrischi",
+  "tag.block.c.cobblestones.deepslate": "Pietrischi di ardesia profonda",
+  "tag.block.c.cobblestones.infested": "Pietrischi infestati",
+  "tag.block.c.cobblestones.mossy": "Pietrischi muschiosi",
+  "tag.block.c.cobblestones.normal": "Pietrischi superficiali",
   "tag.block.c.concretes": "Calcestruzzi",
-  "tag.block.c.dyed": "Blocchi Tinti",
-  "tag.block.c.dyed.black": "Blocchi Tinti di Nero",
-  "tag.block.c.dyed.blue": "Blocchi Tinti di Blu",
-  "tag.block.c.dyed.brown": "Blocchi Tinti di Marrone",
-  "tag.block.c.dyed.cyan": "Blocchi Tinti di Ciano",
-  "tag.block.c.dyed.gray": "Blocchi Tinti di Grigio",
-  "tag.block.c.dyed.green": "Blocchi Tinti di Verde",
-  "tag.block.c.dyed.light_blue": "Blocchi Tinti d'Azzurro",
-  "tag.block.c.dyed.light_gray": "Blocchi Tinti di Grigio Chiaro",
-  "tag.block.c.dyed.lime": "Blocchi Tinti di Lime",
-  "tag.block.c.dyed.magenta": "Blocchi Tinti di Magenta",
-  "tag.block.c.dyed.orange": "Blocchi Tinti di Arancione",
-  "tag.block.c.dyed.pink": "Blocchi Tinti di Rosa",
-  "tag.block.c.dyed.purple": "Blocchi Tinti di Viola",
-  "tag.block.c.dyed.red": "Blocchi Tinti di Rosso",
-  "tag.block.c.dyed.white": "Blocchi Tinti di Bianco",
-  "tag.block.c.dyed.yellow": "Blocchi Tinti di Giallo",
+  "tag.block.c.dyed": "Blocchi tinti",
+  "tag.block.c.dyed.black": "Blocchi tinti di nero",
+  "tag.block.c.dyed.blue": "Blocchi tinti di blu",
+  "tag.block.c.dyed.brown": "Blocchi tinti di marrone",
+  "tag.block.c.dyed.cyan": "Blocchi tinti di ciano",
+  "tag.block.c.dyed.gray": "Blocchi tinti di grigio",
+  "tag.block.c.dyed.green": "Blocchi tinti di verde",
+  "tag.block.c.dyed.light_blue": "Blocchi tinti d'azzurro",
+  "tag.block.c.dyed.light_gray": "Blocchi tinti di grigio chiaro",
+  "tag.block.c.dyed.lime": "Blocchi tinti di lime",
+  "tag.block.c.dyed.magenta": "Blocchi tinti di magenta",
+  "tag.block.c.dyed.orange": "Blocchi tinti di arancione",
+  "tag.block.c.dyed.pink": "Blocchi tinti di rosa",
+  "tag.block.c.dyed.purple": "Blocchi tinti di viola",
+  "tag.block.c.dyed.red": "Blocchi tinti di rosso",
+  "tag.block.c.dyed.white": "Blocchi tinti di bianco",
+  "tag.block.c.dyed.yellow": "Blocchi tinti di giallo",
   "tag.block.c.end_stones": "Pietre dell'End",
   "tag.block.c.fence_gates": "Cancelletti",
-  "tag.block.c.fence_gates.wooden": "Cancelletti di Legno",
+  "tag.block.c.fence_gates.wooden": "Cancelletti di legno",
   "tag.block.c.fences": "Staccionate",
-  "tag.block.c.fences.nether_brick": "Staccionate di Mattoni del Nether",
-  "tag.block.c.fences.wooden": "Staccionate di Legno",
+  "tag.block.c.fences.nether_brick": "Staccionate di mattoni del Nether",
+  "tag.block.c.fences.wooden": "Staccionate di legno",
   "tag.block.c.flowers": "Fiori",
-  "tag.block.c.flowers.small": "Fiori Piccoli",
-  "tag.block.c.flowers.tall": "Fiori Alti",
-  "tag.block.c.glass_blocks": "Blocchi di Vetro",
-  "tag.block.c.glass_blocks.cheap": "Blocchi di Vetro Economico",
-  "tag.block.c.glass_blocks.colorless": "Blocchi di Vetro Incolore",
-  "tag.block.c.glass_blocks.tinted": "Blocchi di Vetro Oscurato",
-  "tag.block.c.glass_panes": "Pannelli di Vetro",
-  "tag.block.c.glass_panes.colorless": "Pannelli di Vetro Incolore",
-  "tag.block.c.glazed_terracotta": "Terracotta Smaltata",
-  "tag.block.c.glazed_terracottas": "Terrecotte Smaltate",
+  "tag.block.c.flowers.small": "Fiorellini",
+  "tag.block.c.flowers.tall": "Fiori alti",
+  "tag.block.c.froglights": "Lanterane",
+  "tag.block.c.glass_blocks": "Blocchi di vetro",
+  "tag.block.c.glass_blocks.cheap": "Blocchi di vetro economico",
+  "tag.block.c.glass_blocks.colorless": "Blocchi di vetro incolore",
+  "tag.block.c.glass_blocks.tinted": "Blocchi di vetro oscurato",
+  "tag.block.c.glass_panes": "Pannelli di vetro",
+  "tag.block.c.glass_panes.colorless": "Pannelli di vetro incolore",
+  "tag.block.c.glazed_terracottas": "Terrecotte smaltate",
   "tag.block.c.gravels": "Ghiaie",
-  "tag.block.c.hidden_from_recipe_viewers": "Nascosto dalle Anteprime Ricette",
+  "tag.block.c.hidden_from_recipe_viewers": "Nascosto nelle anteprime di ricette",
+  "tag.block.c.natural_logs": "Tronchi naturali",
+  "tag.block.c.natural_logs.nether": "Gambi spontanei del Nether",
+  "tag.block.c.natural_logs.overworld": "Tronchi naturali dell'Overworld",
+  "tag.block.c.natural_woods": "Legni naturali",
   "tag.block.c.netherracks": "Netherrack",
   "tag.block.c.obsidians": "Ossidiane",
   "tag.block.c.obsidians.crying": "Ossidiane piangenti",
-  "tag.block.c.obsidians.normal": "Ossidiane Normali",
-  "tag.block.c.ore_bearing_ground.deepslate": "Suolo Ricco di Minerali in Ardesia Profonda",
-  "tag.block.c.ore_bearing_ground.netherrack": "Suolo Ricco di Minerali in Netherrack",
-  "tag.block.c.ore_bearing_ground.stone": "Suolo Ricco di Minerali in Pietra",
-  "tag.block.c.ore_rates.dense": "Tassi Densi di Minerali",
-  "tag.block.c.ore_rates.singular": "Tassi Singolari di Minerali",
-  "tag.block.c.ore_rates.sparse": "Tassi Radi di Minerali",
+  "tag.block.c.obsidians.normal": "Ossidiane inscalfibili",
+  "tag.block.c.ore_bearing_ground.deepslate": "Suolo ricco di minerali in ardesia profonda",
+  "tag.block.c.ore_bearing_ground.netherrack": "Suolo ricco di minerali in netherrack",
+  "tag.block.c.ore_bearing_ground.stone": "Suolo ricco di minerali in pietra",
+  "tag.block.c.ore_rates.dense": "Tassi alti di minerali",
+  "tag.block.c.ore_rates.singular": "Tassi singoli di minerali",
+  "tag.block.c.ore_rates.sparse": "Tassi radi di minerali",
   "tag.block.c.ores": "Minerali",
-  "tag.block.c.ores.coal": "Minerali di Carbone",
-  "tag.block.c.ores.copper": "Minerali di Rame",
-  "tag.block.c.ores.diamond": "Minerali di Diamante",
-  "tag.block.c.ores.emerald": "Minerali di Smeraldo",
-  "tag.block.c.ores.gold": "Minerali d'Oro",
-  "tag.block.c.ores.iron": "Minerali di Ferro",
-  "tag.block.c.ores.lapis": "Minerali di Lapislazzuli",
-  "tag.block.c.ores.netherite_scrap": "Minerali di Frammenti di Netherite",
-  "tag.block.c.ores.quartz": "Minerali di Quarzo",
-  "tag.block.c.ores.redstone": "Minerali di Redstone",
-  "tag.block.c.ores_in_ground.deepslate": "Suolo con Minerali in Ardesia Profonda",
-  "tag.block.c.ores_in_ground.netherrack": "Suolo con Minerali in Netherrack",
-  "tag.block.c.ores_in_ground.stone": "Suolo con Minerali in Pietra",
-  "tag.block.c.player_workstations.crafting_tables": "Banchi da Lavoro",
+  "tag.block.c.ores.coal": "Minerali di carbone",
+  "tag.block.c.ores.copper": "Minerali di rame",
+  "tag.block.c.ores.diamond": "Minerali di diamante",
+  "tag.block.c.ores.emerald": "Minerali di smeraldo",
+  "tag.block.c.ores.gold": "Minerali d'oro",
+  "tag.block.c.ores.iron": "Minerali di ferro",
+  "tag.block.c.ores.lapis": "Minerali di lapislazzuli",
+  "tag.block.c.ores.netherite_scrap": "Minerali di frammenti di netherite",
+  "tag.block.c.ores.quartz": "Minerali di quarzo",
+  "tag.block.c.ores.redstone": "Minerali di redstone",
+  "tag.block.c.ores_in_ground.deepslate": "Suolo con minerali in ardesia profonda",
+  "tag.block.c.ores_in_ground.netherrack": "Suolo con minerali in netherrack",
+  "tag.block.c.ores_in_ground.stone": "Suolo con minerali in pietra",
+  "tag.block.c.player_workstations.crafting_tables": "Banchi da lavoro",
   "tag.block.c.player_workstations.furnaces": "Fornaci",
   "tag.block.c.pumpkins": "Zucche",
-  "tag.block.c.pumpkins.carved": "Zucche Intagliate",
-  "tag.block.c.pumpkins.jack_o_lanterns": "Lanterne di Zucca",
-  "tag.block.c.pumpkins.normal": "Zucche Normali",
-  "tag.block.c.relocation_not_supported": "Spostamento Non Supportato",
+  "tag.block.c.pumpkins.carved": "Zucche intagliate",
+  "tag.block.c.pumpkins.jack_o_lanterns": "Lanterne di zucca",
+  "tag.block.c.pumpkins.normal": "Zucche intere",
+  "tag.block.c.relocation_not_supported": "Spostamento non supportato",
   "tag.block.c.ropes": "Corde",
   "tag.block.c.sands": "Sabbie",
-  "tag.block.c.sands.colorless": "Sabbie Incolori",
-  "tag.block.c.sands.red": "Sabbie Rosse",
-  "tag.block.c.sandstone.blocks": "Blocchi di Arenaria",
-  "tag.block.c.sandstone.red_blocks": "Blocchi di Arenaria Rossa",
-  "tag.block.c.sandstone.red_slabs": "Lastre di Arenaria Rossa",
-  "tag.block.c.sandstone.red_stairs": "Scalini di Arenaria Rossa",
-  "tag.block.c.sandstone.slabs": "Lastre di Arenaria",
-  "tag.block.c.sandstone.stairs": "Scalini di Arenaria",
-  "tag.block.c.sandstone.uncolored_blocks": "Blocchi di Arenaria Non Tinti",
-  "tag.block.c.sandstone.uncolored_slabs": "Lastre di Arenaria Non Tinte",
-  "tag.block.c.sandstone.uncolored_stairs": "Scalini di Arenaria Non Tinti",
-  "tag.block.c.shulker_boxes": "Scatole di Shulker",
+  "tag.block.c.sands.colorless": "Sabbie incolori",
+  "tag.block.c.sands.red": "Sabbie rosse",
+  "tag.block.c.sandstone.blocks": "Blocchi di arenaria",
+  "tag.block.c.sandstone.red_blocks": "Blocchi di arenaria rossa",
+  "tag.block.c.sandstone.red_slabs": "Lastre di arenaria rossa",
+  "tag.block.c.sandstone.red_stairs": "Scalini di arenaria rossa",
+  "tag.block.c.sandstone.slabs": "Lastre di arenaria",
+  "tag.block.c.sandstone.stairs": "Scalini di arenaria",
+  "tag.block.c.sandstone.uncolored_blocks": "Blocchi di arenaria non tinta",
+  "tag.block.c.sandstone.uncolored_slabs": "Lastre di arenaria non tinta",
+  "tag.block.c.sandstone.uncolored_stairs": "Scalini di arenaria non tinta",
   "tag.block.c.skulls": "Teschi",
   "tag.block.c.stones": "Pietre",
-  "tag.block.c.storage_blocks": "Blocchi di Conservazione",
-  "tag.block.c.storage_blocks.bone_meal": "Blocchi di Conservazione di Farina di Ossa",
-  "tag.block.c.storage_blocks.coal": "Blocchi di Conservazione di Carbone",
-  "tag.block.c.storage_blocks.copper": "Blocchi di Conservazione di Rame",
-  "tag.block.c.storage_blocks.diamond": "Blocchi di Conservazione di Diamante",
-  "tag.block.c.storage_blocks.dried_kelp": "Blocchi di Conservazione di Alghe Essiccate",
-  "tag.block.c.storage_blocks.emerald": "Blocchi di Conservazione di Smeraldo",
-  "tag.block.c.storage_blocks.gold": "Blocchi di Conservazione di Oro",
-  "tag.block.c.storage_blocks.iron": "Blocchi di Conservazione di Ferro",
-  "tag.block.c.storage_blocks.lapis": "Blocchi di Conservazione di Lapislazzuli",
-  "tag.block.c.storage_blocks.netherite": "Blocchi di Conservazione di Netherite",
-  "tag.block.c.storage_blocks.raw_copper": "Blocchi di Conservazione di Rame Grezzo",
-  "tag.block.c.storage_blocks.raw_gold": "Blocchi di Conservazione di Oro Grezzo",
-  "tag.block.c.storage_blocks.raw_iron": "Blocchi di Conservazione di Ferro Grezzo",
-  "tag.block.c.storage_blocks.redstone": "Blocchi di Conservazione di Redstone",
-  "tag.block.c.storage_blocks.resin": "Blocchi di Conservazione di Resina",
-  "tag.block.c.storage_blocks.slime": "Blocchi di Conservazione di Slime",
-  "tag.block.c.storage_blocks.wheat": "Blocchi di Conservazione di Grano",
-  "tag.block.c.stripped_logs": "Tronchi Scortecciati",
-  "tag.block.c.stripped_woods": "Legni Scortecciati",
-  "tag.block.c.villager_job_sites": "Siti di Lavoro di Villici",
-  "tag.enchantment.c.entity_auxiliary_movement_enhancements": "Miglioramenti ai Movimenti Ausiliari delle Entità",
-  "tag.enchantment.c.entity_defense_enhancements": "Miglioramenti alla Difesa delle Entità",
-  "tag.enchantment.c.entity_speed_enhancements": "Miglioramenti alla Velocità delle Entità",
-  "tag.enchantment.c.increase_block_drops": "Aumenta i Drop dei Blocchi",
-  "tag.enchantment.c.increase_entity_drops": "Aumenta i Drop delle Entità",
-  "tag.enchantment.c.weapon_damage_enhancements": "Miglioramenti al Danno delle Armi",
+  "tag.block.c.storage_blocks": "Blocchi d'immagazzinamento",
+  "tag.block.c.storage_blocks.bone_meal": "Blocchi d'immagazzinamento di farina di ossa",
+  "tag.block.c.storage_blocks.coal": "Blocchi d'immagazzinamento di carbone",
+  "tag.block.c.storage_blocks.copper": "Blocchi d'immagazzinamento di rame",
+  "tag.block.c.storage_blocks.diamond": "Blocchi d'immagazzinamento di diamante",
+  "tag.block.c.storage_blocks.dried_kelp": "Blocchi d'immagazzinamento di alghe essiccate",
+  "tag.block.c.storage_blocks.emerald": "Blocchi d'immagazzinamento di smeraldo",
+  "tag.block.c.storage_blocks.gold": "Blocchi d'immagazzinamento d'oro",
+  "tag.block.c.storage_blocks.iron": "Blocchi d'immagazzinamento di ferro",
+  "tag.block.c.storage_blocks.lapis": "Blocchi d'immagazzinamento di lapislazzuli",
+  "tag.block.c.storage_blocks.netherite": "Blocchi d'immagazzinamento di netherite",
+  "tag.block.c.storage_blocks.raw_copper": "Blocchi d'immagazzinamento di rame grezzo",
+  "tag.block.c.storage_blocks.raw_gold": "Blocchi d'immagazzinamento d'oro grezzo",
+  "tag.block.c.storage_blocks.raw_iron": "Blocchi d'immagazzinamento di ferro grezzo",
+  "tag.block.c.storage_blocks.redstone": "Blocchi d'immagazzinamento di redstone",
+  "tag.block.c.storage_blocks.resin": "Blocchi d'immagazzinamento di resina",
+  "tag.block.c.storage_blocks.slime": "Blocchi d'immagazzinamento di gelatina",
+  "tag.block.c.storage_blocks.wheat": "Blocchi d'immagazzinamento di grano",
+  "tag.block.c.stripped_logs": "Tronchi scortecciati",
+  "tag.block.c.stripped_woods": "Legni scortecciati",
+  "tag.block.c.villager_job_sites": "Siti di lavoro di villici",
+  "tag.enchantment.c.entity_auxiliary_movement_enhancements": "Miglioramenti ai movimenti ausiliari delle entità",
+  "tag.enchantment.c.entity_defense_enhancements": "Miglioramenti alla difesa delle entità",
+  "tag.enchantment.c.entity_speed_enhancements": "Miglioramenti alla velocità delle entità",
+  "tag.enchantment.c.hidden_from_recipe_viewers": "Nascosto nelle anteprime di ricette",
+  "tag.enchantment.c.increase_block_drops": "Aumenta i drop dei blocchi",
+  "tag.enchantment.c.increase_entity_drops": "Aumenta i drop delle entità",
+  "tag.enchantment.c.weapon_damage_enhancements": "Miglioramenti al danno dalle armi",
   "tag.entity_type.c.boats": "Barche",
   "tag.entity_type.c.bosses": "Boss",
-  "tag.entity_type.c.capturing_not_supported": "Cattura Non Supportata",
-  "tag.entity_type.c.minecarts": "Carrelli da Miniera",
-  "tag.entity_type.c.teleporting_not_supported": "Teletrasporto Non Supportato",
+  "tag.entity_type.c.capturing_not_supported": "Cattura non supportata",
+  "tag.entity_type.c.item_frames": "Cornici",
+  "tag.entity_type.c.minecarts": "Vagonetti",
+  "tag.entity_type.c.teleporting_not_supported": "Teletrasporto non supportato",
   "tag.fluid.c.beetroot_soup": "Zuppa di barbabietole",
   "tag.fluid.c.experience": "Esperienza",
   "tag.fluid.c.gaseous": "Gassoso",
-  "tag.fluid.c.hidden_from_recipe_viewers": "Nascosto dalle Anteprime Ricette",
+  "tag.fluid.c.hidden_from_recipe_viewers": "Nascosto nelle anteprime di ricette",
   "tag.fluid.c.honey": "Miele",
   "tag.fluid.c.lava": "Lava",
   "tag.fluid.c.milk": "Latte",
-  "tag.fluid.c.mushroom_stew": "Zuppa di Funghi",
+  "tag.fluid.c.mushroom_stew": "Zuppa di funghi",
   "tag.fluid.c.potion": "Pozione",
-  "tag.fluid.c.rabbit_stew": "Stufato di Coniglio",
-  "tag.fluid.c.suspicious_stew": "Zuppa Sospetta",
+  "tag.fluid.c.rabbit_stew": "Stufato di coniglio",
+  "tag.fluid.c.suspicious_stew": "Zuppe sospette",
   "tag.fluid.c.water": "Acqua",
   "tag.item.c.animal_foods": "Cibi animali",
   "tag.item.c.armors": "Armature",
+  "tag.item.c.armors.horse": "Bardature",
+  "tag.item.c.armors.humanoid": "Armature umanoidi",
+  "tag.item.c.armors.nautilus": "Armature per nautili",
+  "tag.item.c.armors.wolf": "Armature per lupi",
   "tag.item.c.barrels": "Barili",
-  "tag.item.c.barrels.wooden": "Barili di Legno",
+  "tag.item.c.barrels.wooden": "Barili di legno",
+  "tag.item.c.bars": "Sbarre",
+  "tag.item.c.bars.copper": "Sbarre di rame",
+  "tag.item.c.bars.iron": "Sbarre di ferro",
   "tag.item.c.bones": "Ossa",
-  "tag.item.c.bookshelves": "Scaffali",
+  "tag.item.c.bookshelves": "Librerie",
   "tag.item.c.bricks": "Mattoni",
   "tag.item.c.bricks.nether": "Mattoni del Nether",
   "tag.item.c.bricks.normal": "Mattoni",
-  "tag.item.c.bricks.resin": "Mattoni di Resina",
+  "tag.item.c.bricks.resin": "Mattoni di resina",
   "tag.item.c.buckets": "Secchi",
-  "tag.item.c.buckets.empty": "Secchi Vuoti",
-  "tag.item.c.buckets.entity_water": "Secchi d'Acqua con Entità",
-  "tag.item.c.buckets.lava": "Secchi di Lava",
-  "tag.item.c.buckets.milk": "Secchi di Latte",
-  "tag.item.c.buckets.powder_snow": "Secchi di Neve Polverosa",
-  "tag.item.c.buckets.water": "Secchi d'Acqua",
-  "tag.item.c.budding_blocks": "Blocchi Gemmanti",
+  "tag.item.c.buckets.empty": "Secchi vuoti",
+  "tag.item.c.buckets.entity_water": "Secchi d'acqua con entità",
+  "tag.item.c.buckets.lava": "Secchi di lava",
+  "tag.item.c.buckets.milk": "Secchi di latte",
+  "tag.item.c.buckets.powder_snow": "Secchi di neve polverosa",
+  "tag.item.c.buckets.water": "Secchi d'acqua",
+  "tag.item.c.budding_blocks": "Blocchi gemmanti",
   "tag.item.c.buds": "Gemme",
   "tag.item.c.chains": "Catene",
   "tag.item.c.chests": "Bauli",
-  "tag.item.c.chests.ender": "Bauli di Ender",
-  "tag.item.c.chests.trapped": "Bauli Trappola",
-  "tag.item.c.chests.wooden": "Bauli di Legno",
+  "tag.item.c.chests.ender": "Bauli di ender",
+  "tag.item.c.chests.trapped": "Bauli trappola",
+  "tag.item.c.chests.wooden": "Bauli di legno",
   "tag.item.c.clumps": "Grumi",
-  "tag.item.c.clumps.resin": "Grumi di Resina",
+  "tag.item.c.clumps.resin": "Grumi di resina",
   "tag.item.c.clusters": "Aggregati",
-  "tag.item.c.coal": "Carbone",
-  "tag.item.c.cobblestones": "Ciottoli",
-  "tag.item.c.cobblestones.deepslate": "Ciottoli di Ardesia Profonda",
-  "tag.item.c.cobblestones.infested": "Pietrischi Infestati",
-  "tag.item.c.cobblestones.mossy": "Pietrischi Muschiosi",
-  "tag.item.c.cobblestones.normal": "Pietrischi Normali",
-  "tag.item.c.concrete": "Calcestruzzo",
-  "tag.item.c.concrete_powder": "Polvere di Calcestruzzo",
-  "tag.item.c.concrete_powders": "Polveri di Calcestruzzo",
+  "tag.item.c.cobblestones": "Pietrischi",
+  "tag.item.c.cobblestones.deepslate": "Pietrischi di ardesia profonda",
+  "tag.item.c.cobblestones.infested": "Pietrischi infestati",
+  "tag.item.c.cobblestones.mossy": "Pietrischi muschiosi",
+  "tag.item.c.cobblestones.normal": "Pietrischi superficiali",
+  "tag.item.c.concrete_powders": "Polveri di calcestruzzo",
   "tag.item.c.concretes": "Calcestruzzi",
   "tag.item.c.crops": "Colture",
-  "tag.item.c.crops.beetroot": "Colture di Barbabietola",
-  "tag.item.c.crops.cactus": "Colture di Cactus",
-  "tag.item.c.crops.carrot": "Colture di Carota",
-  "tag.item.c.crops.cocoa_bean": "Colture di Fava di Cacao",
-  "tag.item.c.crops.melon": "Colture di Cocomero",
-  "tag.item.c.crops.nether_wart": "Colture di Verruca del Nether",
-  "tag.item.c.crops.potato": "Colture di Patata",
-  "tag.item.c.crops.pumpkin": "Colture di Zucca",
-  "tag.item.c.crops.sugar_cane": "Colture di Canna da Zucchero",
-  "tag.item.c.crops.wheat": "Colture di Grano",
-  "tag.item.c.drink_containing.bottle": "Bottiglie Contenenti Bevande",
-  "tag.item.c.drink_containing.bucket": "Secchi Contenenti Bevande",
+  "tag.item.c.crops.beetroot": "Colture di barbabietola",
+  "tag.item.c.crops.cactus": "Colture di cactus",
+  "tag.item.c.crops.carrot": "Colture di carota",
+  "tag.item.c.crops.cocoa_bean": "Colture di fava di cacao",
+  "tag.item.c.crops.melon": "Colture di anguria",
+  "tag.item.c.crops.nether_wart": "Colture di verruca del Nether",
+  "tag.item.c.crops.potato": "Colture di patata",
+  "tag.item.c.crops.pumpkin": "Colture di zucca",
+  "tag.item.c.crops.sugar_cane": "Colture di canna da zucchero",
+  "tag.item.c.crops.wheat": "Colture di grano",
+  "tag.item.c.drink_containing.bottle": "Bottiglie contenenti bevande",
+  "tag.item.c.drink_containing.bucket": "Secchi contenenti bevande",
   "tag.item.c.drinks": "Bevande",
   "tag.item.c.drinks.honey": "Miele",
   "tag.item.c.drinks.juice": "Succhi",
-  "tag.item.c.drinks.magic": "Bevande Magiche",
+  "tag.item.c.drinks.magic": "Bevande magiche",
   "tag.item.c.drinks.milk": "Latte",
-  "tag.item.c.drinks.ominous": "Bevande Infauste",
+  "tag.item.c.drinks.ominous": "Bevande infauste",
   "tag.item.c.drinks.water": "Acqua",
-  "tag.item.c.drinks.watery": "Bevande Acquose",
+  "tag.item.c.drinks.watery": "Bevande acquose",
   "tag.item.c.dusts": "Polveri",
-  "tag.item.c.dusts.glowstone": "Polveri di Luminite",
-  "tag.item.c.dusts.redstone": "Polveri di Redstone",
-  "tag.item.c.dyed": "Oggetti Tinti",
-  "tag.item.c.dyed.black": "Oggetti Tinti di Nero",
-  "tag.item.c.dyed.blue": "Oggetti Tinti di Blu",
-  "tag.item.c.dyed.brown": "Oggetti Tinti di Marrone",
-  "tag.item.c.dyed.cyan": "Oggetti Tinti di Ciano",
-  "tag.item.c.dyed.gray": "Oggetti Tinti di Grigio",
-  "tag.item.c.dyed.green": "Oggetti Tinti di Verde",
-  "tag.item.c.dyed.light_blue": "Oggetti Tinti d'Azzurro",
-  "tag.item.c.dyed.light_gray": "Oggetti Tinti di Grigio Chiaro",
-  "tag.item.c.dyed.lime": "Oggetti Tinti di Lime",
-  "tag.item.c.dyed.magenta": "Oggetti Tinti di Magenta",
-  "tag.item.c.dyed.orange": "Oggetti Tinti di Arancione",
-  "tag.item.c.dyed.pink": "Oggetti Tinti di Rosa",
-  "tag.item.c.dyed.purple": "Oggetti Tinti di Viola",
-  "tag.item.c.dyed.red": "Oggetti Tinti di Rosso",
-  "tag.item.c.dyed.white": "Oggetti Tinti di Bianco",
-  "tag.item.c.dyed.yellow": "Oggetti Tinti di Giallo",
+  "tag.item.c.dusts.glowstone": "Polveri di luminite",
+  "tag.item.c.dusts.redstone": "Polveri di redstone",
+  "tag.item.c.dyed": "Oggetti tinti",
+  "tag.item.c.dyed.black": "Oggetti tinti di nero",
+  "tag.item.c.dyed.blue": "Oggetti tinti di blu",
+  "tag.item.c.dyed.brown": "Oggetti tinti di marrone",
+  "tag.item.c.dyed.cyan": "Oggetti tinti di ciano",
+  "tag.item.c.dyed.gray": "Oggetti tinti di grigio",
+  "tag.item.c.dyed.green": "Oggetti tinti di verde",
+  "tag.item.c.dyed.light_blue": "Oggetti tinti d'azzurro",
+  "tag.item.c.dyed.light_gray": "Oggetti tinti di grigio chiaro",
+  "tag.item.c.dyed.lime": "Oggetti tinti di lime",
+  "tag.item.c.dyed.magenta": "Oggetti tinti di magenta",
+  "tag.item.c.dyed.orange": "Oggetti tinti di arancione",
+  "tag.item.c.dyed.pink": "Oggetti tinti di rosa",
+  "tag.item.c.dyed.purple": "Oggetti tinti di viola",
+  "tag.item.c.dyed.red": "Oggetti tinti di rosso",
+  "tag.item.c.dyed.white": "Oggetti tinti di bianco",
+  "tag.item.c.dyed.yellow": "Oggetti tinti di giallo",
   "tag.item.c.dyes": "Coloranti",
-  "tag.item.c.dyes.black": "Coloranti Neri",
-  "tag.item.c.dyes.blue": "Coloranti Blu",
-  "tag.item.c.dyes.brown": "Coloranti Marroni",
-  "tag.item.c.dyes.cyan": "Coloranti Ciani",
-  "tag.item.c.dyes.gray": "Coloranti Grigi",
-  "tag.item.c.dyes.green": "Coloranti Verdi",
-  "tag.item.c.dyes.light_blue": "Coloranti Azzurri",
-  "tag.item.c.dyes.light_gray": "Coloranti Grigi Chiari",
-  "tag.item.c.dyes.lime": "Coloranti Lime",
-  "tag.item.c.dyes.magenta": "Coloranti Magenta",
-  "tag.item.c.dyes.orange": "Coloranti Arancioni",
-  "tag.item.c.dyes.pink": "Coloranti Rosa",
-  "tag.item.c.dyes.purple": "Coloranti Viola",
-  "tag.item.c.dyes.red": "Coloranti Rossi",
-  "tag.item.c.dyes.white": "Coloranti Bianchi",
-  "tag.item.c.dyes.yellow": "Coloranti Gialli",
+  "tag.item.c.dyes.black": "Coloranti neri",
+  "tag.item.c.dyes.blue": "Coloranti blu",
+  "tag.item.c.dyes.brown": "Coloranti marroni",
+  "tag.item.c.dyes.cyan": "Coloranti ciani",
+  "tag.item.c.dyes.gray": "Coloranti grigi",
+  "tag.item.c.dyes.green": "Coloranti verdi",
+  "tag.item.c.dyes.light_blue": "Coloranti azzurri",
+  "tag.item.c.dyes.light_gray": "Coloranti grigi chiari",
+  "tag.item.c.dyes.lime": "Coloranti lime",
+  "tag.item.c.dyes.magenta": "Coloranti magenta",
+  "tag.item.c.dyes.orange": "Coloranti arancioni",
+  "tag.item.c.dyes.pink": "Coloranti rosa",
+  "tag.item.c.dyes.purple": "Coloranti viola",
+  "tag.item.c.dyes.red": "Coloranti rossi",
+  "tag.item.c.dyes.white": "Coloranti bianchi",
+  "tag.item.c.dyes.yellow": "Coloranti gialli",
   "tag.item.c.eggs": "Uova",
   "tag.item.c.enchantables": "Incantabili",
   "tag.item.c.end_stones": "Pietre dell'End",
-  "tag.item.c.ender_pearls": "Perle di Ender",
+  "tag.item.c.ender_pearls": "Perle di ender",
   "tag.item.c.feathers": "Piume",
   "tag.item.c.fence_gates": "Cancelletti",
-  "tag.item.c.fence_gates.wooden": "Cancelletti di Legno",
+  "tag.item.c.fence_gates.wooden": "Cancelletti di legno",
   "tag.item.c.fences": "Staccionate",
-  "tag.item.c.fences.nether_brick": "Staccionate di Mattoni del Nether",
-  "tag.item.c.fences.wooden": "Staccionate di Legno",
+  "tag.item.c.fences.nether_brick": "Staccionate di mattoni del Nether",
+  "tag.item.c.fences.wooden": "Staccionate di legno",
   "tag.item.c.fertilizers": "Fertilizzanti",
   "tag.item.c.flowers": "Fiori",
-  "tag.item.c.flowers.small": "Fiori Piccoli",
-  "tag.item.c.flowers.tall": "Fiori Alti",
+  "tag.item.c.flowers.small": "Fiorellini",
+  "tag.item.c.flowers.tall": "Fiori alti",
   "tag.item.c.foods": "Cibi",
-  "tag.item.c.foods.berries": "Bacche",
   "tag.item.c.foods.berry": "Bacche",
   "tag.item.c.foods.bread": "Pane",
-  "tag.item.c.foods.breads": "Pane",
-  "tag.item.c.foods.candies": "Dolci",
   "tag.item.c.foods.candy": "Dolci",
-  "tag.item.c.foods.cooked_fish": "Pesci Cotti",
-  "tag.item.c.foods.cooked_fishes": "Pesci Cotti",
-  "tag.item.c.foods.cooked_meat": "Carni Cotte",
-  "tag.item.c.foods.cooked_meats": "Carni Cotte",
+  "tag.item.c.foods.cooked_fish": "Pesci cotti",
+  "tag.item.c.foods.cooked_meat": "Carni cotte",
   "tag.item.c.foods.cookie": "Biscotti",
-  "tag.item.c.foods.cookies": "Biscotti",
-  "tag.item.c.foods.edible_when_placed": "Mangiabili se Piazzati",
-  "tag.item.c.foods.food_poisoning": "Avvelenamento da Cibo",
+  "tag.item.c.foods.dough": "Impasti",
+  "tag.item.c.foods.edible_when_placed": "Mangiabili se piazzati",
+  "tag.item.c.foods.food_poisoning": "Cibi velenosi",
   "tag.item.c.foods.fruit": "Frutti",
-  "tag.item.c.foods.fruits": "Frutti",
-  "tag.item.c.foods.golden": "Cibi d'Oro",
+  "tag.item.c.foods.golden": "Cibi d'oro",
   "tag.item.c.foods.pie": "Torte",
-  "tag.item.c.foods.raw_fish": "Pesci Crudi",
-  "tag.item.c.foods.raw_fishes": "Pesci Crudi",
-  "tag.item.c.foods.raw_meat": "Carni Crude",
-  "tag.item.c.foods.raw_meats": "Carni Crude",
+  "tag.item.c.foods.raw_fish": "Pesci crudi",
+  "tag.item.c.foods.raw_meat": "Carni crude",
   "tag.item.c.foods.soup": "Zuppe",
-  "tag.item.c.foods.soups": "Zuppe",
   "tag.item.c.foods.vegetable": "Verdure",
-  "tag.item.c.foods.vegetables": "Verdure",
+  "tag.item.c.froglights": "Lanterane",
   "tag.item.c.gems": "Gemme",
-  "tag.item.c.gems.amethyst": "Gemme di Ametista",
-  "tag.item.c.gems.diamond": "Gemme di Diamante",
-  "tag.item.c.gems.emerald": "Gemme di Smeraldo",
-  "tag.item.c.gems.lapis": "Gemme di Lapislazzuli",
-  "tag.item.c.gems.prismarine": "Gemme di Prismarino",
-  "tag.item.c.gems.quartz": "Gemme di Quarzo",
-  "tag.item.c.glass_blocks": "Blocchi di Vetro",
-  "tag.item.c.glass_blocks.cheap": "Blocchi di Vetro Economico",
-  "tag.item.c.glass_blocks.colorless": "Blocchi di Vetro Incolore",
-  "tag.item.c.glass_blocks.tinted": "Blocchi di Vetro Oscurato",
-  "tag.item.c.glass_panes": "Pannelli di Vetro",
-  "tag.item.c.glass_panes.colorless": "Pannelli di Vetro Incolore",
-  "tag.item.c.glazed_terracotta": "Terracotta Smaltata",
-  "tag.item.c.glazed_terracottas": "Terrecotte Smaltate",
+  "tag.item.c.gems.amethyst": "Gemme di ametista",
+  "tag.item.c.gems.diamond": "Gemme di diamante",
+  "tag.item.c.gems.emerald": "Gemme di smeraldo",
+  "tag.item.c.gems.lapis": "Gemme di lapislazzuli",
+  "tag.item.c.gems.prismarine": "Gemme di prismarino",
+  "tag.item.c.gems.quartz": "Gemme di quarzo",
+  "tag.item.c.glass_blocks": "Blocchi di vetro",
+  "tag.item.c.glass_blocks.cheap": "Blocchi di vetro economico",
+  "tag.item.c.glass_blocks.colorless": "Blocchi di vetro incolore",
+  "tag.item.c.glass_blocks.tinted": "Blocchi di vetro oscurato",
+  "tag.item.c.glass_panes": "Pannelli di vetro",
+  "tag.item.c.glass_panes.colorless": "Pannelli di vetro incolore",
+  "tag.item.c.glazed_terracottas": "Terrecotte smaltate",
   "tag.item.c.gravels": "Ghiaie",
-  "tag.item.c.gunpowders": "Polveri da Sparo",
-  "tag.item.c.hidden_from_recipe_viewers": "Nascosto dalle Anteprime Ricette",
+  "tag.item.c.gunpowders": "Polveri da sparo",
+  "tag.item.c.hidden_from_recipe_viewers": "Nascosto nelle anteprime di ricette",
   "tag.item.c.ingots": "Lingotti",
-  "tag.item.c.ingots.copper": "Lingotti di Rame",
-  "tag.item.c.ingots.gold": "Lingotti d'Oro",
-  "tag.item.c.ingots.iron": "Lingotti di Ferro",
-  "tag.item.c.ingots.netherite": "Lingotti di Netherite",
+  "tag.item.c.ingots.copper": "Lingotti di rame",
+  "tag.item.c.ingots.gold": "Lingotti d'oro",
+  "tag.item.c.ingots.iron": "Lingotti di ferro",
+  "tag.item.c.ingots.netherite": "Lingotti di netherite",
   "tag.item.c.leathers": "Cuoi",
   "tag.item.c.mushrooms": "Funghi",
-  "tag.item.c.music_discs": "Dischi Musicali",
+  "tag.item.c.music_discs": "Dischi musicali",
+  "tag.item.c.natural_logs": "Blocchi di tronchi naturali",
+  "tag.item.c.natural_logs.nether": "Blocchi di gambi spontanei del Nether",
+  "tag.item.c.natural_logs.overworld": "Blocchi di tronchi naturali dell'Overworld",
+  "tag.item.c.natural_woods": "Blocchi di legni naturali",
   "tag.item.c.nether_stars": "Stelle del Nether",
   "tag.item.c.netherracks": "Netherrack",
   "tag.item.c.nuggets": "Pepite",
+  "tag.item.c.nuggets.copper": "Pepite di rame",
   "tag.item.c.nuggets.gold": "Pepite d'oro",
   "tag.item.c.nuggets.iron": "Pepite di ferro",
   "tag.item.c.obsidians": "Ossidiane",
   "tag.item.c.obsidians.crying": "Ossidiane piangenti",
-  "tag.item.c.obsidians.normal": "Ossidiane Normali",
-  "tag.item.c.ore_bearing_ground.deepslate": "Suolo Ricco di Minerali in Ardesia Profonda",
-  "tag.item.c.ore_bearing_ground.netherrack": "Suolo Ricco di Minerali in Netherrack",
-  "tag.item.c.ore_bearing_ground.stone": "Suolo Ricco di Minerali in Pietra",
-  "tag.item.c.ore_rates.dense": "Tassi Densi di Minerali",
-  "tag.item.c.ore_rates.singular": "Tassi Singolari di Minerali",
-  "tag.item.c.ore_rates.sparse": "Tassi Radi di Minerali",
+  "tag.item.c.obsidians.normal": "Ossidiane inscalfibili",
+  "tag.item.c.ore_bearing_ground.deepslate": "Suolo ricco di minerali in ardesia profonda",
+  "tag.item.c.ore_bearing_ground.netherrack": "Suolo ricco di minerali in netherrack",
+  "tag.item.c.ore_bearing_ground.stone": "Suolo ricco di minerali in pietra",
+  "tag.item.c.ore_rates.dense": "Tassi alti di minerali",
+  "tag.item.c.ore_rates.singular": "Tassi singoli di minerali",
+  "tag.item.c.ore_rates.sparse": "Tassi radi di minerali",
   "tag.item.c.ores": "Minerali",
-  "tag.item.c.ores.coal": "Minerali di Carbone",
-  "tag.item.c.ores.copper": "Minerali di Rame",
-  "tag.item.c.ores.diamond": "Minerali di Diamante",
-  "tag.item.c.ores.emerald": "Minerali di Smeraldo",
-  "tag.item.c.ores.gold": "Minerali d'Oro",
-  "tag.item.c.ores.iron": "Minerali di Ferro",
-  "tag.item.c.ores.lapis": "Minerali di Lapislazzuli",
-  "tag.item.c.ores.netherite_scrap": "Minerali di Frammenti di Netherite",
-  "tag.item.c.ores.quartz": "Minerali di Quarzo",
-  "tag.item.c.ores.redstone": "Minerali di Redstone",
-  "tag.item.c.ores_in_ground.deepslate": "Suolo con Minerali in Ardesia Profonda",
-  "tag.item.c.ores_in_ground.netherrack": "Suolo con Minerali in Netherrack",
-  "tag.item.c.ores_in_ground.stone": "Suolo con Minerali in Pietra",
-  "tag.item.c.player_workstations.crafting_tables": "Banchi da Lavoro",
+  "tag.item.c.ores.coal": "Minerali di carbone",
+  "tag.item.c.ores.copper": "Minerali di rame",
+  "tag.item.c.ores.diamond": "Minerali di diamante",
+  "tag.item.c.ores.emerald": "Minerali di smeraldo",
+  "tag.item.c.ores.gold": "Minerali d'oro",
+  "tag.item.c.ores.iron": "Minerali di ferro",
+  "tag.item.c.ores.lapis": "Minerali di lapislazzuli",
+  "tag.item.c.ores.netherite_scrap": "Minerali di frammenti di netherite",
+  "tag.item.c.ores.quartz": "Minerali di quarzo",
+  "tag.item.c.ores.redstone": "Minerali di redstone",
+  "tag.item.c.ores_in_ground.deepslate": "Suolo con minerali in ardesia profonda",
+  "tag.item.c.ores_in_ground.netherrack": "Suolo con minerali in netherrack",
+  "tag.item.c.ores_in_ground.stone": "Suolo con minerali in pietra",
+  "tag.item.c.player_workstations.crafting_tables": "Banchi da lavoro",
   "tag.item.c.player_workstations.furnaces": "Fornaci",
   "tag.item.c.potions": "Pozioni",
-  "tag.item.c.potions.bottle": "Pozioni Imbottigliate",
+  "tag.item.c.potions.bottle": "Pozioni imbottigliate",
   "tag.item.c.pumpkins": "Zucche",
-  "tag.item.c.pumpkins.carved": "Zucche Intagliate",
-  "tag.item.c.pumpkins.jack_o_lanterns": "Lanterne di Zucca",
-  "tag.item.c.pumpkins.normal": "Zucche Normali",
-  "tag.item.c.raw_blocks": "Blocchi Grezzi",
-  "tag.item.c.raw_blocks.copper": "Blocchi di Rame Grezzo",
-  "tag.item.c.raw_blocks.gold": "Blocchi d'Oro Grezzo",
-  "tag.item.c.raw_blocks.iron": "Blocchi di Ferro Grezzo",
-  "tag.item.c.raw_materials": "Materiali Grezzi",
-  "tag.item.c.raw_materials.copper": "Materiali di Rame Grezzo",
-  "tag.item.c.raw_materials.gold": "Materiali d'Oro Grezzo",
-  "tag.item.c.raw_materials.iron": "Materiali di Ferro Grezzo",
+  "tag.item.c.pumpkins.carved": "Zucche intagliate",
+  "tag.item.c.pumpkins.jack_o_lanterns": "Lanterne di zucca",
+  "tag.item.c.pumpkins.normal": "Zucche intere",
+  "tag.item.c.raw_materials": "Materiali grezzi",
+  "tag.item.c.raw_materials.copper": "Materiali di rame grezzo",
+  "tag.item.c.raw_materials.gold": "Materiali d'oro grezzo",
+  "tag.item.c.raw_materials.iron": "Materiali di ferro grezzo",
   "tag.item.c.rods": "Verghe",
-  "tag.item.c.rods.blaze": "Verghe di Blaze",
-  "tag.item.c.rods.breeze": "Verghe di Breeze",
-  "tag.item.c.rods.wooden": "Verghe di Legno",
+  "tag.item.c.rods.blaze": "Verghe di blaze",
+  "tag.item.c.rods.breeze": "Verghe di brezze",
+  "tag.item.c.rods.wooden": "Verghe di legno",
   "tag.item.c.ropes": "Corde",
   "tag.item.c.sands": "Sabbie",
-  "tag.item.c.sands.colorless": "Sabbie Incolori",
-  "tag.item.c.sands.red": "Sabbie Rosse",
-  "tag.item.c.sandstone.blocks": "Blocchi di Arenaria",
-  "tag.item.c.sandstone.red_blocks": "Blocchi di Arenaria Rossa",
-  "tag.item.c.sandstone.red_slabs": "Lastre di Arenaria Rossa",
-  "tag.item.c.sandstone.red_stairs": "Scalini di Arenaria Rossa",
-  "tag.item.c.sandstone.slabs": "Lastre di Arenaria",
-  "tag.item.c.sandstone.stairs": "Scalini di Arenaria",
-  "tag.item.c.sandstone.uncolored_blocks": "Blocchi di Arenaria Non Tinti",
-  "tag.item.c.sandstone.uncolored_slabs": "Lastre di Arenaria Non Tinte",
-  "tag.item.c.sandstone.uncolored_stairs": "Scalini di Arenaria Non Tinti",
+  "tag.item.c.sands.colorless": "Sabbie incolori",
+  "tag.item.c.sands.red": "Sabbie rosse",
+  "tag.item.c.sandstone.blocks": "Blocchi di arenaria",
+  "tag.item.c.sandstone.red_blocks": "Blocchi di arenaria rossa",
+  "tag.item.c.sandstone.red_slabs": "Lastre di arenaria rossa",
+  "tag.item.c.sandstone.red_stairs": "Scalini di arenaria rossa",
+  "tag.item.c.sandstone.slabs": "Lastre di arenaria",
+  "tag.item.c.sandstone.stairs": "Scalini di arenaria",
+  "tag.item.c.sandstone.uncolored_blocks": "Blocchi di arenaria non tinta",
+  "tag.item.c.sandstone.uncolored_slabs": "Lastre di arenaria non tinta",
+  "tag.item.c.sandstone.uncolored_stairs": "Scalini di arenaria non tinta",
   "tag.item.c.seeds": "Semi",
-  "tag.item.c.seeds.beetroot": "Semi di Barbabietola",
-  "tag.item.c.seeds.melon": "Semi di Melone",
-  "tag.item.c.seeds.pitcher_plant": "Semi di Pianta Carnivora",
-  "tag.item.c.seeds.pumpkin": "Semi di Zucca",
-  "tag.item.c.seeds.torchflower": "Semi di Fiortorcia",
-  "tag.item.c.seeds.wheat": "Semi di Grano",
-  "tag.item.c.shulker_boxes": "Scatole di Shulker",
-  "tag.item.c.slime_balls": "Palle di Gelatina",
+  "tag.item.c.seeds.beetroot": "Semi di barbabietola",
+  "tag.item.c.seeds.melon": "Semi di anguria",
+  "tag.item.c.seeds.pitcher_plant": "Semi di pianta carnivora",
+  "tag.item.c.seeds.pumpkin": "Semi di zucca",
+  "tag.item.c.seeds.torchflower": "Semi di fiortorcia",
+  "tag.item.c.seeds.wheat": "Semi di grano",
+  "tag.item.c.shulker_boxes": "Scatole di shulker",
+  "tag.item.c.slime_balls": "Palle di gelatina",
   "tag.item.c.stones": "Pietre",
-  "tag.item.c.storage_blocks": "Blocchi di Conservazione",
-  "tag.item.c.storage_blocks.bone_meal": "Blocchi di Conservazione di Farina di Ossa",
-  "tag.item.c.storage_blocks.coal": "Blocchi di Conservazione di Carbone",
-  "tag.item.c.storage_blocks.copper": "Blocchi di Conservazione di Rame",
-  "tag.item.c.storage_blocks.diamond": "Blocchi di Conservazione di Diamante",
-  "tag.item.c.storage_blocks.dried_kelp": "Blocchi di Conservazione di Alghe Essiccate",
-  "tag.item.c.storage_blocks.emerald": "Blocchi di Conservazione di Smeraldo",
-  "tag.item.c.storage_blocks.gold": "Blocchi di Conservazione di Oro",
-  "tag.item.c.storage_blocks.iron": "Blocchi di Conservazione di Ferro",
-  "tag.item.c.storage_blocks.lapis": "Blocchi di Conservazione di Lapislazzuli",
-  "tag.item.c.storage_blocks.netherite": "Blocchi di Conservazione di Netherite",
-  "tag.item.c.storage_blocks.raw_copper": "Blocchi di Conservazione di Rame Grezzo",
-  "tag.item.c.storage_blocks.raw_gold": "Blocchi di Conservazione di Oro Grezzo",
-  "tag.item.c.storage_blocks.raw_iron": "Blocchi di Conservazione di Ferro Grezzo",
-  "tag.item.c.storage_blocks.redstone": "Blocchi di Conservazione di Redstone",
-  "tag.item.c.storage_blocks.resin": "Blocchi di Conservazione di Resina",
-  "tag.item.c.storage_blocks.slime": "Blocchi di Conservazione di Slime",
-  "tag.item.c.storage_blocks.wheat": "Blocchi di Conservazione di Grano",
+  "tag.item.c.storage_blocks": "Blocchi d'immagazzinamento",
+  "tag.item.c.storage_blocks.bone_meal": "Blocchi d'immagazzinamento di farina di ossa",
+  "tag.item.c.storage_blocks.coal": "Blocchi d'immagazzinamento di carbone",
+  "tag.item.c.storage_blocks.copper": "Blocchi d'immagazzinamento di rame",
+  "tag.item.c.storage_blocks.diamond": "Blocchi d'immagazzinamento di diamante",
+  "tag.item.c.storage_blocks.dried_kelp": "Blocchi d'immagazzinamento di alghe essiccate",
+  "tag.item.c.storage_blocks.emerald": "Blocchi d'immagazzinamento di smeraldo",
+  "tag.item.c.storage_blocks.gold": "Blocchi d'immagazzinamento d'oro",
+  "tag.item.c.storage_blocks.iron": "Blocchi d'immagazzinamento di ferro",
+  "tag.item.c.storage_blocks.lapis": "Blocchi d'immagazzinamento di lapislazzuli",
+  "tag.item.c.storage_blocks.netherite": "Blocchi d'immagazzinamento di netherite",
+  "tag.item.c.storage_blocks.raw_copper": "Blocchi d'immagazzinamento di rame grezzo",
+  "tag.item.c.storage_blocks.raw_gold": "Blocchi d'immagazzinamento d'oro grezzo",
+  "tag.item.c.storage_blocks.raw_iron": "Blocchi d'immagazzinamento di ferro grezzo",
+  "tag.item.c.storage_blocks.redstone": "Blocchi d'immagazzinamento di redstone",
+  "tag.item.c.storage_blocks.resin": "Blocchi d'immagazzinamento di resina",
+  "tag.item.c.storage_blocks.slime": "Blocchi d'immagazzinamento di gelatina",
+  "tag.item.c.storage_blocks.wheat": "Blocchi d'immagazzinamento di grano",
   "tag.item.c.strings": "Cordicelle",
-  "tag.item.c.stripped_logs": "Blocchi di Tronchi Scortecciati",
-  "tag.item.c.stripped_woods": "Blocchi di Legni Scortecciati",
+  "tag.item.c.stripped_logs": "Blocchi di tronchi scortecciati",
+  "tag.item.c.stripped_woods": "Blocchi di legni scortecciati",
   "tag.item.c.tools": "Utensili",
   "tag.item.c.tools.bow": "Archi",
-  "tag.item.c.tools.bows": "Archi",
   "tag.item.c.tools.brush": "Spazzole",
-  "tag.item.c.tools.brushes": "Spazzole",
   "tag.item.c.tools.crossbow": "Balestre",
-  "tag.item.c.tools.crossbows": "Balestre",
-  "tag.item.c.tools.fishing_rod": "Canne da Pesca",
-  "tag.item.c.tools.fishing_rods": "Canne da Pesca",
+  "tag.item.c.tools.fishing_rod": "Canne da pesca",
   "tag.item.c.tools.igniter": "Accensori",
   "tag.item.c.tools.mace": "Mazze",
-  "tag.item.c.tools.melee_weapon": "Armi da Mischia",
-  "tag.item.c.tools.melee_weapons": "Armi da Mischia",
-  "tag.item.c.tools.mining_tool": "Utensili per lo Scavo",
-  "tag.item.c.tools.mining_tools": "Utensili per lo Scavo",
-  "tag.item.c.tools.ranged_weapon": "Armi a Distanza",
-  "tag.item.c.tools.ranged_weapons": "Armi a Distanza",
+  "tag.item.c.tools.melee_weapon": "Armi da mischia",
+  "tag.item.c.tools.mining_tool": "Utensili per lo scavo",
+  "tag.item.c.tools.ranged_weapon": "Armi a distanza",
   "tag.item.c.tools.shear": "Cesoie",
-  "tag.item.c.tools.shears": "Cesoie",
   "tag.item.c.tools.shield": "Scudi",
-  "tag.item.c.tools.shields": "Scudi",
-  "tag.item.c.tools.spear": "Lance",
-  "tag.item.c.tools.spears": "Lance",
-  "tag.item.c.tools.wrench": "Chiavi Inglesi",
-  "tag.item.c.villager_job_sites": "Siti di Lavoro di Villici",
-  "tag.worldgen.biome.c.hidden_from_locator_selection": "Nascosto da Selezione Locazione",
+  "tag.item.c.tools.trident": "Tridenti",
+  "tag.item.c.tools.wrench": "Chiavi inglesi",
+  "tag.item.c.villager_job_sites": "Siti di lavoro di villici",
+  "tag.potion.c.hidden_from_recipe_viewers": "Nascosto nelle anteprime di ricette",
+  "tag.worldgen.biome.c.hidden_from_locator_selection": "Nascosto nei selettori di locazione",
   "tag.worldgen.biome.c.is_aquatic": "Acquatico",
-  "tag.worldgen.biome.c.is_aquatic_icy": "Acquatico Ghiacciato",
-  "tag.worldgen.biome.c.is_badlands": "Badlands",
-  "tag.worldgen.biome.c.is_beach": "Spaggia",
-  "tag.worldgen.biome.c.is_birch_forest": "Foresta di Betulle",
+  "tag.worldgen.biome.c.is_aquatic_icy": "Acquatico ghiacciato",
+  "tag.worldgen.biome.c.is_badlands": "Calanchi",
+  "tag.worldgen.biome.c.is_beach": "Spiaggia",
+  "tag.worldgen.biome.c.is_birch_forest": "Foresta di betulle",
   "tag.worldgen.biome.c.is_cave": "Caverna",
   "tag.worldgen.biome.c.is_cold": "Freddo",
-  "tag.worldgen.biome.c.is_cold.end": "End Freddo",
-  "tag.worldgen.biome.c.is_cold.nether": "Nether Freddo",
-  "tag.worldgen.biome.c.is_cold.overworld": "Overworld Freddo",
-  "tag.worldgen.biome.c.is_dark_forest": "Foresta Oscura",
+  "tag.worldgen.biome.c.is_cold.end": "End polare",
+  "tag.worldgen.biome.c.is_cold.nether": "Nether cocitico",
+  "tag.worldgen.biome.c.is_cold.overworld": "Overworld freddo",
+  "tag.worldgen.biome.c.is_dark_forest": "Foresta oscura",
   "tag.worldgen.biome.c.is_dead": "Morto",
-  "tag.worldgen.biome.c.is_deep_ocean": "Oceano Profondo",
-  "tag.worldgen.biome.c.is_dense_vegetation": "Vegetazione Fitta",
-  "tag.worldgen.biome.c.is_dense_vegetation.end": "Vegetazione dell'End Fitta",
-  "tag.worldgen.biome.c.is_dense_vegetation.nether": "Vegetazione del Nether Fitta",
-  "tag.worldgen.biome.c.is_dense_vegetation.overworld": "Vegetazione dell'Overworld Fitta",
+  "tag.worldgen.biome.c.is_deep_ocean": "Oceano profondo",
+  "tag.worldgen.biome.c.is_dense_vegetation": "Vegetazione fitta",
+  "tag.worldgen.biome.c.is_dense_vegetation.end": "Infiorescenze fitte dell'End",
+  "tag.worldgen.biome.c.is_dense_vegetation.nether": "Escrescenze fitte del Nether",
+  "tag.worldgen.biome.c.is_dense_vegetation.overworld": "Vegetazione fitta dell'Overworld",
   "tag.worldgen.biome.c.is_desert": "Deserto",
   "tag.worldgen.biome.c.is_dry": "Secco",
-  "tag.worldgen.biome.c.is_dry.end": "End Secco",
-  "tag.worldgen.biome.c.is_dry.nether": "Nether Secco",
-  "tag.worldgen.biome.c.is_dry.overworld": "Overworld Secco",
+  "tag.worldgen.biome.c.is_dry.end": "End arido",
+  "tag.worldgen.biome.c.is_dry.nether": "Nether xerico",
+  "tag.worldgen.biome.c.is_dry.overworld": "Overworld secco",
   "tag.worldgen.biome.c.is_end": "L'End",
   "tag.worldgen.biome.c.is_floral": "Fiorito",
-  "tag.worldgen.biome.c.is_flower_forest": "Foresta Fiorita",
+  "tag.worldgen.biome.c.is_flower_forest": "Foresta fiorita",
   "tag.worldgen.biome.c.is_forest": "Foresta",
   "tag.worldgen.biome.c.is_hill": "Collina",
   "tag.worldgen.biome.c.is_hot": "Caldo",
-  "tag.worldgen.biome.c.is_hot.end": "End Caldo",
-  "tag.worldgen.biome.c.is_hot.nether": "Nether Caldo",
-  "tag.worldgen.biome.c.is_hot.overworld": "Overworld Caldo",
+  "tag.worldgen.biome.c.is_hot.end": "End torrido",
+  "tag.worldgen.biome.c.is_hot.nether": "Nether rovente",
+  "tag.worldgen.biome.c.is_hot.overworld": "Overworld caldo",
   "tag.worldgen.biome.c.is_icy": "Ghiacciato",
   "tag.worldgen.biome.c.is_jungle": "Giungla",
   "tag.worldgen.biome.c.is_lush": "Rigoglioso",
@@ -467,7 +460,7 @@
   "tag.worldgen.biome.c.is_nether_forest": "Foresta del Nether",
   "tag.worldgen.biome.c.is_ocean": "Oceano",
   "tag.worldgen.biome.c.is_old_growth": "Secolare",
-  "tag.worldgen.biome.c.is_outer_end_island": "Isola Periferica dell'End",
+  "tag.worldgen.biome.c.is_outer_end_island": "Isola periferica dell'End",
   "tag.worldgen.biome.c.is_overworld": "Overworld",
   "tag.worldgen.biome.c.is_plains": "Pianura",
   "tag.worldgen.biome.c.is_plateau": "Altopiano",
@@ -475,34 +468,47 @@
   "tag.worldgen.biome.c.is_river": "Fiume",
   "tag.worldgen.biome.c.is_sandy": "Sabbioso",
   "tag.worldgen.biome.c.is_savanna": "Savana",
-  "tag.worldgen.biome.c.is_shallow_ocean": "Oceano Poco Profondo",
+  "tag.worldgen.biome.c.is_shallow_ocean": "Oceano poco profondo",
   "tag.worldgen.biome.c.is_snowy": "Nevoso",
-  "tag.worldgen.biome.c.is_snowy_plains": "Pianura Nevosa",
-  "tag.worldgen.biome.c.is_sparse_vegetation": "Vegetazione Rada",
-  "tag.worldgen.biome.c.is_sparse_vegetation.end": "Vegetazione dell'End Rada",
-  "tag.worldgen.biome.c.is_sparse_vegetation.nether": "Vegetazione del Nether Rada",
-  "tag.worldgen.biome.c.is_sparse_vegetation.overworld": "Vegetazione dell'Overworld Rada",
+  "tag.worldgen.biome.c.is_snowy_plains": "Pianura nevosa",
+  "tag.worldgen.biome.c.is_sparse_vegetation": "Vegetazione rada",
+  "tag.worldgen.biome.c.is_sparse_vegetation.end": "Infiorescenze rade dell'End",
+  "tag.worldgen.biome.c.is_sparse_vegetation.nether": "Escrescenze rade del Nether",
+  "tag.worldgen.biome.c.is_sparse_vegetation.overworld": "Vegetazione rada dell'Overworld",
   "tag.worldgen.biome.c.is_spooky": "Spaventoso",
-  "tag.worldgen.biome.c.is_stony_shores": "Coste Rocciose",
+  "tag.worldgen.biome.c.is_stony_shores": "Coste rocciose",
   "tag.worldgen.biome.c.is_swamp": "Palude",
   "tag.worldgen.biome.c.is_taiga": "Taiga",
   "tag.worldgen.biome.c.is_temperate": "Temperato",
-  "tag.worldgen.biome.c.is_temperate.end": "End Temperato",
-  "tag.worldgen.biome.c.is_temperate.nether": "Nether Temperato",
-  "tag.worldgen.biome.c.is_temperate.overworld": "Overworld Temperato",
+  "tag.worldgen.biome.c.is_temperate.end": "End mite",
+  "tag.worldgen.biome.c.is_temperate.nether": "Nether mitigato",
+  "tag.worldgen.biome.c.is_temperate.overworld": "Overworld temperato",
   "tag.worldgen.biome.c.is_tree.coniferous": "Conifera",
   "tag.worldgen.biome.c.is_tree.deciduous": "Latifoglie",
-  "tag.worldgen.biome.c.is_tree.jungle": "Albero della Giungla",
-  "tag.worldgen.biome.c.is_tree.savanna": "Albero della Savana",
+  "tag.worldgen.biome.c.is_tree.jungle": "Albero della giungla",
+  "tag.worldgen.biome.c.is_tree.savanna": "Albero della savana",
   "tag.worldgen.biome.c.is_underground": "Sotterraneo",
   "tag.worldgen.biome.c.is_void": "Vuoto",
-  "tag.worldgen.biome.c.is_wasteland": "Terre Desolate",
+  "tag.worldgen.biome.c.is_wasteland": "Terre desolate",
   "tag.worldgen.biome.c.is_wet": "Umido",
-  "tag.worldgen.biome.c.is_wet.end": "End Umido",
-  "tag.worldgen.biome.c.is_wet.nether": "Nether Umido",
-  "tag.worldgen.biome.c.is_wet.overworld": "Overworld Umido",
+  "tag.worldgen.biome.c.is_wet.end": "End madido",
+  "tag.worldgen.biome.c.is_wet.nether": "Nether fradicio",
+  "tag.worldgen.biome.c.is_wet.overworld": "Overworld umido",
   "tag.worldgen.biome.c.is_windswept": "Ventoso",
-  "tag.worldgen.biome.c.no_default_monsters": "Nessun Mostro Predefinito",
-  "tag.worldgen.structure.c.hidden_from_displayers": "Nascosto da Visualizzatori",
-  "tag.worldgen.structure.c.hidden_from_locator_selection": "Nascosto da Selezione Locazione"
+  "tag.worldgen.biome.c.no_default_monsters": "Nessun mostro autoctono",
+  "tag.worldgen.biome.c.primary_wood_type": "Tipo primario di legno",
+  "tag.worldgen.biome.c.primary_wood_type.acacia": "Tipo primario di legno di acacia",
+  "tag.worldgen.biome.c.primary_wood_type.bamboo": "Tipo primario di legno di bambù",
+  "tag.worldgen.biome.c.primary_wood_type.birch": "Tipo primario di legno di betulla",
+  "tag.worldgen.biome.c.primary_wood_type.cherry": "Tipo primario di legno di ciliegio",
+  "tag.worldgen.biome.c.primary_wood_type.crimson": "Tipo primario di gambo cremisi",
+  "tag.worldgen.biome.c.primary_wood_type.dark_oak": "Tipo primario di legno di quercia scura",
+  "tag.worldgen.biome.c.primary_wood_type.jungle": "Tipo primario di legno della giungla",
+  "tag.worldgen.biome.c.primary_wood_type.mangrove": "Tipo primario di legno di mangrovia",
+  "tag.worldgen.biome.c.primary_wood_type.oak": "Tipo primario di legno di quercia",
+  "tag.worldgen.biome.c.primary_wood_type.pale_oak": "Tipo primario di legno di quercia pallida",
+  "tag.worldgen.biome.c.primary_wood_type.spruce": "Tipo primario di legno di abete",
+  "tag.worldgen.biome.c.primary_wood_type.warped": "Tipo primario di gambo distorto",
+  "tag.worldgen.structure.c.hidden_from_displayers": "Nascosto nei visualizzatori",
+  "tag.worldgen.structure.c.hidden_from_locator_selection": "Nascosto nei selettori di locazione"
 }
\ No newline at end of file
diff --git a/fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/lang/uk_ua.json b/fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/lang/uk_ua.json
index 0251a6f310..4906dce368 100644
--- a/fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/lang/uk_ua.json
+++ b/fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/lang/uk_ua.json
@@ -1,6 +1,9 @@
 {
   "tag.block.c.barrels": "Діжки",
   "tag.block.c.barrels.wooden": "Дерев'яні діжки",
+  "tag.block.c.bars": "Ґрати",
+  "tag.block.c.bars.copper": "Мідні ґрати",
+  "tag.block.c.bars.iron": "Залізні ґрати",
   "tag.block.c.bookshelves": "Книжкові полиці",
   "tag.block.c.budding_blocks": "Родючі блоки",
   "tag.block.c.buds": "Зародки",
@@ -15,8 +18,7 @@
   "tag.block.c.cobblestones.infested": "Заражені кругляки",
   "tag.block.c.cobblestones.mossy": "Моховиті кругляки",
   "tag.block.c.cobblestones.normal": "Звичайні кругляки",
-  "tag.block.c.concrete": "Бетон",
-  "tag.block.c.concretes": "Бетонні",
+  "tag.block.c.concretes": "Бетони",
   "tag.block.c.dyed": "Пофарбовані блоки",
   "tag.block.c.dyed.black": "Чорні блоки",
   "tag.block.c.dyed.blue": "Сині блоки",
@@ -42,17 +44,21 @@
   "tag.block.c.fences.wooden": "Дерев'яні паркани",
   "tag.block.c.flowers": "Квіти",
   "tag.block.c.flowers.small": "Малі квіти",
-  "tag.block.c.flowers.tall": "Великі квіти",
+  "tag.block.c.flowers.tall": "Високі квіти",
+  "tag.block.c.froglights": "Жаб'ячі світла",
   "tag.block.c.glass_blocks": "Скляні блоки",
   "tag.block.c.glass_blocks.cheap": "Дешеві скляні блоки",
   "tag.block.c.glass_blocks.colorless": "Нефарбовані скляні блоки",
   "tag.block.c.glass_blocks.tinted": "Тоновані скляні блоки",
-  "tag.block.c.glass_panes": "Скляні шибки",
-  "tag.block.c.glass_panes.colorless": "Нефарбовані скляні шибки",
-  "tag.block.c.glazed_terracotta": "Глазурована кераміка",
+  "tag.block.c.glass_panes": "Шибки",
+  "tag.block.c.glass_panes.colorless": "Нефарбовані шибки",
   "tag.block.c.glazed_terracottas": "Глазуровані кераміки",
   "tag.block.c.gravels": "Гравії",
-  "tag.block.c.hidden_from_recipe_viewers": "Приховані від перегляду рецептів",
+  "tag.block.c.hidden_from_recipe_viewers": "Сховані від переглядачів рецептів",
+  "tag.block.c.natural_logs": "Природні колоди",
+  "tag.block.c.natural_logs.nether": "Природні колоди Незеру",
+  "tag.block.c.natural_logs.overworld": "Природні колоди Верхнього світу",
+  "tag.block.c.natural_woods": "Природні деревини",
   "tag.block.c.netherracks": "Незераки",
   "tag.block.c.obsidians": "Обсидіани",
   "tag.block.c.obsidians.crying": "Плакучі обсидіани",
@@ -83,7 +89,7 @@
   "tag.block.c.pumpkins.carved": "Вирізані гарбузи",
   "tag.block.c.pumpkins.jack_o_lanterns": "Ліхтарі Джека",
   "tag.block.c.pumpkins.normal": "Звичайні гарбузи",
-  "tag.block.c.relocation_not_supported": "Переміщення не підтримується",
+  "tag.block.c.relocation_not_supported": "Не переміщується",
   "tag.block.c.ropes": "Мотузки",
   "tag.block.c.sands": "Піски",
   "tag.block.c.sands.colorless": "Безбарвні піски",
@@ -97,7 +103,6 @@
   "tag.block.c.sandstone.uncolored_blocks": "Некольорові пісковикові блоки",
   "tag.block.c.sandstone.uncolored_slabs": "Некольорові пісковикові плити",
   "tag.block.c.sandstone.uncolored_stairs": "Некольорові пісковикові сходи",
-  "tag.block.c.shulker_boxes": "Шалкерові коробки",
   "tag.block.c.skulls": "Черепи",
   "tag.block.c.stones": "Камені",
   "tag.block.c.storage_blocks": "Компактні блоки",
@@ -121,21 +126,23 @@
   "tag.block.c.stripped_logs": "Обтесані колоди",
   "tag.block.c.stripped_woods": "Обтесані деревини",
   "tag.block.c.villager_job_sites": "Станки роботи селян",
-  "tag.enchantment.c.entity_auxiliary_movement_enhancements": "Зачарування допоміжних рухів сутності",
-  "tag.enchantment.c.entity_defense_enhancements": "Зачарування захисту сутності",
-  "tag.enchantment.c.entity_speed_enhancements": "Зачарування швидкости сутності",
+  "tag.enchantment.c.entity_auxiliary_movement_enhancements": "Зачарування поліпшення руху сутности",
+  "tag.enchantment.c.entity_defense_enhancements": "Зачарування захисту сутности",
+  "tag.enchantment.c.entity_speed_enhancements": "Зачарування швидкости сутности",
+  "tag.enchantment.c.hidden_from_recipe_viewers": "Сховані від переглядачів рецептів",
   "tag.enchantment.c.increase_block_drops": "Збільшує випадання блоків",
   "tag.enchantment.c.increase_entity_drops": "Збільшує випадання сутностей",
   "tag.enchantment.c.weapon_damage_enhancements": "Зачарування шкоди зброї",
   "tag.entity_type.c.boats": "Човни",
   "tag.entity_type.c.bosses": "Боси",
-  "tag.entity_type.c.capturing_not_supported": "Захоплення не підтримується",
+  "tag.entity_type.c.capturing_not_supported": "Не захоплюється",
+  "tag.entity_type.c.item_frames": "Рамки для предметів",
   "tag.entity_type.c.minecarts": "Вагонетки",
-  "tag.entity_type.c.teleporting_not_supported": "Телепортація не підтримується",
+  "tag.entity_type.c.teleporting_not_supported": "Не телепортується",
   "tag.fluid.c.beetroot_soup": "Борщ",
   "tag.fluid.c.experience": "Досвід",
   "tag.fluid.c.gaseous": "Газоподібний",
-  "tag.fluid.c.hidden_from_recipe_viewers": "Приховано від перегляду рецептів",
+  "tag.fluid.c.hidden_from_recipe_viewers": "Сховані від переглядачів рецептів",
   "tag.fluid.c.honey": "Мед",
   "tag.fluid.c.lava": "Лава",
   "tag.fluid.c.milk": "Молоко",
@@ -146,8 +153,15 @@
   "tag.fluid.c.water": "Вода",
   "tag.item.c.animal_foods": "Тваринна їжа",
   "tag.item.c.armors": "Обладунки",
+  "tag.item.c.armors.horse": "Кінські обладунки",
+  "tag.item.c.armors.humanoid": "Людські обладунки",
+  "tag.item.c.armors.nautilus": "Обладунки навтилуса",
+  "tag.item.c.armors.wolf": "Вовчі обладунки",
   "tag.item.c.barrels": "Діжки",
   "tag.item.c.barrels.wooden": "Дерев'яні діжки",
+  "tag.item.c.bars": "Ґрати",
+  "tag.item.c.bars.copper": "Мідні ґрати",
+  "tag.item.c.bars.iron": "Залізні ґрати",
   "tag.item.c.bones": "Кістки",
   "tag.item.c.bookshelves": "Книжкові полиці",
   "tag.item.c.bricks": "Цегла",
@@ -156,7 +170,7 @@
   "tag.item.c.bricks.resin": "Смоляні цеглини",
   "tag.item.c.buckets": "Відра",
   "tag.item.c.buckets.empty": "Порожні відра",
-  "tag.item.c.buckets.entity_water": "Відра води сутності",
+  "tag.item.c.buckets.entity_water": "Відра води зі сутністю",
   "tag.item.c.buckets.lava": "Відра лави",
   "tag.item.c.buckets.milk": "Відра молока",
   "tag.item.c.buckets.powder_snow": "Відра із сипким снігом",
@@ -171,27 +185,24 @@
   "tag.item.c.clumps": "Згустки",
   "tag.item.c.clumps.resin": "Згустки смоли",
   "tag.item.c.clusters": "Друзи",
-  "tag.item.c.coal": "Вугілля",
   "tag.item.c.cobblestones": "Кругляки",
   "tag.item.c.cobblestones.deepslate": "Глибосланцеві кругляки",
   "tag.item.c.cobblestones.infested": "Заражені кругляки",
   "tag.item.c.cobblestones.mossy": "Моховиті кругляки",
   "tag.item.c.cobblestones.normal": "Звичайні кругляки",
-  "tag.item.c.concrete": "Бетон",
-  "tag.item.c.concrete_powder": "Цемент",
   "tag.item.c.concrete_powders": "Цементи",
   "tag.item.c.concretes": "Бетони",
   "tag.item.c.crops": "Урожаї",
-  "tag.item.c.crops.beetroot": "Урожаї буряку",
-  "tag.item.c.crops.cactus": "Урожай кактусу",
-  "tag.item.c.crops.carrot": "Урожай моркви",
-  "tag.item.c.crops.cocoa_bean": "Урожай какао-бобів",
-  "tag.item.c.crops.melon": "Урожай кавуну",
-  "tag.item.c.crops.nether_wart": "Урожай незерського наросту",
-  "tag.item.c.crops.potato": "Урожай картоплі",
-  "tag.item.c.crops.pumpkin": "Урожай гарбузу",
-  "tag.item.c.crops.sugar_cane": "Урожай цукрової тростини",
-  "tag.item.c.crops.wheat": "Урожай пшениці",
+  "tag.item.c.crops.beetroot": "Урожаї буряка",
+  "tag.item.c.crops.cactus": "Урожаї кактуса",
+  "tag.item.c.crops.carrot": "Урожаї моркви",
+  "tag.item.c.crops.cocoa_bean": "Урожаї какао-бобів",
+  "tag.item.c.crops.melon": "Урожаї кавуна",
+  "tag.item.c.crops.nether_wart": "Урожаї незерського наросту",
+  "tag.item.c.crops.potato": "Урожаї картоплі",
+  "tag.item.c.crops.pumpkin": "Урожаї гарбуза",
+  "tag.item.c.crops.sugar_cane": "Урожаї цукрової тростини",
+  "tag.item.c.crops.wheat": "Урожаї пшениці",
   "tag.item.c.drink_containing.bottle": "Напій у пляшці",
   "tag.item.c.drink_containing.bucket": "Напій у відрі",
   "tag.item.c.drinks": "Напої",
@@ -240,7 +251,7 @@
   "tag.item.c.dyes.white": "Білі барвники",
   "tag.item.c.dyes.yellow": "Жовті барвники",
   "tag.item.c.eggs": "Яйця",
-  "tag.item.c.enchantables": "Можна зачарувати",
+  "tag.item.c.enchantables": "Зачаровувані",
   "tag.item.c.end_stones": "Камені Енду",
   "tag.item.c.ender_pearls": "Перлини Енду",
   "tag.item.c.feathers": "Шкіри",
@@ -252,34 +263,25 @@
   "tag.item.c.fertilizers": "Добрива",
   "tag.item.c.flowers": "Квіти",
   "tag.item.c.flowers.small": "Малі квіти",
-  "tag.item.c.flowers.tall": "Великі квіти",
+  "tag.item.c.flowers.tall": "Високі квіти",
   "tag.item.c.foods": "Їжа",
-  "tag.item.c.foods.berries": "Ягоди",
   "tag.item.c.foods.berry": "Ягоди",
   "tag.item.c.foods.bread": "Хліби",
-  "tag.item.c.foods.breads": "Хліби",
-  "tag.item.c.foods.candies": "Солодощі",
   "tag.item.c.foods.candy": "Солодощі",
   "tag.item.c.foods.cooked_fish": "Смажені риби",
-  "tag.item.c.foods.cooked_fishes": "Смажені риби",
-  "tag.item.c.foods.cooked_meat": "Смажене м'ясо",
-  "tag.item.c.foods.cooked_meats": "Смажені м'ясо",
-  "tag.item.c.foods.cookie": "Печиво",
-  "tag.item.c.foods.cookies": "Печиво",
+  "tag.item.c.foods.cooked_meat": "Смажені м'яса",
+  "tag.item.c.foods.cookie": "Печива",
+  "tag.item.c.foods.dough": "Тіста",
   "tag.item.c.foods.edible_when_placed": "Їстівні після розміщення",
   "tag.item.c.foods.food_poisoning": "Отруйна їжа",
   "tag.item.c.foods.fruit": "Фрукти",
-  "tag.item.c.foods.fruits": "Фрукти",
   "tag.item.c.foods.golden": "Золота їжа",
   "tag.item.c.foods.pie": "Пироги",
   "tag.item.c.foods.raw_fish": "Сирі риби",
-  "tag.item.c.foods.raw_fishes": "Сирі риби",
-  "tag.item.c.foods.raw_meat": "Сире м'ясо",
-  "tag.item.c.foods.raw_meats": "Сире м'ясо",
+  "tag.item.c.foods.raw_meat": "Сирі м'яса",
   "tag.item.c.foods.soup": "Супи",
-  "tag.item.c.foods.soups": "Супи",
   "tag.item.c.foods.vegetable": "Овочі",
-  "tag.item.c.foods.vegetables": "Овочі",
+  "tag.item.c.froglights": "Жаб'ячі світла",
   "tag.item.c.gems": "Кристали",
   "tag.item.c.gems.amethyst": "Аметистові кристали",
   "tag.item.c.gems.diamond": "Діамантові кристали",
@@ -291,13 +293,12 @@
   "tag.item.c.glass_blocks.cheap": "Дешеві скляні блоки",
   "tag.item.c.glass_blocks.colorless": "Нефарбовані скляні блоки",
   "tag.item.c.glass_blocks.tinted": "Тоновані скляні блоки",
-  "tag.item.c.glass_panes": "Скляні шибки",
-  "tag.item.c.glass_panes.colorless": "Нефарбовані скляні шибки",
-  "tag.item.c.glazed_terracotta": "Глазурована кераміка",
+  "tag.item.c.glass_panes": "Шибки",
+  "tag.item.c.glass_panes.colorless": "Нефарбовані шибки",
   "tag.item.c.glazed_terracottas": "Глазуровані кераміки",
   "tag.item.c.gravels": "Гравії",
   "tag.item.c.gunpowders": "Порохи",
-  "tag.item.c.hidden_from_recipe_viewers": "Приховані від перегляду рецептів",
+  "tag.item.c.hidden_from_recipe_viewers": "Сховані від переглядачів рецептів",
   "tag.item.c.ingots": "Злитки",
   "tag.item.c.ingots.copper": "Мідні злитки",
   "tag.item.c.ingots.gold": "Золоті злитки",
@@ -306,9 +307,14 @@
   "tag.item.c.leathers": "Шкіра",
   "tag.item.c.mushrooms": "Гриби",
   "tag.item.c.music_discs": "Платівки",
+  "tag.item.c.natural_logs": "Блоки природних колод",
+  "tag.item.c.natural_logs.nether": "Блоки природних колод Незеру",
+  "tag.item.c.natural_logs.overworld": "Блоки природних колод Верхнього світу",
+  "tag.item.c.natural_woods": "Блоки природних деревин",
   "tag.item.c.nether_stars": "Сходи із незерської цегли",
   "tag.item.c.netherracks": "Незераки",
   "tag.item.c.nuggets": "Самородки",
+  "tag.item.c.nuggets.copper": "Мідні самородки",
   "tag.item.c.nuggets.gold": "Золоті самородки",
   "tag.item.c.nuggets.iron": "Залізні самородки",
   "tag.item.c.obsidians": "Обсидіани",
@@ -342,10 +348,6 @@
   "tag.item.c.pumpkins.carved": "Вирізані гарбузи",
   "tag.item.c.pumpkins.jack_o_lanterns": "Ліхтарі Джека",
   "tag.item.c.pumpkins.normal": "Звичайні гарбузи",
-  "tag.item.c.raw_blocks": "Необроблені блоки",
-  "tag.item.c.raw_blocks.copper": "Блоки необробленої міді",
-  "tag.item.c.raw_blocks.gold": "Блоки необробленого золота",
-  "tag.item.c.raw_blocks.iron": "Блоки необробленого заліза",
   "tag.item.c.raw_materials": "Необроблені матеріали",
   "tag.item.c.raw_materials.copper": "Необроблена мідь",
   "tag.item.c.raw_materials.gold": "Необроблене золото",
@@ -368,10 +370,10 @@
   "tag.item.c.sandstone.uncolored_slabs": "Некольорові пісковикові плити",
   "tag.item.c.sandstone.uncolored_stairs": "Некольорові пісковикові сходи",
   "tag.item.c.seeds": "Насіння",
-  "tag.item.c.seeds.beetroot": "Насіння буряку",
-  "tag.item.c.seeds.melon": "Насіння кавуну",
-  "tag.item.c.seeds.pitcher_plant": "Посаджене насіння глечника",
-  "tag.item.c.seeds.pumpkin": "Насіння гарбузу",
+  "tag.item.c.seeds.beetroot": "Насіння буряка",
+  "tag.item.c.seeds.melon": "Насіння кавуна",
+  "tag.item.c.seeds.pitcher_plant": "Насіння стебла глечника",
+  "tag.item.c.seeds.pumpkin": "Насіння гарбуза",
   "tag.item.c.seeds.torchflower": "Насіння смолоскипника",
   "tag.item.c.seeds.wheat": "Насіння пшениці",
   "tag.item.c.shulker_boxes": "Шалкерові коробки",
@@ -400,29 +402,20 @@
   "tag.item.c.stripped_woods": "Блоки обтесаної деревини",
   "tag.item.c.tools": "Інструменти",
   "tag.item.c.tools.bow": "Луки",
-  "tag.item.c.tools.bows": "Луки",
   "tag.item.c.tools.brush": "Щітки",
-  "tag.item.c.tools.brushes": "Щітки",
   "tag.item.c.tools.crossbow": "Арбалети",
-  "tag.item.c.tools.crossbows": "Арбалети",
   "tag.item.c.tools.fishing_rod": "Вудки",
-  "tag.item.c.tools.fishing_rods": "Вудки",
   "tag.item.c.tools.igniter": "Запальники",
   "tag.item.c.tools.mace": "Булави",
-  "tag.item.c.tools.melee_weapon": "Холодна зброя",
-  "tag.item.c.tools.melee_weapons": "Холодна зброя",
+  "tag.item.c.tools.melee_weapon": "Ближня зброя",
   "tag.item.c.tools.mining_tool": "Добувні інструменти",
-  "tag.item.c.tools.mining_tools": "Добувні інструменти",
-  "tag.item.c.tools.ranged_weapon": "Далекобійна зброя",
-  "tag.item.c.tools.ranged_weapons": "Далекобійна зброя",
+  "tag.item.c.tools.ranged_weapon": "Дальня зброя",
   "tag.item.c.tools.shear": "Ножиці",
-  "tag.item.c.tools.shears": "Ножиці",
   "tag.item.c.tools.shield": "Щити",
-  "tag.item.c.tools.shields": "Щити",
-  "tag.item.c.tools.spear": "Списи",
-  "tag.item.c.tools.spears": "Списи",
+  "tag.item.c.tools.trident": "Тризубці",
   "tag.item.c.tools.wrench": "Гайкові ключі",
   "tag.item.c.villager_job_sites": "Станки роботи селян",
+  "tag.potion.c.hidden_from_recipe_viewers": "Сховані від переглядачів рецептів",
   "tag.worldgen.biome.c.hidden_from_locator_selection": "Приховано від вибору локатора",
   "tag.worldgen.biome.c.is_aquatic": "Водяні",
   "tag.worldgen.biome.c.is_aquatic_icy": "Льодяно-водяні",
@@ -430,7 +423,7 @@
   "tag.worldgen.biome.c.is_beach": "Пляж",
   "tag.worldgen.biome.c.is_birch_forest": "Березовий ліс",
   "tag.worldgen.biome.c.is_cave": "Печера",
-  "tag.worldgen.biome.c.is_cold": "Холодно",
+  "tag.worldgen.biome.c.is_cold": "Холодний",
   "tag.worldgen.biome.c.is_cold.end": "Холодний Енд",
   "tag.worldgen.biome.c.is_cold.nether": "Холодний Незер",
   "tag.worldgen.biome.c.is_cold.overworld": "Холодний Верхній світ",
@@ -442,7 +435,7 @@
   "tag.worldgen.biome.c.is_dense_vegetation.nether": "Густа рослинність Незер",
   "tag.worldgen.biome.c.is_dense_vegetation.overworld": "Густа рослинність Верхнього світу",
   "tag.worldgen.biome.c.is_desert": "Пустеля",
-  "tag.worldgen.biome.c.is_dry": "Засуха",
+  "tag.worldgen.biome.c.is_dry": "Засушливий",
   "tag.worldgen.biome.c.is_dry.end": "Засушливий Енд",
   "tag.worldgen.biome.c.is_dry.nether": "Засушливий Незер",
   "tag.worldgen.biome.c.is_dry.overworld": "Засушливий Верхній світ",
@@ -457,14 +450,14 @@
   "tag.worldgen.biome.c.is_hot.overworld": "Спекотний Верхній світ",
   "tag.worldgen.biome.c.is_icy": "Льодяний",
   "tag.worldgen.biome.c.is_jungle": "Джунглі",
-  "tag.worldgen.biome.c.is_lush": "Пишний",
+  "tag.worldgen.biome.c.is_lush": "Зарослий",
   "tag.worldgen.biome.c.is_magical": "Магічний",
   "tag.worldgen.biome.c.is_mountain": "Гора",
   "tag.worldgen.biome.c.is_mountain.peak": "Гірський пік",
   "tag.worldgen.biome.c.is_mountain.slope": "Гірський схил",
   "tag.worldgen.biome.c.is_mushroom": "Гриб",
   "tag.worldgen.biome.c.is_nether": "Незер",
-  "tag.worldgen.biome.c.is_nether_forest": "Ліс Незеру",
+  "tag.worldgen.biome.c.is_nether_forest": "Незерський ліс",
   "tag.worldgen.biome.c.is_ocean": "Океан",
   "tag.worldgen.biome.c.is_old_growth": "Старий гай",
   "tag.worldgen.biome.c.is_outer_end_island": "Зовнішні острови Енду",
@@ -473,17 +466,17 @@
   "tag.worldgen.biome.c.is_plateau": "Плато",
   "tag.worldgen.biome.c.is_rare": "Рідкісний",
   "tag.worldgen.biome.c.is_river": "Річка",
-  "tag.worldgen.biome.c.is_sandy": "Пісковий",
+  "tag.worldgen.biome.c.is_sandy": "Піщаний",
   "tag.worldgen.biome.c.is_savanna": "Савана",
   "tag.worldgen.biome.c.is_shallow_ocean": "Мілководдя",
   "tag.worldgen.biome.c.is_snowy": "Засніжений",
   "tag.worldgen.biome.c.is_snowy_plains": "Засніжені рівнини",
   "tag.worldgen.biome.c.is_sparse_vegetation": "Розріджена рослинність",
-  "tag.worldgen.biome.c.is_sparse_vegetation.end": "Розсіяна рослинність Енду",
-  "tag.worldgen.biome.c.is_sparse_vegetation.nether": "Розсіяна рослинність Незеру",
+  "tag.worldgen.biome.c.is_sparse_vegetation.end": "Розріджена рослинність Енду",
+  "tag.worldgen.biome.c.is_sparse_vegetation.nether": "Розріджена рослинність Незеру",
   "tag.worldgen.biome.c.is_sparse_vegetation.overworld": "Розріджена рослинність Верхнього світу",
-  "tag.worldgen.biome.c.is_spooky": "Мотороший",
-  "tag.worldgen.biome.c.is_stony_shores": "Кам'янисті береги",
+  "tag.worldgen.biome.c.is_spooky": "Моторошний",
+  "tag.worldgen.biome.c.is_stony_shores": "Скелястий берег",
   "tag.worldgen.biome.c.is_swamp": "Болото",
   "tag.worldgen.biome.c.is_taiga": "Тайга",
   "tag.worldgen.biome.c.is_temperate": "Помірний",
@@ -491,18 +484,18 @@
   "tag.worldgen.biome.c.is_temperate.nether": "Помірний Незер",
   "tag.worldgen.biome.c.is_temperate.overworld": "Помірний верхній світ",
   "tag.worldgen.biome.c.is_tree.coniferous": "Хвойне дерево",
-  "tag.worldgen.biome.c.is_tree.deciduous": "Листопадне дерево",
-  "tag.worldgen.biome.c.is_tree.jungle": "Джунглеве дерево",
+  "tag.worldgen.biome.c.is_tree.deciduous": "Листяне дерево",
+  "tag.worldgen.biome.c.is_tree.jungle": "Тропічне дерево",
   "tag.worldgen.biome.c.is_tree.savanna": "Саванне дерево",
   "tag.worldgen.biome.c.is_underground": "Підземелля",
   "tag.worldgen.biome.c.is_void": "Порожнеча",
-  "tag.worldgen.biome.c.is_wasteland": "Пустище",
+  "tag.worldgen.biome.c.is_wasteland": "Пустир",
   "tag.worldgen.biome.c.is_wet": "Вологий",
   "tag.worldgen.biome.c.is_wet.end": "Вологий Енд",
   "tag.worldgen.biome.c.is_wet.nether": "Вологий Незер",
   "tag.worldgen.biome.c.is_wet.overworld": "Вологий Верхній світ",
   "tag.worldgen.biome.c.is_windswept": "Вітряний",
-  "tag.worldgen.biome.c.no_default_monsters": "Без монстрів усталено",
+  "tag.worldgen.biome.c.no_default_monsters": "Усталено немає монстрів",
   "tag.worldgen.biome.c.primary_wood_type": "Первинний тип деревини",
   "tag.worldgen.biome.c.primary_wood_type.acacia": "Акацієвий первинний тип деревини",
   "tag.worldgen.biome.c.primary_wood_type.bamboo": "Бамбуковий первинний тип деревини",
@@ -516,6 +509,6 @@
   "tag.worldgen.biome.c.primary_wood_type.pale_oak": "Блідо-дубовий первинний тип деревини",
   "tag.worldgen.biome.c.primary_wood_type.spruce": "Смерековий первинний тип деревини",
   "tag.worldgen.biome.c.primary_wood_type.warped": "Химерний первинний тип деревини",
-  "tag.worldgen.structure.c.hidden_from_displayers": "Приховано від демонстраторів",
-  "tag.worldgen.structure.c.hidden_from_locator_selection": "Приховано від вибору локатора"
+  "tag.worldgen.structure.c.hidden_from_displayers": "Сховані від демонстраторів",
+  "tag.worldgen.structure.c.hidden_from_locator_selection": "Сховані від вибору локатора"
 }
\ No newline at end of file
diff --git a/fabric-crash-report-info-v1/build.gradle b/fabric-crash-report-info-v1/build.gradle
deleted file mode 100644
index 64f55fd09e..0000000000
--- a/fabric-crash-report-info-v1/build.gradle
+++ /dev/null
@@ -1,5 +0,0 @@
-version = getSubprojectVersion(project)
-
-testDependencies(project, [
-	':fabric-command-api-v2'
-])
diff --git a/fabric-crash-report-info-v1/src/main/java/net/fabricmc/fabric/impl/crash/report/info/ThreadPrinting.java b/fabric-crash-report-info-v1/src/main/java/net/fabricmc/fabric/impl/crash/report/info/ThreadPrinting.java
deleted file mode 100644
index 41d48a5c68..0000000000
--- a/fabric-crash-report-info-v1/src/main/java/net/fabricmc/fabric/impl/crash/report/info/ThreadPrinting.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * 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.impl.crash.report.info;
-
-import java.lang.management.LockInfo;
-import java.lang.management.MonitorInfo;
-import java.lang.management.ThreadInfo;
-
-public class ThreadPrinting {
-	/**
-	 * A modified copy of {@link ThreadInfo#toString} without the MAX_FRAMES check.
-	 */
-	public static String fullThreadInfoToString(ThreadInfo threadInfo) {
-		StringBuilder sb = new StringBuilder("\"" + threadInfo.getThreadName() + "\""
-				+ (threadInfo.isDaemon() ? " daemon" : "")
-				+ " prio=" + threadInfo.getPriority()
-				+ " Id=" + threadInfo.getThreadId() + " "
-				+ threadInfo.getThreadState());
-
-		if (threadInfo.getLockName() != null) {
-			sb.append(" on ").append(threadInfo.getLockName());
-		}
-
-		if (threadInfo.getLockOwnerName() != null) {
-			sb.append(" owned by \"").append(threadInfo.getLockOwnerName())
-					.append("\" Id=").append(threadInfo.getLockOwnerId());
-		}
-
-		if (threadInfo.isSuspended()) {
-			sb.append(" (suspended)");
-		}
-
-		if (threadInfo.isInNative()) {
-			sb.append(" (in native)");
-		}
-
-		sb.append('\n');
-
-		StackTraceElement[] stackTraceElements = threadInfo.getStackTrace();
-
-		for (int i = 0; i < stackTraceElements.length; i++) {
-			StackTraceElement ste = stackTraceElements[i];
-			sb.append("\tat ").append(ste.toString());
-			sb.append('\n');
-
-			if (i == 0 && threadInfo.getLockInfo() != null) {
-				Thread.State ts = threadInfo.getThreadState();
-				switch (ts) {
-				case BLOCKED -> {
-					sb.append("\t-  blocked on ").append(threadInfo.getLockInfo());
-					sb.append('\n');
-				}
-				case WAITING, TIMED_WAITING -> {
-					sb.append("\t-  waiting on ").append(threadInfo.getLockInfo());
-					sb.append('\n');
-				}
-				default -> {
-				}
-				}
-			}
-
-			for (MonitorInfo mi : threadInfo.getLockedMonitors()) {
-				if (mi.getLockedStackDepth() == i) {
-					sb.append("\t-  locked ").append(mi);
-					sb.append('\n');
-				}
-			}
-		}
-
-		LockInfo[] locks = threadInfo.getLockedSynchronizers();
-
-		if (locks.length > 0) {
-			sb.append("\n\tNumber of locked synchronizers = ").append(locks.length);
-			sb.append('\n');
-
-			for (LockInfo li : locks) {
-				sb.append("\t- ").append(li);
-				sb.append('\n');
-			}
-		}
-
-		sb.append('\n');
-		return sb.toString();
-	}
-}
diff --git a/fabric-crash-report-info-v1/src/main/java/net/fabricmc/fabric/mixin/crash/report/info/ServerWatchdogMixin.java b/fabric-crash-report-info-v1/src/main/java/net/fabricmc/fabric/mixin/crash/report/info/ServerWatchdogMixin.java
deleted file mode 100644
index 61d278af12..0000000000
--- a/fabric-crash-report-info-v1/src/main/java/net/fabricmc/fabric/mixin/crash/report/info/ServerWatchdogMixin.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.mixin.crash.report.info;
-
-import java.lang.management.ThreadInfo;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyArg;
-
-import net.minecraft.server.dedicated.ServerWatchdog;
-
-import net.fabricmc.fabric.impl.crash.report.info.ThreadPrinting;
-
-@Mixin(ServerWatchdog.class)
-public class ServerWatchdogMixin {
-	@ModifyArg(method = "createWatchdogCrashReport(Ljava/lang/String;J)Lnet/minecraft/CrashReport;",
-			at = @At(value = "INVOKE",
-					target = "Ljava/lang/StringBuilder;append(Ljava/lang/Object;)Ljava/lang/StringBuilder;",
-					ordinal = 0)
-	)
-	private static Object printEntireThreadDump(Object object) {
-		if (object instanceof ThreadInfo threadInfo) {
-			return ThreadPrinting.fullThreadInfoToString(threadInfo);
-		}
-
-		return object;
-	}
-}
diff --git a/fabric-crash-report-info-v1/src/main/java/net/fabricmc/fabric/mixin/crash/report/info/SystemReportMixin.java b/fabric-crash-report-info-v1/src/main/java/net/fabricmc/fabric/mixin/crash/report/info/SystemReportMixin.java
deleted file mode 100644
index 06d3217048..0000000000
--- a/fabric-crash-report-info-v1/src/main/java/net/fabricmc/fabric/mixin/crash/report/info/SystemReportMixin.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.mixin.crash.report.info;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.function.Supplier;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.SystemReport;
-
-import net.fabricmc.loader.api.FabricLoader;
-import net.fabricmc.loader.api.ModContainer;
-
-@Mixin(SystemReport.class)
-public abstract class SystemReportMixin {
-	@Shadow
-	public abstract void setDetail(String string, Supplier supplier);
-
-	@Inject(at = @At("RETURN"), method = "")
-	private void fillSystemDetails(CallbackInfo info) {
-		setDetail("Fabric Mods", () -> {
-			ArrayList topLevelMods = new ArrayList<>();
-
-			for (ModContainer container : FabricLoader.getInstance().getAllMods()) {
-				if (container.getContainingMod().isEmpty()) {
-					topLevelMods.add(container);
-				}
-			}
-
-			StringBuilder modString = new StringBuilder();
-
-			appendMods(modString, 2, topLevelMods);
-
-			return modString.toString();
-		});
-	}
-
-	@Unique
-	private static void appendMods(StringBuilder modString, int depth, ArrayList mods) {
-		mods.sort(Comparator.comparing(mod -> mod.getMetadata().getId()));
-
-		for (ModContainer mod : mods) {
-			modString.append('\n');
-			modString.append("\t".repeat(depth));
-			modString.append(mod.getMetadata().getId());
-			modString.append(": ");
-			modString.append(mod.getMetadata().getName());
-			modString.append(' ');
-			modString.append(mod.getMetadata().getVersion().getFriendlyString());
-
-			if (!mod.getContainedMods().isEmpty()) {
-				ArrayList childMods = new ArrayList<>(mod.getContainedMods());
-				appendMods(modString, depth + 1, childMods);
-			}
-		}
-	}
-}
diff --git a/fabric-crash-report-info-v1/src/testmod/java/net/fabricmc/fabric/test/crash/report/info/ThreadDumpTests.java b/fabric-crash-report-info-v1/src/testmod/java/net/fabricmc/fabric/test/crash/report/info/ThreadDumpTests.java
deleted file mode 100644
index f9382c4da0..0000000000
--- a/fabric-crash-report-info-v1/src/testmod/java/net/fabricmc/fabric/test/crash/report/info/ThreadDumpTests.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.crash.report.info;
-
-import static net.minecraft.commands.Commands.literal;
-
-import com.mojang.brigadier.context.CommandContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.minecraft.CrashReport;
-import net.minecraft.ReportType;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.dedicated.ServerWatchdog;
-
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
-
-public class ThreadDumpTests implements ModInitializer {
-	private static final Logger LOGGER = LoggerFactory.getLogger(ThreadDumpTests.class);
-
-	@Override
-	public void onInitialize() {
-		CommandRegistrationCallback.EVENT.register((dispatcher, buildContext, selection) ->
-				dispatcher.register(literal("print_thread_dump_test_command").executes(this::executeDumpCommand)));
-	}
-
-	private int executeDumpCommand(CommandContext context) {
-		final CommandSourceStack source = context.getSource();
-		CrashReport crashReport = ServerWatchdog.createWatchdogCrashReport("Watching Server", context.getSource().getServer().getRunningThread().threadId());
-		LOGGER.info(crashReport.getFriendlyReport(ReportType.CRASH));
-		source.sendSuccess(() -> Component.literal("Thread Dump printed to console."), false);
-		return 1;
-	}
-}
diff --git a/fabric-crash-report-info-v1/src/testmod/resources/fabric.mod.json b/fabric-crash-report-info-v1/src/testmod/resources/fabric.mod.json
deleted file mode 100644
index 759aa34045..0000000000
--- a/fabric-crash-report-info-v1/src/testmod/resources/fabric.mod.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "fabric-crash-report-info-v1-testmod",
-  "name": "Fabric Crash Report Info (v1) Test Mod",
-  "version": "1.0.0",
-  "environment": "*",
-  "license": "Apache-2.0",
-  "entrypoints": {
-    "main": [
-      "net.fabricmc.fabric.test.crash.report.info.ThreadDumpTests"
-    ]
-  }
-}
diff --git a/fabric-creative-tab-api-v1/src/client/java/net/fabricmc/fabric/impl/client/creativetab/FabricCreativeGuiComponents.java b/fabric-creative-tab-api-v1/src/client/java/net/fabricmc/fabric/impl/client/creativetab/FabricCreativeGuiComponents.java
deleted file mode 100644
index 25e96c2593..0000000000
--- a/fabric-creative-tab-api-v1/src/client/java/net/fabricmc/fabric/impl/client/creativetab/FabricCreativeGuiComponents.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.impl.client.creativetab;
-
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphicsExtractor;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen;
-import net.minecraft.client.renderer.RenderPipelines;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.Identifier;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.CreativeModeTabs;
-
-import net.fabricmc.fabric.impl.creativetab.FabricCreativeModeTabImpl;
-
-public class FabricCreativeGuiComponents {
-	private static final Identifier BUTTON_TEX = Identifier.fromNamespaceAndPath("fabric", "textures/gui/creative_buttons.png");
-	private static final double TABS_PER_PAGE = FabricCreativeModeTabImpl.TABS_PER_PAGE;
-	public static final Set COMMON_TABS = Set.of(CreativeModeTabs.SEARCH, CreativeModeTabs.INVENTORY, CreativeModeTabs.HOTBAR, CreativeModeTabs.OP_BLOCKS).stream()
-			.map(BuiltInRegistries.CREATIVE_MODE_TAB::getValueOrThrow)
-			.collect(Collectors.toSet());
-
-	public static int getPageCount() {
-		return (int) Math.ceil((CreativeModeTabs.tabs().size() - COMMON_TABS.stream().filter(CreativeModeTab::shouldDisplay).count()) / TABS_PER_PAGE);
-	}
-
-	public static class CreativeModeTabButton extends Button {
-		final CreativeModeInventoryScreen screen;
-		final Type type;
-
-		public CreativeModeTabButton(int x, int y, Type type, CreativeModeInventoryScreen screen) {
-			super(x, y, 10, 12, type.component, (bw) -> type.clickConsumer.accept(screen), Button.DEFAULT_NARRATION);
-			this.type = type;
-			this.screen = screen;
-		}
-
-		@Override
-		protected void extractContents(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float delta) {
-			this.active = type.isEnabled.test(screen);
-			this.visible = screen.hasAdditionalPages();
-
-			if (!this.visible) {
-				return;
-			}
-
-			int u = active && this.isHovered() ? 20 : 0;
-			int v = active ? 0 : 12;
-			graphics.blit(RenderPipelines.GUI_TEXTURED, BUTTON_TEX, this.getX(), this.getY(), u + (type == Type.NEXT ? 10 : 0), v, 10, 12, 256, 256);
-
-			if (this.isHovered()) {
-				graphics.setTooltipForNextFrame(Minecraft.getInstance().font, net.minecraft.network.chat.Component.translatable("fabric.gui.creativeTabPage", screen.getCurrentPage() + 1, getPageCount()), mouseX, mouseY);
-			}
-		}
-	}
-
-	public enum Type {
-		NEXT(Component.literal(">"), CreativeModeInventoryScreen::switchToNextPage, screen -> screen.getCurrentPage() + 1 < screen.getPageCount()),
-		PREVIOUS(Component.literal("<"), CreativeModeInventoryScreen::switchToPreviousPage, screen -> screen.getCurrentPage() != 0);
-
-		final Component component;
-		final Consumer clickConsumer;
-		final Predicate isEnabled;
-
-		Type(Component component, Consumer clickConsumer, Predicate isEnabled) {
-			this.component = component;
-			this.clickConsumer = clickConsumer;
-			this.isEnabled = isEnabled;
-		}
-	}
-}
diff --git a/fabric-creative-tab-api-v1/src/client/java/net/fabricmc/fabric/mixin/creativetab/client/CreativeModeInventoryScreenMixin.java b/fabric-creative-tab-api-v1/src/client/java/net/fabricmc/fabric/mixin/creativetab/client/CreativeModeInventoryScreenMixin.java
index a66a26254e..feaa5bc904 100644
--- a/fabric-creative-tab-api-v1/src/client/java/net/fabricmc/fabric/mixin/creativetab/client/CreativeModeInventoryScreenMixin.java
+++ b/fabric-creative-tab-api-v1/src/client/java/net/fabricmc/fabric/mixin/creativetab/client/CreativeModeInventoryScreenMixin.java
@@ -16,174 +16,83 @@
 
 package net.fabricmc.fabric.mixin.creativetab.client;
 
-import java.util.Comparator;
 import java.util.List;
-import java.util.Objects;
 
-import org.lwjgl.glfw.GLFW;
+import net.neoforged.neoforge.client.gui.CreativeTabsScreenPage;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen;
 import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen.ItemPickerMenu;
-import net.minecraft.client.input.KeyEvent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.CreativeModeTabs;
 
 import net.fabricmc.fabric.api.client.creativetab.v1.FabricCreativeModeInventoryScreen;
-import net.fabricmc.fabric.impl.client.creativetab.FabricCreativeGuiComponents;
-import net.fabricmc.fabric.impl.creativetab.FabricCreativeModeTabImpl;
 
 @Mixin(CreativeModeInventoryScreen.class)
 public abstract class CreativeModeInventoryScreenMixin extends AbstractContainerScreen implements FabricCreativeModeInventoryScreen {
-	public CreativeModeInventoryScreenMixin(ItemPickerMenu menu, Inventory playerInventory, Component component) {
-		super(menu, playerInventory, component);
-	}
-
-	@Shadow
-	protected abstract void selectTab(CreativeModeTab creativeModeTab_1);
-
 	@Shadow
 	private static CreativeModeTab selectedTab;
 
-	// "static" matches selectedTab
-	@Unique
-	private static int currentPage = 0;
-
-	@Unique
-	private void updateSelection() {
-		if (!isTabVisible(selectedTab)) {
-			CreativeModeTabs.allTabs()
-					.stream()
-					.filter(this::isTabVisible)
-					.min((a, b) -> Boolean.compare(a.isAlignedRight(), b.isAlignedRight()))
-					.ifPresent(this::selectTab);
-		}
-	}
-
-	@Inject(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/EditBox;setTextColor(I)V", shift = At.Shift.AFTER))
-	private void init(CallbackInfo info) {
-		currentPage = getPage(selectedTab);
-
-		int xpos = leftPos + 171;
-		int ypos = topPos + 4;
-
-		CreativeModeInventoryScreen self = (CreativeModeInventoryScreen) (Object) this;
-		addRenderableWidget(new FabricCreativeGuiComponents.CreativeModeTabButton(xpos + 10, ypos, FabricCreativeGuiComponents.Type.NEXT, self));
-		addRenderableWidget(new FabricCreativeGuiComponents.CreativeModeTabButton(xpos, ypos, FabricCreativeGuiComponents.Type.PREVIOUS, self));
-	}
-
-	@Inject(method = "selectTab", at = @At("HEAD"), cancellable = true)
-	private void setSelectedTab(CreativeModeTab creativeModeTab, CallbackInfo info) {
-		if (!isTabVisible(creativeModeTab)) {
-			info.cancel();
-		}
-	}
-
-	@Inject(method = "checkTabHovering", at = @At("HEAD"), cancellable = true)
-	private void renderTabTooltipIfHovered(GuiGraphicsExtractor graphics, CreativeModeTab creativeModeTab, int mx, int my, CallbackInfoReturnable info) {
-		if (!isTabVisible(creativeModeTab)) {
-			info.setReturnValue(false);
-		}
-	}
-
-	@Inject(method = "checkTabClicked", at = @At("HEAD"), cancellable = true)
-	private void isClickInTab(CreativeModeTab creativeModeTab, double mx, double my, CallbackInfoReturnable info) {
-		if (!isTabVisible(creativeModeTab)) {
-			info.setReturnValue(false);
-		}
-	}
-
-	@Inject(method = "extractTabButton", at = @At("HEAD"), cancellable = true)
-	private void extractTabButton(GuiGraphicsExtractor guiGraphics, int i, int j, CreativeModeTab creativeModeTab, CallbackInfo info) {
-		if (!isTabVisible(creativeModeTab)) {
-			info.cancel();
-		}
-	}
-
-	@Inject(method = "keyPressed", at = @At("HEAD"), cancellable = true)
-	private void keyPressed(KeyEvent context, CallbackInfoReturnable cir) {
-		if (context.key() == GLFW.GLFW_KEY_PAGE_UP) {
-			if (switchToPreviousPage()) {
-				cir.setReturnValue(true);
-			}
-		} else if (context.key() == GLFW.GLFW_KEY_PAGE_DOWN) {
-			if (switchToNextPage()) {
-				cir.setReturnValue(true);
-			}
-		}
-	}
+	@Shadow
+	@Final
+	private List pages;
+	@Shadow
+	private CreativeTabsScreenPage currentPage;
 
-	@Unique
-	private boolean isTabVisible(CreativeModeTab creativeModeTab) {
-		return creativeModeTab.shouldDisplay() && currentPage == getPage(creativeModeTab);
+	public CreativeModeInventoryScreenMixin(ItemPickerMenu menu, Inventory inventory, Component title) {
+		super(menu, inventory, title);
 	}
 
 	@Override
-	public int getPage(CreativeModeTab creativeModeTab) {
-		if (FabricCreativeGuiComponents.COMMON_TABS.contains(creativeModeTab)) {
-			return currentPage;
-		}
-
-		final FabricCreativeModeTabImpl fabriccreativeModeTab = (FabricCreativeModeTabImpl) creativeModeTab;
-		return fabriccreativeModeTab.fabric_getPage();
-	}
-
-	@Unique
-	private boolean hasGroupForPage(int page) {
-		return CreativeModeTabs.tabs()
-				.stream()
-				.anyMatch(creativeModeTab -> getPage(creativeModeTab) == page);
+	public boolean switchToPage(int page) {
+		CreativeTabsScreenPage oldPage = currentPage;
+		((CreativeModeInventoryScreen) (Object) this).setCurrentPage(pages.get(page));
+		return oldPage != currentPage;
 	}
 
 	@Override
-	public boolean switchToPage(int page) {
-		if (!hasGroupForPage(page)) {
-			return false;
-		}
-
-		if (currentPage == page) {
-			return false;
-		}
-
-		currentPage = page;
-		updateSelection();
-		return true;
+	public boolean switchToNextPage() {
+		CreativeTabsScreenPage oldPage = currentPage;
+		((CreativeModeInventoryScreen) (Object) this).setCurrentPage(this.pages.get(Math.min(this.pages.indexOf(this.currentPage) + 1, this.pages.size() - 1)));
+		return oldPage != currentPage;
 	}
 
 	@Override
-	public int getCurrentPage() {
-		return currentPage;
+	public boolean switchToPreviousPage() {
+		CreativeTabsScreenPage oldPage = currentPage;
+		((CreativeModeInventoryScreen) (Object) this).setCurrentPage(this.pages.get(Math.max(this.pages.indexOf(this.currentPage) - 1, 0)));
+		return oldPage != currentPage;
 	}
 
 	@Override
 	public int getPageCount() {
-		return FabricCreativeGuiComponents.getPageCount();
+		return pages.size();
 	}
 
 	@Override
 	public List getTabsOnPage(int page) {
-		return CreativeModeTabs.tabs()
-				.stream()
-				.filter(creativeModeTab -> getPage(creativeModeTab) == page)
-				// Thanks to isXander for the sorting
-				.sorted(Comparator.comparing(CreativeModeTab::row).thenComparingInt(CreativeModeTab::column))
-				.sorted((a, b) -> Boolean.compare(a.isAlignedRight(), b.isAlignedRight()))
-				.toList();
+		return pages.get(page).getVisibleTabs();
+	}
+
+	@Override
+	public int getPage(CreativeModeTab creativeModeTab) {
+		for (int i = 0; i < pages.size(); i++) {
+			CreativeTabsScreenPage page = pages.get(i);
+
+			if (page.getVisibleTabs().contains(creativeModeTab)) {
+				return i;
+			}
+		}
+		return -1;
 	}
 
 	@Override
 	public boolean hasAdditionalPages() {
-		return CreativeModeTabs.tabs().size() > (Objects.requireNonNull(CreativeModeTabs.CACHED_PARAMETERS).hasPermissions() ? 14 : 13);
+		return pages.size() > 1;
 	}
 
 	@Override
@@ -193,19 +102,10 @@ public CreativeModeTab getSelectedTab() {
 
 	@Override
 	public boolean setSelectedTab(CreativeModeTab creativeModeTab) {
-		Objects.requireNonNull(creativeModeTab, "creativeModeTab");
-
-		if (selectedTab == creativeModeTab) {
-			return false;
-		}
-
-		if (currentPage != getPage(creativeModeTab)) {
-			if (!switchToPage(getPage(creativeModeTab))) {
-				return false;
-			}
+		if (selectedTab != creativeModeTab) {
+			selectedTab = creativeModeTab;
+			return true;
 		}
-
-		selectTab(creativeModeTab);
-		return true;
+		return false;
 	}
 }
diff --git a/fabric-creative-tab-api-v1/src/main/java/net/fabricmc/fabric/impl/creativetab/CreativeModeTabEventsImpl.java b/fabric-creative-tab-api-v1/src/main/java/net/fabricmc/fabric/impl/creativetab/CreativeModeTabEventsImpl.java
index 28c4195298..b3abeac5a1 100644
--- a/fabric-creative-tab-api-v1/src/main/java/net/fabricmc/fabric/impl/creativetab/CreativeModeTabEventsImpl.java
+++ b/fabric-creative-tab-api-v1/src/main/java/net/fabricmc/fabric/impl/creativetab/CreativeModeTabEventsImpl.java
@@ -16,8 +16,8 @@
 
 package net.fabricmc.fabric.impl.creativetab;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.jspecify.annotations.Nullable;
 
@@ -29,7 +29,7 @@
 import net.fabricmc.fabric.api.event.EventFactory;
 
 public class CreativeModeTabEventsImpl {
-	private static final Map, Event> CREATIVE_MODE_TAB_EVENT_MAP = new HashMap<>();
+	private static final Map, Event> CREATIVE_MODE_TAB_EVENT_MAP = new ConcurrentHashMap<>();
 
 	public static Event getOrCreateModifyOutputEvent(ResourceKey resourceKey) {
 		return CREATIVE_MODE_TAB_EVENT_MAP.computeIfAbsent(resourceKey, (g -> createModifyEvent()));
diff --git a/fabric-creative-tab-api-v1/src/main/java/net/fabricmc/fabric/mixin/creativetab/CreativeModeTabAccessor.java b/fabric-creative-tab-api-v1/src/main/java/net/fabricmc/fabric/mixin/creativetab/CreativeModeTabAccessor.java
deleted file mode 100644
index 4a1d2259e3..0000000000
--- a/fabric-creative-tab-api-v1/src/main/java/net/fabricmc/fabric/mixin/creativetab/CreativeModeTabAccessor.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.mixin.creativetab;
-
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import net.minecraft.world.item.CreativeModeTab;
-
-@Mixin(CreativeModeTab.class)
-public interface CreativeModeTabAccessor {
-	@Accessor
-	@Mutable
-	@Final
-	void setRow(CreativeModeTab.Row row);
-
-	@Accessor
-	@Mutable
-	@Final
-	void setColumn(int column);
-}
diff --git a/fabric-creative-tab-api-v1/src/main/java/net/fabricmc/fabric/mixin/creativetab/CreativeModeTabsMixin.java b/fabric-creative-tab-api-v1/src/main/java/net/fabricmc/fabric/mixin/creativetab/CreativeModeTabsMixin.java
deleted file mode 100644
index a51226ab56..0000000000
--- a/fabric-creative-tab-api-v1/src/main/java/net/fabricmc/fabric/mixin/creativetab/CreativeModeTabsMixin.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * 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.mixin.creativetab;
-
-import static net.minecraft.world.item.CreativeModeTabs.BUILDING_BLOCKS;
-import static net.minecraft.world.item.CreativeModeTabs.COLORED_BLOCKS;
-import static net.minecraft.world.item.CreativeModeTabs.COMBAT;
-import static net.minecraft.world.item.CreativeModeTabs.FOOD_AND_DRINKS;
-import static net.minecraft.world.item.CreativeModeTabs.FUNCTIONAL_BLOCKS;
-import static net.minecraft.world.item.CreativeModeTabs.HOTBAR;
-import static net.minecraft.world.item.CreativeModeTabs.INGREDIENTS;
-import static net.minecraft.world.item.CreativeModeTabs.INVENTORY;
-import static net.minecraft.world.item.CreativeModeTabs.NATURAL_BLOCKS;
-import static net.minecraft.world.item.CreativeModeTabs.OP_BLOCKS;
-import static net.minecraft.world.item.CreativeModeTabs.REDSTONE_BLOCKS;
-import static net.minecraft.world.item.CreativeModeTabs.SEARCH;
-import static net.minecraft.world.item.CreativeModeTabs.SPAWN_EGGS;
-import static net.minecraft.world.item.CreativeModeTabs.TOOLS_AND_UTILITIES;
-
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.core.Holder;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.Identifier;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.CreativeModeTabs;
-
-import net.fabricmc.fabric.impl.creativetab.FabricCreativeModeTabImpl;
-
-@Mixin(CreativeModeTabs.class)
-public class CreativeModeTabsMixin {
-	@Unique
-	private static final int TABS_PER_PAGE = FabricCreativeModeTabImpl.TABS_PER_PAGE;
-
-	@Inject(method = "validate", at = @At("HEAD"), cancellable = true)
-	private static void deferDuplicateCheck(CallbackInfo ci) {
-		/*
-		 * Defer the duplication checks to when fabric performs them (see mixin below).
-		 * It is preserved just in case, but fabric's pagination logic should prevent any from happening anyway.
-		 */
-		ci.cancel();
-	}
-
-	@Inject(method = "buildAllTabContents", at = @At("TAIL"))
-	private static void paginateTabs(CallbackInfo ci) {
-		final List> vanillaTabs = List.of(BUILDING_BLOCKS, COLORED_BLOCKS, NATURAL_BLOCKS, FUNCTIONAL_BLOCKS, REDSTONE_BLOCKS, HOTBAR, SEARCH, TOOLS_AND_UTILITIES, COMBAT, FOOD_AND_DRINKS, INGREDIENTS, SPAWN_EGGS, OP_BLOCKS, INVENTORY);
-
-		int count = 0;
-
-		Comparator> entryComparator = (e1, e2) -> {
-			// Non-displayable tabs should come last for proper pagination
-			int displayCompare = Boolean.compare(e1.value().shouldDisplay(), e2.value().shouldDisplay());
-
-			if (displayCompare != 0) {
-				return -displayCompare;
-			} else {
-				// Ensure a deterministic order
-				return compareNamespaceFirst(e1.key().identifier(), e2.key().identifier());
-			}
-		};
-		final List> sortedCreativeModeTabs = BuiltInRegistries.CREATIVE_MODE_TAB.listElements()
-				.sorted(entryComparator)
-				.toList();
-
-		for (Holder.Reference reference : sortedCreativeModeTabs) {
-			final CreativeModeTab creativeModeTab = reference.value();
-			final FabricCreativeModeTabImpl vanillaCreativeModeTab = (FabricCreativeModeTabImpl) creativeModeTab;
-
-			if (vanillaTabs.contains(reference.key())) {
-				// Vanilla tab goes on the first page.
-				vanillaCreativeModeTab.fabric_setPage(0);
-				continue;
-			}
-
-			final CreativeModeTabAccessor creativeModeTabAccessor = (CreativeModeTabAccessor) creativeModeTab;
-			vanillaCreativeModeTab.fabric_setPage((count / TABS_PER_PAGE) + 1);
-			int pageIndex = count % TABS_PER_PAGE;
-			CreativeModeTab.Row row = pageIndex < (TABS_PER_PAGE / 2) ? CreativeModeTab.Row.TOP : CreativeModeTab.Row.BOTTOM;
-			creativeModeTabAccessor.setRow(row);
-			creativeModeTabAccessor.setColumn(row == CreativeModeTab.Row.TOP ? pageIndex % TABS_PER_PAGE : (pageIndex - TABS_PER_PAGE / 2) % (TABS_PER_PAGE));
-
-			count++;
-		}
-
-		// Overlapping tab detection logic, with support for pages.
-		record CreativeModeTabPosition(CreativeModeTab.Row row, int column, int page) { }
-		var map = new HashMap();
-
-		for (ResourceKey resourceKey : BuiltInRegistries.CREATIVE_MODE_TAB.registryKeySet()) {
-			final CreativeModeTab creativeModeTab = BuiltInRegistries.CREATIVE_MODE_TAB.getValueOrThrow(resourceKey);
-			final FabricCreativeModeTabImpl vanillaCreativeModeTab = (FabricCreativeModeTabImpl) creativeModeTab;
-			final String displayName = creativeModeTab.getDisplayName().getString();
-			final var position = new CreativeModeTabPosition(creativeModeTab.row(), creativeModeTab.column(), vanillaCreativeModeTab.fabric_getPage());
-			final String existingName = map.put(position, displayName);
-
-			if (existingName != null) {
-				throw new IllegalArgumentException("Duplicate position: (%s) for creative mode tabs %s vs %s".formatted(position, displayName, existingName));
-			}
-		}
-	}
-
-	// Identifier#compareTo checks the path first, but we want to check the namespace first so that tabs added by the
-	// same mod appear next to each other.
-	@Unique
-	private static int compareNamespaceFirst(Identifier a, Identifier b) {
-		int c = a.getNamespace().compareTo(b.getNamespace());
-
-		if (c != 0) {
-			return c;
-		}
-
-		return a.getPath().compareTo(b.getPath());
-	}
-}
diff --git a/fabric-creative-tab-api-v1/src/main/resources/fabric-creative-tab-api-v1.mixins.json b/fabric-creative-tab-api-v1/src/main/resources/fabric-creative-tab-api-v1.mixins.json
index 7778ed7f03..3a5759ec0a 100644
--- a/fabric-creative-tab-api-v1/src/main/resources/fabric-creative-tab-api-v1.mixins.json
+++ b/fabric-creative-tab-api-v1/src/main/resources/fabric-creative-tab-api-v1.mixins.json
@@ -3,9 +3,7 @@
   "package": "net.fabricmc.fabric.mixin.creativetab",
   "compatibilityLevel": "JAVA_25",
   "mixins": [
-    "CreativeModeTabAccessor",
-    "CreativeModeTabMixin",
-    "CreativeModeTabsMixin"
+    "CreativeModeTabMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-data-attachment-api-v1/src/client/java/net/fabricmc/fabric/impl/attachment/client/AttachmentClientModImpl.java b/fabric-data-attachment-api-v1/src/client/java/net/fabricmc/fabric/impl/attachment/client/AttachmentClientModImpl.java
new file mode 100644
index 0000000000..7ea026de90
--- /dev/null
+++ b/fabric-data-attachment-api-v1/src/client/java/net/fabricmc/fabric/impl/attachment/client/AttachmentClientModImpl.java
@@ -0,0 +1,33 @@
+package net.fabricmc.fabric.impl.attachment.client;
+
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.attachment.AttachmentSync;
+import net.neoforged.neoforge.client.network.event.RegisterClientPayloadHandlersEvent;
+import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent;
+import org.sinytra.fabric.data_attachment_api.generated.GeneratedEntryPoint;
+
+import net.minecraft.server.level.ServerPlayer;
+
+import net.fabricmc.fabric.impl.attachment.GlobalAttachmentsImpl;
+import net.fabricmc.fabric.impl.attachment.sync.clientbound.ClientboundAttachmentSyncPayload;
+
+@Mod(value = GeneratedEntryPoint.MOD_ID, dist = Dist.CLIENT)
+public class AttachmentClientModImpl {
+	public AttachmentClientModImpl(IEventBus bus) {
+		bus.addListener(RegisterClientPayloadHandlersEvent.class, event -> {
+			event.register(ClientboundAttachmentSyncPayload.TYPE, (payload, context) -> {
+				GlobalAttachmentsImpl listener = (GlobalAttachmentsImpl) context.player().level().globalAttachments();
+				AttachmentSync.receiveSyncedDataAttachments(listener, context.player().registryAccess(), payload.types(), payload.syncPayload());
+			});
+		});
+
+		NeoForge.EVENT_BUS.addListener(PlayerLoggedInEvent.class, event -> {
+			if (event.getEntity() instanceof ServerPlayer player) {
+				GlobalAttachmentsImpl.syncInitialData(player);
+			}
+		});
+	}
+}
diff --git a/fabric-data-attachment-api-v1/src/client/java/net/fabricmc/fabric/impl/attachment/client/AttachmentSyncClient.java b/fabric-data-attachment-api-v1/src/client/java/net/fabricmc/fabric/impl/attachment/client/AttachmentSyncClient.java
deleted file mode 100644
index 8648c4078d..0000000000
--- a/fabric-data-attachment-api-v1/src/client/java/net/fabricmc/fabric/impl/attachment/client/AttachmentSyncClient.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.impl.attachment.client;
-
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationNetworking;
-import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
-import net.fabricmc.fabric.impl.attachment.AttachmentEntrypoint;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentSync;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentSyncException;
-import net.fabricmc.fabric.impl.attachment.sync.clientbound.ClientboundAttachmentSyncPayload;
-import net.fabricmc.fabric.impl.attachment.sync.clientbound.ClientboundRequestAcceptedAttachmentsPayload;
-
-public class AttachmentSyncClient implements ClientModInitializer {
-	@Override
-	public void onInitializeClient() {
-		// config
-		ClientConfigurationNetworking.registerGlobalReceiver(
-				ClientboundRequestAcceptedAttachmentsPayload.ID,
-				(payload, context) -> context.responseSender().sendPacket(AttachmentSync.createResponsePayload())
-		);
-
-		// play
-		ClientPlayNetworking.registerGlobalReceiver(
-				ClientboundAttachmentSyncPayload.TYPE,
-				(payload, context) -> {
-					try {
-						payload.attachment().tryApply(context.client().level);
-					} catch (AttachmentSyncException e) {
-						AttachmentEntrypoint.LOGGER.error("Error accepting attachment changes", e);
-						context.responseSender().disconnect(e.getComponent());
-					}
-				}
-		);
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/client/java/net/fabricmc/fabric/mixin/attachment/client/ClientPacketListenerMixin.java b/fabric-data-attachment-api-v1/src/client/java/net/fabricmc/fabric/mixin/attachment/client/ClientPacketListenerMixin.java
index cdae6c21bf..5c7eb5a8d4 100644
--- a/fabric-data-attachment-api-v1/src/client/java/net/fabricmc/fabric/mixin/attachment/client/ClientPacketListenerMixin.java
+++ b/fabric-data-attachment-api-v1/src/client/java/net/fabricmc/fabric/mixin/attachment/client/ClientPacketListenerMixin.java
@@ -16,25 +16,16 @@
 
 package net.fabricmc.fabric.mixin.attachment.client;
 
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local;
-import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.network.protocol.game.ClientboundRespawnPacket;
 
 import net.fabricmc.fabric.api.attachment.v1.GlobalAttachments;
 import net.fabricmc.fabric.api.attachment.v1.GlobalAttachmentsProvider;
-import net.fabricmc.fabric.impl.attachment.AttachmentTargetImpl;
 import net.fabricmc.fabric.impl.attachment.GlobalAttachmentsImpl;
 
 @Mixin(ClientPacketListener.class)
@@ -51,23 +42,4 @@ public GlobalAttachments globalAttachments() {
 	private void initGlobalAttachments(CallbackInfo ci) {
 		globalAttachments = new GlobalAttachmentsImpl(null);
 	}
-
-	@WrapOperation(
-			method = "handleRespawn",
-			at = @At(
-					value = "FIELD",
-					target = "Lnet/minecraft/client/Minecraft;player:Lnet/minecraft/client/player/LocalPlayer;",
-					opcode = Opcodes.PUTFIELD
-			),
-			slice = @Slice(
-					from = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientPacketListener;startWaitingForNewLevel(Lnet/minecraft/client/player/LocalPlayer;Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/client/gui/screens/LevelLoadingScreen$Reason;)V")
-			)
-	)
-	private void copyAttachmentsOnClientRespawn(Minecraft client, LocalPlayer newPlayer, Operation init, ClientboundRespawnPacket packet, @Local(name = "oldPlayer") LocalPlayer oldPlayer) {
-		/*
-		 * The KEEP_ATTRIBUTES flag is not set on a death respawn, and set in all other cases
-		 */
-		AttachmentTargetImpl.transfer(oldPlayer, newPlayer, !packet.shouldKeep(ClientboundRespawnPacket.KEEP_ATTRIBUTE_MODIFIERS));
-		init.call(client, newPlayer);
-	}
 }
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/api/attachment/v1/AttachmentTarget.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/api/attachment/v1/AttachmentTarget.java
index cc52f0584c..81c9428cfd 100644
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/api/attachment/v1/AttachmentTarget.java
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/api/attachment/v1/AttachmentTarget.java
@@ -20,6 +20,9 @@
 import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 
+import net.fabricmc.fabric.impl.attachment.AttachmentChangeEvents;
+
+import net.neoforged.neoforge.attachment.IAttachmentHolder;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jspecify.annotations.Nullable;
@@ -31,6 +34,7 @@
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 
 import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.impl.attachment.AttachmentTypeImpl;
 
 /**
  * Marks all objects on which data can be attached using {@link AttachmentType}s.
@@ -79,7 +83,7 @@ public interface AttachmentTarget {
 	 */
 	@Nullable
 	default  A getAttached(AttachmentType type) {
-		throw new UnsupportedOperationException("Implemented via mixin");
+		return ((IAttachmentHolder) this).getExistingData(((AttachmentTypeImpl) type).internalType()).orElse(null);
 	}
 
 	/**
@@ -144,13 +148,11 @@ default  A getAttachedOrCreate(AttachmentType type, Supplier initialize
 	 * @return the attached data, initialized if originally absent
 	 */
 	default  A getAttachedOrCreate(AttachmentType type) {
-		Supplier init = type.initializer();
-
-		if (init == null) {
+		if (type.initializer() == null) {
 			throw new IllegalArgumentException("Single-argument getAttachedOrCreate is reserved for attachment types with default initializers");
 		}
 
-		return getAttachedOrCreate(type, init);
+		return ((IAttachmentHolder) this).getData(((AttachmentTypeImpl) type).internalType());
 	}
 
 	/**
@@ -164,8 +166,7 @@ default  A getAttachedOrCreate(AttachmentType type) {
 	 */
 	@Contract("_, !null -> !null")
 	default  A getAttachedOrElse(AttachmentType type, @Nullable A defaultValue) {
-		A attached = getAttached(type);
-		return attached == null ? defaultValue : attached;
+		return ((IAttachmentHolder) this).getExistingData(((AttachmentTypeImpl) type).internalType()).orElse(defaultValue);
 	}
 
 	/**
@@ -181,8 +182,7 @@ default  A getAttachedOrElse(AttachmentType type, @Nullable A defaultValue
 	default  A getAttachedOrGet(AttachmentType type, Supplier defaultValue) {
 		Objects.requireNonNull(defaultValue, "default value supplier cannot be null");
 
-		A attached = getAttached(type);
-		return attached == null ? defaultValue.get() : attached;
+		return ((IAttachmentHolder) this).getExistingData(((AttachmentTypeImpl) type).internalType()).orElseGet(defaultValue);
 	}
 
 	/**
@@ -195,7 +195,10 @@ default  A getAttachedOrGet(AttachmentType type, Supplier defaultValue)
 	 */
 	@Nullable
 	default  A setAttached(AttachmentType type, @Nullable A value) {
-		throw new UnsupportedOperationException("Implemented via mixin");
+		if (value == null) {
+			return ((IAttachmentHolder) this).removeData(((AttachmentTypeImpl) type).internalType());
+		}
+		return ((IAttachmentHolder) this).setData(((AttachmentTypeImpl) type).internalType(), value);
 	}
 
 	/**
@@ -206,7 +209,7 @@ default  A setAttached(AttachmentType type, @Nullable A value) {
 	 * @return whether there is associated data
 	 */
 	default boolean hasAttached(AttachmentType type) {
-		throw new UnsupportedOperationException("Implemented via mixin");
+		return ((IAttachmentHolder) this).hasData(((AttachmentTypeImpl) type).internalType());
 	}
 
 	/**
@@ -219,7 +222,7 @@ default boolean hasAttached(AttachmentType type) {
 	 */
 	@Nullable
 	default  A removeAttached(AttachmentType type) {
-		return setAttached(type, null);
+		return ((IAttachmentHolder) this).removeData(((AttachmentTypeImpl) type).internalType());
 	}
 
 	/**
@@ -231,7 +234,7 @@ default  A removeAttached(AttachmentType type) {
 	 * @return event associated with this target and attachment type
 	 */
 	default  Event> onAttachedSet(AttachmentType type) {
-		throw new UnsupportedOperationException("Implemented via mixin");
+		return AttachmentChangeEvents.onAttachedSet(type);
 	}
 
 	/**
@@ -254,9 +257,9 @@ interface OnAttachedSet {
 		/**
 		 * Called after the attachment is set on this target.
 		 *
-		 * @see AttachmentTarget#onAttachedSet(AttachmentType)
 		 * @param oldValue attachment value on the target prior to it being set
 		 * @param newValue attachment value on the target after it was set
+		 * @see AttachmentTarget#onAttachedSet(AttachmentType)
 		 */
 		void onAttachedSet(@Nullable A oldValue, @Nullable A newValue);
 	}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/api/attachment/v1/GlobalAttachments.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/api/attachment/v1/GlobalAttachments.java
index b5f07fe04d..1237c55c87 100644
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/api/attachment/v1/GlobalAttachments.java
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/api/attachment/v1/GlobalAttachments.java
@@ -16,6 +16,8 @@
 
 package net.fabricmc.fabric.api.attachment.v1;
 
+import net.neoforged.neoforge.attachment.IAttachmentHolder;
+
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.Level;
 
@@ -31,5 +33,5 @@
  * while on the client it is bound to {@code ClientPacketListener} and should only be accessed when in a world
  * (when {@code Minecraft.getInstance().level} is not null).
  */
-public interface GlobalAttachments extends AttachmentTarget {
+public interface GlobalAttachments extends AttachmentTarget, IAttachmentHolder {
 }
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentChangeEvents.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentChangeEvents.java
new file mode 100644
index 0000000000..d46cffd6ea
--- /dev/null
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentChangeEvents.java
@@ -0,0 +1,35 @@
+package net.fabricmc.fabric.impl.attachment;
+
+import java.util.IdentityHashMap;
+import java.util.function.Function;
+
+import net.neoforged.neoforge.attachment.AttachmentType;
+
+import net.fabricmc.fabric.api.attachment.v1.AttachmentTarget.OnAttachedSet;
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+
+public class AttachmentChangeEvents {
+	private static final IdentityHashMap, Event>> LISTENERS = new IdentityHashMap<>();
+
+	@SuppressWarnings("unchecked")
+	public static  Event> onAttachedSet(net.fabricmc.fabric.api.attachment.v1.AttachmentType type) {
+		net.neoforged.neoforge.attachment.AttachmentType neoType = ((AttachmentTypeImpl) type).internalType();
+		return (Event>) (Event) LISTENERS.computeIfAbsent(neoType, t -> {
+			return (Event>) (Event) EventFactory.createArrayBacked(OnAttachedSet.class, (Function[], OnAttachedSet>) listeners -> (oldValue, newValue) -> {
+				for (OnAttachedSet listener : listeners) {
+					listener.onAttachedSet(oldValue, newValue);
+				}
+			});
+		});
+	}
+
+	@SuppressWarnings("unchecked")
+	public static  void invoke(AttachmentType type, T oldValue, T value) {
+		Event> event = (Event>) (Event) LISTENERS.get(type);
+
+		if (event != null) {
+			event.invoker().onAttachedSet(oldValue, value);
+		}
+	}
+}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentEntrypoint.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentEntrypoint.java
index c0301850aa..1fb0933e0c 100644
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentEntrypoint.java
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentEntrypoint.java
@@ -16,6 +16,10 @@
 
 package net.fabricmc.fabric.impl.attachment;
 
+import java.util.Map;
+
+import net.neoforged.neoforge.attachment.AttachmentType;
+import net.neoforged.neoforge.attachment.IAttachmentHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,6 +27,7 @@
 import net.fabricmc.fabric.api.entity.event.v1.ServerEntityLevelChangeEvents;
 import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents;
 import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
+import net.fabricmc.fabric.mixin.attachment.AttachmentHolderAccessor;
 
 public class AttachmentEntrypoint implements ModInitializer {
 	public static final Logger LOGGER = LoggerFactory.getLogger("fabric-data-attachment-api-v1");
@@ -30,14 +35,41 @@ public class AttachmentEntrypoint implements ModInitializer {
 	@Override
 	public void onInitialize() {
 		ServerPlayerEvents.AFTER_RESPAWN.register((oldPlayer, newPlayer, alive) ->
-				AttachmentTargetImpl.transfer(oldPlayer, newPlayer, !alive)
+				transfer(oldPlayer, newPlayer, !alive)
 		);
-		ServerEntityLevelChangeEvents.AFTER_ENTITY_CHANGE_LEVEL.register(((originalEntity, newEntity, origin, destination) ->
-				AttachmentTargetImpl.transfer(originalEntity, newEntity, false))
+		ServerEntityLevelChangeEvents.AFTER_ENTITY_CHANGE_LEVEL.register((originalEntity, newEntity, origin, destination) ->
+				transfer(originalEntity, newEntity, false)
 		);
 		// using the corresponding player event is unnecessary as no new instance is created
 		ServerLivingEntityEvents.MOB_CONVERSION.register((previous, converted, keepEquipment) ->
-				AttachmentTargetImpl.transfer(previous, converted, true)
+				transfer(previous, converted, true)
 		);
 	}
+
+	/**
+	 * Copies attachments from the original to the target. This is used when a ProtoChunk is converted to a
+	 * LevelChunk, and when an entity is respawned and a new instance is created. For entity respawns, it is
+	 * triggered on player respawn, entity conversion, return from the End, or cross-level entity teleportation.
+	 * In the first two cases, only the attachments with {@link net.fabricmc.fabric.api.attachment.v1.AttachmentType#copyOnDeath()} will be transferred.
+	 */
+	@SuppressWarnings("unchecked")
+	static void transfer(IAttachmentHolder original, IAttachmentHolder target, boolean isDeath) {
+		Map, ?> attachments = ((AttachmentHolderAccessor) original).invokeGetAttachmentMap();
+
+		if (attachments == null) {
+			return;
+		}
+
+		for (Map.Entry, ?> entry : attachments.entrySet()) {
+			AttachmentType type = entry.getKey();
+			net.fabricmc.fabric.api.attachment.v1.AttachmentType fabricType = AttachmentRegistryImpl.getFabricAttachmentType(type);
+			if (fabricType == null) {
+				continue;
+			}
+
+			if (!isDeath || fabricType.copyOnDeath()) {
+				target.setData(type, entry.getValue());
+			}
+		}
+	}
 }
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentModImpl.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentModImpl.java
new file mode 100644
index 0000000000..5efca757b3
--- /dev/null
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentModImpl.java
@@ -0,0 +1,40 @@
+package net.fabricmc.fabric.impl.attachment;
+
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent;
+import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
+import net.neoforged.neoforge.network.registration.PayloadRegistrar;
+import net.neoforged.neoforge.registries.NeoForgeRegistries;
+import net.neoforged.neoforge.registries.RegisterEvent;
+
+import net.minecraft.server.level.ServerPlayer;
+
+import net.fabricmc.fabric.impl.attachment.sync.clientbound.ClientboundAttachmentSyncPayload;
+
+import org.sinytra.fabric.data_attachment_api.generated.GeneratedEntryPoint;
+
+@Mod(GeneratedEntryPoint.MOD_ID)
+public class AttachmentModImpl {
+
+    public AttachmentModImpl(IEventBus bus) {
+        bus.addListener(RegisterEvent.class, event ->
+            event.register(NeoForgeRegistries.Keys.ATTACHMENT_TYPES, AttachmentRegistryImpl::registerNeoTypes));
+		
+		bus.addListener(RegisterPayloadHandlersEvent.class, event -> {
+			PayloadRegistrar registrar = event.registrar("1").optional();
+
+			registrar.playToClient(
+					ClientboundAttachmentSyncPayload.TYPE,
+					ClientboundAttachmentSyncPayload.STREAM_CODEC
+			);
+		});
+		
+		NeoForge.EVENT_BUS.addListener(PlayerLoggedInEvent.class, event -> {
+			if (event.getEntity() instanceof ServerPlayer player) {
+				GlobalAttachmentsImpl.syncInitialData(player);
+			}
+		});
+    }
+}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentRegistryImpl.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentRegistryImpl.java
index eb50eff8cc..f36107ae3b 100644
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentRegistryImpl.java
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentRegistryImpl.java
@@ -16,75 +16,67 @@
 
 package net.fabricmc.fabric.impl.attachment;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 
 import com.mojang.serialization.Codec;
+import net.neoforged.neoforge.attachment.IAttachmentHolder;
+import net.neoforged.neoforge.attachment.IAttachmentSerializer;
+import net.neoforged.neoforge.registries.NeoForgeRegistries;
+import net.neoforged.neoforge.registries.RegisterEvent;
 import org.jspecify.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import net.minecraft.core.Registry;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.resources.Identifier;
+import net.minecraft.world.level.storage.ValueInput;
+import net.minecraft.world.level.storage.ValueOutput;
 
 import net.fabricmc.fabric.api.attachment.v1.AttachmentRegistry;
 import net.fabricmc.fabric.api.attachment.v1.AttachmentSyncPredicate;
+import net.fabricmc.fabric.api.attachment.v1.AttachmentTarget;
 import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentSync;
+import net.fabricmc.fabric.mixin.attachment.BaseMappedRegistryAccessor;
+import net.fabricmc.fabric.mixin.attachment.MappedRegistryAccessor;
 
 public final class AttachmentRegistryImpl {
-	private static final Logger LOGGER = LoggerFactory.getLogger("fabric-data-attachment-api-v1");
-	private static final Map> attachmentRegistry = new HashMap<>();
-	private static final Set syncableAttachments = new HashSet<>();
-	private static final Set syncableView = Collections.unmodifiableSet(syncableAttachments);
-	private static int maxSyncPacketSize = AttachmentSync.DEFAULT_ATTACHMENT_SYNC_PACKET_SIZE;
-
-	public static  void register(Identifier id, AttachmentType attachmentType) {
-		AttachmentType existing = attachmentRegistry.put(id, attachmentType);
-
-		if (existing != null) {
-			LOGGER.warn("Encountered duplicate type registration for id {}", id);
-
-			// Prevent duplicate registration from incorrectly overriding a synced type with a non-synced one or vice-versa
-			if (existing.isSynced() && !attachmentType.isSynced()) {
-				syncableAttachments.remove(id);
-			} else if (!existing.isSynced() && attachmentType.isSynced()) {
-				syncableAttachments.add(id);
+	private static final Map, AttachmentType> FABRIC_ATTACHMENT_TYPES = new ConcurrentHashMap<>();
+	private static final Map> NEO_ATTACHMENT_TYPES = new ConcurrentHashMap<>();
+	private static boolean deferRegistration = true;
+
+	public static  net.neoforged.neoforge.attachment.AttachmentType registerNeoForgeAttachment(Identifier id, net.neoforged.neoforge.attachment.AttachmentType attachmentType) {
+		if (deferRegistration) {
+			NEO_ATTACHMENT_TYPES.put(id, attachmentType);
+		} else {
+			boolean frozen = ((MappedRegistryAccessor) NeoForgeRegistries.ATTACHMENT_TYPES).getFrozen();
+			if (frozen) {
+				((BaseMappedRegistryAccessor) NeoForgeRegistries.ATTACHMENT_TYPES).invokeUnfreeze(false);
+			}
+			Registry.register(NeoForgeRegistries.ATTACHMENT_TYPES, id, attachmentType);
+			if (frozen) {
+				NeoForgeRegistries.ATTACHMENT_TYPES.freeze();
 			}
-		} else if (attachmentType.isSynced()) {
-			syncableAttachments.add(id);
 		}
+		return attachmentType;
 	}
 
-	@Nullable
-	public static AttachmentType get(Identifier id) {
-		return attachmentRegistry.get(id);
+	public static void registerNeoTypes(RegisterEvent.RegisterHelper> helper) {
+		deferRegistration = false;
+		NEO_ATTACHMENT_TYPES.forEach(helper::register);
 	}
 
-	public static Set getSyncableAttachments() {
-		return syncableView;
+	@SuppressWarnings("unchecked")
+	public static  AttachmentType getFabricAttachmentType(net.neoforged.neoforge.attachment.AttachmentType neoType) {
+		return (AttachmentType) FABRIC_ATTACHMENT_TYPES.get(neoType);
 	}
 
 	public static  AttachmentRegistry.Builder builder() {
 		return new BuilderImpl<>();
 	}
 
-	public static int getMaxSyncPacketSize() {
-		if (maxSyncPacketSize == -1) {
-			throw new IllegalStateException("getMaxSyncPacketSize should only be called ONCE!");
-		}
-
-		int maxSize = maxSyncPacketSize;
-		maxSyncPacketSize = -1;
-		return maxSize;
-	}
-
 	public static class BuilderImpl implements AttachmentRegistry.Builder {
 		@Nullable
 		private Supplier defaultInitializer = null;
@@ -145,26 +137,9 @@ public AttachmentRegistry.Builder syncWith(StreamCodec buildAndRegister(Identifier id) {
 			Objects.requireNonNull(id, "identifier cannot be null");
 
-			if (syncPredicate != null && id.toString().length() > AttachmentSync.MAX_IDENTIFIER_SIZE) {
-				throw new IllegalArgumentException(
-						"Identifier length is too long for a synced attachment type (was %d, maximum is %d)".formatted(
-								id.toString().length(),
-								AttachmentSync.MAX_IDENTIFIER_SIZE
-						)
-				);
-			}
-
-			if (maxSyncSize <= AttachmentSync.DEFAULT_MAX_DATA_SIZE) {
-				maxSyncSize = AttachmentSync.DEFAULT_MAX_DATA_SIZE;
-			} else if (maxSyncPacketSize == -1) {
-				throw new IllegalStateException("Large attachment " + id + " registered too late! Must be registered during mod initialization.");
-			} else {
-				int newMaxPacketSize = maxSyncSize + AttachmentSync.MAX_PADDING_SIZE_IN_BYTES;
-				newMaxPacketSize = newMaxPacketSize < 0 ? Integer.MAX_VALUE : newMaxPacketSize; // prevent overflow
-				maxSyncPacketSize = Math.max(newMaxPacketSize, maxSyncPacketSize);
-			}
-
-			var attachment = new AttachmentTypeImpl<>(
+			net.neoforged.neoforge.attachment.AttachmentType neoType = registerNeoForgeAttachment(id, toNeoForgeAttachmentType(id));
+			AttachmentType attachmentType = new AttachmentTypeImpl<>(
+					neoType,
 					id,
 					defaultInitializer,
 					persistenceCodec,
@@ -173,8 +148,40 @@ public AttachmentType buildAndRegister(Identifier id) {
 					copyOnDeath,
 					maxSyncSize
 			);
-			register(id, attachment);
-			return attachment;
+			FABRIC_ATTACHMENT_TYPES.put(neoType, attachmentType);
+			return attachmentType;
+		}
+
+		private net.neoforged.neoforge.attachment.AttachmentType toNeoForgeAttachmentType(Identifier id) {
+			net.neoforged.neoforge.attachment.AttachmentType.Builder builder = net.neoforged.neoforge.attachment.AttachmentType.builder(this.defaultInitializer != null ? this.defaultInitializer : () -> null);
+			if (this.persistenceCodec != null) {
+				builder.serialize(this.persistenceCodec.fieldOf(id.getPath()));
+				if (this.copyOnDeath) {
+					builder.copyOnDeath();
+				}
+			} else {
+				builder.serialize((IAttachmentSerializer) DummyAttachmentSerializer.INSTANCE);
+				builder.copyHandler((value, holder, provider) -> value);
+			}
+			if (this.streamCodec != null) {
+				Objects.requireNonNull(this.syncPredicate, "sync predicate cannot be null");
+				builder.sync((holder, player) -> this.syncPredicate.test((AttachmentTarget) holder, player), this.streamCodec);
+			}
+			return builder.build();
+		}
+	}
+
+	private static class DummyAttachmentSerializer implements IAttachmentSerializer {
+		private static final DummyAttachmentSerializer INSTANCE = new DummyAttachmentSerializer();
+
+		@Override
+		public Object read(IAttachmentHolder holder, ValueInput input) {
+			return null;
+		}
+
+		@Override
+		public boolean write(Object attachment, ValueOutput output) {
+			return false;
 		}
 	}
 }
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentSavedData.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentSavedData.java
index 3aa07cb4ba..263c8798b9 100644
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentSavedData.java
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentSavedData.java
@@ -16,27 +16,18 @@
 
 package net.fabricmc.fabric.impl.attachment;
 
-import com.mojang.datafixers.util.Pair;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DataResult;
-import com.mojang.serialization.Decoder;
-import com.mojang.serialization.DynamicOps;
-import com.mojang.serialization.Encoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtOps;
 import net.minecraft.resources.Identifier;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.ProblemReporter;
 import net.minecraft.world.level.saveddata.SavedData;
 import net.minecraft.world.level.storage.TagValueInput;
 import net.minecraft.world.level.storage.TagValueOutput;
-import net.minecraft.world.level.storage.ValueInput;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentTarget;
 
 /**
  * Backing storage for server-side global and level attachments.
@@ -45,48 +36,39 @@
 public class AttachmentSavedData extends SavedData {
 	private static final Logger LOGGER = LoggerFactory.getLogger(AttachmentSavedData.class);
 	public static final Identifier ID = Identifier.fromNamespaceAndPath("fabric", "attachments");
-	private final AttachmentTargetImpl target;
-	private final boolean wasSerialized;
+	private final MinecraftServer server;
 
-	public AttachmentSavedData(AttachmentTarget target) {
-		this.target = (AttachmentTargetImpl) target;
-		this.wasSerialized = this.target.fabric_hasPersistentAttachments();
+	public AttachmentSavedData(MinecraftServer server) {
+		this.server = server;
 	}
 
 	public static Codec codec(MinecraftServer server) {
-		return codec((AttachmentTargetImpl) server.globalAttachments(), () -> "AttachmentSavedData @ global server attachments");
-	}
-
-	public static Codec codec(ServerLevel level) {
-		return codec((AttachmentTargetImpl) level, () -> "AttachmentSavedData @ " + level.dimension().identifier());
+		return codec(server, () -> "AttachmentSavedData @ global server attachments");
 	}
 
-	// TODO 1.21.5 look at making this more idiomatic
-	private static Codec codec(AttachmentTargetImpl target, ProblemReporter.PathElement reporterContext) {
-		return Codec.of(new Encoder<>() {
-			@Override
-			public  DataResult encode(AttachmentSavedData input, DynamicOps ops, T prefix) {
-				try (ProblemReporter.ScopedCollector reporter = new ProblemReporter.ScopedCollector(reporterContext, LOGGER)) {
-					TagValueOutput output = TagValueOutput.createWithoutContext(reporter);
-					target.fabric_writeAttachmentsToNbt(output);
-					return DataResult.success(NbtOps.INSTANCE.convertTo(ops, output.buildResult()));
-				}
+	private static Codec codec(MinecraftServer server, ProblemReporter.PathElement reporterContext) {
+		return CompoundTag.CODEC.flatXmap(tag -> {
+			try (ProblemReporter.ScopedCollector reporter = new ProblemReporter.ScopedCollector(reporterContext, LOGGER)) {
+				var data = new AttachmentSavedData(server);
+				// Note: Side effect here, keep an eye on this
+				((GlobalAttachmentsImpl) data.server.globalAttachments()).doDeserializeAttachments(TagValueInput.create(reporter, data.server.registryAccess(), tag));
+				return !reporter.isEmpty()
+						? DataResult.error(() -> "Deserialisation error in level attachments: " + reporter.getReport())
+						: DataResult.success(data);
 			}
-		}, new Decoder<>() {
-			@Override
-			public  DataResult> decode(DynamicOps ops, T input) {
-				try (ProblemReporter.ScopedCollector reporter = new ProblemReporter.ScopedCollector(reporterContext, LOGGER)) {
-					ValueInput valueInput = TagValueInput.create(reporter, target.fabric_getRegistryAccess(), (CompoundTag) ops.convertTo(NbtOps.INSTANCE, input));
-					target.fabric_readAttachmentsFromNbt(valueInput);
-					return DataResult.success(Pair.of(new AttachmentSavedData(target), ops.empty()));
-				}
+		}, data -> {
+			try (ProblemReporter.ScopedCollector reporter = new ProblemReporter.ScopedCollector(reporterContext, LOGGER)) {
+				var tag = TagValueOutput.createWithContext(reporter, data.server.registryAccess());
+				((GlobalAttachmentsImpl) data.server.globalAttachments()).serializeAttachments(tag);
+				return !reporter.isEmpty()
+						? DataResult.error(() -> "Serialisation error in level attachments: " + reporter.getReport())
+						: DataResult.success(tag.buildResult());
 			}
 		});
 	}
 
 	@Override
 	public boolean isDirty() {
-		// Only write data if there are attachments, or if we previously wrote data.
-		return wasSerialized || target.fabric_hasPersistentAttachments();
+		return true;
 	}
 }
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentSerializingImpl.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentSerializingImpl.java
deleted file mode 100644
index 295402e43e..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentSerializingImpl.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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.impl.attachment;
-
-import java.util.IdentityHashMap;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.DataResult;
-import org.jspecify.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.minecraft.resources.Identifier;
-import net.minecraft.world.level.storage.ValueInput;
-import net.minecraft.world.level.storage.ValueOutput;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentTarget;
-import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
-
-public class AttachmentSerializingImpl {
-	private static final Logger LOGGER = LoggerFactory.getLogger("fabric-data-attachment-api-v1");
-
-	private static final Codec> TYPE_CODEC = Identifier.CODEC.comapFlatMap(id -> {
-		AttachmentType type = AttachmentRegistryImpl.get(id);
-		return type == null ? DataResult.error(() -> "Found unknown attachment type " + id)
-				: type.persistenceCodec() == null ? DataResult.error(() -> "Found non-permanent attachment type " + id)
-				: DataResult.success(type);
-	}, AttachmentType::identifier);
-	private static final Codec, Object>> CODEC = Codec., Object>dispatchedMap(
-			TYPE_CODEC,
-			AttachmentType::persistenceCodec
-	)
-			.promotePartial(error -> LOGGER.warn("Skipping invalid attachments: {}", error))
-			.xmap(
-				IdentityHashMap::new,
-				Function.identity()
-	);
-
-	public static void serializeAttachmentData(ValueOutput output, @Nullable IdentityHashMap, Object> attachments) {
-		if (attachments == null || attachments.isEmpty()) {
-			return;
-		}
-
-		IdentityHashMap, Object> attachmentsToSerialize = attachments.entrySet().stream()
-				.filter(entry -> entry.getKey().persistenceCodec() != null)
-				.collect(Collectors.toMap(
-					Map.Entry::getKey,
-					Map.Entry::getValue,
-					(v1, v2) -> v1,
-					IdentityHashMap::new
-				));
-
-		if (attachmentsToSerialize.isEmpty()) {
-			return;
-		}
-
-		output.store(AttachmentTarget.NBT_ATTACHMENT_KEY, CODEC, attachmentsToSerialize);
-	}
-
-	@Nullable
-	public static IdentityHashMap, Object> deserializeAttachmentData(@Nullable ValueInput data) {
-		return data == null ? null : data.read(AttachmentTarget.NBT_ATTACHMENT_KEY, CODEC).filter(m -> !m.isEmpty()).orElse(null);
-	}
-
-	public static boolean hasPersistentAttachments(@Nullable IdentityHashMap, ?> map) {
-		if (map == null) {
-			return false;
-		}
-
-		for (AttachmentType type : map.keySet()) {
-			if (type.isPersistent()) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentTargetImpl.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentTargetImpl.java
deleted file mode 100644
index c8f837899c..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentTargetImpl.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * 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.impl.attachment;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-
-import org.jspecify.annotations.Nullable;
-
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.storage.ValueInput;
-import net.minecraft.world.level.storage.ValueOutput;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentTarget;
-import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentChange;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentTargetInfo;
-
-public interface AttachmentTargetImpl extends AttachmentTarget {
-	/**
-	 * Copies attachments from the original to the target. This is used when a ProtoChunk is converted to a
-	 * LevelChunk, and when an entity is respawned and a new instance is created. For entity respawns, it is
-	 * triggered on player respawn, entity conversion, return from the End, or cross-level entity teleportation.
-	 * In the first two cases, only the attachments with {@link AttachmentType#copyOnDeath()} will be transferred.
-	 */
-	@SuppressWarnings("unchecked")
-	static void transfer(AttachmentTarget original, AttachmentTarget target, boolean isDeath) {
-		Map, ?> attachments = ((AttachmentTargetImpl) original).fabric_getAttachments();
-
-		if (attachments == null) {
-			return;
-		}
-
-		for (Map.Entry, ?> entry : attachments.entrySet()) {
-			AttachmentType type = (AttachmentType) entry.getKey();
-
-			if (!isDeath || type.copyOnDeath()) {
-				target.setAttached(type, entry.getValue());
-			}
-		}
-
-		// Avoid unnecessary extra syncing after initial sync
-		((AttachmentTargetImpl) target).fabric_clearDeferredSyncChanges();
-	}
-
-	@Nullable
-	default Map, ?> fabric_getAttachments() {
-		throw new UnsupportedOperationException("Implemented via mixin");
-	}
-
-	default void fabric_writeAttachmentsToNbt(ValueOutput output) {
-		throw new UnsupportedOperationException("Implemented via mixin");
-	}
-
-	default void fabric_readAttachmentsFromNbt(ValueInput input) {
-		throw new UnsupportedOperationException("Implemented via mixin");
-	}
-
-	default boolean fabric_hasPersistentAttachments() {
-		throw new UnsupportedOperationException("Implemented via mixin");
-	}
-
-	default AttachmentTargetInfo fabric_getSyncTargetInfo() {
-		// this only makes sense for server objects
-		throw new UnsupportedOperationException("Sync target info was not retrieved on server!");
-	}
-
-	/*
-	 * Computes changes that should be communicated to newcomers (i.e. clients that start tracking this target)
-	 */
-	default void fabric_computeInitialSyncChanges(ServerPlayer player, Consumer changeOutput) {
-		throw new UnsupportedOperationException("Implemented via mixin");
-	}
-
-	/**
-	 * Sends changes that should be communicated to clients in a deferred manner, then clears those changes.
-	 *
-	 * 
Used when the target does not immediately sync when the attachment is set, but instead defers sync to (usually) match vanilla's sync timing.
-	 */
-	default void fabric_sendAndClearDeferredSyncChanges(List players) {
-		throw new UnsupportedOperationException("Implemented via mixin");
-	}
-
-	default void fabric_clearDeferredSyncChanges() {
-		throw new UnsupportedOperationException("Implemented via mixin");
-	}
-
-	/**
-	 * Sync targets can change their identity {@link net.minecraft.world.entity.Entity#setId(int)}, use this function to update the target to match the new identity.
-	 */
-	default  void fabric_updateSyncTarget(AttachmentTargetInfo oldTargetInfo, AttachmentTargetInfo newTargetInfo) {
-		throw new UnsupportedOperationException("Implemented via mixin");
-	}
-
-	default void fabric_syncChange(AttachmentType type, AttachmentChange change) {
-	}
-
-	default void fabric_markChanged(AttachmentType type) {
-	}
-
-	default boolean fabric_shouldTryToSync() {
-		throw new UnsupportedOperationException("Implemented via mixin");
-	}
-
-	default boolean fabric_shouldDeferSync() {
-		return false;
-	}
-
-	RegistryAccess fabric_getRegistryAccess();
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentTypeImpl.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentTypeImpl.java
index 0580f06de8..227c8c62a5 100644
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentTypeImpl.java
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentTypeImpl.java
@@ -29,6 +29,7 @@
 import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
 
 public record AttachmentTypeImpl(
+		net.neoforged.neoforge.attachment.AttachmentType internalType,
 		Identifier identifier,
 		@Nullable Supplier initializer,
 		@Nullable Codec persistenceCodec,
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/DataAccessorHandler.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/DataAccessorHandler.java
deleted file mode 100644
index ebefc3b6a2..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/DataAccessorHandler.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.impl.attachment;
-
-import java.util.IdentityHashMap;
-import java.util.Map;
-
-import net.minecraft.world.level.storage.ValueInput;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentTarget;
-import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
-
-/**
- * Replacement logic to handle applying attachments when using the /data command.
- * This applies the changes using the high level APIs, ensuring that the changes are correctly synced to the client.
- */
-public class DataAccessorHandler {
-	public static final ScopedValue APPLYING_DATA_CHANGE = ScopedValue.newInstance();
-
-	public static void applyDataChanges(AttachmentTarget target, ValueInput data, Runnable applyData) {
-		AttachmentTargetImpl targetImpl = (AttachmentTargetImpl) target;
-
-		Map, ?> oldAttachments = targetImpl.fabric_getAttachments();
-		ScopedValue.where(APPLYING_DATA_CHANGE, null).run(applyData);
-
-		if (oldAttachments != targetImpl.fabric_getAttachments()) {
-			throw new AssertionError("Attachment data changed during data change application.");
-		}
-
-		IdentityHashMap, Object> newAttachments = AttachmentSerializingImpl.deserializeAttachmentData(data);
-
-		if (oldAttachments == null && newAttachments == null) {
-			// No attachments before or after, nothing to do
-			return;
-		} else if (oldAttachments != null && (newAttachments == null || newAttachments.isEmpty())) {
-			// Clear all attachments - copy keys to avoid ConcurrentModificationException
-			oldAttachments.keySet().stream()
-					.filter(AttachmentType::isPersistent)
-					.toList()
-					.forEach(target::removeAttached);
-			return;
-		}
-
-		// Update the new attachments
-		newAttachments.forEach((attachmentType, o) -> target.setAttached((AttachmentType) attachmentType, o));
-
-		// Remove all of the removed attachments - copy keys to avoid ConcurrentModificationException
-		if (oldAttachments != null) {
-			oldAttachments.keySet().stream()
-					.filter(AttachmentType::isPersistent)
-					.filter(attachmentType -> !newAttachments.containsKey(attachmentType))
-					.toList()
-					.forEach(target::removeAttached);
-		}
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/GlobalAttachmentsImpl.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/GlobalAttachmentsImpl.java
index d22f938e6c..9e2b21302e 100644
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/GlobalAttachmentsImpl.java
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/GlobalAttachmentsImpl.java
@@ -16,19 +16,28 @@
 
 package net.fabricmc.fabric.impl.attachment;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import net.neoforged.neoforge.attachment.AttachmentHolder;
+import net.neoforged.neoforge.attachment.AttachmentSyncHandler;
+import net.neoforged.neoforge.attachment.AttachmentType;
+import net.neoforged.neoforge.attachment.IAttachmentHolder;
+import net.neoforged.neoforge.common.util.FriendlyByteBufUtil;
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import net.minecraft.world.level.storage.ValueInput;
 
-import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
 import net.fabricmc.fabric.api.attachment.v1.GlobalAttachments;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentChange;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentSync;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentTargetInfo;
+import net.fabricmc.fabric.impl.attachment.sync.clientbound.ClientboundAttachmentSyncPayload;
+import net.fabricmc.fabric.mixin.attachment.AttachmentHolderAccessor;
+import net.fabricmc.fabric.mixin.attachment.AttachmentTypeAccessor;
 
-public class GlobalAttachmentsImpl implements GlobalAttachments, AttachmentTargetImpl {
+public class GlobalAttachmentsImpl extends AttachmentHolder implements GlobalAttachments {
 	@Nullable
 	private final MinecraftServer server;
 
@@ -36,8 +45,12 @@ public GlobalAttachmentsImpl(@Nullable MinecraftServer server) {
 		this.server = server;
 	}
 
+	public void doDeserializeAttachments(ValueInput input) {
+		super.deserializeAttachments(input);
+	}
+
 	@Override
-	public void fabric_syncChange(AttachmentType type, AttachmentChange change) {
+	public void syncData(AttachmentType type) {
 		if (server != null) {
 			// We don't use PlayerLookup.all() because when a player respawns,
 			// there is a brief period where said player will not be in the server player list.
@@ -46,31 +59,81 @@ public void fabric_syncChange(AttachmentType type, AttachmentChange change) {
 				// if packet listener is not ServerGamePacketListenerImpl, then player is not in PLAY phase yet
 				// initial sync will handle it
 				if (connection.getPacketListener() instanceof ServerGamePacketListenerImpl serverGamePacketListener) {
-					if (((AttachmentTypeImpl) type).syncPredicate().test(this, serverGamePacketListener.player)) {
-						AttachmentSync.trySync(change, serverGamePacketListener.player);
+					AttachmentSyncHandler syncHandler = ((AttachmentTypeAccessor) (Object) type).getSyncHandler();
+
+					if (syncHandler != null && syncHandler.sendToPlayer(this, serverGamePacketListener.player)) {
+						syncUpdate(this, type, syncHandler, serverGamePacketListener.player);
 					}
 				}
 			});
 		}
 	}
 
-	@Override
-	public boolean fabric_shouldTryToSync() {
-		return server != null;
+	public static void syncInitialData(ServerPlayer player) {
+		GlobalAttachmentsImpl impl = (GlobalAttachmentsImpl) player.level().getServer().globalAttachments();
+		syncInitialAttachments(impl, player);
 	}
 
-	@Override
-	public AttachmentTargetInfo fabric_getSyncTargetInfo() {
-		return AttachmentTargetInfo.GlobalTarget.INSTANCE;
-	}
+	private static  void syncUpdate(AttachmentHolder holder, AttachmentType type, AttachmentSyncHandler syncHandler, ServerPlayer player) {
+		RegistryAccess registryAccess = player.registryAccess();
 
-	@Override
-	public RegistryAccess fabric_getRegistryAccess() {
-		if (server != null) {
-			return server.registryAccess();
+		var data = FriendlyByteBufUtil.writeCustomData(buf -> {
+			var existingData = holder.getExistingDataOrNull(type);
+			if (existingData != null) {
+				buf.writeBoolean(true);
+				syncHandler.write(buf, holder.getData(type), false);
+			} else {
+				buf.writeBoolean(false);
+			}
+		}, registryAccess);
+
+		var packet = new ClientboundAttachmentSyncPayload(List.of(type), data).toVanillaClientbound();
+		IAttachmentHolder exposed = ((AttachmentHolderAccessor) holder).invokeGetExposedHolder();
+		if (syncHandler.sendToPlayer(exposed, player)) {
+			if (player.connection.hasChannel(ClientboundAttachmentSyncPayload.TYPE)) {
+				player.connection.send(packet);
+			}
 		}
+	}
 
-		// only used for deserializing on the server and syncing, so should not be possible to get here.
-		throw new UnsupportedOperationException("GlobalAttachments does not have a registry access on the client side.");
+	@Nullable
+	public static ClientboundAttachmentSyncPayload syncInitialAttachments(AttachmentHolder holder, ServerPlayer to) {
+		AttachmentHolderAccessor accessor = (AttachmentHolderAccessor) holder;
+		
+		if (accessor.getAttachments() == null) {
+			return null;
+		}
+		if (!to.connection.hasChannel(ClientboundAttachmentSyncPayload.TYPE)) {
+			return null;
+		}
+		
+		boolean anySyncableAttachment = false;
+		for (var attachment : accessor.getAttachments().keySet()) {
+			anySyncableAttachment = anySyncableAttachment | ((AttachmentTypeAccessor) (Object) attachment).getSyncHandler() != null;
+		}
+		if (!anySyncableAttachment) {
+			return null;
+		}
+		List> syncedTypes = new ArrayList<>();
+		var data = FriendlyByteBufUtil.writeCustomData(buf -> {
+			for (var entry : accessor.getAttachments().entrySet()) {
+				AttachmentType type = entry.getKey();
+				@SuppressWarnings("unchecked")
+				var syncHandler = (AttachmentSyncHandler) ((AttachmentTypeAccessor) (Object) type).getSyncHandler();
+				if (syncHandler != null) {
+					int indexBefore = buf.writerIndex();
+					buf.writeBoolean(true);
+					int indexBetween = buf.writerIndex();
+					syncHandler.write(buf, entry.getValue(), true);
+					if (indexBetween < buf.writerIndex()) {
+						// Actually wrote something
+						syncedTypes.add(type);
+					} else {
+						buf.writerIndex(indexBefore);
+					}
+				}
+			}
+		}, to.registryAccess());
+		return new ClientboundAttachmentSyncPayload(syncedTypes, data);
 	}
 }
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/AttachmentChange.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/AttachmentChange.java
deleted file mode 100644
index a34d549319..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/AttachmentChange.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * 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.impl.attachment.sync;
-
-import java.util.Objects;
-
-import io.netty.buffer.Unpooled;
-import org.jspecify.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.minecraft.ChatFormatting;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.RegistryFriendlyByteBuf;
-import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.codec.ByteBufCodecs;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.resources.Identifier;
-import net.minecraft.world.level.Level;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentTarget;
-import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
-import net.fabricmc.fabric.api.networking.v1.FriendlyByteBufs;
-import net.fabricmc.fabric.impl.attachment.AttachmentRegistryImpl;
-import net.fabricmc.fabric.impl.attachment.AttachmentTypeImpl;
-
-public record AttachmentChange(AttachmentTargetInfo targetInfo, AttachmentType type, byte[] data) {
-	public static final StreamCodec PACKET_CODEC = StreamCodec.composite(
-			AttachmentTargetInfo.PACKET_CODEC, AttachmentChange::targetInfo,
-			Identifier.STREAM_CODEC.map(
-					id -> Objects.requireNonNull(AttachmentRegistryImpl.get(id)),
-					AttachmentType::identifier
-			), AttachmentChange::type,
-			ByteBufCodecs.BYTE_ARRAY, AttachmentChange::data,
-			AttachmentChange::new
-	);
-	private static final boolean DISCONNECT_ON_UNKNOWN_TARGETS = System.getProperty("fabric.attachment.disconnect_on_unknown_targets") != null;
-	private static final Logger LOGGER = LoggerFactory.getLogger(AttachmentChange.class);
-
-	@SuppressWarnings("unchecked")
-	public static AttachmentChange create(AttachmentTargetInfo targetInfo, AttachmentType type, @Nullable Object value, RegistryAccess registryAccess) {
-		StreamCodec codec = (StreamCodec) ((AttachmentTypeImpl) type).streamCodec();
-		Objects.requireNonNull(codec, "attachment stream codec cannot be null");
-		Objects.requireNonNull(registryAccess, "registry access cannot be null");
-
-		RegistryFriendlyByteBuf buf = new RegistryFriendlyByteBuf(FriendlyByteBufs.create(), registryAccess);
-
-		if (value != null) {
-			buf.writeBoolean(true);
-			codec.encode(buf, value);
-		} else {
-			buf.writeBoolean(false);
-		}
-
-		// buf.array() returns the backing array directly, which often contains unused space
-		byte[] encoded = new byte[buf.readableBytes()];
-		buf.readBytes(encoded);
-		int maxDataSize = ((AttachmentTypeImpl) type).maxSyncSize();
-
-		if (encoded.length > maxDataSize) {
-			throw new IllegalArgumentException("Data for attachment '%s' was too big (%d bytes, over maximum %d)".formatted(
-					type.identifier(),
-					encoded.length,
-					maxDataSize
-			));
-		}
-
-		return new AttachmentChange(targetInfo, type, encoded);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Nullable
-	public Object decodeValue(RegistryAccess registryAccess) {
-		StreamCodec codec = (StreamCodec) ((AttachmentTypeImpl) type).streamCodec();
-		Objects.requireNonNull(codec, "codec was null");
-		Objects.requireNonNull(registryAccess, "registry access cannot be null");
-
-		RegistryFriendlyByteBuf buf = new RegistryFriendlyByteBuf(Unpooled.copiedBuffer(data), registryAccess);
-
-		if (!buf.readBoolean()) {
-			return null;
-		}
-
-		return codec.decode(buf);
-	}
-
-	public void tryApply(Level level) throws AttachmentSyncException {
-		AttachmentTarget target = targetInfo.getTarget(level);
-		Object value = decodeValue(level.registryAccess());
-
-		if (target == null) {
-			final MutableComponent errorMessageComponent = Component.empty();
-			errorMessageComponent
-					.append(Component.translatable("fabric-data-attachment-api-v1.unknown-target.title").withStyle(ChatFormatting.RED))
-					.append(CommonComponents.NEW_LINE);
-			errorMessageComponent.append(CommonComponents.NEW_LINE);
-
-			errorMessageComponent
-					.append(Component.translatable(
-							"fabric-data-attachment-api-v1.unknown-target.attachment-identifier",
-							Component.literal(String.valueOf(type.identifier())).withStyle(ChatFormatting.YELLOW))
-					)
-					.append(CommonComponents.NEW_LINE);
-			errorMessageComponent
-					.append(Component.translatable(
-							"fabric-data-attachment-api-v1.unknown-target.level",
-							Component.literal(String.valueOf(level.dimension().identifier())).withStyle(ChatFormatting.YELLOW)
-					))
-					.append(CommonComponents.NEW_LINE);
-			targetInfo.appendDebugInformation(errorMessageComponent);
-
-			if (DISCONNECT_ON_UNKNOWN_TARGETS) {
-				throw new AttachmentSyncException(errorMessageComponent);
-			}
-
-			LOGGER.warn(errorMessageComponent.getString().trim());
-			return;
-		}
-
-		target.setAttached((AttachmentType) type, value);
-	}
-
-	public AttachmentChange withNewTarget(AttachmentTargetInfo newTargetInfo) {
-		return new AttachmentChange(newTargetInfo, this.type, this.data);
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/AttachmentSync.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/AttachmentSync.java
deleted file mode 100644
index 2a7b1b0a22..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/AttachmentSync.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * 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.impl.attachment.sync;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
-import io.netty.buffer.ByteBufUtil;
-
-import net.minecraft.network.VarInt;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.ClientGamePacketListener;
-import net.minecraft.network.protocol.game.ClientboundBundlePacket;
-import net.minecraft.resources.Identifier;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.network.ConfigurationTask;
-
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.entity.event.v1.ServerEntityLevelChangeEvents;
-import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
-import net.fabricmc.fabric.api.networking.v1.EntityTrackingEvents;
-import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
-import net.fabricmc.fabric.api.networking.v1.ServerConfigurationConnectionEvents;
-import net.fabricmc.fabric.api.networking.v1.ServerConfigurationNetworking;
-import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
-import net.fabricmc.fabric.api.networking.v1.context.PacketContext;
-import net.fabricmc.fabric.impl.attachment.AttachmentEntrypoint;
-import net.fabricmc.fabric.impl.attachment.AttachmentRegistryImpl;
-import net.fabricmc.fabric.impl.attachment.AttachmentTargetImpl;
-import net.fabricmc.fabric.impl.attachment.sync.clientbound.ClientboundAttachmentSyncPayload;
-import net.fabricmc.fabric.impl.attachment.sync.clientbound.ClientboundRequestAcceptedAttachmentsPayload;
-import net.fabricmc.fabric.impl.attachment.sync.serverbound.ServerboundAcceptedAttachmentsPayload;
-import net.fabricmc.fabric.mixin.attachment.ClientboundCustomPayloadPacketAccessor;
-
-public class AttachmentSync implements ModInitializer {
-	public static final int MAX_IDENTIFIER_SIZE = 256;
-	public static final int MAX_PADDING_SIZE_IN_BYTES = AttachmentTargetInfo.MAX_SIZE_IN_BYTES + MAX_IDENTIFIER_SIZE;
-	public static final int DEFAULT_MAX_DATA_SIZE;
-	public static final int DEFAULT_ATTACHMENT_SYNC_PACKET_SIZE;
-	private static final PacketContext.Key> SUPPORTED_ATTACHMENTS_KEY = PacketContext.key(Identifier.fromNamespaceAndPath("fabric", "supported_attachments"));
-
-	static {
-		// ensure no splitting by default
-		int identifierSize = ByteBufUtil.utf8MaxBytes(ClientboundAttachmentSyncPayload.PACKET_ID.toString());
-		int networkingApiPaddingSize = VarInt.getByteSize(identifierSize) + identifierSize + 5 * 2;
-		DEFAULT_MAX_DATA_SIZE = ClientboundCustomPayloadPacketAccessor.getMaxPayloadSize() - MAX_PADDING_SIZE_IN_BYTES - networkingApiPaddingSize;
-		DEFAULT_ATTACHMENT_SYNC_PACKET_SIZE = MAX_PADDING_SIZE_IN_BYTES + DEFAULT_MAX_DATA_SIZE;
-	}
-
-	public static ServerboundAcceptedAttachmentsPayload createResponsePayload() {
-		return new ServerboundAcceptedAttachmentsPayload(AttachmentRegistryImpl.getSyncableAttachments());
-	}
-
-	public static void trySync(AttachmentChange change, ServerPlayer player) {
-		if (player.connection == null) {
-			return;
-		}
-
-		Set supported = player.connection.getPacketContext().orElse(SUPPORTED_ATTACHMENTS_KEY, Set.of());
-
-		if (supported.contains(change.type().identifier())) {
-			ServerPlayNetworking.send(player, new ClientboundAttachmentSyncPayload(change));
-		}
-	}
-
-	public static void trySync(List changes, ServerPlayer player) {
-		if (changes.size() == 1) {
-			trySync(changes.getFirst(), player);
-			return;
-		}
-
-		Set supported = player.connection.getPacketContext().orElse(SUPPORTED_ATTACHMENTS_KEY, Set.of());
-
-		List> syncableChanges = new ArrayList<>();
-		changes.forEach(change -> {
-			if (supported.contains(change.type().identifier())) {
-				syncableChanges.add(ServerPlayNetworking.createClientboundPacket(new ClientboundAttachmentSyncPayload(change)));
-			}
-		});
-
-		if (!syncableChanges.isEmpty()) {
-			ServerPlayNetworking.getSender(player).sendPacket(new ClientboundBundlePacket(syncableChanges));
-		}
-	}
-
-	private static Set decodeResponsePayload(
-			ServerboundAcceptedAttachmentsPayload payload) {
-		Set atts = payload.acceptedAttachments();
-		Set syncable = AttachmentRegistryImpl.getSyncableAttachments();
-		atts.retainAll(syncable);
-
-		if (atts.size() < syncable.size()) {
-			// Client doesn't support all
-			AttachmentEntrypoint.LOGGER.warn(
-					"Client does not support the syncable attachments {}",
-					syncable.stream().filter(id -> !atts.contains(id)).map(Identifier::toString).collect(Collectors.joining(", "))
-			);
-		}
-
-		return atts;
-	}
-
-	@Override
-	public void onInitialize() {
-		// Config
-		PayloadTypeRegistry.serverboundConfiguration()
-				.register(ServerboundAcceptedAttachmentsPayload.ID, ServerboundAcceptedAttachmentsPayload.CODEC);
-		PayloadTypeRegistry.clientboundConfiguration()
-				.register(ClientboundRequestAcceptedAttachmentsPayload.ID, ClientboundRequestAcceptedAttachmentsPayload.CODEC);
-
-		ServerConfigurationConnectionEvents.CONFIGURE.register((handler, server) -> {
-			if (ServerConfigurationNetworking.canSend(handler, ClientboundRequestAcceptedAttachmentsPayload.PACKET_ID)) {
-				handler.addTask(new AttachmentSyncTask());
-			} else {
-				AttachmentEntrypoint.LOGGER.debug(
-						"Couldn't send attachment configuration packet to client, as the client cannot receive the payload."
-				);
-			}
-		});
-
-		ServerConfigurationNetworking.registerGlobalReceiver(
-				ServerboundAcceptedAttachmentsPayload.ID, (payload, context) -> {
-					Set supportedAttachments = decodeResponsePayload(payload);
-					context.packetListener().getPacketContext().set(SUPPORTED_ATTACHMENTS_KEY, supportedAttachments);
-
-					context.packetListener().completeTask(AttachmentSyncTask.KEY);
-				});
-
-		// Play
-		PayloadTypeRegistry.clientboundPlay().registerLarge(
-				ClientboundAttachmentSyncPayload.TYPE, ClientboundAttachmentSyncPayload.CODEC, AttachmentRegistryImpl::getMaxSyncPacketSize);
-
-		ServerPlayerEvents.JOIN.register((player) -> {
-			List changes = new ArrayList<>();
-			// sync global attachments
-			((AttachmentTargetImpl) player.level().globalAttachments()).fabric_computeInitialSyncChanges(player, changes::add);
-			// sync level attachments
-			((AttachmentTargetImpl) player.level()).fabric_computeInitialSyncChanges(player, changes::add);
-			// sync player's own persistent attachments that couldn't be synced earlier
-			((AttachmentTargetImpl) player).fabric_computeInitialSyncChanges(player, changes::add);
-
-			if (!changes.isEmpty()) {
-				trySync(changes, player);
-			}
-		});
-
-		ServerEntityLevelChangeEvents.AFTER_PLAYER_CHANGE_LEVEL.register((player, origin, destination) -> {
-			// sync new level's attachments
-			// no conflict with previous one because the client level is recreated every time
-			List changes = new ArrayList<>();
-			((AttachmentTargetImpl) destination).fabric_computeInitialSyncChanges(player, changes::add);
-
-			if (!changes.isEmpty()) {
-				trySync(changes, player);
-			}
-		});
-
-		EntityTrackingEvents.START_TRACKING.register((trackedEntity, player) -> {
-			List changes = new ArrayList<>();
-			((AttachmentTargetImpl) trackedEntity).fabric_computeInitialSyncChanges(player, changes::add);
-
-			if (!changes.isEmpty()) {
-				trySync(changes, player);
-			}
-		});
-	}
-
-	private record AttachmentSyncTask() implements ConfigurationTask {
-		public static final Type KEY = new Type(
-				ClientboundRequestAcceptedAttachmentsPayload.PACKET_ID.toString());
-
-		@Override
-		public void start(Consumer> sender) {
-			sender.accept(ServerConfigurationNetworking.createClientboundPacket(
-					ClientboundRequestAcceptedAttachmentsPayload.INSTANCE));
-		}
-
-		@Override
-		public Type type() {
-			return KEY;
-		}
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/AttachmentTargetInfo.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/AttachmentTargetInfo.java
deleted file mode 100644
index 9f56160a28..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/AttachmentTargetInfo.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * 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.impl.attachment.sync;
-
-import io.netty.buffer.ByteBuf;
-import it.unimi.dsi.fastutil.bytes.Byte2ObjectArrayMap;
-import it.unimi.dsi.fastutil.bytes.Byte2ObjectMap;
-import org.jspecify.annotations.Nullable;
-
-import net.minecraft.ChatFormatting;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.codec.ByteBufCodecs;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.status.ChunkStatus;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentTarget;
-import net.fabricmc.fabric.api.attachment.v1.GlobalAttachments;
-
-public sealed interface AttachmentTargetInfo {
-	int MAX_SIZE_IN_BYTES = Byte.BYTES + Long.BYTES;
-	StreamCodec> PACKET_CODEC = ByteBufCodecs.BYTE.dispatch(
-			AttachmentTargetInfo::getId, Type::streamCodecFromId
-	);
-
-	Type getType();
-
-	default byte getId() {
-		return getType().id;
-	}
-
-	@Nullable
-	AttachmentTarget getTarget(Level level);
-
-	void appendDebugInformation(MutableComponent component);
-
-	record Type(byte id, StreamCodec> streamCodec) {
-		static Byte2ObjectMap> TYPES = new Byte2ObjectArrayMap<>();
-		static Type BLOCK_ENTITY = new Type<>((byte) 0, BlockEntityTarget.PACKET_CODEC);
-		static Type ENTITY = new Type<>((byte) 1, EntityTarget.PACKET_CODEC);
-		static Type CHUNK = new Type<>((byte) 2, ChunkTarget.PACKET_CODEC);
-		static Type WORLD = new Type<>((byte) 3, LevelTarget.PACKET_CODEC);
-		static Type GLOBAL = new Type<>((byte) 4, GlobalTarget.PACKET_CODEC);
-
-		public Type {
-			TYPES.put(id, this);
-		}
-
-		static StreamCodec> streamCodecFromId(byte id) {
-			return TYPES.get(id).streamCodec;
-		}
-	}
-
-	record BlockEntityTarget(BlockPos pos) implements AttachmentTargetInfo {
-		static final StreamCodec PACKET_CODEC = StreamCodec.composite(
-				BlockPos.STREAM_CODEC, BlockEntityTarget::pos,
-				BlockEntityTarget::new
-		);
-
-		@Override
-		public Type getType() {
-			return Type.BLOCK_ENTITY;
-		}
-
-		@Override
-		public AttachmentTarget getTarget(Level level) {
-			return level.getBlockEntity(pos);
-		}
-
-		@Override
-		public void appendDebugInformation(MutableComponent component) {
-			component
-					.append(Component.translatable(
-							"fabric-data-attachment-api-v1.unknown-target.target-type",
-							Component.translatable("fabric-data-attachment-api-v1.unknown-target.target-type.block-entity").withStyle(ChatFormatting.YELLOW)
-					))
-					.append(CommonComponents.NEW_LINE);
-			component
-					.append(Component.translatable(
-							"fabric-data-attachment-api-v1.unknown-target.block-entity-position",
-							Component.literal(pos.toShortString()).withStyle(ChatFormatting.YELLOW)
-					))
-					.append(CommonComponents.NEW_LINE);
-		}
-	}
-
-	record EntityTarget(int networkId) implements AttachmentTargetInfo {
-		static final StreamCodec PACKET_CODEC = StreamCodec.composite(
-				ByteBufCodecs.VAR_INT, EntityTarget::networkId,
-				EntityTarget::new
-		);
-
-		@Override
-		public Type getType() {
-			return Type.ENTITY;
-		}
-
-		@Override
-		public AttachmentTarget getTarget(Level level) {
-			return level.getEntity(networkId);
-		}
-
-		@Override
-		public void appendDebugInformation(MutableComponent component) {
-			component
-					.append(Component.translatable(
-							"fabric-data-attachment-api-v1.unknown-target.target-type",
-							Component.translatable("fabric-data-attachment-api-v1.unknown-target.target-type.entity").withStyle(ChatFormatting.YELLOW)
-					))
-					.append(CommonComponents.NEW_LINE);
-			component
-					.append(Component.translatable(
-							"fabric-data-attachment-api-v1.unknown-target.entity-network-id",
-							Component.literal(String.valueOf(networkId)).withStyle(ChatFormatting.YELLOW)
-					))
-					.append(CommonComponents.NEW_LINE);
-		}
-	}
-
-	record ChunkTarget(ChunkPos pos) implements AttachmentTargetInfo {
-		static final StreamCodec PACKET_CODEC = ByteBufCodecs.VAR_LONG
-				.map(ChunkPos::unpack, ChunkPos::pack)
-				.map(ChunkTarget::new, ChunkTarget::pos);
-
-		@Override
-		public Type getType() {
-			return Type.CHUNK;
-		}
-
-		@Override
-		public AttachmentTarget getTarget(Level level) {
-			return level.getChunk(pos.x(), pos.z(), ChunkStatus.FULL, false);
-		}
-
-		@Override
-		public void appendDebugInformation(MutableComponent component) {
-			component
-					.append(Component.translatable(
-							"fabric-data-attachment-api-v1.unknown-target.target-type",
-							Component.translatable("fabric-data-attachment-api-v1.unknown-target.target-type.chunk").withStyle(ChatFormatting.YELLOW)
-					))
-					.append(CommonComponents.NEW_LINE);
-			component
-					.append(Component.translatable(
-							"fabric-data-attachment-api-v1.unknown-target.chunk-position",
-							Component.literal(pos.x() + ", " + pos.z()).withStyle(ChatFormatting.YELLOW)
-					))
-					.append(CommonComponents.NEW_LINE);
-		}
-	}
-
-	final class LevelTarget implements AttachmentTargetInfo {
-		public static final LevelTarget INSTANCE = new LevelTarget();
-		static final StreamCodec PACKET_CODEC = StreamCodec.unit(INSTANCE);
-
-		private LevelTarget() {
-		}
-
-		@Override
-		public Type getType() {
-			return Type.WORLD;
-		}
-
-		@Override
-		public AttachmentTarget getTarget(Level level) {
-			return level;
-		}
-
-		@Override
-		public void appendDebugInformation(MutableComponent component) {
-			component
-					.append(Component.translatable(
-							"fabric-data-attachment-api-v1.unknown-target.target-type",
-							Component.translatable("fabric-data-attachment-api-v1.unknown-target.target-type.level").withStyle(ChatFormatting.YELLOW)
-					))
-					.append(CommonComponents.NEW_LINE);
-		}
-	}
-
-	final class GlobalTarget implements AttachmentTargetInfo {
-		public static final GlobalTarget INSTANCE = new GlobalTarget();
-		static final StreamCodec PACKET_CODEC = StreamCodec.unit(INSTANCE);
-
-		private GlobalTarget() {
-		}
-
-		@Override
-		public Type getType() {
-			return Type.GLOBAL;
-		}
-
-		@Override
-		public AttachmentTarget getTarget(Level level) {
-			return level.globalAttachments();
-		}
-
-		@Override
-		public void appendDebugInformation(MutableComponent component) {
-			component
-					.append(Component.translatable(
-							"fabric-data-attachment-api-v1.unknown-target.target-type",
-							Component.translatable("fabric-data-attachment-api-v1.unknown-target.target-type.global").withStyle(ChatFormatting.YELLOW)
-					))
-					.append(CommonComponents.NEW_LINE);
-		}
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/clientbound/ClientboundAttachmentSyncPayload.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/clientbound/ClientboundAttachmentSyncPayload.java
index 6aa155b92d..bba1b6b75b 100644
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/clientbound/ClientboundAttachmentSyncPayload.java
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/clientbound/ClientboundAttachmentSyncPayload.java
@@ -16,19 +16,26 @@
 
 package net.fabricmc.fabric.impl.attachment.sync.clientbound;
 
-import net.minecraft.network.FriendlyByteBuf;
+import java.util.List;
+
+import net.neoforged.neoforge.attachment.AttachmentSync;
+import net.neoforged.neoforge.attachment.AttachmentType;
+import net.neoforged.neoforge.network.codec.NeoForgeStreamCodecs;
+
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.Identifier;
 
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentChange;
-
-public record ClientboundAttachmentSyncPayload(AttachmentChange attachment) implements CustomPacketPayload {
-	public static final StreamCodec CODEC = StreamCodec.composite(
-			AttachmentChange.PACKET_CODEC,
-			ClientboundAttachmentSyncPayload::attachment,
-			ClientboundAttachmentSyncPayload::new
-	);
+public record ClientboundAttachmentSyncPayload(List> types,
+                                               byte[] syncPayload) implements CustomPacketPayload {
+	public static final StreamCodec STREAM_CODEC = StreamCodec.composite(
+			ByteBufCodecs.registry(AttachmentSync.SYNCED_ATTACHMENT_TYPES.key()).apply(ByteBufCodecs.list()),
+			ClientboundAttachmentSyncPayload::types,
+			NeoForgeStreamCodecs.UNBOUNDED_BYTE_ARRAY,
+			ClientboundAttachmentSyncPayload::syncPayload,
+			ClientboundAttachmentSyncPayload::new);
 	public static final Identifier PACKET_ID = Identifier.fromNamespaceAndPath("fabric", "attachment_sync_v1");
 	public static final Type TYPE = new Type<>(PACKET_ID);
 
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/clientbound/ClientboundRequestAcceptedAttachmentsPayload.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/clientbound/ClientboundRequestAcceptedAttachmentsPayload.java
deleted file mode 100644
index 12676a81f6..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/clientbound/ClientboundRequestAcceptedAttachmentsPayload.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.impl.attachment.sync.clientbound;
-
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.Identifier;
-
-public class ClientboundRequestAcceptedAttachmentsPayload implements CustomPacketPayload {
-	public static final ClientboundRequestAcceptedAttachmentsPayload INSTANCE = new ClientboundRequestAcceptedAttachmentsPayload();
-	public static final Identifier PACKET_ID = Identifier.fromNamespaceAndPath("fabric", "accepted_attachments_v1");
-	public static final Type ID = new Type<>(PACKET_ID);
-	public static final StreamCodec CODEC = StreamCodec.unit(INSTANCE);
-
-	private ClientboundRequestAcceptedAttachmentsPayload() {
-	}
-
-	@Override
-	public Type type() {
-		return ID;
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/serverbound/ServerboundAcceptedAttachmentsPayload.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/serverbound/ServerboundAcceptedAttachmentsPayload.java
deleted file mode 100644
index 61a8e55db3..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/serverbound/ServerboundAcceptedAttachmentsPayload.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.impl.attachment.sync.serverbound;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.codec.ByteBufCodecs;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.Identifier;
-
-public record ServerboundAcceptedAttachmentsPayload(Set acceptedAttachments) implements CustomPacketPayload {
-	public static final StreamCodec CODEC = StreamCodec.composite(
-			ByteBufCodecs.collection(HashSet::new, Identifier.STREAM_CODEC), ServerboundAcceptedAttachmentsPayload::acceptedAttachments,
-			ServerboundAcceptedAttachmentsPayload::new
-	);
-	public static final Identifier PACKET_ID = Identifier.fromNamespaceAndPath("fabric", "accepted_attachments_v1");
-	public static final Type ID = new Type<>(PACKET_ID);
-
-	@Override
-	public Type type() {
-		return ID;
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/AttachmentHolderAccessor.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/AttachmentHolderAccessor.java
new file mode 100644
index 0000000000..eea623bf65
--- /dev/null
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/AttachmentHolderAccessor.java
@@ -0,0 +1,22 @@
+package net.fabricmc.fabric.mixin.attachment;
+
+import java.util.Map;
+
+import net.neoforged.neoforge.attachment.AttachmentHolder;
+import net.neoforged.neoforge.attachment.AttachmentType;
+import net.neoforged.neoforge.attachment.IAttachmentHolder;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(AttachmentHolder.class)
+public interface AttachmentHolderAccessor {
+	@Accessor
+	Map, Object> getAttachments();
+	
+    @Invoker
+    Map, Object> invokeGetAttachmentMap();
+	
+	@Invoker
+	IAttachmentHolder invokeGetExposedHolder();
+}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/AttachmentHolderMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/AttachmentHolderMixin.java
new file mode 100644
index 0000000000..41f3fd811a
--- /dev/null
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/AttachmentHolderMixin.java
@@ -0,0 +1,24 @@
+package net.fabricmc.fabric.mixin.attachment;
+
+import net.neoforged.neoforge.attachment.AttachmentHolder;
+import net.neoforged.neoforge.attachment.AttachmentType;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.fabricmc.fabric.impl.attachment.AttachmentChangeEvents;
+
+@Mixin(AttachmentHolder.class)
+public class AttachmentHolderMixin {
+
+	@Inject(method = "setData", at = @At("RETURN"))
+	private  void onSetData(AttachmentType type, T data, CallbackInfoReturnable cir) {
+		AttachmentChangeEvents.invoke(type, cir.getReturnValue(), data);
+	}
+
+	@Inject(method = "removeData", at = @At("RETURN"))
+	private  void onRemoveData(AttachmentType type, CallbackInfoReturnable cir) {
+		AttachmentChangeEvents.invoke(type, cir.getReturnValue(), null);
+	}
+}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/AttachmentTargetsMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/AttachmentTargetsMixin.java
deleted file mode 100644
index e39e6e2330..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/AttachmentTargetsMixin.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * 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.mixin.attachment;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-import org.jspecify.annotations.Nullable;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-
-import net.minecraft.core.HolderLookup;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.storage.ValueInput;
-import net.minecraft.world.level.storage.ValueOutput;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
-import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.api.event.EventFactory;
-import net.fabricmc.fabric.impl.attachment.AttachmentSerializingImpl;
-import net.fabricmc.fabric.impl.attachment.AttachmentTargetImpl;
-import net.fabricmc.fabric.impl.attachment.AttachmentTypeImpl;
-import net.fabricmc.fabric.impl.attachment.DataAccessorHandler;
-import net.fabricmc.fabric.impl.attachment.GlobalAttachmentsImpl;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentChange;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentSync;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentTargetInfo;
-
-@Mixin({BlockEntity.class, Entity.class, Level.class, ChunkAccess.class, GlobalAttachmentsImpl.class})
-abstract class AttachmentTargetsMixin implements AttachmentTargetImpl {
-	@Unique
-	@Nullable
-	private IdentityHashMap, Object> dataAttachments = null;
-	@Unique
-	@Nullable
-	private IdentityHashMap, AttachmentChange> syncedAttachments = null;
-	@Unique
-	@Nullable
-	private Set> deferredSyncedAttachments = null;
-	@Unique
-	@Nullable
-	private IdentityHashMap, Event>> attachedChangedListeners = null;
-
-	@SuppressWarnings("unchecked")
-	@Override
-	@Nullable
-	public  T getAttached(AttachmentType type) {
-		return dataAttachments == null ? null : (T) dataAttachments.get(type);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	@Nullable
-	public  T setAttached(AttachmentType type, @Nullable T value) {
-		T oldValue;
-
-		if (value == null) {
-			oldValue = dataAttachments == null ? null : (T) dataAttachments.remove(type);
-		} else {
-			if (dataAttachments == null) {
-				dataAttachments = new IdentityHashMap<>();
-			}
-
-			oldValue = (T) dataAttachments.put(type, value);
-		}
-
-		if (attachedChangedListeners != null) {
-			Event> event = (Event>) (Event) attachedChangedListeners.get(type);
-
-			if (event != null) {
-				event.invoker().onAttachedSet(oldValue, value);
-			}
-		}
-
-		if (!Objects.equals(oldValue, value)) {
-			this.fabric_markChanged(type);
-
-			if (this.fabric_shouldTryToSync() && type.isSynced()) {
-				AttachmentChange change = AttachmentChange.create(fabric_getSyncTargetInfo(), type, value, fabric_getRegistryAccess());
-				acknowledgeSyncedEntry(type, change);
-				this.fabric_syncChange(type, change);
-			}
-		}
-
-		return oldValue;
-	}
-
-	@Override
-	public boolean hasAttached(AttachmentType type) {
-		return dataAttachments != null && dataAttachments.containsKey(type);
-	}
-
-	@Override
-	public  Event> onAttachedSet(AttachmentType type) {
-		if (attachedChangedListeners == null) {
-			attachedChangedListeners = new IdentityHashMap<>();
-		}
-
-		return (Event>) (Event) attachedChangedListeners.computeIfAbsent(type, t -> {
-			return (Event>) (Event) EventFactory.createArrayBacked(OnAttachedSet.class, (Function[], OnAttachedSet>) listeners -> (oldValue, newValue) -> {
-				for (OnAttachedSet listener : listeners) {
-					listener.onAttachedSet(oldValue, newValue);
-				}
-			});
-		});
-	}
-
-	@Override
-	public void fabric_writeAttachmentsToNbt(ValueOutput output) {
-		AttachmentSerializingImpl.serializeAttachmentData(output, dataAttachments);
-	}
-
-	@Override
-	public void fabric_readAttachmentsFromNbt(ValueInput input) {
-		if (DataAccessorHandler.APPLYING_DATA_CHANGE.isBound()) {
-			// DataAccessorHandler handles applying data changes separately.
-			return;
-		}
-
-		// Note on player targets: no syncing can happen here as the networkHandler is still null
-		// Instead it is done on player join (see AttachmentSync)
-		IdentityHashMap, Object> fromNbt = AttachmentSerializingImpl.deserializeAttachmentData(input);
-
-		// If the NBT is devoid of data attachments, treat it as a no-op, rather than wiping them out.
-		// Any changes to data attachments (including removals) post-load are done independently of this
-		// code path, so we don't need to blindly overwrite it every time if Vanilla MC sends updates
-		// (i.e. block entity updates) sans data attachments. See https://github.com/FabricMC/fabric/issues/4638
-		if (fromNbt == null) {
-			return;
-		}
-
-		this.dataAttachments = fromNbt;
-
-		if (this.fabric_shouldTryToSync() && this.dataAttachments != null) {
-			this.dataAttachments.forEach((type, value) -> {
-				if (type.isSynced()) {
-					acknowledgeSynced(type, value, input.lookup());
-				}
-			});
-
-			// Avoid unnecessary extra syncing after initial sync
-			fabric_clearDeferredSyncChanges();
-		}
-	}
-
-	@Override
-	public boolean fabric_hasPersistentAttachments() {
-		return AttachmentSerializingImpl.hasPersistentAttachments(dataAttachments);
-	}
-
-	@Override
-	public Map, ?> fabric_getAttachments() {
-		return dataAttachments;
-	}
-
-	@Unique
-	private void acknowledgeSynced(AttachmentType type, Object value, HolderLookup.Provider registries) {
-		RegistryAccess registryAccess = (registries instanceof RegistryAccess ra) ? ra : fabric_getRegistryAccess();
-		acknowledgeSyncedEntry(type, AttachmentChange.create(fabric_getSyncTargetInfo(), type, value, registryAccess));
-	}
-
-	@Unique
-	private void acknowledgeSyncedEntry(AttachmentType type, @Nullable AttachmentChange change) {
-		if (change == null) {
-			if (syncedAttachments == null) {
-				return;
-			}
-
-			syncedAttachments.remove(type);
-
-			if (fabric_shouldDeferSync()) {
-				deferredSyncedAttachments.add(type);
-			}
-		} else {
-			if (syncedAttachments == null) {
-				syncedAttachments = new IdentityHashMap<>();
-			}
-
-			syncedAttachments.put(type, change);
-
-			if (fabric_shouldDeferSync()) {
-				if (deferredSyncedAttachments == null) {
-					deferredSyncedAttachments = Collections.newSetFromMap(new IdentityHashMap<>());
-				}
-
-				deferredSyncedAttachments.add(type);
-			}
-		}
-	}
-
-	@Override
-	public void fabric_computeInitialSyncChanges(ServerPlayer player, Consumer changeOutput) {
-		if (syncedAttachments == null) {
-			return;
-		}
-
-		for (Map.Entry, AttachmentChange> entry : syncedAttachments.entrySet()) {
-			if (((AttachmentTypeImpl) entry.getKey()).syncPredicate().test(this, player)) {
-				changeOutput.accept(entry.getValue());
-			}
-		}
-	}
-
-	@Override
-	public void fabric_sendAndClearDeferredSyncChanges(List players) {
-		if (syncedAttachments == null || deferredSyncedAttachments == null || deferredSyncedAttachments.isEmpty()) {
-			return;
-		}
-
-		List deferredChanges = deferredSyncedAttachments.stream().map(type -> {
-			AttachmentChange change = syncedAttachments.get(type);
-
-			if (change == null) { // attachment was removed
-				change = AttachmentChange.create(fabric_getSyncTargetInfo(), type, null, fabric_getRegistryAccess());
-			}
-
-			return change;
-		}).toList();
-
-		for (ServerPlayer player : players) {
-			List syncableChanges = new ArrayList<>();
-
-			for (AttachmentChange change : deferredChanges) {
-				if (((AttachmentTypeImpl) change.type()).syncPredicate().test(this, player)) {
-					syncableChanges.add(change);
-				}
-			}
-
-			if (!syncableChanges.isEmpty()) {
-				AttachmentSync.trySync(syncableChanges, player);
-			}
-		}
-
-		deferredSyncedAttachments.clear();
-	}
-
-	@Override
-	public void fabric_clearDeferredSyncChanges() {
-		if (deferredSyncedAttachments != null) {
-			deferredSyncedAttachments.clear();
-		}
-	}
-
-	@Override
-	public  void fabric_updateSyncTarget(AttachmentTargetInfo oldTargetInfo, AttachmentTargetInfo newTargetInfo) {
-		if (syncedAttachments == null) {
-			return;
-		}
-
-		syncedAttachments.replaceAll((_, attachmentChange) -> {
-			if (attachmentChange.targetInfo().equals(oldTargetInfo)) {
-				return attachmentChange.withNewTarget(newTargetInfo);
-			}
-
-			return attachmentChange;
-		});
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/AttachmentTypeAccessor.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/AttachmentTypeAccessor.java
new file mode 100644
index 0000000000..8ea980de88
--- /dev/null
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/AttachmentTypeAccessor.java
@@ -0,0 +1,12 @@
+package net.fabricmc.fabric.mixin.attachment;
+
+import net.neoforged.neoforge.attachment.AttachmentSyncHandler;
+import net.neoforged.neoforge.attachment.AttachmentType;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(AttachmentType.class)
+public interface AttachmentTypeAccessor {
+	@Accessor
+	AttachmentSyncHandler getSyncHandler();
+}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/BannerBlockEntityMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/BannerBlockEntityMixin.java
deleted file mode 100644
index d2f1449d65..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/BannerBlockEntityMixin.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.mixin.attachment;
-
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.level.block.entity.BannerBlockEntity;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentTarget;
-
-@Mixin(BannerBlockEntity.class)
-abstract class BannerBlockEntityMixin {
-	@ModifyExpressionValue(method = "getUpdateTag", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/entity/BannerBlockEntity;saveWithoutMetadata(Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/nbt/CompoundTag;"))
-	private CompoundTag removeAttachments(CompoundTag original) {
-		original.remove(AttachmentTarget.NBT_ATTACHMENT_KEY);
-		return original;
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/BaseMappedRegistryAccessor.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/BaseMappedRegistryAccessor.java
new file mode 100644
index 0000000000..31c5273198
--- /dev/null
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/BaseMappedRegistryAccessor.java
@@ -0,0 +1,11 @@
+package net.fabricmc.fabric.mixin.attachment;
+
+import net.neoforged.neoforge.registries.BaseMappedRegistry;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(BaseMappedRegistry.class)
+public interface BaseMappedRegistryAccessor {
+    @Invoker
+    void invokeUnfreeze(boolean clearTags);
+}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/BlockDataAccessorMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/BlockDataAccessorMixin.java
deleted file mode 100644
index 79dac0760e..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/BlockDataAccessorMixin.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.mixin.attachment;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.server.commands.data.BlockDataAccessor;
-import net.minecraft.server.commands.data.DataAccessor;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.storage.ValueInput;
-
-import net.fabricmc.fabric.impl.attachment.DataAccessorHandler;
-
-@Mixin(BlockDataAccessor.class)
-public abstract class BlockDataAccessorMixin implements DataAccessor {
-	@WrapOperation(method = "setData", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/entity/BlockEntity;loadWithComponents(Lnet/minecraft/world/level/storage/ValueInput;)V"))
-	public void setData(BlockEntity entity, ValueInput input, Operation original) {
-		if (entity.getLevel() == null) {
-			// The block entity is not in a level, just follow the default logic.
-			original.call(entity, input);
-			return;
-		}
-
-		DataAccessorHandler.applyDataChanges(entity, input, () -> original.call(entity, input));
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/BlockEntityMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/BlockEntityMixin.java
deleted file mode 100644
index 338a31fc38..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/BlockEntityMixin.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.mixin.attachment;
-
-import java.util.concurrent.CompletableFuture;
-
-import org.jspecify.annotations.Nullable;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ChunkHolder;
-import net.minecraft.server.level.ChunkResult;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.storage.ValueInput;
-import net.minecraft.world.level.storage.ValueOutput;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
-import net.fabricmc.fabric.impl.attachment.AttachmentTargetImpl;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentChange;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentTargetInfo;
-
-@Mixin(BlockEntity.class)
-abstract class BlockEntityMixin implements AttachmentTargetImpl {
-	@Shadow
-	public abstract void setChanged();
-
-	@Shadow
-	@Final
-	protected BlockPos worldPosition;
-
-	@Shadow
-	public abstract boolean hasLevel();
-
-	@Shadow
-	@Nullable
-	protected Level level;
-
-	@Inject(
-			method = "loadWithComponents",
-			at = @At("RETURN")
-	)
-	private void readBlockEntityAttachments(ValueInput input, CallbackInfo ci) {
-		this.fabric_readAttachmentsFromNbt(input);
-	}
-
-	@Inject(
-			method = "saveWithoutMetadata(Lnet/minecraft/world/level/storage/ValueOutput;)V",
-			at = @At(value = "TAIL")
-	)
-	private void writeBlockEntityAttachments(ValueOutput output, CallbackInfo ci) {
-		this.fabric_writeAttachmentsToNbt(output);
-	}
-
-	@Override
-	public void fabric_markChanged(AttachmentType type) {
-		if (this.level instanceof ServerLevel serverLevel) {
-			ChunkHolder chunkHolder = serverLevel.getChunkSource().chunkMap.getUpdatingChunkIfPresent(ChunkPos.pack(this.worldPosition));
-
-			// If chunkHolder is null, then chunk is probably unloaded/unloading.
-			// calling setChanged() may start loading the chunk again, causing an infinite loop of chunk loading/unloading.
-			// so just do nothing.
-			if (chunkHolder == null) {
-				return;
-			}
-
-			CompletableFuture> chunkFuture = chunkHolder.getFullChunkFuture();
-
-			if (chunkFuture.isDone()) {
-				// If chunk is already loaded successfully, then call setChanged() immediately
-				chunkFuture.thenAccept(chunkResult -> chunkResult.ifSuccess(_ -> this.setChanged()));
-			} else {
-				// Otherwise setChanged() is called after to avoid deadlocking the server thread
-				MinecraftServer server = serverLevel.getServer();
-				server.schedule(server.wrapRunnable(() -> fabric_markChanged(type)));
-			}
-		} else {
-			this.setChanged();
-		}
-	}
-
-	@Override
-	public AttachmentTargetInfo fabric_getSyncTargetInfo() {
-		return new AttachmentTargetInfo.BlockEntityTarget(this.worldPosition);
-	}
-
-	@Override
-	public void fabric_syncChange(AttachmentType type, AttachmentChange change) {
-		if (this.level instanceof ServerLevel serverLevel) {
-			serverLevel.getChunkSource().blockChanged(this.worldPosition);
-		}
-	}
-
-	@Override
-	public boolean fabric_shouldTryToSync() {
-		// Persistent attachments are read at a time with no level
-		return !this.hasLevel() || !this.level.isClientSide();
-	}
-
-	@Override
-	public boolean fabric_shouldDeferSync() {
-		return true;
-	}
-
-	@Override
-	public RegistryAccess fabric_getRegistryAccess() {
-		return this.level.registryAccess();
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ChunkAccessMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ChunkAccessMixin.java
deleted file mode 100644
index deceaeb2e7..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ChunkAccessMixin.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.mixin.attachment;
-
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.status.ChunkStatus;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
-import net.fabricmc.fabric.impl.attachment.AttachmentEntrypoint;
-import net.fabricmc.fabric.impl.attachment.AttachmentTargetImpl;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentTargetInfo;
-
-@Mixin(ChunkAccess.class)
-abstract class ChunkAccessMixin implements AttachmentTargetImpl {
-	@Shadow
-	public abstract ChunkPos getPos();
-
-	@Shadow
-	public abstract void markUnsaved();
-
-	@Shadow
-	public abstract ChunkStatus getPersistedStatus();
-
-	@Shadow
-	@Final
-	protected ChunkPos chunkPos;
-
-	@Override
-	public AttachmentTargetInfo fabric_getSyncTargetInfo() {
-		return new AttachmentTargetInfo.ChunkTarget(this.chunkPos);
-	}
-
-	@Override
-	public void fabric_markChanged(AttachmentType type) {
-		markUnsaved();
-
-		if (type.isPersistent() && this.getPersistedStatus().equals(ChunkStatus.EMPTY)) {
-			AttachmentEntrypoint.LOGGER.warn(
-					"Attaching persistent attachment {} to chunk {} with chunk status EMPTY. Attachment might be discarded.",
-					type.identifier(),
-					this.getPos()
-			);
-		}
-	}
-
-	@Override
-	public boolean fabric_shouldTryToSync() {
-		// ProtoChunk or EmptyLevelChunk
-		return false;
-	}
-
-	@Override
-	public RegistryAccess fabric_getRegistryAccess() {
-		// Should never happen as this is only used for sync
-		throw new UnsupportedOperationException("Chunk does not have a RegistryAccess.");
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ChunkHolderMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ChunkHolderMixin.java
deleted file mode 100644
index bb69af02fb..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ChunkHolderMixin.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.mixin.attachment;
-
-import java.util.List;
-
-import com.llamalad7.mixinextras.sugar.Local;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ChunkHolder;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntity;
-
-import net.fabricmc.fabric.impl.attachment.AttachmentTargetImpl;
-
-@Mixin(ChunkHolder.class)
-public class ChunkHolderMixin {
-	@Inject(method = "broadcastBlockEntity", at = @At("TAIL"))
-	private void broadcastBlockEntity(List players, Level level, BlockPos blockPos, CallbackInfo ci, @Local(name = "blockEntity") BlockEntity blockEntity) {
-		if (blockEntity != null) {
-			((AttachmentTargetImpl) blockEntity).fabric_sendAndClearDeferredSyncChanges(players);
-		}
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/DimensionStorageFileFixMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/DimensionStorageFileFixMixin.java
deleted file mode 100644
index ecb50c1439..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/DimensionStorageFileFixMixin.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.mixin.attachment;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyArg;
-
-import net.minecraft.util.filefix.fixes.DimensionStorageFileFix;
-import net.minecraft.util.filefix.operations.FileFixOperation;
-import net.minecraft.util.filefix.operations.FileFixOperations;
-
-@Mixin(DimensionStorageFileFix.class)
-abstract class DimensionStorageFileFixMixin {
-	@ModifyArg(
-			method = "makeFixer",
-			at = @At(
-					value = "INVOKE",
-					target = "Lnet/minecraft/util/filefix/operations/FileFixOperations;applyInFolders(Lnet/minecraft/util/filefix/access/FileRelation;Ljava/util/List;)Lnet/minecraft/util/filefix/operations/ApplyInFolders;",
-					ordinal = 1
-			),
-			index = 1
-	)
-	private List addFabricAttachmentsMigration(List original) {
-		List operations = new ArrayList<>(original);
-		operations.add(FileFixOperations.move("fabric_attachments.dat", "fabric/attachments.dat"));
-		return Collections.unmodifiableList(operations);
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/EntityDataAccessorMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/EntityDataAccessorMixin.java
deleted file mode 100644
index 5c831d0fc3..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/EntityDataAccessorMixin.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.mixin.attachment;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.server.commands.data.DataAccessor;
-import net.minecraft.server.commands.data.EntityDataAccessor;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.storage.ValueInput;
-
-import net.fabricmc.fabric.impl.attachment.DataAccessorHandler;
-
-@Mixin(EntityDataAccessor.class)
-public abstract class EntityDataAccessorMixin implements DataAccessor {
-	@WrapOperation(method = "setData", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;load(Lnet/minecraft/world/level/storage/ValueInput;)V"))
-	public void setData(Entity entity, ValueInput input, Operation original) {
-		if (entity.level() == null) {
-			// The block entity is not in a level, just follow the default logic.
-			original.call(entity, input);
-			return;
-		}
-
-		DataAccessorHandler.applyDataChanges(entity, input, () -> original.call(entity, input));
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/EntityMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/EntityMixin.java
deleted file mode 100644
index dbeaa23808..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/EntityMixin.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * 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.mixin.attachment;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.storage.ValueInput;
-import net.minecraft.world.level.storage.ValueOutput;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentSyncPredicate;
-import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
-import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
-import net.fabricmc.fabric.impl.attachment.AttachmentTargetImpl;
-import net.fabricmc.fabric.impl.attachment.AttachmentTypeImpl;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentChange;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentSync;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentTargetInfo;
-
-@Mixin(Entity.class)
-abstract class EntityMixin implements AttachmentTargetImpl {
-	@Shadow
-	private int id;
-
-	@Shadow
-	public abstract Level level();
-
-	@Inject(
-			at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;readAdditionalSaveData(Lnet/minecraft/world/level/storage/ValueInput;)V"),
-			method = "load"
-	)
-	private void readEntityAttachments(ValueInput data, CallbackInfo ci) {
-		this.fabric_readAttachmentsFromNbt(data);
-	}
-
-	@Inject(
-			at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;addAdditionalSaveData(Lnet/minecraft/world/level/storage/ValueOutput;)V"),
-			method = "saveWithoutId"
-	)
-	private void writeEntityAttachments(ValueOutput output, CallbackInfo ci) {
-		this.fabric_writeAttachmentsToNbt(output);
-	}
-
-	@Override
-	public AttachmentTargetInfo fabric_getSyncTargetInfo() {
-		return new AttachmentTargetInfo.EntityTarget(this.id);
-	}
-
-	@Override
-	public void fabric_syncChange(AttachmentType type, AttachmentChange change) {
-		if (!this.level().isClientSide()) {
-			AttachmentSyncPredicate predicate = ((AttachmentTypeImpl) type).syncPredicate();
-
-			if ((Object) this instanceof ServerPlayer self && predicate.test(this, self)) {
-				// Players do not track themselves
-				AttachmentSync.trySync(change, self);
-			}
-
-			PlayerLookup.tracking((Entity) (Object) this)
-					.forEach(player -> {
-						if (predicate.test(this, player)) {
-							AttachmentSync.trySync(change, player);
-						}
-					});
-		}
-	}
-
-	@Override
-	public boolean fabric_shouldTryToSync() {
-		return !this.level().isClientSide();
-	}
-
-	@Override
-	public RegistryAccess fabric_getRegistryAccess() {
-		return this.level().registryAccess();
-	}
-
-	@Inject(method = "setId", at = @At("HEAD"))
-	private void setId(int id, CallbackInfo ci) {
-		var oldTargetInfo = new AttachmentTargetInfo.EntityTarget(this.id);
-		var newTargetInfo = new AttachmentTargetInfo.EntityTarget(id);
-		fabric_updateSyncTarget(oldTargetInfo, newTargetInfo);
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/IAttachmentHolderMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/IAttachmentHolderMixin.java
new file mode 100644
index 0000000000..4c3cd86d09
--- /dev/null
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/IAttachmentHolderMixin.java
@@ -0,0 +1,10 @@
+package net.fabricmc.fabric.mixin.attachment;
+
+import net.fabricmc.fabric.api.attachment.v1.AttachmentTarget;
+import net.neoforged.neoforge.attachment.IAttachmentHolder;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(IAttachmentHolder.class)
+public interface IAttachmentHolderMixin extends AttachmentTarget {
+
+}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ImposterProtoChunkMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ImposterProtoChunkMixin.java
deleted file mode 100644
index 74f0e41dc6..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ImposterProtoChunkMixin.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * 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.mixin.attachment;
-
-import java.util.Map;
-import java.util.function.Consumer;
-
-import org.jspecify.annotations.Nullable;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.chunk.ImposterProtoChunk;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.storage.ValueInput;
-import net.minecraft.world.level.storage.ValueOutput;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
-import net.fabricmc.fabric.impl.attachment.AttachmentTargetImpl;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentChange;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentTargetInfo;
-
-@Mixin(ImposterProtoChunk.class)
-abstract class ImposterProtoChunkMixin extends AttachmentTargetsMixin {
-	@Shadow
-	@Final
-	private LevelChunk wrapped;
-
-	@Override
-	@Nullable
-	public  T getAttached(AttachmentType type) {
-		return this.wrapped.getAttached(type);
-	}
-
-	@Override
-	@Nullable
-	public  T setAttached(AttachmentType type, @Nullable T value) {
-		return this.wrapped.setAttached(type, value);
-	}
-
-	@Override
-	public boolean hasAttached(AttachmentType type) {
-		return this.wrapped.hasAttached(type);
-	}
-
-	@Override
-	public void fabric_writeAttachmentsToNbt(ValueOutput output) {
-		((AttachmentTargetImpl) this.wrapped).fabric_writeAttachmentsToNbt(output);
-	}
-
-	@Override
-	public void fabric_readAttachmentsFromNbt(ValueInput input) {
-		((AttachmentTargetImpl) this.wrapped).fabric_readAttachmentsFromNbt(input);
-	}
-
-	@Override
-	public boolean fabric_hasPersistentAttachments() {
-		return ((AttachmentTargetImpl) this.wrapped).fabric_hasPersistentAttachments();
-	}
-
-	@Override
-	public Map, ?> fabric_getAttachments() {
-		return ((AttachmentTargetImpl) this.wrapped).fabric_getAttachments();
-	}
-
-	@Override
-	public boolean fabric_shouldTryToSync() {
-		return ((AttachmentTargetImpl) wrapped).fabric_shouldTryToSync();
-	}
-
-	@Override
-	public void fabric_computeInitialSyncChanges(ServerPlayer player, Consumer changeOutput) {
-		((AttachmentTargetImpl) wrapped).fabric_computeInitialSyncChanges(player, changeOutput);
-	}
-
-	@Override
-	public AttachmentTargetInfo fabric_getSyncTargetInfo() {
-		return ((AttachmentTargetImpl) wrapped).fabric_getSyncTargetInfo();
-	}
-
-	@Override
-	public void fabric_syncChange(AttachmentType type, AttachmentChange change) {
-		((AttachmentTargetImpl) wrapped).fabric_syncChange(type, change);
-	}
-
-	@Override
-	public void fabric_markChanged(AttachmentType type) {
-		((AttachmentTargetImpl) wrapped).fabric_markChanged(type);
-	}
-
-	@Override
-	public RegistryAccess fabric_getRegistryAccess() {
-		return ((AttachmentTargetImpl) wrapped).fabric_getRegistryAccess();
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/LevelChunkMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/LevelChunkMixin.java
deleted file mode 100644
index 5c43273dd4..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/LevelChunkMixin.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.mixin.attachment;
-
-import java.util.Map;
-import java.util.function.Consumer;
-
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.chunk.ProtoChunk;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
-import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
-import net.fabricmc.fabric.impl.attachment.AttachmentTargetImpl;
-import net.fabricmc.fabric.impl.attachment.AttachmentTypeImpl;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentChange;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentSync;
-
-@Mixin(LevelChunk.class)
-abstract class LevelChunkMixin extends AttachmentTargetsMixin implements AttachmentTargetImpl {
-	@Shadow
-	@Final
-	private Level level;
-
-	@Shadow
-	public abstract Map getBlockEntities();
-
-	@Inject(method = "(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/ProtoChunk;Lnet/minecraft/world/level/chunk/LevelChunk$PostLoadProcessor;)V", at = @At("TAIL"))
-	private void transferProtoChunkAttachment(ServerLevel level, ProtoChunk protoChunk, LevelChunk.PostLoadProcessor entityLoader, CallbackInfo ci) {
-		AttachmentTargetImpl.transfer(protoChunk, this, false);
-	}
-
-	@Override
-	public void fabric_computeInitialSyncChanges(ServerPlayer player, Consumer changeOutput) {
-		super.fabric_computeInitialSyncChanges(player, changeOutput);
-
-		for (BlockEntity be : this.getBlockEntities().values()) {
-			((AttachmentTargetImpl) be).fabric_computeInitialSyncChanges(player, changeOutput);
-		}
-	}
-
-	@Override
-	public void fabric_syncChange(AttachmentType type, AttachmentChange change) {
-		if (this.level instanceof ServerLevel serverLevel) {
-			// can't shadow from Chunk because this already extends a supermixin
-			PlayerLookup.tracking(serverLevel, ((ChunkAccess) (Object) this).getPos())
-					.forEach(player -> {
-						if (((AttachmentTypeImpl) type).syncPredicate().test(this, player)) {
-							AttachmentSync.trySync(change, player);
-						}
-					});
-		}
-	}
-
-	@Override
-	public boolean fabric_shouldTryToSync() {
-		return !this.level.isClientSide();
-	}
-
-	@Override
-	public RegistryAccess fabric_getRegistryAccess() {
-		return level.registryAccess();
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/MappedRegistryAccessor.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/MappedRegistryAccessor.java
new file mode 100644
index 0000000000..1f7fd99d01
--- /dev/null
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/MappedRegistryAccessor.java
@@ -0,0 +1,12 @@
+package net.fabricmc.fabric.mixin.attachment;
+
+import net.minecraft.core.MappedRegistry;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(MappedRegistry.class)
+public interface MappedRegistryAccessor {
+    @Accessor
+    boolean getFrozen();
+}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/MinecraftServerMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/MinecraftServerMixin.java
index 4680687db6..ba271f64c4 100644
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/MinecraftServerMixin.java
+++ b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/MinecraftServerMixin.java
@@ -48,7 +48,7 @@ private void initGlobalAttachments(CallbackInfo ci) {
 
 		var type = new SavedDataType<>(
 				AttachmentSavedData.ID,
-				() -> new AttachmentSavedData(globalAttachments),
+				() -> new AttachmentSavedData(server),
 				AttachmentSavedData.codec(server),
 				null
 		);
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/PlayerChunkSenderMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/PlayerChunkSenderMixin.java
deleted file mode 100644
index 02e5f50e2b..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/PlayerChunkSenderMixin.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.mixin.attachment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.network.PlayerChunkSender;
-import net.minecraft.server.network.ServerGamePacketListenerImpl;
-import net.minecraft.world.level.chunk.LevelChunk;
-
-import net.fabricmc.fabric.impl.attachment.AttachmentTargetImpl;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentChange;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentSync;
-
-@Mixin(PlayerChunkSender.class)
-abstract class PlayerChunkSenderMixin {
-	@WrapOperation(
-			method = "sendNextChunks",
-			at = @At(
-					value = "INVOKE",
-					target = "Lnet/minecraft/server/network/PlayerChunkSender;sendChunk(Lnet/minecraft/server/network/ServerGamePacketListenerImpl;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/LevelChunk;)V"
-			)
-	)
-	private void sendInitialAttachmentData(ServerGamePacketListenerImpl handler, ServerLevel level, LevelChunk chunk, Operation original, ServerPlayer player) {
-		original.call(handler, level, chunk);
-		// do a wrap operation so this packet is sent *after* the chunk ones
-		List changes = new ArrayList<>();
-		((AttachmentTargetImpl) chunk).fabric_computeInitialSyncChanges(player, changes::add);
-
-		if (!changes.isEmpty()) {
-			AttachmentSync.trySync(changes, player);
-		}
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/SerializableChunkDataMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/SerializableChunkDataMixin.java
deleted file mode 100644
index 24187b5bbf..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/SerializableChunkDataMixin.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * 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.mixin.attachment;
-
-import com.llamalad7.mixinextras.sugar.Share;
-import com.llamalad7.mixinextras.sugar.ref.LocalRef;
-import org.jspecify.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.util.ProblemReporter;
-import net.minecraft.world.entity.ai.village.poi.PoiManager;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.LevelHeightAccessor;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.PalettedContainerFactory;
-import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.chunk.storage.RegionStorageInfo;
-import net.minecraft.world.level.chunk.storage.SerializableChunkData;
-import net.minecraft.world.level.storage.TagValueInput;
-import net.minecraft.world.level.storage.TagValueOutput;
-import net.minecraft.world.level.storage.ValueInput;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentTarget;
-import net.fabricmc.fabric.impl.attachment.AttachmentTargetImpl;
-
-@Mixin(SerializableChunkData.class)
-abstract class SerializableChunkDataMixin {
-	@Unique
-	private static final Logger LOGGER = LoggerFactory.getLogger("SerializableChunkDataMixin");
-
-	// Adding a mutable record field like this is likely a bad idea, but I cannot see a better way.
-	@Unique
-	@Nullable
-	private CompoundTag attachmentNbtData;
-
-	@Inject(method = "parse", at = @At("RETURN"))
-	private static void storeAttachmentNbtData(LevelHeightAccessor heightLimitView, PalettedContainerFactory arg, CompoundTag chunkData, CallbackInfoReturnable cir, @Share("attachmentDataNbt") LocalRef attachmentDataNbt) {
-		final SerializableChunkData serializer = cir.getReturnValue();
-
-		if (serializer == null) {
-			return;
-		}
-
-		//noinspection SimplifyOptionalCallChains
-		CompoundTag attachmentNbtData = chunkData.getCompound(AttachmentTarget.NBT_ATTACHMENT_KEY).orElse(null);
-
-		if (attachmentNbtData != null) {
-			((SerializableChunkDataMixin) (Object) serializer).attachmentNbtData = attachmentNbtData;
-		}
-	}
-
-	@Inject(method = "read", at = @At("RETURN"))
-	private void setAttachmentDataInChunk(ServerLevel serverLevel, PoiManager pointOfInterestStorage, RegionStorageInfo storageKey, ChunkPos chunkPos, CallbackInfoReturnable cir) {
-		ProtoChunk chunk = cir.getReturnValue();
-
-		if (chunk != null && attachmentNbtData != null) {
-			var attachmentNbtData = new CompoundTag();
-			attachmentNbtData.put(AttachmentTarget.NBT_ATTACHMENT_KEY, this.attachmentNbtData);
-
-			try (ProblemReporter.ScopedCollector reporter = new ProblemReporter.ScopedCollector(LOGGER)) {
-				ValueInput input = TagValueInput.create(reporter, serverLevel.registryAccess(), attachmentNbtData);
-				((AttachmentTargetImpl) chunk).fabric_readAttachmentsFromNbt(input);
-			}
-		}
-	}
-
-	@Inject(method = "copyOf", at = @At("RETURN"))
-	private static void storeAttachmentNbtData(ServerLevel level, ChunkAccess chunk, CallbackInfoReturnable cir) {
-		try (ProblemReporter.ScopedCollector reporter = new ProblemReporter.ScopedCollector(LOGGER)) {
-			TagValueOutput output = TagValueOutput.createWithContext(reporter, level.registryAccess());
-			((AttachmentTargetImpl) chunk).fabric_writeAttachmentsToNbt(output);
-
-			//noinspection SimplifyOptionalCallChains
-			CompoundTag attachmentNbtData = output.buildResult().getCompound(AttachmentTarget.NBT_ATTACHMENT_KEY).orElse(null);
-
-			if (attachmentNbtData != null) {
-				((SerializableChunkDataMixin) (Object) cir.getReturnValue()).attachmentNbtData = attachmentNbtData;
-			}
-		}
-	}
-
-	@Inject(method = "write", at = @At("RETURN"))
-	private void writeChunkAttachments(CallbackInfoReturnable cir) {
-		if (attachmentNbtData != null) {
-			cir.getReturnValue().put(AttachmentTarget.NBT_ATTACHMENT_KEY, attachmentNbtData);
-		}
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ServerLevelMixin.java b/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ServerLevelMixin.java
deleted file mode 100644
index 90ba99cad5..0000000000
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ServerLevelMixin.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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.mixin.attachment;
-
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.core.Holder;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.dimension.DimensionType;
-import net.minecraft.world.level.saveddata.SavedDataType;
-import net.minecraft.world.level.storage.WritableLevelData;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
-import net.fabricmc.fabric.api.attachment.v1.GlobalAttachments;
-import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
-import net.fabricmc.fabric.impl.attachment.AttachmentSavedData;
-import net.fabricmc.fabric.impl.attachment.AttachmentTargetImpl;
-import net.fabricmc.fabric.impl.attachment.AttachmentTypeImpl;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentChange;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentSync;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentTargetInfo;
-
-@Mixin(ServerLevel.class)
-abstract class ServerLevelMixin extends Level implements AttachmentTargetImpl {
-	@Shadow
-	@Final
-	private MinecraftServer server;
-
-	protected ServerLevelMixin(WritableLevelData properties, ResourceKey registryRef, RegistryAccess registryManager, Holder dimensionEntry, boolean isClient, boolean debugWorld, long seed, int maxChainedNeighborUpdates) {
-		super(
-				properties,
-				registryRef,
-				registryManager,
-				dimensionEntry,
-				isClient,
-				debugWorld,
-				seed,
-				maxChainedNeighborUpdates
-		);
-	}
-
-	@Inject(at = @At("TAIL"), method = "")
-	private void createAttachmentsPersistentState(CallbackInfo ci) {
-		// Force persistent state creation
-		ServerLevel level = (ServerLevel) (Object) this;
-		var type = new SavedDataType<>(
-				AttachmentSavedData.ID,
-				() -> new AttachmentSavedData(level),
-				AttachmentSavedData.codec(level),
-				null // Object builder API 12.1.0 and later makes this a no-op
-		);
-		level.getDataStorage().computeIfAbsent(type);
-	}
-
-	@Override
-	public void fabric_syncChange(AttachmentType type, AttachmentChange change) {
-		if ((Object) this instanceof ServerLevel serverLevel) {
-			PlayerLookup.level(serverLevel)
-					.forEach(player -> {
-						if (((AttachmentTypeImpl) type).syncPredicate().test(this, player)) {
-							AttachmentSync.trySync(change, player);
-						}
-					});
-		}
-	}
-
-	@Override
-	public AttachmentTargetInfo fabric_getSyncTargetInfo() {
-		return AttachmentTargetInfo.LevelTarget.INSTANCE;
-	}
-
-	@Override
-	public RegistryAccess fabric_getRegistryAccess() {
-		return registryAccess();
-	}
-
-	@Override
-	public GlobalAttachments globalAttachments() {
-		return server.globalAttachments();
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/main/resources/fabric-data-attachment-api-v1.mixins.json b/fabric-data-attachment-api-v1/src/main/resources/fabric-data-attachment-api-v1.mixins.json
index 43d9c4a702..9e9b57c3a6 100644
--- a/fabric-data-attachment-api-v1/src/main/resources/fabric-data-attachment-api-v1.mixins.json
+++ b/fabric-data-attachment-api-v1/src/main/resources/fabric-data-attachment-api-v1.mixins.json
@@ -3,24 +3,13 @@
   "package": "net.fabricmc.fabric.mixin.attachment",
   "compatibilityLevel": "JAVA_25",
   "mixins": [
-    "AttachmentTargetsMixin",
-    "BannerBlockEntityMixin",
-    "BlockDataAccessorMixin",
-    "BlockEntityMixin",
-    "ChunkAccessMixin",
-    "ChunkHolderMixin",
-    "ClientboundCustomPayloadPacketAccessor",
-    "DimensionStorageFileFixMixin",
-    "EntityDataAccessorMixin",
-    "EntityMixin",
-    "ImposterProtoChunkMixin",
-    "LevelChunkMixin",
-    "LevelMixin",
+    "AttachmentHolderAccessor",
+    "AttachmentHolderMixin",
+    "AttachmentTypeAccessor",
+    "BaseMappedRegistryAccessor",
+    "IAttachmentHolderMixin",
     "MinecraftServerMixin",
-    "PlayerChunkSenderMixin",
-    "SerializableChunkDataMixin",
-    "ServerLevelMixin",
-    "VarIntAccessor"
+    "MappedRegistryAccessor"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-data-attachment-api-v1/src/main/resources/fabric.mod.json b/fabric-data-attachment-api-v1/src/main/resources/fabric.mod.json
index 4de4544f5e..ceef9638db 100644
--- a/fabric-data-attachment-api-v1/src/main/resources/fabric.mod.json
+++ b/fabric-data-attachment-api-v1/src/main/resources/fabric.mod.json
@@ -31,11 +31,9 @@
   ],
   "entrypoints": {
     "main": [
-      "net.fabricmc.fabric.impl.attachment.AttachmentEntrypoint",
-      "net.fabricmc.fabric.impl.attachment.sync.AttachmentSync"
+      "net.fabricmc.fabric.impl.attachment.AttachmentEntrypoint"
     ],
     "client": [
-      "net.fabricmc.fabric.impl.attachment.client.AttachmentSyncClient"
     ]
   },
   "accessWidener": "fabric-data-attachment-api-v1.classtweaker",
diff --git a/fabric-data-attachment-api-v1/src/test/java/net/fabricmc/fabric/test/attachment/CommonAttachmentTests.java b/fabric-data-attachment-api-v1/src/test/java/net/fabricmc/fabric/test/attachment/CommonAttachmentTests.java
deleted file mode 100644
index 6e5a2690dd..0000000000
--- a/fabric-data-attachment-api-v1/src/test/java/net/fabricmc/fabric/test/attachment/CommonAttachmentTests.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * 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.attachment;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.CALLS_REAL_METHODS;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.IdentityHashMap;
-import java.util.Map;
-import java.util.function.UnaryOperator;
-
-import com.mojang.serialization.Codec;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-import net.minecraft.SharedConstants;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtOps;
-import net.minecraft.network.codec.ByteBufCodecs;
-import net.minecraft.resources.Identifier;
-import net.minecraft.resources.RegistryOps;
-import net.minecraft.server.Bootstrap;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.util.ProblemReporter;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.Marker;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.entity.BellBlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.ChestBlockEntity;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.storage.TagValueInput;
-import net.minecraft.world.level.storage.TagValueOutput;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentRegistry;
-import net.fabricmc.fabric.api.attachment.v1.AttachmentSyncPredicate;
-import net.fabricmc.fabric.api.attachment.v1.AttachmentTarget;
-import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
-import net.fabricmc.fabric.impl.attachment.AttachmentSavedData;
-import net.fabricmc.fabric.impl.attachment.AttachmentSerializingImpl;
-import net.fabricmc.fabric.impl.attachment.AttachmentTargetImpl;
-import net.fabricmc.fabric.impl.attachment.GlobalAttachmentsImpl;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentChange;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentSyncException;
-import net.fabricmc.fabric.impl.attachment.sync.AttachmentTargetInfo;
-
-public class CommonAttachmentTests {
-	private static final String MOD_ID = "example";
-	private static final AttachmentType PERSISTENT = AttachmentRegistry.createPersistent(
-			Identifier.fromNamespaceAndPath(MOD_ID, "persistent"),
-			Codec.INT
-	);
-	private static final AttachmentType SYNCED = AttachmentRegistry.create(
-			Identifier.fromNamespaceAndPath(MOD_ID, "synced"),
-			builder -> {
-				builder.syncWith(ByteBufCodecs.INT, AttachmentSyncPredicate.all());
-			}
-	);
-
-	private static final AttachmentType WHEEL = AttachmentRegistry.create(Identifier.fromNamespaceAndPath(AttachmentTestMod.MOD_ID, "wheel_info"),
-			attachment -> attachment
-					.initializer(() -> new WheelInfo(100, 5432, 37))
-					.persistent(WheelInfo.CODEC)
-	);
-
-	@BeforeAll
-	static void beforeAll() {
-		SharedConstants.tryDetectVersion();
-		Bootstrap.bootStrap();
-	}
-
-	private static  T mockAndDisableSync(Class cl) {
-		T target = mock(cl, CALLS_REAL_METHODS);
-		doReturn(false).when((AttachmentTargetImpl) target).fabric_shouldTryToSync();
-		return target;
-	}
-
-	@Test
-	void testTargets() {
-		AttachmentType basic = AttachmentRegistry.create(Identifier.fromNamespaceAndPath(MOD_ID, "basic_attachment"));
-		// Attachment targets
-		/*
-		 * CALLS_REAL_METHODS makes sense here because AttachmentTarget does not refer to anything in the underlying
-		 * class, and it saves us a lot of pain trying to get the regular constructors for ServerLevel and LevelChunk to work.
-		 */
-		GlobalAttachmentsImpl globalAttachments = mockAndDisableSync(GlobalAttachmentsImpl.class);
-		ServerLevel serverLevel = mockAndDisableSync(ServerLevel.class);
-		Entity entity = mockAndDisableSync(Entity.class);
-		BlockEntity blockEntity = mockAndDisableSync(BlockEntity.class);
-
-		LevelChunk levelChunk = mockAndDisableSync(LevelChunk.class);
-		levelChunk.setUnsavedListener(pos -> { });
-
-		ProtoChunk protoChunk = mockAndDisableSync(ProtoChunk.class);
-
-		for (AttachmentTarget target : new AttachmentTarget[]{globalAttachments, serverLevel, entity, blockEntity, levelChunk, protoChunk}) {
-			testForTarget(target, basic);
-		}
-	}
-
-	private void testForTarget(AttachmentTarget target, AttachmentType basic) {
-		assertFalse(target.hasAttached(basic));
-		assertEquals("", target.getAttachedOrElse(basic, ""));
-		assertNull(target.getAttached(basic));
-
-		String value = "attached";
-		assertEquals(value, target.getAttachedOrSet(basic, value));
-		assertTrue(target.hasAttached(basic));
-		assertEquals(value, target.getAttached(basic));
-		assertDoesNotThrow(() -> target.getAttachedOrThrow(basic));
-
-		UnaryOperator modifier = s -> s + '_';
-		String modified = modifier.apply(value);
-		target.modifyAttached(basic, modifier);
-		assertEquals(modified, target.getAttached(basic));
-		assertEquals(modified, target.removeAttached(basic));
-		assertFalse(target.hasAttached(basic));
-		assertThrows(NullPointerException.class, () -> target.getAttachedOrThrow(basic));
-	}
-
-	@Test
-	void testDefaulted() {
-		AttachmentType defaulted = AttachmentRegistry.createDefaulted(
-				Identifier.fromNamespaceAndPath(MOD_ID, "defaulted_attachment"),
-				() -> 0
-		);
-		Entity target = mockAndDisableSync(Entity.class);
-
-		assertFalse(target.hasAttached(defaulted));
-		assertEquals(0, target.getAttachedOrCreate(defaulted));
-		target.removeAttached(defaulted);
-		assertFalse(target.hasAttached(defaulted));
-	}
-
-	@Test
-	void testStaticReadWrite() {
-		AttachmentType dummy = AttachmentRegistry.createPersistent(
-				Identifier.fromNamespaceAndPath(MOD_ID, "dummy"),
-				Codec.DOUBLE
-		);
-		var map = new IdentityHashMap, Object>();
-		map.put(dummy, 0.5d);
-		RegistryAccess ra = mockRA();
-		TagValueOutput output = TagValueOutput.createWithContext(ProblemReporter.DISCARDING, ra);
-
-		AttachmentSerializingImpl.serializeAttachmentData(output, map);
-		assertTrue(output.buildResult().contains(AttachmentTarget.NBT_ATTACHMENT_KEY));
-		assertTrue(output.buildResult().getCompound(AttachmentTarget.NBT_ATTACHMENT_KEY).orElseThrow().contains(dummy.identifier().toString()));
-
-		map = AttachmentSerializingImpl.deserializeAttachmentData(TagValueInput.create(ProblemReporter.DISCARDING, ra, output.buildResult()));
-		assertEquals(1, map.size());
-		Map.Entry, Object> entry = map.entrySet().stream().findFirst().orElseThrow();
-		// in this case the key should be the exact same object
-		// but in practice this is meaningless because on a dedicated server the JVM restarted
-		assertEquals(dummy.identifier(), entry.getKey().identifier());
-		assertEquals(0.5d, entry.getValue());
-	}
-
-	@Test
-	void deserializeNull() {
-		var tag = new CompoundTag();
-		assertNull(AttachmentSerializingImpl.deserializeAttachmentData(null));
-
-		tag.put(Identifier.withDefaultNamespace("test").toString(), new CompoundTag());
-		assertNull(AttachmentSerializingImpl.deserializeAttachmentData(TagValueInput.create(ProblemReporter.DISCARDING, mockRA(), tag)));
-	}
-
-	@Test
-	void serializeNullOrEmpty() {
-		TagValueOutput output = TagValueOutput.createWithContext(ProblemReporter.DISCARDING, mockRA());
-		AttachmentSerializingImpl.serializeAttachmentData(output, null);
-		assertFalse(output.buildResult().contains(AttachmentTarget.NBT_ATTACHMENT_KEY));
-
-		output = TagValueOutput.createWithContext(ProblemReporter.DISCARDING, mockRA());
-		AttachmentSerializingImpl.serializeAttachmentData(output, new IdentityHashMap<>());
-		assertFalse(output.buildResult().contains(AttachmentTarget.NBT_ATTACHMENT_KEY));
-	}
-
-	@Test
-	void testEntityCopy() {
-		AttachmentType notCopiedOnRespawn = AttachmentRegistry.create(
-				Identifier.fromNamespaceAndPath(MOD_ID, "not_copied_on_respawn")
-		);
-		AttachmentType copiedOnRespawn = AttachmentRegistry.create(Identifier.fromNamespaceAndPath(MOD_ID, "copied_on_respawn"),
-				AttachmentRegistry.Builder::copyOnDeath);
-
-		Entity original = mockAndDisableSync(Entity.class);
-		original.setAttached(notCopiedOnRespawn, true);
-		original.setAttached(copiedOnRespawn, true);
-
-		Entity respawnTarget = mockAndDisableSync(Entity.class);
-		Entity nonRespawnTarget = mockAndDisableSync(Entity.class);
-
-		AttachmentTargetImpl.transfer(original, respawnTarget, true);
-		AttachmentTargetImpl.transfer(original, nonRespawnTarget, false);
-		assertTrue(respawnTarget.hasAttached(copiedOnRespawn));
-		assertFalse(respawnTarget.hasAttached(notCopiedOnRespawn));
-		assertTrue(nonRespawnTarget.hasAttached(copiedOnRespawn));
-		assertTrue(nonRespawnTarget.hasAttached(notCopiedOnRespawn));
-	}
-
-	// Test https://github.com/FabricMC/fabric-api/issues/4943#issuecomment-3790935408
-	@Test
-	void testEntityChangeId() {
-		ServerPlayer player = mockAndDisableSync(ServerPlayer.class);
-		Entity entity = mockAndDisableSync(Entity.class);
-		entity.setAttached(SYNCED, 456);
-
-		entity.setId(123);
-
-		AttachmentTargetImpl targetImpl = (AttachmentTargetImpl) entity;
-		targetImpl.fabric_computeInitialSyncChanges(player, change -> {
-			assertEquals(123, ((AttachmentTargetInfo.EntityTarget) change.targetInfo()).networkId());
-		});
-	}
-
-	@Test
-	void testEntityPersistence() {
-		RegistryAccess ra = mockRA();
-		Level mockLevel = mock(Level.class);
-		when(mockLevel.registryAccess()).thenReturn(ra);
-		Entity entity = new Marker(EntityType.MARKER, mockLevel);
-		assertFalse(entity.hasAttached(PERSISTENT));
-
-		int expected = 1;
-		entity.setAttached(PERSISTENT, expected);
-		TagValueOutput fakeSave = TagValueOutput.createWithoutContext(ProblemReporter.DISCARDING);
-		entity.saveWithoutId(fakeSave);
-
-		entity = new Marker(EntityType.MARKER, mockLevel); // fresh object, like on restart
-		entity.setLevelCallback(mock());
-		entity.load(TagValueInput.create(ProblemReporter.DISCARDING, ra, fakeSave.buildResult()));
-		assertTrue(entity.hasAttached(PERSISTENT));
-		assertEquals(expected, entity.getAttached(PERSISTENT));
-	}
-
-	@Test
-	void testBlockEntityPersistence() {
-		BlockEntity blockEntity = new BellBlockEntity(BlockPos.ZERO, Blocks.BELL.defaultBlockState());
-		assertFalse(blockEntity.hasAttached(PERSISTENT));
-
-		int expected = 1;
-		blockEntity.setAttached(PERSISTENT, expected);
-		CompoundTag fakeSave = blockEntity.saveWithFullMetadata(mockRA());
-
-		blockEntity = BlockEntity.loadStatic(BlockPos.ZERO, Blocks.BELL.defaultBlockState(), fakeSave, mockRA());
-		assertNotNull(blockEntity);
-		assertTrue(blockEntity.hasAttached(PERSISTENT));
-		assertEquals(expected, blockEntity.getAttached(PERSISTENT));
-	}
-
-	@Test
-	void testLevelSavedData() {
-		// Trying to simulate actual saving and loading for the world is too hard
-		RegistryAccess ra = mockRA();
-
-		ServerLevel level = mockAndDisableSync(ServerLevel.class);
-		when(level.registryAccess()).thenReturn(ra);
-
-		AttachmentSavedData state = new AttachmentSavedData(level);
-		assertFalse(level.hasAttached(PERSISTENT));
-		assertFalse(state.isDirty());
-
-		int expected = 1;
-		level.setAttached(PERSISTENT, expected);
-		assertTrue(state.isDirty());
-		CompoundTag fakeSave = (CompoundTag) AttachmentSavedData.codec(level).encodeStart(RegistryOps.create(NbtOps.INSTANCE, ra), state).getOrThrow();
-		assertEquals("{\"fabric:attachments\":{\"example:persistent\":1}}", fakeSave.toString());
-
-		level = mockAndDisableSync(ServerLevel.class);
-		when(level.registryAccess()).thenReturn(ra);
-
-		AttachmentSavedData.codec(level).decode(RegistryOps.create(NbtOps.INSTANCE, ra), fakeSave).getOrThrow();
-		assertTrue(level.hasAttached(PERSISTENT));
-		assertEquals(expected, level.getAttached(PERSISTENT));
-	}
-
-	@Test
-	void testGlobalSavedData() {
-		RegistryAccess.Frozen ra = mockFrozenRA();
-
-		MinecraftServer server = mock(MinecraftServer.class);
-		GlobalAttachmentsImpl globalAttachments = new GlobalAttachmentsImpl(server);
-		when(server.registryAccess()).thenReturn(ra);
-		when(server.globalAttachments()).thenReturn(globalAttachments);
-
-		AttachmentSavedData state = new AttachmentSavedData(globalAttachments);
-		assertFalse(globalAttachments.hasAttached(PERSISTENT));
-		assertFalse(state.isDirty());
-
-		int expected = 1;
-		globalAttachments.setAttached(PERSISTENT, expected);
-		assertTrue(state.isDirty());
-		CompoundTag fakeSave = (CompoundTag) AttachmentSavedData.codec(server).encodeStart(RegistryOps.create(NbtOps.INSTANCE, ra), state).getOrThrow();
-		assertEquals("{\"fabric:attachments\":{\"example:persistent\":1}}", fakeSave.toString());
-
-		server = mock(MinecraftServer.class);
-		globalAttachments = new GlobalAttachmentsImpl(server);
-		when(server.registryAccess()).thenReturn(ra);
-		when(server.globalAttachments()).thenReturn(globalAttachments);
-
-		AttachmentSavedData.codec(server).decode(RegistryOps.create(NbtOps.INSTANCE, ra), fakeSave).getOrThrow();
-		assertTrue(globalAttachments.hasAttached(PERSISTENT));
-		assertEquals(expected, globalAttachments.getAttached(PERSISTENT));
-	}
-
-	@Test
-	void applyToInvalidTarget() throws AttachmentSyncException {
-		RegistryAccess ra = mockRA();
-
-		ServerLevel level = mock(ServerLevel.class);
-		when(level.registryAccess()).thenReturn(ra);
-		when(level.dimension()).thenReturn(Level.END);
-
-		BlockEntity blockEntity = new ChestBlockEntity(BlockPos.ZERO, Blocks.CHEST.defaultBlockState());
-
-		AttachmentChange attachmentChange = new AttachmentChange(
-				((AttachmentTargetImpl) blockEntity).fabric_getSyncTargetInfo(),
-				SYNCED,
-				new byte[]{0}
-		);
-
-		attachmentChange.tryApply(level);
-	}
-
-	/*
-	 * Chunk serializing is coupled with world saving in ChunkSerializer which is too much of a pain to mock,
-	 * so testing is handled by the testmod instead.
-	 */
-
-	static RegistryAccess mockRA() {
-		RegistryAccess ra = mock(RegistryAccess.class);
-		when(ra.createSerializationContext(any())).thenReturn((RegistryOps) (Object) RegistryOps.create(NbtOps.INSTANCE, ra));
-		return ra;
-	}
-
-	private static RegistryAccess.Frozen mockFrozenRA() {
-		RegistryAccess.Frozen ra = mock(RegistryAccess.Frozen.class);
-		when(ra.createSerializationContext(any())).thenReturn((RegistryOps) (Object) RegistryOps.create(NbtOps.INSTANCE, ra));
-		return ra;
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/test/java/net/fabricmc/fabric/test/attachment/DataAccessorHandlerTests.java b/fabric-data-attachment-api-v1/src/test/java/net/fabricmc/fabric/test/attachment/DataAccessorHandlerTests.java
deleted file mode 100644
index c34c760857..0000000000
--- a/fabric-data-attachment-api-v1/src/test/java/net/fabricmc/fabric/test/attachment/DataAccessorHandlerTests.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * 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.attachment;
-
-import static net.fabricmc.fabric.test.attachment.AttachmentTestMod.MOD_ID;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
-import static org.mockito.Mockito.when;
-
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.mojang.serialization.Codec;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import net.minecraft.SharedConstants;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.TagParser;
-import net.minecraft.resources.Identifier;
-import net.minecraft.server.Bootstrap;
-import net.minecraft.server.commands.data.BlockDataAccessor;
-import net.minecraft.server.commands.data.DataAccessor;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-
-import net.fabricmc.fabric.api.attachment.v1.AttachmentRegistry;
-import net.fabricmc.fabric.api.attachment.v1.AttachmentTarget;
-import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
-
-public class DataAccessorHandlerTests {
-	private static final AttachmentType INT = AttachmentRegistry.createPersistent(
-			Identifier.fromNamespaceAndPath(MOD_ID, "int"),
-			Codec.INT
-	);
-	private static final AttachmentType STRING = AttachmentRegistry.createPersistent(
-			Identifier.fromNamespaceAndPath(MOD_ID, "string"),
-			Codec.STRING
-	);
-	private static final AttachmentType BOOL = AttachmentRegistry.createPersistent(
-			Identifier.fromNamespaceAndPath(MOD_ID, "bool"),
-			Codec.BOOL
-	);
-	private static final AttachmentType NON_PERSISTENT_INT = AttachmentRegistry.create(
-			Identifier.fromNamespaceAndPath(MOD_ID, "non_persistent_int")
-	);
-	private static final AttachmentType NON_PERSISTENT_STRING = AttachmentRegistry.create(
-			Identifier.fromNamespaceAndPath(MOD_ID, "non_persistent_string")
-	);
-
-	@BeforeAll
-	static void beforeAll() {
-		SharedConstants.tryDetectVersion();
-		Bootstrap.bootStrap();
-	}
-
-	BlockEntity blockEntity;
-	BlockDataAccessor dataAccessor;
-	AttachmentTarget.OnAttachedSet callback;
-
-	@BeforeEach
-	void setUp() {
-		RegistryAccess ra = CommonAttachmentTests.mockRA();
-		this.blockEntity = new BlockEntity(BlockEntityType.CHEST, BlockPos.ZERO, Blocks.CHEST.defaultBlockState()) { };
-		Level mockLevel = mock(Level.class);
-		when(mockLevel.registryAccess()).thenReturn(ra);
-		blockEntity.setLevel(mockLevel);
-		this.dataAccessor = new BlockDataAccessor(blockEntity, BlockPos.ZERO);
-
-		this.callback = mock(AttachmentTarget.OnAttachedSet.class);
-		blockEntity.onAttachedSet(INT).register(callback);
-	}
-
-	private static void merge(DataAccessor dataAccessor, String nbt) throws CommandSyntaxException {
-		CompoundTag old = dataAccessor.getData();
-		CompoundTag merged = old.copy().merge(TagParser.parseCompoundFully(nbt));
-		dataAccessor.setData(merged);
-	}
-
-	private static void set(DataAccessor dataAccessor, String nbt) throws CommandSyntaxException {
-		dataAccessor.setData(TagParser.parseCompoundFully(nbt));
-	}
-
-	@Test
-	void setAttachment() throws CommandSyntaxException {
-		assertFalse(blockEntity.hasAttached(INT));
-		merge(dataAccessor, "{\"fabric:attachments\": {\"fabric-data-attachment-api-v1-testmod:int\": 5}}");
-		assertEquals(5, blockEntity.getAttached(INT));
-		verify(callback).onAttachedSet(null, 5);
-	}
-
-	@Test
-	void removeAttachment() throws CommandSyntaxException {
-		blockEntity.setAttached(INT, 5);
-		reset(callback);
-
-		assertTrue(blockEntity.hasAttached(INT));
-		set(dataAccessor, "{}");
-		assertFalse(blockEntity.hasAttached(INT));
-		verify(callback).onAttachedSet(5, null);
-	}
-
-	@Test
-	void updateAttachment() throws CommandSyntaxException {
-		blockEntity.setAttached(INT, 1);
-		reset(callback);
-
-		merge(dataAccessor, "{\"fabric:attachments\": {\"fabric-data-attachment-api-v1-testmod:int\": 5}}");
-		assertEquals(5, blockEntity.getAttached(INT));
-		verify(callback).onAttachedSet(1, 5);
-	}
-
-	@Test
-	void noAttachmentsNoOp() throws CommandSyntaxException {
-		assertFalse(blockEntity.hasAttached(INT));
-		set(dataAccessor, "{}");
-		assertFalse(blockEntity.hasAttached(INT));
-		verifyNoInteractions(callback);
-	}
-
-	@Test
-	void clearAllAttachmentsWithEmptyData() throws CommandSyntaxException {
-		blockEntity.setAttached(INT, 5);
-		reset(callback);
-
-		assertTrue(blockEntity.hasAttached(INT));
-		set(dataAccessor, "{}");
-		assertFalse(blockEntity.hasAttached(INT));
-		verify(callback).onAttachedSet(5, null);
-	}
-
-	@Test
-	void clearAllAttachmentsWithEmptyAttachments() throws CommandSyntaxException {
-		blockEntity.setAttached(INT, 5);
-		reset(callback);
-
-		assertTrue(blockEntity.hasAttached(INT));
-		set(dataAccessor, "{\"fabric:attachments\": {}}");
-		assertFalse(blockEntity.hasAttached(INT));
-		verify(callback).onAttachedSet(5, null);
-	}
-
-	@Test
-	void addMultipleAttachments() throws CommandSyntaxException {
-		assertFalse(blockEntity.hasAttached(INT));
-		assertFalse(blockEntity.hasAttached(STRING));
-		assertFalse(blockEntity.hasAttached(BOOL));
-
-		merge(dataAccessor, "{\"fabric:attachments\": {"
-				+ "\"fabric-data-attachment-api-v1-testmod:int\": 42, "
-				+ "\"fabric-data-attachment-api-v1-testmod:string\": \"test\", "
-				+ "\"fabric-data-attachment-api-v1-testmod:bool\": true"
-				+ "}}");
-
-		assertEquals(42, blockEntity.getAttached(INT));
-		assertEquals("test", blockEntity.getAttached(STRING));
-		assertEquals(true, blockEntity.getAttached(BOOL));
-	}
-
-	@Test
-	void removeSomeAttachmentsKeepOthers() throws CommandSyntaxException {
-		blockEntity.setAttached(INT, 10);
-		blockEntity.setAttached(STRING, "keep");
-		blockEntity.setAttached(BOOL, false);
-		reset(callback);
-
-		assertTrue(blockEntity.hasAttached(INT));
-		assertTrue(blockEntity.hasAttached(STRING));
-		assertTrue(blockEntity.hasAttached(BOOL));
-
-		// Only keep STRING attachment
-		set(dataAccessor, "{\"fabric:attachments\": {\"fabric-data-attachment-api-v1-testmod:string\": \"keep\"}}");
-
-		assertFalse(blockEntity.hasAttached(INT));
-		assertTrue(blockEntity.hasAttached(STRING));
-		assertFalse(blockEntity.hasAttached(BOOL));
-		assertEquals("keep", blockEntity.getAttached(STRING));
-		verify(callback).onAttachedSet(10, null);
-	}
-
-	@Test
-	void mixedUpdateAddRemoveUpdate() throws CommandSyntaxException {
-		blockEntity.setAttached(INT, 1);
-		blockEntity.setAttached(STRING, "old");
-		reset(callback);
-
-		assertTrue(blockEntity.hasAttached(INT));
-		assertTrue(blockEntity.hasAttached(STRING));
-		assertFalse(blockEntity.hasAttached(BOOL));
-
-		// Update INT, remove STRING, add BOOL
-		set(dataAccessor, "{\"fabric:attachments\": {"
-				+ "\"fabric-data-attachment-api-v1-testmod:int\": 999, "
-				+ "\"fabric-data-attachment-api-v1-testmod:bool\": true"
-				+ "}}");
-
-		assertEquals(999, blockEntity.getAttached(INT));
-		assertFalse(blockEntity.hasAttached(STRING));
-		assertEquals(true, blockEntity.getAttached(BOOL));
-		verify(callback).onAttachedSet(1, 999);
-	}
-
-	@Test
-	void nonPersistentAttachmentsKeptWhenClearingWithEmptyData() throws CommandSyntaxException {
-		blockEntity.setAttached(INT, 5);
-		blockEntity.setAttached(NON_PERSISTENT_INT, 100);
-		reset(callback);
-
-		assertTrue(blockEntity.hasAttached(INT));
-		assertTrue(blockEntity.hasAttached(NON_PERSISTENT_INT));
-
-		// Clear all data - persistent attachments should be removed, non-persistent kept
-		set(dataAccessor, "{}");
-
-		assertFalse(blockEntity.hasAttached(INT));
-		assertTrue(blockEntity.hasAttached(NON_PERSISTENT_INT));
-		assertEquals(100, blockEntity.getAttached(NON_PERSISTENT_INT));
-		verify(callback).onAttachedSet(5, null);
-	}
-
-	@Test
-	void nonPersistentAttachmentsKeptWhenClearingWithEmptyAttachments() throws CommandSyntaxException {
-		blockEntity.setAttached(INT, 5);
-		blockEntity.setAttached(NON_PERSISTENT_STRING, "keep me");
-		reset(callback);
-
-		assertTrue(blockEntity.hasAttached(INT));
-		assertTrue(blockEntity.hasAttached(NON_PERSISTENT_STRING));
-
-		// Clear all attachments - persistent should be removed, non-persistent kept
-		set(dataAccessor, "{\"fabric:attachments\": {}}");
-
-		assertFalse(blockEntity.hasAttached(INT));
-		assertTrue(blockEntity.hasAttached(NON_PERSISTENT_STRING));
-		assertEquals("keep me", blockEntity.getAttached(NON_PERSISTENT_STRING));
-		verify(callback).onAttachedSet(5, null);
-	}
-
-	@Test
-	void nonPersistentAttachmentsKeptWhenSettingPersistentOnes() throws CommandSyntaxException {
-		blockEntity.setAttached(INT, 1);
-		blockEntity.setAttached(NON_PERSISTENT_INT, 200);
-		blockEntity.setAttached(NON_PERSISTENT_STRING, "transient");
-		reset(callback);
-
-		assertTrue(blockEntity.hasAttached(INT));
-		assertTrue(blockEntity.hasAttached(NON_PERSISTENT_INT));
-		assertTrue(blockEntity.hasAttached(NON_PERSISTENT_STRING));
-
-		// Update only persistent attachment INT - non-persistent should remain
-		set(dataAccessor, "{\"fabric:attachments\": {\"fabric-data-attachment-api-v1-testmod:int\": 42}}");
-
-		assertEquals(42, blockEntity.getAttached(INT));
-		assertTrue(blockEntity.hasAttached(NON_PERSISTENT_INT));
-		assertEquals(200, blockEntity.getAttached(NON_PERSISTENT_INT));
-		assertTrue(blockEntity.hasAttached(NON_PERSISTENT_STRING));
-		assertEquals("transient", blockEntity.getAttached(NON_PERSISTENT_STRING));
-		verify(callback).onAttachedSet(1, 42);
-	}
-
-	@Test
-	void mixedPersistentAndNonPersistentRemoval() throws CommandSyntaxException {
-		blockEntity.setAttached(INT, 10);
-		blockEntity.setAttached(STRING, "remove");
-		blockEntity.setAttached(NON_PERSISTENT_INT, 300);
-		blockEntity.setAttached(NON_PERSISTENT_STRING, "keep");
-		reset(callback);
-
-		assertTrue(blockEntity.hasAttached(INT));
-		assertTrue(blockEntity.hasAttached(STRING));
-		assertTrue(blockEntity.hasAttached(NON_PERSISTENT_INT));
-		assertTrue(blockEntity.hasAttached(NON_PERSISTENT_STRING));
-
-		// Only keep INT with new value - STRING should be removed, non-persistent should be kept
-		set(dataAccessor, "{\"fabric:attachments\": {\"fabric-data-attachment-api-v1-testmod:int\": 15}}");
-
-		assertTrue(blockEntity.hasAttached(INT));
-		assertEquals(15, blockEntity.getAttached(INT));
-		assertFalse(blockEntity.hasAttached(STRING));
-		assertTrue(blockEntity.hasAttached(NON_PERSISTENT_INT));
-		assertEquals(300, blockEntity.getAttached(NON_PERSISTENT_INT));
-		assertTrue(blockEntity.hasAttached(NON_PERSISTENT_STRING));
-		assertEquals("keep", blockEntity.getAttached(NON_PERSISTENT_STRING));
-		verify(callback).onAttachedSet(10, 15);
-	}
-
-	@Test
-	void nonPersistentOnlyUnaffectedByDataCommands() throws CommandSyntaxException {
-		blockEntity.setAttached(NON_PERSISTENT_INT, 500);
-		blockEntity.setAttached(NON_PERSISTENT_STRING, "unchanged");
-
-		assertTrue(blockEntity.hasAttached(NON_PERSISTENT_INT));
-		assertTrue(blockEntity.hasAttached(NON_PERSISTENT_STRING));
-
-		// Add persistent attachments via data command - non-persistent should remain
-		merge(dataAccessor, "{\"fabric:attachments\": {"
-				+ "\"fabric-data-attachment-api-v1-testmod:int\": 7, "
-				+ "\"fabric-data-attachment-api-v1-testmod:string\": \"new\""
-				+ "}}");
-
-		assertEquals(7, blockEntity.getAttached(INT));
-		assertEquals("new", blockEntity.getAttached(STRING));
-		assertTrue(blockEntity.hasAttached(NON_PERSISTENT_INT));
-		assertEquals(500, blockEntity.getAttached(NON_PERSISTENT_INT));
-		assertTrue(blockEntity.hasAttached(NON_PERSISTENT_STRING));
-		assertEquals("unchanged", blockEntity.getAttached(NON_PERSISTENT_STRING));
-	}
-}
diff --git a/fabric-data-attachment-api-v1/src/testmod/java/net/fabricmc/fabric/test/attachment/gametest/AttachmentCopyTests.java b/fabric-data-attachment-api-v1/src/testmod/java/net/fabricmc/fabric/test/attachment/gametest/AttachmentCopyTests.java
index d583f3e0fd..3f5eb6ba3a 100644
--- a/fabric-data-attachment-api-v1/src/testmod/java/net/fabricmc/fabric/test/attachment/gametest/AttachmentCopyTests.java
+++ b/fabric-data-attachment-api-v1/src/testmod/java/net/fabricmc/fabric/test/attachment/gametest/AttachmentCopyTests.java
@@ -27,7 +27,7 @@
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntitySpawnReason;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EntityTypes;
 import net.minecraft.world.entity.monster.zombie.Drowned;
 import net.minecraft.world.entity.monster.zombie.Zombie;
 import net.minecraft.world.level.Level;
@@ -57,12 +57,12 @@ public void testCrossLevelTeleport(GameTestHelper helper) {
 		ServerLevel end = server.getLevel(Level.END);
 		// using overworld and end to avoid portal code related to the nether
 
-		Entity entity = EntityType.PIG.create(overworld, EntitySpawnReason.SPAWN_ITEM_USE);
+		Entity entity = EntityTypes.PIG.create(overworld, EntitySpawnReason.SPAWN_ITEM_USE);
 		Objects.requireNonNull(entity, "entity was null");
 		entity.setAttached(DUMMY, () -> 10);
 		entity.setAttached(COPY_ON_DEATH, () -> 10);
 
-		Vec3 spawnPos = entity.adjustSpawnLocation(end, end.getRespawnData().pos()).getBottomCenter();
+		Vec3 spawnPos = Vec3.atBottomCenterOf(entity.adjustSpawnLocation(end, end.getRespawnData().pos()));
 		Entity moved = entity.teleport(new TeleportTransition(end, spawnPos, Vec3.ZERO, 0.0F, 0.0F, TeleportTransition.DO_NOTHING));
 		if (moved == null) throw helper.assertionException("Cross-level teleportation failed");
 
@@ -79,13 +79,13 @@ public void testCrossLevelTeleport(GameTestHelper helper) {
 
 	@GameTest
 	public void testMobConversion(GameTestHelper helper) {
-		Zombie mob = helper.spawn(EntityType.ZOMBIE, BlockPos.ZERO);
+		Zombie mob = helper.spawn(EntityTypes.ZOMBIE, BlockPos.ZERO);
 		mob.setAttached(DUMMY, () -> 42);
 		mob.setAttached(COPY_ON_DEATH, () -> 42);
 
 		ZombieAccessor zombieAccessor = (ZombieAccessor) mob;
-		zombieAccessor.invokeConvertTo(helper.getLevel(), EntityType.DROWNED);
-		List drowned = helper.getEntities(EntityType.DROWNED);
+		zombieAccessor.invokeConvertTo(helper.getLevel(), EntityTypes.DROWNED);
+		List drowned = helper.getEntities(EntityTypes.DROWNED);
 
 		if (drowned.size() != 1) {
 			throw helper.assertionException("Conversion failed");
diff --git a/fabric-data-attachment-api-v1/src/testmod/resources/fabric.mod.json b/fabric-data-attachment-api-v1/src/testmod/resources/fabric.mod.json
index 28180d7919..4b76b8e429 100644
--- a/fabric-data-attachment-api-v1/src/testmod/resources/fabric.mod.json
+++ b/fabric-data-attachment-api-v1/src/testmod/resources/fabric.mod.json
@@ -23,8 +23,7 @@
       "net.fabricmc.fabric.test.attachment.gametest.BlockEntityTests"
     ],
     "fabric-client-gametest": [
-      "net.fabricmc.fabric.test.attachment.client.gametest.PersistenceGametest",
-      "net.fabricmc.fabric.test.attachment.client.gametest.SyncGametest"
+      "net.fabricmc.fabric.test.attachment.client.gametest.PersistenceGametest"
     ]
   },
   "mixins": [
diff --git a/fabric-data-attachment-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/attachment/client/AttachmentClientTestMod.java b/fabric-data-attachment-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/attachment/client/AttachmentClientTestMod.java
index 165c74645f..74ad473aa8 100644
--- a/fabric-data-attachment-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/attachment/client/AttachmentClientTestMod.java
+++ b/fabric-data-attachment-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/attachment/client/AttachmentClientTestMod.java
@@ -35,7 +35,7 @@ public void onInitializeClient() {
 
 					if (viewDistance.get() < newValue) {
 						viewDistance.set(newValue);
-						Minecraft.getInstance().gui.getChat().addClientSystemMessage(Component.nullToEmpty("The server requested to up the render distance to " + newValue));
+						Minecraft.getInstance().gui.hud.getChat().addClientSystemMessage(Component.nullToEmpty("The server requested to up the render distance to " + newValue));
 					}
 				});
 			}
diff --git a/fabric-data-attachment-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/attachment/client/gametest/PersistenceGametest.java b/fabric-data-attachment-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/attachment/client/gametest/PersistenceGametest.java
index cc3771927c..a7b1b40539 100644
--- a/fabric-data-attachment-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/attachment/client/gametest/PersistenceGametest.java
+++ b/fabric-data-attachment-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/attachment/client/gametest/PersistenceGametest.java
@@ -24,9 +24,7 @@
 import org.slf4j.LoggerFactory;
 
 import net.minecraft.client.gui.screens.worldselection.WorldCreationUiState;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ImposterProtoChunk;
@@ -55,10 +53,6 @@ private static  void assertAttached(
 		}
 	}
 
-	private static ServerPlayer getSinglePlayer(MinecraftServer server) {
-		return server.getPlayerList().getPlayers().getFirst();
-	}
-
 	@Override
 	public void runTest(ClientGameTestContext context) {
 		TestWorldSave save;
@@ -69,11 +63,11 @@ public void runTest(ClientGameTestContext context) {
 				.adjustSettings(worldCreator -> worldCreator.setGameMode(WorldCreationUiState.SelectedGameMode.CREATIVE))
 				.create()) {
 			save = spContext.getWorldSave();
-			spContext.getClientLevel().waitForChunksDownload();
+			spContext.getConnection().waitForChunksDownload();
 
 			spContext.getServer().runOnServer(server -> {
-				ServerLevel overworld = server.overworld();
-				LevelChunk originChunk = overworld.getChunk(0, 0);
+				ServerLevel level = spContext.getConnection().getServerLevel();
+				LevelChunk originChunk = level.getChunk(0, 0);
 
 				assertAttached(
 						originChunk,
@@ -84,11 +78,11 @@ public void runTest(ClientGameTestContext context) {
 
 				// setting up persistent attachments for second run
 				server.globalAttachments().setAttached(PERSISTENT, "global_data");
-				getSinglePlayer(server).setAttached(PERSISTENT, "player_data");
-				overworld.setAttached(PERSISTENT, "level_data");
+				spContext.getConnection().getServerPlayer().setAttached(PERSISTENT, "player_data");
+				level.setAttached(PERSISTENT, "level_data");
 				originChunk.setAttached(PERSISTENT, "chunk_data");
 
-				ProtoChunk farChunk = (ProtoChunk) overworld.getChunkSource()
+				ProtoChunk farChunk = (ProtoChunk) level.getChunkSource()
 						.getChunk(FAR_CHUNK_POS.x(), FAR_CHUNK_POS.z(), ChunkStatus.STRUCTURE_STARTS, true);
 				farChunk.setAttached(PERSISTENT, "protochunk_data");
 				LOGGER.info("Set persistent attachments");
@@ -99,26 +93,26 @@ public void runTest(ClientGameTestContext context) {
 
 		// second launch
 		try (TestSingleplayerContext spContext = save.open()) {
-			spContext.getClientLevel().waitForChunksDownload();
+			spContext.getConnection().waitForChunksDownload();
 
 			LOGGER.info("Testing persistent attachments");
 			spContext.getServer().runOnServer(server -> {
-				ServerLevel overworld = server.overworld();
-				LevelChunk originChunk = overworld.getChunk(0, 0);
+				ServerLevel level = spContext.getConnection().getServerLevel();
+				LevelChunk originChunk = level.getChunk(0, 0);
 
 				assertAttached(server.globalAttachments(), PERSISTENT, "global_data", "Global attachment did not persist");
-				assertAttached(getSinglePlayer(server), PERSISTENT, "player_data", "Player attachment did not persist");
-				assertAttached(overworld, PERSISTENT, "level_data", "Level attachment did not persist");
+				assertAttached(spContext.getConnection().getServerPlayer(), PERSISTENT, "player_data", "Player attachment did not persist");
+				assertAttached(level, PERSISTENT, "level_data", "Level attachment did not persist");
 				assertAttached(originChunk, PERSISTENT, "chunk_data", "LevelChunk attachment did not persist");
 
-				ImposterProtoChunk imposterProtoChunk = (ImposterProtoChunk) overworld.getChunkSource()
+				ImposterProtoChunk imposterProtoChunk = (ImposterProtoChunk) level.getChunkSource()
 						.getChunk(0, 0, ChunkStatus.EMPTY, true);
 				assertAttached(
 						imposterProtoChunk, PERSISTENT, "chunk_data",
 						"Attachment is not accessible through ImposterProtoChunk"
 				);
 
-				ChunkAccess farChunk = overworld.getChunkSource()
+				ChunkAccess farChunk = level.getChunkSource()
 						.getChunk(FAR_CHUNK_POS.x(), FAR_CHUNK_POS.z(), ChunkStatus.EMPTY, true);
 
 				if (farChunk instanceof ImposterProtoChunk) {
@@ -131,7 +125,7 @@ public void runTest(ClientGameTestContext context) {
 			LOGGER.info("Testing ProtoChunk transfer");
 			// load far chunk
 			spContext.getServer().runCommand("tp @p 4800 ~ 0");
-			spContext.getClientLevel().waitForChunksDownload();
+			spContext.getConnection().waitForChunksDownload();
 
 			spContext.getServer().runOnServer(server -> {
 				LevelChunk farChunk = server.overworld().getChunk(FAR_CHUNK_POS.x(), FAR_CHUNK_POS.z());
diff --git a/fabric-data-attachment-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/attachment/client/gametest/SyncGametest.java b/fabric-data-attachment-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/attachment/client/gametest/SyncGametest.java
index c300528ad4..58011ea823 100644
--- a/fabric-data-attachment-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/attachment/client/gametest/SyncGametest.java
+++ b/fabric-data-attachment-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/attachment/client/gametest/SyncGametest.java
@@ -26,18 +26,17 @@
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EntityTypes;
 import net.minecraft.world.entity.npc.villager.Villager;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.entity.BlockEntityTypes;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.levelgen.Heightmap;
 
@@ -45,17 +44,14 @@
 import net.fabricmc.fabric.api.attachment.v1.AttachmentType;
 import net.fabricmc.fabric.api.client.gametest.v1.FabricClientGameTest;
 import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext;
+import net.fabricmc.fabric.api.client.gametest.v1.context.TestDedicatedServerConnection;
 import net.fabricmc.fabric.api.client.gametest.v1.context.TestDedicatedServerContext;
-import net.fabricmc.fabric.api.client.gametest.v1.context.TestServerConnection;
 import net.fabricmc.fabric.test.attachment.AttachmentTestMod;
 
+// FIXME
 public class SyncGametest implements FabricClientGameTest {
 	public static final Logger LOGGER = LoggerFactory.getLogger("data-attachment-syncing-gametest");
 
-	private static ServerPlayer getSinglePlayer(MinecraftServer server) {
-		return server.getPlayerList().getPlayers().getFirst();
-	}
-
 	private static void setSyncedWithAll(AttachmentTarget target) {
 		set(target, AttachmentTestMod.SYNCED_WITH_ALL);
 	}
@@ -106,9 +102,9 @@ public void runTest(ClientGameTestContext context) {
 				state.furnacePos = top;
 
 				level.setBlockAndUpdate(top, Blocks.FURNACE.defaultBlockState());
-				setSyncedWithAll(level.getBlockEntity(top, BlockEntityType.FURNACE).orElseThrow());
+				setSyncedWithAll(level.getBlockEntity(top, BlockEntityTypes.FURNACE).orElseThrow());
 
-				var villager = new Villager(EntityType.VILLAGER, level);
+				var villager = new Villager(EntityTypes.VILLAGER, level);
 				villager.setNoAi(true);
 				villager.setInvulnerable(true);
 				villager.setCustomName(Component.literal("TestVillager"));
@@ -130,12 +126,12 @@ public void runTest(ClientGameTestContext context) {
 
 			LOGGER.info("Joining dedicated server");
 
-			try (TestServerConnection connection = serverContext.connect()) {
-				connection.getClientLevel().waitForChunksDownload();
+			try (TestDedicatedServerConnection connection = serverContext.connect()) {
+				connection.waitForChunksDownload();
 
 				LOGGER.info("Setting up rest of synced attachments");
 				serverContext.runOnServer(server -> {
-					ServerPlayer player = getSinglePlayer(server);
+					ServerPlayer player = connection.getServerPlayer();
 					setSyncedWithAll(player);
 					set(player, AttachmentTestMod.SYNCED_EXCEPT_TARGET);
 					set(player, AttachmentTestMod.SYNCED_CREATIVE_ONLY);
@@ -150,12 +146,11 @@ public void runTest(ClientGameTestContext context) {
 					set(server.overworld().getBlockEntity(state.furnacePos), AttachmentTestMod.SYNCED_EXCEPT_TARGET);
 				});
 
-				// safety
-				context.waitTick();
+				connection.waitForClientboundPackets();
 
 				LOGGER.info("Testing synced attachments (1/2)");
 				context.runOnClient(client -> {
-					ClientLevel level = Objects.requireNonNull(client.level);
+					ClientLevel level = connection.getClientLevel();
 					Entity villager = level.getEntity(state.villagerId);
 					BlockEntity furnace = level.getBlockEntity(state.furnacePos);
 
@@ -184,9 +179,9 @@ public void runTest(ClientGameTestContext context) {
 
 				// Test modifying attachments using the data command, and that the changes are synced to the client.
 				serverContext.runCommand("data modify entity @n[name=\"TestVillager\"] \"fabric:attachments\".\"fabric-data-attachment-api-v1-testmod:synced_item\".id set value \"minecraft:diamond\"");
-				context.waitTick();
+				connection.waitForClientboundPackets();
 				context.runOnClient(client -> {
-					ClientLevel level = Objects.requireNonNull(client.level);
+					ClientLevel level = connection.getClientLevel();
 					Entity villager = level.getEntity(state.villagerId);
 					ItemStack syncedItem = villager.getAttached(AttachmentTestMod.SYNCED_ITEM);
 
@@ -199,10 +194,9 @@ public void runTest(ClientGameTestContext context) {
 				// now teleport to nether, on roof to avoid suffocation when switching to survival
 				serverContext.runCommand("execute in minecraft:the_nether run tp @p ~ 128 ~");
 				serverContext.runCommand("gamemode survival @p");
-				serverContext.runOnServer(server -> getSinglePlayer(server).removeAttached(AttachmentTestMod.SYNCED_CREATIVE_ONLY));
+				serverContext.runOnServer(server -> connection.getServerPlayer().removeAttached(AttachmentTestMod.SYNCED_CREATIVE_ONLY));
 
-				// safety
-				context.waitTick();
+				connection.waitForClientboundPackets();
 
 				LOGGER.info("Testing synced attachments (2/2)");
 				context.runOnClient(client -> {
diff --git a/fabric-data-generation-api-v1/build.gradle b/fabric-data-generation-api-v1/build.gradle
index 8e37efb8f1..22048bc874 100644
--- a/fabric-data-generation-api-v1/build.gradle
+++ b/fabric-data-generation-api-v1/build.gradle
@@ -10,7 +10,7 @@ moduleDependencies(project, [
 
 testDependencies(project, [
 	':fabric-creative-tab-api-v1',
-    ':fabric-object-builder-api-v1'
+	':fabric-object-builder-api-v1'
 ])
 
 dependencies {
@@ -28,28 +28,29 @@ sourceSets {
 
 loom {
 	accessWidenerPath = file("src/main/resources/fabric-data-generation-api-v1.classtweaker")
+}
 
+neoForge {
 	runs {
 		datagen {
-			inherit testmodServer
-			name "Data Generation"
-			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"
+			server()
+			ideName = "Data Generation"
+			jvmArgument "-Dfabric-api.datagen"
+			jvmArgument "-Dfabric-api.datagen.output-dir=${file("src/testmod/generated")}"
+			jvmArgument "-Dfabric-api.datagen.strict-validation"
+
+			gameDirectory = file("build/datagen")
+			sourceSet = sourceSets.testmod
 		}
 		datagenClient {
 			client()
-			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.testmodClient
+			ideName = "Data Generation Client"
+			jvmArgument "-Dfabric-api.datagen"
+			jvmArgument "-Dfabric-api.datagen.output-dir=${file("src/testmod/generated")}"
+			jvmArgument "-Dfabric-api.datagen.strict-validation"
+
+			gameDirectory = file("build/datagen")
+			sourceSet = sourceSets.testmod
 		}
 	}
 }
@@ -81,7 +82,7 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
 
 tasks.register('generateClassTweaker') {
-	inputs.files(loom.getNamedMinecraftJars())
+//	inputs.files(loom.getNamedMinecraftJars())
 
 	doLast {
 		// Use parent provider to get the jar before the AWs are applied
@@ -106,12 +107,18 @@ tasks.register('generateClassTweaker') {
 
 		visitMethods(classes["net/minecraft/client/data/models/BlockModelGenerators"]) { name, desc, owner ->
 			if (desc == "()V")
-				// Skip over methods that dont take any arguments, as they are specific to minecraft.
+			// Skip over methods that dont take any arguments, as they are specific to minecraft.
 				return
 
 			out += "transitive-accessible\tmethod\t${owner}\t${name}\t${desc}\n"
 		}
 
+		visitStaticFinalFields(classes["net/minecraft/client/data/models/BlockModelGenerators"]) { name, desc, owner ->
+			if (desc == "Lnet/minecraft/client/data/models/blockstates/PropertyDispatch;") {
+				out += "transitive-accessible\tfield\t${owner}\t${name}\t${desc}\n"
+			}
+		}
+
 		visitMethods(classes["net/minecraft/data/loot/BlockLootSubProvider"]) { name, desc, owner ->
 			out += "transitive-accessible\tmethod\t${owner}\t${name}\t${desc}\n"
 		}
@@ -164,12 +171,22 @@ static def visitFinalMethods(ClassNode classNode, closure) {
 	}
 }
 
+static def visitStaticFinalFields(ClassNode classNode, closure) {
+	classNode.fields.forEach {
+		int access = Opcodes.ACC_STATIC | Opcodes.ACC_FINAL
+		if ((it.access & access) != access || (it.access & Opcodes.ACC_PUBLIC) != 0)
+			return
+
+		closure(it.name, it.desc, classNode.name)
+	}
+}
+
 // Return a map of all class names to classNodes
 static def getClasses(List inputs) {
 	Map classes = new TreeMap<>()
 
 	for (File input : inputs) {
-		new ZipFile(input).withCloseable { ZipFile zip  ->
+		new ZipFile(input).withCloseable { ZipFile zip ->
 			zip.entries().toList().forEach { ZipEntry entry ->
 				if (!entry.name.endsWith(".class")) {
 					return
diff --git a/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/MinecraftMixin.java b/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/MinecraftMixin.java
index 7359b24bec..a9e20c2e71 100644
--- a/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/MinecraftMixin.java
+++ b/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/MinecraftMixin.java
@@ -16,6 +16,9 @@
 
 package net.fabricmc.fabric.mixin.datagen.client;
 
+import net.minecraft.client.ClientBootstrap;
+import net.minecraft.server.Bootstrap;
+
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -30,6 +33,9 @@ public class MinecraftMixin {
 	@Inject(method = "", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;getBackendDescription()Ljava/lang/String;"))
 	private void main(CallbackInfo info) {
 		if (FabricDataGenHelper.ENABLED) {
+			Bootstrap.bootStrap();
+			ClientBootstrap.bootstrap();
+			
 			FabricDataGenHelper.run();
 
 			// Exit gracefully.
diff --git a/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderMixin.java b/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderMixin.java
index 69597daa21..719b11bf0e 100644
--- a/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderMixin.java
+++ b/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderMixin.java
@@ -51,7 +51,7 @@ public void init(PackOutput output, CallbackInfo ci) {
 		}
 	}
 
-	@WrapOperation(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/data/models/BlockModelGenerators;run()V"))
+	@WrapOperation(method = "registerModels", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/data/models/BlockModelGenerators;run()V"))
 	private void registerBlockStateModels(BlockModelGenerators instance, Operation original) {
 		if (((Object) this) instanceof FabricModelProvider fabricModelProvider) {
 			fabricModelProvider.generateBlockStateModels(instance);
@@ -61,7 +61,7 @@ private void registerBlockStateModels(BlockModelGenerators instance, Operation original) {
 		if (((Object) this) instanceof FabricModelProvider fabricModelProvider) {
 			fabricModelProvider.generateItemModels(instance);
@@ -71,7 +71,7 @@ private void registerItemModels(ItemModelGenerators instance, Operation or
 		}
 	}
 
-	@Inject(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/data/models/BlockModelGenerators;run()V"))
+	@Inject(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/data/models/ModelProvider;registerModels(Lnet/minecraft/client/data/models/BlockModelGenerators;Lnet/minecraft/client/data/models/ItemModelGenerators;)V"))
 	private void setFabricPackOutput(CachedOutput output, CallbackInfoReturnable> cir,
 									@Local(name = "blockStateGenerators") ModelProvider.BlockStateGeneratorCollector blockStateGenerators,
 									@Local(name = "itemModels") ModelProvider.ItemInfoCollector itemModels) {
diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/FabricDataGenerator.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/FabricDataGenerator.java
index d27d8e9abe..c4e1bcbfda 100644
--- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/FabricDataGenerator.java
+++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/FabricDataGenerator.java
@@ -16,14 +16,13 @@
 
 package net.fabricmc.fabric.api.datagen.v1;
 
-import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 
 import org.jetbrains.annotations.ApiStatus;
 
+import net.minecraft.SharedConstants;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.RegistrySetBuilder;
 import net.minecraft.data.DataGenerator;
@@ -33,13 +32,12 @@
 import net.minecraft.resources.Identifier;
 
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagsProvider;
-import net.fabricmc.fabric.impl.datagen.FabricDataGenHelper;
 import net.fabricmc.loader.api.ModContainer;
 
 /**
  * An extension to vanilla's {@link DataGenerator} providing mod specific data, and helper functions.
  */
-public final class FabricDataGenerator extends DataGenerator.Uncached {
+public final class FabricDataGenerator extends DataGenerator.Cached {
 	private final ModContainer modContainer;
 	private final boolean strictValidation;
 	private final FabricPackOutput fabricOutput;
@@ -47,7 +45,7 @@ public final class FabricDataGenerator extends DataGenerator.Uncached {
 
 	@ApiStatus.Internal
 	public FabricDataGenerator(Path output, ModContainer mod, boolean strictValidation, CompletableFuture registriesFuture) {
-		super(output);
+		super(output, SharedConstants.getCurrentVersion(), true);
 		this.modContainer = Objects.requireNonNull(mod);
 		this.strictValidation = strictValidation;
 		this.fabricOutput = new FabricPackOutput(mod, output, strictValidation);
@@ -133,17 +131,6 @@ public DataGenerator.PackGenerator getBuiltinDatapack(boolean shouldRun, String
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
-	public void run() throws IOException {
-		Path output = vanillaPackOutput.getOutputFolder();
-
-		if (Files.exists(output)) {
-			FabricDataGenHelper.deleteDirectory(output);
-		}
-
-		super.run();
-	}
-
 	/**
 	 * Represents a pack of generated data (i.e. data pack or resource pack). Providers are added to a pack.
 	 */
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ClientboundCustomPayloadPacketAccessor.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/advancement/FabricAdvancementBuilder.java
similarity index 51%
rename from fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ClientboundCustomPayloadPacketAccessor.java
rename to fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/advancement/FabricAdvancementBuilder.java
index 9f51ac0b31..961c39b976 100644
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/ClientboundCustomPayloadPacketAccessor.java
+++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/advancement/FabricAdvancementBuilder.java
@@ -14,17 +14,27 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.attachment;
+package net.fabricmc.fabric.api.datagen.v1.advancement;
 
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
+import java.util.function.Consumer;
 
-import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
+import org.jetbrains.annotations.ApiStatus;
 
-@Mixin(ClientboundCustomPayloadPacket.class)
-public interface ClientboundCustomPayloadPacketAccessor {
-	@Accessor("MAX_PAYLOAD_SIZE")
-	static int getMaxPayloadSize() {
+import net.minecraft.advancements.AdvancementHolder;
+import net.minecraft.resources.Identifier;
+
+/**
+ * Advancement builder extensions provided by Fabric.
+ */
+@ApiStatus.NonExtendable
+public interface FabricAdvancementBuilder {
+	/**
+	 * Builds and saves the advancement.
+	 * @param output The output to save the advancement to
+	 * @param id The id of the advancement
+	 * @return A new holder containing the saved advancement
+	 */
+	default AdvancementHolder save(Consumer output, Identifier id) {
 		throw new UnsupportedOperationException("Implemented via mixin");
 	}
 }
diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/TaggedChoiceTypeExtension.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/advancement/package-info.java
similarity index 82%
rename from fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/TaggedChoiceTypeExtension.java
rename to fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/advancement/package-info.java
index 8e041d1b0f..af8b080d0a 100644
--- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/TaggedChoiceTypeExtension.java
+++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/advancement/package-info.java
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.dimension;
+@NullMarked
+package net.fabricmc.fabric.api.datagen.v1.advancement;
 
-public interface TaggedChoiceTypeExtension {
-	void fabric$setFailSoft(boolean cond);
-}
+import org.jspecify.annotations.NullMarked;
diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricAdvancementProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricAdvancementProvider.java
index ed8789345d..e96006641b 100644
--- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricAdvancementProvider.java
+++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricAdvancementProvider.java
@@ -78,6 +78,21 @@ protected Consumer withConditions(Consumer
 		};
 	}
 
+	/**
+	 * Creates a reference to an existing advancement.
+	 *
+	 * {@snippet :
+	 * Advancement.Builder builder = ...;
+	 * builder.parent(createPlaceholder(Identifier.withDefaultNamespace("adventure/root")))
+	 * }
+	 *
+	 * @param id The identifier to create a reference for.
+	 * @return A new holder containing the provided id.
+	 */
+	public static AdvancementHolder createPlaceholder(Identifier id) {
+		return Advancement.Builder.advancement().build(id);
+	}
+
 	@Override
 	public CompletableFuture run(CachedOutput output) {
 		return this.registryLookup.thenCompose(lookup -> {
diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricDynamicRegistryProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricDynamicRegistryProvider.java
index ae1238ee89..30c5d48093 100644
--- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricDynamicRegistryProvider.java
+++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricDynamicRegistryProvider.java
@@ -83,7 +83,7 @@ public static final class Entries {
 		@ApiStatus.Internal
 		Entries(HolderLookup.Provider registries, String modId) {
 			this.registries = registries;
-			this.queuedEntries = DynamicRegistries.getDynamicRegistries().stream()
+			this.queuedEntries = DynamicRegistries.getWorldRegistries().stream()
 					// Some modded dynamic registries might not be in the wrapper lookup, filter them out
 					.filter(e -> registries.lookup(e.key()).isPresent())
 					.collect(Collectors.toMap(
diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java
index 95d4ae9c49..f0d95afe84 100644
--- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java
+++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java
@@ -26,6 +26,9 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.google.gson.JsonObject;
+
+import net.fabricmc.fabric.api.tag.FabricTagKey;
+
 import org.jetbrains.annotations.ApiStatus;
 
 import net.minecraft.core.Holder;
@@ -243,7 +246,7 @@ default void add(Identifier identifier, String value) {
 		 * @param value  the value of the entry
 		 */
 		default void add(TagKey tagKey, String value) {
-			add(tagKey.getTranslationKey(), value);
+			add(((FabricTagKey) (Object) tagKey).getTranslationKey(), value);
 		}
 
 		/**
diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java
index fa4992dc52..da23415c0b 100644
--- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java
+++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java
@@ -26,6 +26,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.mojang.serialization.JsonOps;
+import net.neoforged.neoforge.common.conditions.ICondition;
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.advancements.Advancement;
@@ -78,9 +79,9 @@ protected RecipeOutput withConditions(RecipeOutput output, ResourceCondition...
 		Preconditions.checkArgument(conditions.length > 0, "Must add at least one condition.");
 		return new RecipeOutput() {
 			@Override
-			public void accept(ResourceKey> key, Recipe recipe, @Nullable AdvancementHolder advancementHolder) {
+			public void accept(ResourceKey> key, Recipe recipe, @Nullable AdvancementHolder advancement, ICondition... forgeConditions) {
 				FabricDataGenHelper.addConditions(recipe, conditions);
-				output.accept(key, recipe, advancementHolder);
+				output.accept(key, recipe, advancement);
 			}
 
 			@Override
@@ -101,12 +102,12 @@ public Identifier getRecipeIdentifier(Identifier recipeId) {
 
 	@Override
 	public CompletableFuture run(CachedOutput output) {
-		return registriesFuture.thenCompose((registries -> {
+		return registriesFuture.thenCompose(registries -> {
 			Set generatedRecipes = Sets.newHashSet();
 			List> list = new ArrayList<>();
 			RecipeProvider recipeProvider = createRecipeProvider(registries, new RecipeOutput() {
 				@Override
-				public void accept(ResourceKey> recipeKey, Recipe recipe, @Nullable AdvancementHolder advancement) {
+				public void accept(ResourceKey> recipeKey, Recipe recipe, @Nullable AdvancementHolder advancement, ICondition... forgeConditions) {
 					Identifier identifier = recipeKey.identifier();
 
 					if (!generatedRecipes.add(identifier)) {
@@ -147,7 +148,7 @@ public Identifier getRecipeIdentifier(Identifier recipeId) {
 			});
 			recipeProvider.buildRecipes();
 			return CompletableFuture.allOf(list.toArray(CompletableFuture[]::new));
-		}));
+		});
 	}
 
 	/**
diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagAppender.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagAppender.java
index 0d2c949769..d57aa13d18 100644
--- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagAppender.java
+++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagAppender.java
@@ -16,25 +16,98 @@
 
 package net.fabricmc.fabric.api.datagen.v1.provider;
 
+import java.util.Collection;
+import java.util.stream.Stream;
+
+import net.neoforged.neoforge.common.extensions.ITagAppenderExtension;
+
 import net.minecraft.data.tags.TagAppender;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.tags.TagBuilder;
 import net.minecraft.tags.TagKey;
 
+import net.fabricmc.fabric.impl.datagen.ForcedTagEntry;
+
 /**
  * Interface-injected to {@link net.minecraft.data.tags.TagAppender}.
  */
 @SuppressWarnings("unchecked")
-public interface FabricTagAppender {
+public interface FabricTagAppender extends ITagAppenderExtension {
 	/**
 	 * Sets the value of the {@code replace} flag. When set to {@code true}
 	 * this tag will replace contents of any other tag.
+	 *
 	 * @param replace whether to replace the contents of the tag
 	 * @return this, for chaining
 	 */
-	default TagAppender setReplace(boolean replace) {
-		return (TagAppender) this;
+	default TagAppender setReplace(boolean replace) {
+		replace(replace);
+		return (TagAppender) this;
+	}
+
+	/**
+	 * Forces a tag key into the tag, bypassing any errors resulting from the
+	 * tag not existing at runtime.
+	 *
+	 * @param tag The tag to force into the contents of the tag
+	 * @return this, for chaining
+	 */
+	default TagAppender forceAddTag(TagKey tag) {
+		add(new ForcedTagEntry(tag.location()));
+		return (TagAppender) this;
+	}
+
+	/**
+	 * Removes an entry from the tag.
+	 *
+	 * @param element The entry to remove from the contents of the tag
+	 * @return this, for chaining
+	 */
+	default TagAppender remove(ResourceKey element) {
+		throw new AssertionError("Implemented via mixin");
+	}
+
+	/**
+	 * Removes multiple entries from the tag.
+	 *
+	 * @param elements The entries to remove from the contents of the tag
+	 * @return this, for chaining
+	 */
+	default TagAppender remove(final ResourceKey... elements) {
+		throw new AssertionError("Implemented via mixin");
+	}
+
+	/**
+	 * Removes multiple entries from the tag.
+	 *
+	 * @param elements The entries to remove from the contents of the tag
+	 * @return this, for chaining
+	 */
+	default TagAppender removeAll(final Collection> elements) {
+		throw new AssertionError("Implemented via mixin");
+	}
+
+	/**
+	 * Removes multiple entries from the tag.
+	 *
+	 * @param elements The entries to remove from the contents of the tag
+	 * @return this, for chaining
+	 */
+	default TagAppender removeAll(final Stream> elements) {
+		throw new AssertionError("Implemented via mixin");
+	}
+
+	/**
+	 * Removes all entries of the specified tag from the tag.
+	 *
+	 * @param tag The tag to remove from the contents of the tag
+	 * @return this, for chaining
+	 */
+	default TagAppender removeTag(TagKey tag) {
+		throw new AssertionError("Implemented via mixin");
 	}
 
-	default TagAppender forceAddTag(TagKey tag) {
-		return (TagAppender) this;
+	default TagBuilder getBuilder() {
+		return null;
 	}
 }
diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagsProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagsProvider.java
index 70eb655526..d76145e8b1 100644
--- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagsProvider.java
+++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagsProvider.java
@@ -31,8 +31,10 @@
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistrySetBuilder;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.data.tags.BlockItemTagAppender;
 import net.minecraft.data.tags.TagAppender;
 import net.minecraft.data.tags.TagsProvider;
+import net.minecraft.references.BlockItemId;
 import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.tags.TagBuilder;
@@ -85,7 +87,7 @@ public FabricTagsProvider(FabricPackOutput output, ResourceKey, T> builder(TagKey tag) {
+	protected TagAppender builder(TagKey tag) {
 		TagBuilder tagBuilder = this.getOrCreateRawBuilder(tag);
 		return TagAppender.forBuilder(tagBuilder);
 	}
@@ -118,49 +120,37 @@ public Map getAliasGroupBuilders() {
 		return Collections.unmodifiableMap(aliasGroupBuilders);
 	}
 
-	/**
-	 * Parent class for tags providers that support adding registered values directly.
-	 *
-	 * @apiNote This class should not be subclassed directly. Either use a subclass provided by
-	 * this API, or use the regular {@link FabricTagsProvider}. (Ability to add registered values
-	 * directly should be considered as deprecated.)
-	 */
-	public abstract static class FabricIntrinsicHolderTagsProvider extends FabricTagsProvider {
-		private final Function> valueToKey;
-
-		protected FabricIntrinsicHolderTagsProvider(FabricPackOutput output, ResourceKey> registryKey, CompletableFuture registryLookupFuture, Function> valueToKey) {
-			super(output, registryKey, registryLookupFuture);
-			this.valueToKey = valueToKey;
-		}
-
-		protected TagAppender valueLookupBuilder(TagKey tag) {
-			TagBuilder tagBuilder = this.getOrCreateRawBuilder(tag);
-			return TagAppender.forBuilder(tagBuilder).map(this.valueToKey);
-		}
-	}
-
 	/**
 	 * Extend this class to create {@link Block} tags in the "/block" tag directory.
 	 */
-	public abstract static class BlockTagsProvider extends FabricIntrinsicHolderTagsProvider {
+	public abstract static class BlockTagsProvider extends FabricTagsProvider {
 		public BlockTagsProvider(FabricPackOutput output, CompletableFuture registryLookupFuture) {
-			super(output, Registries.BLOCK, registryLookupFuture, block -> block.builtInRegistryHolder().key());
+			super(output, Registries.BLOCK, registryLookupFuture);
+		}
+
+		protected BlockItemTagAppender builder(TagKey tag) {
+			return new BlockItemTagAppender<>(super.builder(tag)) {
+				@Override
+				protected ResourceKey convertElement(BlockItemId element) {
+					return element.block();
+				}
+			};
 		}
 	}
 
 	/**
 	 * Extend this class to create {@link BlockEntityType} tags in the "/block_entity_type" tag directory.
 	 */
-	public abstract static class BlockEntityTypeTagsProvider extends FabricIntrinsicHolderTagsProvider> {
+	public abstract static class BlockEntityTypeTagsProvider extends FabricTagsProvider> {
 		public BlockEntityTypeTagsProvider(FabricPackOutput output, CompletableFuture registryLookupFuture) {
-			super(output, Registries.BLOCK_ENTITY_TYPE, registryLookupFuture, type -> type.builtInRegistryHolder().key());
+			super(output, Registries.BLOCK_ENTITY_TYPE, registryLookupFuture);
 		}
 	}
 
 	/**
 	 * Extend this class to create {@link Item} tags in the "/item" tag directory.
 	 */
-	public abstract static class ItemTagsProvider extends FabricIntrinsicHolderTagsProvider {
+	public abstract static class ItemTagsProvider extends FabricTagsProvider {
 		@Nullable
 		private final Function, TagBuilder> blockTagBuilderProvider;
 
@@ -170,7 +160,7 @@ public abstract static class ItemTagsProvider extends FabricIntrinsicHolderTagsP
 		 * @param output The {@link FabricPackOutput} instance
 		 */
 		public ItemTagsProvider(FabricPackOutput output, CompletableFuture registryLookupFuture, @Nullable BlockTagsProvider blockTagsProvider) {
-			super(output, Registries.ITEM, registryLookupFuture, item -> item.builtInRegistryHolder().key());
+			super(output, Registries.ITEM, registryLookupFuture);
 
 			this.blockTagBuilderProvider = blockTagsProvider == null ? null : blockTagsProvider::getOrCreateRawBuilder;
 		}
@@ -197,23 +187,32 @@ public void copy(TagKey blockTag, TagKey itemTag) {
 			TagBuilder itemTagBuilder = this.getOrCreateRawBuilder(itemTag);
 			blockTagBuilder.build().forEach(itemTagBuilder::add);
 		}
+
+		protected BlockItemTagAppender builder(TagKey tag) {
+			return new BlockItemTagAppender<>(super.builder(tag)) {
+				@Override
+				protected ResourceKey convertElement(BlockItemId element) {
+					return element.item();
+				}
+			};
+		}
 	}
 
 	/**
 	 * Extend this class to create {@link Fluid} tags in the "/fluid" tag directory.
 	 */
-	public abstract static class FluidTagsProvider extends FabricIntrinsicHolderTagsProvider {
+	public abstract static class FluidTagsProvider extends FabricTagsProvider {
 		public FluidTagsProvider(FabricPackOutput output, CompletableFuture registryLookupFuture) {
-			super(output, Registries.FLUID, registryLookupFuture, fluid -> fluid.builtInRegistryHolder().key());
+			super(output, Registries.FLUID, registryLookupFuture);
 		}
 	}
 
 	/**
 	 * Extend this class to create {@link EntityType} tags in the "/entity_type" tag directory.
 	 */
-	public abstract static class EntityTypeTagsProvider extends FabricIntrinsicHolderTagsProvider> {
+	public abstract static class EntityTypeTagsProvider extends FabricTagsProvider> {
 		public EntityTypeTagsProvider(FabricPackOutput output, CompletableFuture registryLookupFuture) {
-			super(output, Registries.ENTITY_TYPE, registryLookupFuture, type -> type.builtInRegistryHolder().key());
+			super(output, Registries.ENTITY_TYPE, registryLookupFuture);
 		}
 	}
 
diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/FabricDataGenHelper.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/FabricDataGenHelper.java
index e320264c78..e9ffa4cfde 100644
--- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/FabricDataGenHelper.java
+++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/FabricDataGenHelper.java
@@ -16,13 +16,8 @@
 
 package net.fabricmc.fabric.impl.datagen;
 
-import java.io.IOException;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -204,8 +199,8 @@ void bootstrap(BootstrapContext context) {
 
 		Map, BuilderData> builderDataMap = new HashMap<>();
 
-		// Ensure all dynamic registries are present.
-		for (RegistryDataLoader.RegistryData key : DynamicRegistries.getDynamicRegistries()) {
+		// Ensure all bootstrapping registries are present.
+		for (RegistryDataLoader.RegistryData key : DynamicRegistries.getBootstrappingRegistries()) {
 			builderDataMap.computeIfAbsent(key.key(), BuilderData::new);
 		}
 
@@ -258,22 +253,4 @@ public static void addConditions(JsonObject baseObject, ResourceCondition... con
 
 		baseObject.add(ResourceConditions.CONDITIONS_KEY, ResourceCondition.LIST_CODEC.encodeStart(JsonOps.INSTANCE, Arrays.asList(conditions)).getOrThrow());
 	}
-
-	public static void deleteDirectory(Path dir) throws IOException {
-		Files.walkFileTree(dir, new SimpleFileVisitor<>() {
-			@Override
-			public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-					throws IOException {
-				Files.delete(file);
-				return FileVisitResult.CONTINUE;
-			}
-
-			@Override
-			public FileVisitResult postVisitDirectory(Path dir, IOException exc)
-					throws IOException {
-				Files.delete(dir);
-				return FileVisitResult.CONTINUE;
-			}
-		});
-	}
 }
diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagAppenderMixin.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagAppenderMixin.java
index 7f1d91f89c..bfd121ad59 100644
--- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagAppenderMixin.java
+++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagAppenderMixin.java
@@ -16,71 +16,16 @@
 
 package net.fabricmc.fabric.mixin.datagen;
 
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
 
 import net.minecraft.data.tags.TagAppender;
-import net.minecraft.tags.TagBuilder;
-import net.minecraft.tags.TagKey;
 
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagAppender;
-import net.fabricmc.fabric.impl.datagen.FabricTagBuilder;
 
 /**
- * Extends TagAppender to support setting the replace field.
+ * Extends TagAppender to support setting the {@code replace} and {@code fabric:remove} fields.
  */
-@SuppressWarnings({"rawtypes", "unchecked"})
 @Mixin(TagAppender.class)
-interface TagAppenderMixin extends FabricTagAppender {
-	@Mixin(targets = "net.minecraft.data.tags.TagAppender$1")
-	abstract class TagAppender1Mixin implements TagAppenderMixin {
-		// the builder param
-		@Shadow
-		@Final
-		TagBuilder val$builder;
+interface TagAppenderMixin extends FabricTagAppender {
 
-		@Override
-		public TagAppender setReplace(boolean replace) {
-			((FabricTagBuilder) this.val$builder).fabric_setReplace(replace);
-			return (TagAppender) this;
-		}
-
-		@Override
-		public TagAppender forceAddTag(TagKey tag) {
-			((FabricTagBuilder) this.val$builder).fabric_forceAddTag(tag.location());
-			return (TagAppender) this;
-		}
-	}
-
-	@Mixin(targets = "net.minecraft.data.tags.TagAppender$2")
-	abstract class TagAppender2Mixin implements TagAppenderMixin {
-		// TagAppender.this
-		@Shadow
-		@Final
-		TagAppender val$original;
-
-		@Override
-		public TagAppender setReplace(boolean replace) {
-			((FabricTagAppender) this.val$original).setReplace(replace);
-			return (TagAppender) this;
-		}
-
-		@Override
-		public TagAppender forceAddTag(TagKey tag) {
-			((FabricTagAppender) this.val$original).forceAddTag(tag);
-			return (TagAppender) this;
-		}
-
-		@WrapOperation(
-				method = "addOptional",
-				at = @At(value = "INVOKE", target = "Lnet/minecraft/data/tags/TagAppender;add(Ljava/lang/Object;)Lnet/minecraft/data/tags/TagAppender;")
-		)
-		private TagAppender fixAddOptional(TagAppender instance, E e, Operation> original) {
-			return instance.addOptional(e);
-		}
-	}
 }
diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagBuilderMixin.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagBuilderMixin.java
deleted file mode 100644
index 7518faf53c..0000000000
--- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagBuilderMixin.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.mixin.datagen;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-
-import net.minecraft.resources.Identifier;
-import net.minecraft.tags.TagBuilder;
-import net.minecraft.tags.TagEntry;
-
-import net.fabricmc.fabric.impl.datagen.FabricTagBuilder;
-import net.fabricmc.fabric.impl.datagen.ForcedTagEntry;
-
-@Mixin(TagBuilder.class)
-public abstract class TagBuilderMixin implements FabricTagBuilder {
-	@Shadow
-	public abstract TagBuilder add(TagEntry entry);
-
-	@Unique
-	private boolean replace = false;
-
-	@Override
-	public void fabric_setReplace(boolean replace) {
-		this.replace = replace;
-	}
-
-	@Override
-	public boolean fabric_isReplaced() {
-		return this.replace;
-	}
-
-	@Override
-	public void fabric_forceAddTag(Identifier tag) {
-		this.add(new ForcedTagEntry(tag));
-	}
-}
diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagsProviderMixin.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagsProviderMixin.java
index c2afdebd62..ca23640b2e 100644
--- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagsProviderMixin.java
+++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagsProviderMixin.java
@@ -29,7 +29,6 @@
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.core.Registry;
@@ -38,10 +37,8 @@
 import net.minecraft.data.tags.TagsProvider;
 import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.tags.TagBuilder;
 
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagsProvider;
-import net.fabricmc.fabric.impl.datagen.FabricTagBuilder;
 import net.fabricmc.fabric.impl.datagen.TagAliasGenerator;
 
 @Mixin(TagsProvider.class)
@@ -52,36 +49,28 @@ public class TagsProviderMixin {
 	@Unique
 	private PackOutput.PathProvider tagAliasPathResolver;
 
-	@Inject(method = "(Lnet/minecraft/data/PackOutput;Lnet/minecraft/resources/ResourceKey;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V", at = @At("RETURN"))
-	private void initPathResolver(PackOutput output, ResourceKey> registryRef, CompletableFuture registriesFuture, CompletableFuture parentTagLookupFuture, CallbackInfo info) {
+	@Inject(method = "(Lnet/minecraft/data/PackOutput;Lnet/minecraft/resources/ResourceKey;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/lang/String;)V", at = @At("RETURN"))
+	private void initPathResolver(PackOutput output, ResourceKey> registryRef, CompletableFuture registriesFuture, CompletableFuture parentTagLookupFuture, String modId, CallbackInfo info) {
 		tagAliasPathResolver = output.createPathProvider(PackOutput.Target.DATA_PACK, TagAliasGenerator.getDirectory(registryRef));
 	}
 
-	@ModifyArg(method = "lambda$run$5", at = @At(value = "INVOKE", target = "Lnet/minecraft/tags/TagFile;(Ljava/util/List;Z)V"), index = 1)
-	private boolean addReplaced(boolean replaced, @Local(name = "builder") TagBuilder builder) {
-		if (builder instanceof FabricTagBuilder fabricTagBuilder) {
-			return fabricTagBuilder.fabric_isReplaced();
-		}
-
-		return replaced;
-	}
-
 	@SuppressWarnings("unchecked")
 	@WrapOperation(method = "lambda$run$2", at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;allOf([Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture;"))
-	private CompletableFuture addTagAliasGroupBuilders(CompletableFuture[] futures, Operation> original, @Local(argsOnly = true) CachedOutput writer) {
-		if ((Object) this instanceof FabricTagsProvider) {
-			// Note: no pattern matching instanceof so that we can cast directly to FabricTagsProvider instead of a wildcard
-			Map.AliasGroupBuilder> builders = ((FabricTagsProvider) (Object) this).getAliasGroupBuilders();
-			CompletableFuture[] newFutures = Arrays.copyOf(futures, futures.length + builders.size());
-			int index = futures.length;
+	private CompletableFuture addTagAliasGroupBuilders(CompletableFuture[] cfs, Operation> original, @Local(argsOnly = true) CachedOutput cache) {
+		// exclude providers that don't use fabric API
+		if (!((Object) this instanceof FabricTagsProvider)) {
+			return original.call((Object) cfs);
+		}
 
-			for (Map.Entry.AliasGroupBuilder> entry : builders.entrySet()) {
-				newFutures[index++] = TagAliasGenerator.writeTagAlias(writer, tagAliasPathResolver, registryKey, entry.getKey(), entry.getValue().getTags());
-			}
+		// Note: no pattern matching instanceof so that we can cast directly to FabricTagsProvider instead of a wildcard
+		Map.AliasGroupBuilder> builders = ((FabricTagsProvider) (Object) this).getAliasGroupBuilders();
+		CompletableFuture[] newFutures = Arrays.copyOf(cfs, cfs.length + builders.size());
+		int index = cfs.length;
 
-			return original.call((Object) newFutures);
-		} else {
-			return original.call((Object) futures);
+		for (Map.Entry.AliasGroupBuilder> entry : builders.entrySet()) {
+			newFutures[index++] = TagAliasGenerator.writeTagAlias(cache, tagAliasPathResolver, registryKey, entry.getKey(), entry.getValue().getTags());
 		}
+
+		return original.call((Object) newFutures);
 	}
 }
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/LevelMixin.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/advancement/AdvancementBuilderMixin.java
similarity index 52%
rename from fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/LevelMixin.java
rename to fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/advancement/AdvancementBuilderMixin.java
index 593e417744..6eea353804 100644
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/LevelMixin.java
+++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/advancement/AdvancementBuilderMixin.java
@@ -14,32 +14,28 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.attachment;
+package net.fabricmc.fabric.mixin.datagen.advancement;
+
+import java.util.function.Consumer;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.world.level.Level;
-
-import net.fabricmc.fabric.api.attachment.v1.GlobalAttachmentsProvider;
-import net.fabricmc.fabric.impl.attachment.AttachmentTargetImpl;
+import net.minecraft.advancements.Advancement;
+import net.minecraft.advancements.AdvancementHolder;
+import net.minecraft.resources.Identifier;
 
-@Mixin(Level.class)
-abstract class LevelMixin implements AttachmentTargetImpl, GlobalAttachmentsProvider {
-	@Shadow
-	public abstract boolean isClientSide();
+import net.fabricmc.fabric.api.datagen.v1.advancement.FabricAdvancementBuilder;
 
+@Mixin(Advancement.Builder.class)
+abstract class AdvancementBuilderMixin implements FabricAdvancementBuilder {
 	@Shadow
-	public abstract RegistryAccess registryAccess();
-
-	@Override
-	public boolean fabric_shouldTryToSync() {
-		return !this.isClientSide();
-	}
+	public abstract AdvancementHolder build(Identifier id);
 
 	@Override
-	public RegistryAccess fabric_getRegistryAccess() {
-		return registryAccess();
+	public AdvancementHolder save(Consumer output, Identifier id) {
+		AdvancementHolder advancement = build(id);
+		output.accept(advancement);
+		return advancement;
 	}
 }
diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/RecipeProviderMixin.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/RecipeProviderMixin.java
new file mode 100644
index 0000000000..4f92e9302d
--- /dev/null
+++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/RecipeProviderMixin.java
@@ -0,0 +1,42 @@
+/*
+ * 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.mixin.datagen.recipe;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.data.recipes.RecipeProvider;
+import net.minecraft.data.recipes.packs.VanillaRecipeProvider;
+import net.minecraft.world.level.ItemLike;
+
+@Mixin(RecipeProvider.class)
+abstract class RecipeProviderMixin {
+	// The default `RecipeProvider` outputs all stonecutting recipes
+	// in the `minecraft` namespace. Override this method to place
+	// them in the output item’s namespace instead.
+	@ModifyArg(method = "stonecutterResultFromBase(Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;I)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/data/recipes/SingleItemRecipeBuilder;save(Lnet/minecraft/data/recipes/RecipeOutput;Ljava/lang/String;)V"), index = 1)
+	private String adjustId(String path, @Local(name = "result", argsOnly = true) ItemLike result) {
+		if ((Object) this instanceof VanillaRecipeProvider) {
+			return path;
+		}
+
+		return BuiltInRegistries.ITEM.getKey(result.asItem()).getNamespace() + ":" + path;
+	}
+}
diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/server/MainMixin.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/server/MainMixin.java
index a30d6213fd..c01233f584 100644
--- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/server/MainMixin.java
+++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/server/MainMixin.java
@@ -16,6 +16,8 @@
 
 package net.fabricmc.fabric.mixin.datagen.server;
 
+import net.minecraft.server.Bootstrap;
+
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -30,6 +32,7 @@ public class MainMixin {
 	@Inject(method = "main", at = @At(value = "NEW", target = "net/minecraft/server/dedicated/DedicatedServerSettings"), cancellable = true)
 	private static void main(String[] args, CallbackInfo info) {
 		if (FabricDataGenHelper.ENABLED) {
+			Bootstrap.bootStrap();
 			FabricDataGenHelper.run();
 			info.cancel();
 		}
diff --git a/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.classtweaker b/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.classtweaker
index 052dd8cb0a..ad7cfa58f3 100644
--- a/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.classtweaker
+++ b/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.classtweaker
@@ -53,14 +53,16 @@ accessible	class	net/minecraft/client/data/models/ModelProvider$ItemInfoCollecto
 accessible	class	net/minecraft/client/data/models/ModelProvider$BlockStateGeneratorCollector
 accessible	field	net/minecraft/client/data/models/ModelProvider$BlockStateGeneratorCollector	generators	Ljava/util/Map;
 
+transitive-inject-interface net/minecraft/advancements/Advancement$Builder net/fabricmc/fabric/api/datagen/v1/advancement/FabricAdvancementBuilder
 transitive-inject-interface	net/minecraft/data/loot/BlockLootSubProvider	net/fabricmc/fabric/api/datagen/v1/loot/FabricBlockLootSubProvider
 transitive-inject-interface	net/minecraft/data/loot/EntityLootSubProvider	net/fabricmc/fabric/api/datagen/v1/loot/FabricEntityLootSubProvider
 transitive-inject-interface	net/minecraft/data/recipes/RecipeOutput	net/fabricmc/fabric/api/datagen/v1/recipe/FabricRecipeOutput
-transitive-inject-interface	net/minecraft/data/tags/TagAppender	net/fabricmc/fabric/api/datagen/v1/provider/FabricTagAppender
+transitive-inject-interface	net/minecraft/data/tags/TagAppender	net/fabricmc/fabric/api/datagen/v1/provider/FabricTagAppender
 
 ### Generated access wideners below
 
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	buildRecipes	()V
+transitive-accessible	method	net/minecraft/data/recipes/packs/VanillaRecipeProvider	buildRecipes	()V
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	generateForEnabledBlockFamilies	(Lnet/minecraft/world/flag/FeatureFlagSet;)V
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	oneToOneConversionRecipe	(Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;Ljava/lang/String;)V
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	oneToOneConversionRecipe	(Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;Ljava/lang/String;I)V
@@ -89,7 +91,7 @@ transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	slabBuild
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	stairBuilder	(Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder;
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	trapdoorBuilder	(Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder;
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	signBuilder	(Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder;
-transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	hangingSign	(Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V
+transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	hangingSignBuilder	(Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder;
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	colorItemWithDye	(Ljava/util/List;Ljava/util/List;Ljava/lang/String;Lnet/minecraft/data/recipes/RecipeCategory;)V
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	colorWithDye	(Ljava/util/List;Ljava/util/List;Lnet/minecraft/world/item/Item;Ljava/lang/String;Lnet/minecraft/data/recipes/RecipeCategory;)V
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	carpet	(Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V
@@ -107,6 +109,7 @@ transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	wall	(Lne
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	wallBuilder	(Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder;
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	bricksBuilder	(Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder;
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	tilesBuilder	(Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder;
+transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	pillarBuilder	(Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder;
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	polished	(Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	polishedBuilder	(Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder;
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	cut	(Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V
@@ -135,15 +138,17 @@ transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	dyedShulk
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	dyedBundleRecipe	(Lnet/minecraft/world/item/Item;Lnet/minecraft/world/item/Item;)V
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	generateRecipes	(Lnet/minecraft/data/BlockFamily;Lnet/minecraft/world/flag/FeatureFlagSet;)V
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	generateCraftingRecipe	(Lnet/minecraft/data/BlockFamily;Lnet/minecraft/data/BlockFamily$Variant;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/ItemLike;)V
+transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	generateSmeltingRecipe	(Lnet/minecraft/data/BlockFamily$Variant;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/ItemLike;)V
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	generateStonecutterRecipe	(Lnet/minecraft/data/BlockFamily;Lnet/minecraft/data/BlockFamily$Variant;Lnet/minecraft/world/level/block/Block;)V
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	getBaseBlockForCrafting	(Lnet/minecraft/data/BlockFamily;Lnet/minecraft/data/BlockFamily$Variant;)Lnet/minecraft/world/level/block/Block;
-transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	insideOf	(Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/advancements/Criterion;
-transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	bredAnimal	()Lnet/minecraft/advancements/Criterion;
-transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	has	(Lnet/minecraft/advancements/criterion/MinMaxBounds$Ints;Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/advancements/Criterion;
-transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	has	(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/advancements/Criterion;
-transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	has	(Lnet/minecraft/tags/TagKey;)Lnet/minecraft/advancements/Criterion;
-transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	inventoryTrigger	([Lnet/minecraft/advancements/criterion/ItemPredicate$Builder;)Lnet/minecraft/advancements/Criterion;
-transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	inventoryTrigger	([Lnet/minecraft/advancements/criterion/ItemPredicate;)Lnet/minecraft/advancements/Criterion;
+transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	getCraftingCriterionName	(Lnet/minecraft/data/BlockFamily;Lnet/minecraft/data/BlockFamily$Variant;Lnet/minecraft/world/level/ItemLike;)Ljava/lang/String;
+transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	insideOf	(Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/advancements/triggers/Criterion;
+transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	bredAnimal	()Lnet/minecraft/advancements/triggers/Criterion;
+transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	has	(Lnet/minecraft/advancements/predicates/MinMaxBounds$Ints;Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/advancements/triggers/Criterion;
+transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	has	(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/advancements/triggers/Criterion;
+transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	has	(Lnet/minecraft/tags/TagKey;)Lnet/minecraft/advancements/triggers/Criterion;
+transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	inventoryTrigger	([Lnet/minecraft/advancements/predicates/ItemPredicate$Builder;)Lnet/minecraft/advancements/triggers/Criterion;
+transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	inventoryTrigger	([Lnet/minecraft/advancements/predicates/ItemPredicate;)Lnet/minecraft/advancements/triggers/Criterion;
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	getHasName	(Lnet/minecraft/world/level/ItemLike;)Ljava/lang/String;
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	getItemName	(Lnet/minecraft/world/level/ItemLike;)Ljava/lang/String;
 transitive-accessible	method	net/minecraft/data/recipes/RecipeProvider	getSimpleRecipeName	(Lnet/minecraft/world/level/ItemLike;)Ljava/lang/String;
@@ -194,6 +199,9 @@ transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerato
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createStairs	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;)Lnet/minecraft/client/data/models/blockstates/BlockModelDefinitionGenerator;
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createOrientableTrapdoor	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;)Lnet/minecraft/client/data/models/blockstates/BlockModelDefinitionGenerator;
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createTrapdoor	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;)Lnet/minecraft/client/data/models/blockstates/BlockModelDefinitionGenerator;
+transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createBed	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;)Lnet/minecraft/client/data/models/blockstates/BlockModelDefinitionGenerator;
+transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createSign	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;)Lnet/minecraft/client/data/models/blockstates/BlockModelDefinitionGenerator;
+transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createHangingSign	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;)Lnet/minecraft/client/data/models/blockstates/BlockModelDefinitionGenerator;
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createSimpleBlock	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/client/data/models/MultiVariant;)Lnet/minecraft/client/data/models/blockstates/MultiVariantGenerator;
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createRotatedPillar	()Lnet/minecraft/client/data/models/blockstates/PropertyDispatch;
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createPillarBlockUVLocked	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/client/data/models/model/TextureMapping;Ljava/util/function/BiConsumer;)Lnet/minecraft/client/data/models/blockstates/BlockModelDefinitionGenerator;
@@ -244,8 +252,8 @@ transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerato
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createLeafLitter	(Lnet/minecraft/world/level/block/Block;)V
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createFlowerBed	(Lnet/minecraft/world/level/block/Block;)V
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createSegmentedBlock	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/client/data/models/MultiVariant;Ljava/util/function/Function;Lnet/minecraft/client/data/models/MultiVariant;Ljava/util/function/Function;Lnet/minecraft/client/data/models/MultiVariant;Ljava/util/function/Function;Lnet/minecraft/client/data/models/MultiVariant;Ljava/util/function/Function;)V
-transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createColoredBlockWithRandomRotations	(Lnet/minecraft/client/data/models/model/TexturedModel$Provider;[Lnet/minecraft/world/level/block/Block;)V
-transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createColoredBlockWithStateRotations	(Lnet/minecraft/client/data/models/model/TexturedModel$Provider;[Lnet/minecraft/world/level/block/Block;)V
+transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createColoredBlockWithRandomRotations	(Lnet/minecraft/client/data/models/model/TexturedModel$Provider;Ljava/util/List;)V
+transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createColoredBlockWithStateRotations	(Lnet/minecraft/client/data/models/model/TexturedModel$Provider;Ljava/util/List;)V
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createGlassBlocks	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;)V
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createCommandBlock	(Lnet/minecraft/world/level/block/Block;)V
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createAnvil	(Lnet/minecraft/world/level/block/Block;)V
@@ -265,7 +273,8 @@ transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerato
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createCopperBulb	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;Lnet/minecraft/client/data/models/MultiVariant;)Lnet/minecraft/client/data/models/blockstates/BlockModelDefinitionGenerator;
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	copyCopperBulbModel	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;)V
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createAmethystCluster	(Lnet/minecraft/world/level/block/Block;)V
-transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createPointedDripstoneVariant	(Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/properties/DripstoneThickness;)Lnet/minecraft/client/data/models/MultiVariant;
+transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createSpeleothem	(Lnet/minecraft/world/level/block/Block;)V
+transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createSpeleothemVariant	(Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/properties/SpeleothemThickness;Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/MultiVariant;
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createNyliumBlock	(Lnet/minecraft/world/level/block/Block;)V
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createRotatableColumn	(Lnet/minecraft/world/level/block/Block;)V
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createLightningRod	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;)V
@@ -304,13 +313,18 @@ transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerato
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	applyRotation	(Lnet/minecraft/core/FrontAndTop;)Lnet/minecraft/client/renderer/block/dispatch/VariantMutator;
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createHead	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/SkullBlock$Type;Lnet/minecraft/resources/Identifier;)V
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createCopperGolemStatue	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/WeatheringCopper$WeatherState;)V
-transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createBanner	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/item/DyeColor;)V
+transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createBanner	(Lnet/minecraft/world/item/DyeColor;)V
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createChest	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/resources/Identifier;Z)V
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createChest	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/client/renderer/MultiblockChestResources;Z)V
-transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createBed	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/item/DyeColor;)V
+transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createBed	(Lnet/minecraft/world/item/DyeColor;)V
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	generateSimpleSpecialItemModel	(Lnet/minecraft/world/level/block/Block;Ljava/util/Optional;Lnet/minecraft/client/renderer/special/SpecialModelRenderer$Unbaked;)V
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createCopperChainItem	(Lnet/minecraft/world/item/Item;Lnet/minecraft/world/item/Item;)V
 transitive-accessible	method	net/minecraft/client/data/models/BlockModelGenerators	createCandleAndCandleCake	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;)V
+transitive-accessible	field	net/minecraft/client/data/models/BlockModelGenerators	ROTATION_FACING	Lnet/minecraft/client/data/models/blockstates/PropertyDispatch;
+transitive-accessible	field	net/minecraft/client/data/models/BlockModelGenerators	ROTATIONS_COLUMN_WITH_FACING	Lnet/minecraft/client/data/models/blockstates/PropertyDispatch;
+transitive-accessible	field	net/minecraft/client/data/models/BlockModelGenerators	ROTATION_TORCH	Lnet/minecraft/client/data/models/blockstates/PropertyDispatch;
+transitive-accessible	field	net/minecraft/client/data/models/BlockModelGenerators	ROTATION_HORIZONTAL_FACING_ALT	Lnet/minecraft/client/data/models/blockstates/PropertyDispatch;
+transitive-accessible	field	net/minecraft/client/data/models/BlockModelGenerators	ROTATION_HORIZONTAL_FACING	Lnet/minecraft/client/data/models/blockstates/PropertyDispatch;
 transitive-accessible	method	net/minecraft/data/loot/BlockLootSubProvider	hasSilkTouch	()Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
 transitive-accessible	method	net/minecraft/data/loot/BlockLootSubProvider	doesNotHaveSilkTouch	()Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
 transitive-accessible	method	net/minecraft/data/loot/BlockLootSubProvider	hasShears	()Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;
@@ -356,6 +370,7 @@ transitive-accessible	method	net/minecraft/data/loot/BlockLootSubProvider	create
 transitive-accessible	method	net/minecraft/data/loot/BlockLootSubProvider	createCandleDrops	(Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
 transitive-accessible	method	net/minecraft/data/loot/BlockLootSubProvider	createCandleCakeDrops	(Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
 transitive-accessible	method	net/minecraft/data/loot/BlockLootSubProvider	generate	()V
+transitive-accessible	method	net/minecraft/data/loot/packs/VanillaBlockLoot	generate	()V
 transitive-accessible	method	net/minecraft/data/loot/BlockLootSubProvider	addNetherVinesDropTable	(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;)V
 transitive-accessible	method	net/minecraft/data/loot/BlockLootSubProvider	createDoorTable	(Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder;
 transitive-accessible	method	net/minecraft/data/loot/BlockLootSubProvider	dropPottedContents	(Lnet/minecraft/world/level/block/Block;)V
diff --git a/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.mixins.json b/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.mixins.json
index b42d5e715b..86a87cbda5 100644
--- a/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.mixins.json
+++ b/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.mixins.json
@@ -3,23 +3,22 @@
   "package": "net.fabricmc.fabric.mixin.datagen",
   "compatibilityLevel": "JAVA_25",
   "mixins": [
-    "HashCacheProviderCacheMixin",
-    "HashCacheMixin",
     "DataProviderMixin",
+    "HashCacheMixin",
+    "HashCacheProviderCacheMixin",
     "TagAppenderMixin",
-    "TagAppenderMixin$TagAppender1Mixin",
-    "TagAppenderMixin$TagAppender2Mixin",
-    "TagBuilderMixin",
     "TagsProviderMixin",
+    "advancement.AdvancementBuilderMixin",
     "loot.BlockLootSubProviderAccessor",
     "loot.BlockLootSubProviderMixin",
     "loot.EntityLootSubProviderAccessor",
     "loot.EntityLootSubProviderMixin",
     "recipe.AllCraftingRecipeJsonBuildersMixin",
     "recipe.RecipeOutputMixin",
-    "recipe.SpecialRecipeBuilderMixin",
+    "recipe.RecipeProviderMixin",
     "recipe.SmithingTransformRecipeBuilderMixin",
-    "recipe.SmithingTrimRecipeBuilderMixin"
+    "recipe.SmithingTrimRecipeBuilderMixin",
+    "recipe.SpecialRecipeBuilderMixin"
   ],
   "server": [
     "server.MainMixin"
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/assets/fabric-data-gen-api-v1-testmod/lang/en_us.json b/fabric-data-generation-api-v1/src/testmod/generated/assets/fabric_data_gen_api_v1_testmod/lang/en_us.json
similarity index 100%
rename from fabric-data-generation-api-v1/src/testmod/generated/assets/fabric-data-gen-api-v1-testmod/lang/en_us.json
rename to fabric-data-generation-api-v1/src/testmod/generated/assets/fabric_data_gen_api_v1_testmod/lang/en_us.json
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/assets/fabric-data-gen-api-v1-testmod/lang/ja_jp.json b/fabric-data-generation-api-v1/src/testmod/generated/assets/fabric_data_gen_api_v1_testmod/lang/ja_jp.json
similarity index 100%
rename from fabric-data-generation-api-v1/src/testmod/generated/assets/fabric-data-gen-api-v1-testmod/lang/ja_jp.json
rename to fabric-data-generation-api-v1/src/testmod/generated/assets/fabric_data_gen_api_v1_testmod/lang/ja_jp.json
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/test/adventure_child.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/test/adventure_child.json
new file mode 100644
index 0000000000..30c7cb14c1
--- /dev/null
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/test/adventure_child.json
@@ -0,0 +1,29 @@
+{
+  "parent": "minecraft:adventure/root",
+  "criteria": {
+    "killed_something": {
+      "trigger": "minecraft:player_killed_entity"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "background": "minecraft:textures/gui/advancements/backgrounds/end.png",
+    "description": {
+      "translate": "advancements.test.adventure_child.description"
+    },
+    "frame": "goal",
+    "icon": {
+      "id": "fabric-data-gen-api-v1-testmod:simple_block"
+    },
+    "show_toast": false,
+    "title": {
+      "translate": "advancements.test.adventure_child.title"
+    }
+  },
+  "requirements": [
+    [
+      "killed_something"
+    ]
+  ],
+  "sends_telemetry_event": true
+}
\ No newline at end of file
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/test/root_not_loaded.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/test/root_not_loaded.json
index 427d60732a..c6b1957a7b 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/test/root_not_loaded.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/test/root_not_loaded.json
@@ -1,10 +1,7 @@
 {
   "fabric:load_conditions": [
     {
-      "condition": "fabric:not",
-      "value": {
-        "condition": "fabric:true"
-      }
+      "condition": "fabric:false"
     }
   ],
   "criteria": {
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/loot_table/blocks/block_without_item.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/loot_table/blocks/block_without_item.json
index 034fb345c9..961dccd8b1 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/loot_table/blocks/block_without_item.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/loot_table/blocks/block_without_item.json
@@ -2,7 +2,6 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "bonus_rolls": 0.0,
       "conditions": [
         {
           "condition": "minecraft:survives_explosion"
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/loot_table/blocks/simple_block.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/loot_table/blocks/simple_block.json
index 14ca56cb44..7bcf3f8a10 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/loot_table/blocks/simple_block.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/loot_table/blocks/simple_block.json
@@ -3,10 +3,7 @@
     {
       "condition": "fabric:not",
       "value": {
-        "condition": "fabric:not",
-        "value": {
-          "condition": "fabric:true"
-        }
+        "condition": "fabric:false"
       }
     },
     {
@@ -16,7 +13,6 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "bonus_rolls": 0.0,
       "conditions": [
         {
           "condition": "minecraft:survives_explosion"
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/loot_table/entities/simple_entity.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/loot_table/entities/simple_entity.json
index 930a04a24a..3056745472 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/loot_table/entities/simple_entity.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/loot_table/entities/simple_entity.json
@@ -3,10 +3,7 @@
     {
       "condition": "fabric:not",
       "value": {
-        "condition": "fabric:not",
-        "value": {
-          "condition": "fabric:true"
-        }
+        "condition": "fabric:false"
       }
     },
     {
@@ -16,7 +13,6 @@
   "type": "minecraft:entity",
   "pools": [
     {
-      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/tags/game_event/game_event_tag_test.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/tags/game_event/game_event_tag_test.json
index 55393ba75c..14e0ed8299 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/tags/game_event/game_event_tag_test.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/tags/game_event/game_event_tag_test.json
@@ -1,4 +1,5 @@
 {
+  "remove": [],
   "values": [
     "minecraft:shriek"
   ]
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/tags/sound_event/test_equip_sounds.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/tags/sound_event/test_equip_sounds.json
new file mode 100644
index 0000000000..fd1f046b61
--- /dev/null
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/tags/sound_event/test_equip_sounds.json
@@ -0,0 +1,14 @@
+{
+  "values": [
+    "minecraft:item.armor.equip_turtle",
+    "minecraft:item.armor.equip_elytra",
+    "minecraft:item.armor.equip_leather",
+    "minecraft:item.armor.equip_chain",
+    "minecraft:item.armor.equip_copper",
+    "minecraft:item.armor.equip_iron",
+    "minecraft:item.armor.equip_gold",
+    "minecraft:item.armor.equip_diamond",
+    "minecraft:item.armor.equip_netherite",
+    "minecraft:item.armor.equip_generic"
+  ]
+}
\ No newline at end of file
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/tags/worldgen/biome/biome_tag_test.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/tags/worldgen/biome/biome_tag_test.json
index 8216fdf204..37dc1a1b04 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/tags/worldgen/biome/biome_tag_test.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/tags/worldgen/biome/biome_tag_test.json
@@ -1,4 +1,5 @@
 {
+  "remove": [],
   "values": [
     "minecraft:badlands",
     "minecraft:bamboo_jungle",
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/building_blocks/simple_block.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/building_blocks/simple_block.json
similarity index 80%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/building_blocks/simple_block.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/building_blocks/simple_block.json
index dc4a2b70b5..3e1d37499d 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/building_blocks/simple_block.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/building_blocks/simple_block.json
@@ -14,7 +14,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "fabric-data-gen-api-v1-testmod:simple_block"
+        "recipe": "fabric_data_gen_api_v1_testmod:simple_block"
       }
     }
   },
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "fabric-data-gen-api-v1-testmod:simple_block"
+      "fabric_data_gen_api_v1_testmod:simple_block"
     ]
   }
 }
\ No newline at end of file
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/beacon.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/beacon.json
similarity index 82%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/beacon.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/beacon.json
index f3195a72ec..adb047e6ef 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/beacon.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/beacon.json
@@ -14,7 +14,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "fabric-data-gen-api-v1-testmod:beacon"
+        "recipe": "fabric_data_gen_api_v1_testmod:beacon"
       }
     }
   },
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "fabric-data-gen-api-v1-testmod:beacon"
+      "fabric_data_gen_api_v1_testmod:beacon"
     ]
   }
 }
\ No newline at end of file
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/diamond.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/diamond.json
similarity index 84%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/diamond.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/diamond.json
index d87a5477d8..6fcc64d231 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/diamond.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/diamond.json
@@ -19,7 +19,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "fabric-data-gen-api-v1-testmod:diamond"
+        "recipe": "fabric_data_gen_api_v1_testmod:diamond"
       }
     }
   },
@@ -31,7 +31,7 @@
   ],
   "rewards": {
     "recipes": [
-      "fabric-data-gen-api-v1-testmod:diamond"
+      "fabric_data_gen_api_v1_testmod:diamond"
     ]
   }
 }
\ No newline at end of file
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/diamond_block.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/diamond_block.json
similarity index 81%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/diamond_block.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/diamond_block.json
index b54c06b45f..fba197df79 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/diamond_block.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/diamond_block.json
@@ -14,7 +14,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "fabric-data-gen-api-v1-testmod:diamond_block"
+        "recipe": "fabric_data_gen_api_v1_testmod:diamond_block"
       }
     }
   },
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "fabric-data-gen-api-v1-testmod:diamond_block"
+      "fabric_data_gen_api_v1_testmod:diamond_block"
     ]
   }
 }
\ No newline at end of file
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/diamond_ore.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/diamond_ore.json
similarity index 85%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/diamond_ore.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/diamond_ore.json
index 32e3ba8ff2..78fc8b866d 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/diamond_ore.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/diamond_ore.json
@@ -23,7 +23,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "fabric-data-gen-api-v1-testmod:diamond_ore"
+        "recipe": "fabric_data_gen_api_v1_testmod:diamond_ore"
       }
     }
   },
@@ -35,7 +35,7 @@
   ],
   "rewards": {
     "recipes": [
-      "fabric-data-gen-api-v1-testmod:diamond_ore"
+      "fabric_data_gen_api_v1_testmod:diamond_ore"
     ]
   }
 }
\ No newline at end of file
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/emerald.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/emerald.json
similarity index 87%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/emerald.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/emerald.json
index 82e592f731..727c1a2273 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/emerald.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/emerald.json
@@ -24,7 +24,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "fabric-data-gen-api-v1-testmod:emerald"
+        "recipe": "fabric_data_gen_api_v1_testmod:emerald"
       }
     }
   },
@@ -36,7 +36,7 @@
   ],
   "rewards": {
     "recipes": [
-      "fabric-data-gen-api-v1-testmod:emerald"
+      "fabric_data_gen_api_v1_testmod:emerald"
     ]
   }
 }
\ No newline at end of file
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/gold_block.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/gold_block.json
similarity index 86%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/gold_block.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/gold_block.json
index 01759bda2d..e6bca83346 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/gold_block.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/gold_block.json
@@ -24,7 +24,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "fabric-data-gen-api-v1-testmod:gold_block"
+        "recipe": "fabric_data_gen_api_v1_testmod:gold_block"
       }
     }
   },
@@ -37,7 +37,7 @@
   ],
   "rewards": {
     "recipes": [
-      "fabric-data-gen-api-v1-testmod:gold_block"
+      "fabric_data_gen_api_v1_testmod:gold_block"
     ]
   }
 }
\ No newline at end of file
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/gold_ingot.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/gold_ingot.json
similarity index 72%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/gold_ingot.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/gold_ingot.json
index cb7adc5c08..d37e1b45d2 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/gold_ingot.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/gold_ingot.json
@@ -1,10 +1,7 @@
 {
   "fabric:load_conditions": [
     {
-      "condition": "fabric:not",
-      "value": {
-        "condition": "fabric:true"
-      }
+      "condition": "fabric:false"
     }
   ],
   "parent": "minecraft:recipes/root",
@@ -22,7 +19,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "fabric-data-gen-api-v1-testmod:gold_ingot"
+        "recipe": "fabric_data_gen_api_v1_testmod:gold_ingot"
       }
     }
   },
@@ -34,7 +31,7 @@
   ],
   "rewards": {
     "recipes": [
-      "fabric-data-gen-api-v1-testmod:gold_ingot"
+      "fabric_data_gen_api_v1_testmod:gold_ingot"
     ]
   }
 }
\ No newline at end of file
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/torch.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/torch.json
similarity index 82%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/torch.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/torch.json
index 602eb55c17..b458ec55bc 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/recipes/misc/torch.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/advancement/recipes/misc/torch.json
@@ -14,7 +14,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "fabric-data-gen-api-v1-testmod:torch"
+        "recipe": "fabric_data_gen_api_v1_testmod:torch"
       }
     }
   },
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "fabric-data-gen-api-v1-testmod:torch"
+      "fabric_data_gen_api_v1_testmod:torch"
     ]
   }
 }
\ No newline at end of file
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/fabric/tag_aliases/block/flowers.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/fabric/tag_aliases/block/flowers.json
similarity index 100%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/fabric/tag_aliases/block/flowers.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/fabric/tag_aliases/block/flowers.json
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/beacon.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/beacon.json
similarity index 95%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/beacon.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/beacon.json
index 759d286bcf..9cb47add2a 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/beacon.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/beacon.json
@@ -1,6 +1,5 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "category": "misc",
   "ingredients": [
     {
       "fabric:type": "fabric:difference",
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/diamond.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/diamond.json
similarity index 90%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/diamond.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/diamond.json
index 7754b6a179..0f77287b70 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/diamond.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/diamond.json
@@ -5,7 +5,6 @@
     }
   ],
   "type": "minecraft:crafting_shapeless",
-  "category": "misc",
   "ingredients": [
     "minecraft:stick"
   ],
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/diamond_block.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/diamond_block.json
similarity index 96%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/diamond_block.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/diamond_block.json
index ac07b9409a..9da4d3db68 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/diamond_block.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/diamond_block.json
@@ -1,6 +1,5 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "category": "misc",
   "ingredients": [
     "minecraft:diamond_pickaxe",
     "minecraft:diamond_pickaxe",
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/diamond_ore.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/diamond_ore.json
similarity index 94%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/diamond_ore.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/diamond_ore.json
index c5d3eda4f5..35e94c25c0 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/diamond_ore.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/diamond_ore.json
@@ -9,7 +9,6 @@
     }
   ],
   "type": "minecraft:crafting_shapeless",
-  "category": "misc",
   "ingredients": [
     "minecraft:item_frame"
   ],
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/emerald.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/emerald.json
similarity index 94%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/emerald.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/emerald.json
index e870fb23fc..2f29d12697 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/emerald.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/emerald.json
@@ -10,7 +10,6 @@
     }
   ],
   "type": "minecraft:crafting_shapeless",
-  "category": "misc",
   "ingredients": [
     "minecraft:item_frame",
     "minecraft:item_frame"
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/gold_block.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/gold_block.json
similarity index 92%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/gold_block.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/gold_block.json
index d81846bf59..49a2f91990 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/gold_block.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/gold_block.json
@@ -1,6 +1,5 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "category": "misc",
   "ingredients": [
     {
       "fabric:type": "fabric:any",
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/gold_ingot.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/gold_ingot.json
similarity index 62%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/gold_ingot.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/gold_ingot.json
index ac4896aac6..d5fb938a68 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/gold_ingot.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/gold_ingot.json
@@ -1,14 +1,10 @@
 {
   "fabric:load_conditions": [
     {
-      "condition": "fabric:not",
-      "value": {
-        "condition": "fabric:true"
-      }
+      "condition": "fabric:false"
     }
   ],
   "type": "minecraft:crafting_shapeless",
-  "category": "misc",
   "ingredients": [
     "minecraft:dirt"
   ],
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/simple_block.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/simple_block.json
similarity index 100%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/simple_block.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/simple_block.json
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/torch.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/torch.json
similarity index 91%
rename from fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/torch.json
rename to fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/torch.json
index 9e9c2b3020..fe3d16d17f 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/recipe/torch.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric_data_gen_api_v1_testmod/recipe/torch.json
@@ -1,6 +1,5 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "category": "misc",
   "ingredients": [
     {
       "fabric:type": "fabric:all",
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/loot_table/gameplay/piglin_bartering.json b/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/loot_table/gameplay/piglin_bartering.json
index 9dc5284f74..16591ce950 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/loot_table/gameplay/piglin_bartering.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/loot_table/gameplay/piglin_bartering.json
@@ -7,7 +7,6 @@
   "type": "minecraft:barter",
   "pools": [
     {
-      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/acacia_logs.json b/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/acacia_logs.json
index ac03180443..9c37902329 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/acacia_logs.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/acacia_logs.json
@@ -1,4 +1,5 @@
 {
+  "remove": [],
   "values": [
     "#minecraft:animals_spawnable_on"
   ]
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/climbable.json b/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/climbable.json
new file mode 100644
index 0000000000..adf6df5a57
--- /dev/null
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/climbable.json
@@ -0,0 +1,9 @@
+{
+  "remove": [
+    "minecraft:blue_glazed_terracotta"
+  ],
+  "values": [
+    "minecraft:blue_glazed_terracotta",
+    "minecraft:brown_glazed_terracotta"
+  ]
+}
\ No newline at end of file
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/dirt.json b/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/dirt.json
index 2e5a9286d1..d675afc226 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/dirt.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/dirt.json
@@ -1,4 +1,5 @@
 {
+  "remove": [],
   "values": [
     "fabric-data-gen-api-v1-testmod:simple_block"
   ]
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/fire.json b/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/fire.json
index e50e55fd80..7484a37f85 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/fire.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/fire.json
@@ -1,4 +1,5 @@
 {
+  "remove": [],
   "replace": true,
   "values": [
     "fabric-data-gen-api-v1-testmod:simple_block"
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/needs_diamond_tool.json b/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/needs_diamond_tool.json
new file mode 100644
index 0000000000..377b376bf3
--- /dev/null
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/needs_diamond_tool.json
@@ -0,0 +1,8 @@
+{
+  "remove": [
+    "minecraft:ancient_debris",
+    "minecraft:netherite_block",
+    "minecraft:obsidian"
+  ],
+  "values": []
+}
\ No newline at end of file
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/supports_warped_fungus.json b/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/supports_warped_fungus.json
new file mode 100644
index 0000000000..6541a27dd9
--- /dev/null
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/block/supports_warped_fungus.json
@@ -0,0 +1,7 @@
+{
+  "remove": [
+    "minecraft:soul_soil",
+    "#minecraft:dirt"
+  ],
+  "values": []
+}
\ No newline at end of file
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/item/dirt.json b/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/item/dirt.json
index 2e5a9286d1..d675afc226 100644
--- a/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/item/dirt.json
+++ b/fabric-data-generation-api-v1/src/testmod/generated/data/minecraft/tags/item/dirt.json
@@ -1,4 +1,5 @@
 {
+  "remove": [],
   "values": [
     "fabric-data-gen-api-v1-testmod:simple_block"
   ]
diff --git a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/items/simple_block.json b/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/items/simple_block.json
deleted file mode 100644
index 90438fd929..0000000000
--- a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/items/simple_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "model": {
-    "type": "minecraft:model",
-    "model": "fabric-data-gen-api-v1-testmod:block/simple_block"
-  }
-}
\ No newline at end of file
diff --git a/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestContent.java b/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestContent.java
index e53dee20c3..0718eb316c 100644
--- a/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestContent.java
+++ b/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestContent.java
@@ -23,9 +23,11 @@
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
+import net.minecraft.references.BlockItemId;
 import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
@@ -52,11 +54,20 @@ public class DataGeneratorTestContent implements ModInitializer {
 	public static Block BLOCK_WITH_VANILLA_LOOT_TABLE;
 	public static Block BLOCK_THAT_DROPS_NOTHING;
 
+	public static BlockItemId SIMPLE_BLOCK_KEY = createBlockItemId("simple_block");
+	public static ResourceKey BLOCK_WITHOUT_ITEM_KEY = createBlockResourceKey("block_without_item");
+	public static ResourceKey BLOCK_WITHOUT_LOOT_TABLE_KEY = createBlockResourceKey("block_without_loot_table");
+	public static ResourceKey BLOCK_WITH_VANILLA_LOOT_TABLE_KEY = createBlockResourceKey("block_with_vanilla_loot_table");
+	public static ResourceKey BLOCK_THAT_DROPS_NOTHING_KEY = createBlockResourceKey("block_that_drops_nothing");
+
 	public static SoundEvent TEST_SOUND;
 
 	public static EntityType SIMPLE_ENTITY_TYPE;
 	public static EntityType ENTITY_TYPE_WITHOUT_LOOT_TABLE;
 
+	public static ResourceKey> SIMPLE_ENTITY_TYPE_KEY = createEntityTypeResourceKey("simple_entity");
+	public static ResourceKey> ENTITY_TYPE_WITHOUT_LOOT_TABLE_KEY = createEntityTypeResourceKey("entity_without_loot_table");
+
 	public static final ResourceKey SIMPLE_ITEM_GROUP = ResourceKey.create(Registries.CREATIVE_MODE_TAB, Identifier.fromNamespaceAndPath(MOD_ID, "simple"));
 
 	public static final ResourceKey> TEST_DATAGEN_DYNAMIC_REGISTRY_KEY =
@@ -73,16 +84,18 @@ public class DataGeneratorTestContent implements ModInitializer {
 	public static final ResourceKey> TEST_DATAGEN_DYNAMIC_EMPTY_REGISTRY_KEY =
 			ResourceKey.createRegistryKey(Identifier.fromNamespaceAndPath("fabric", "test_datagen_dynamic_empty"));
 
+	public static final TagKey EQUIP_SOUNDS = TagKey.create(Registries.SOUND_EVENT, Identifier.fromNamespaceAndPath(MOD_ID, "test_equip_sounds"));
+
 	@Override
 	public void onInitialize() {
-		SIMPLE_BLOCK = createBlock("simple_block", true, BlockBehaviour.Properties.of());
-		BLOCK_WITHOUT_ITEM = createBlock("block_without_item", false, BlockBehaviour.Properties.of());
-		BLOCK_WITHOUT_LOOT_TABLE = createBlock("block_without_loot_table", false, BlockBehaviour.Properties.of());
-		BLOCK_WITH_VANILLA_LOOT_TABLE = createBlock("block_with_vanilla_loot_table", false, BlockBehaviour.Properties.of().overrideLootTable(Blocks.STONE.getLootTable()));
-		BLOCK_THAT_DROPS_NOTHING = createBlock("block_that_drops_nothing", false, BlockBehaviour.Properties.of().noLootTable());
+		SIMPLE_BLOCK = createBlockItem(SIMPLE_BLOCK_KEY, BlockBehaviour.Properties.of());
+		BLOCK_WITHOUT_ITEM = createBlock(BLOCK_WITHOUT_ITEM_KEY, BlockBehaviour.Properties.of());
+		BLOCK_WITHOUT_LOOT_TABLE = createBlock(BLOCK_WITHOUT_LOOT_TABLE_KEY, BlockBehaviour.Properties.of());
+		BLOCK_WITH_VANILLA_LOOT_TABLE = createBlock(BLOCK_WITH_VANILLA_LOOT_TABLE_KEY, BlockBehaviour.Properties.of().overrideLootTable(Blocks.STONE.getLootTable()));
+		BLOCK_THAT_DROPS_NOTHING = createBlock(BLOCK_THAT_DROPS_NOTHING_KEY, BlockBehaviour.Properties.of().noLootTable());
 
-		SIMPLE_ENTITY_TYPE = createEntityType("simple_entity", EntityType.Builder.createNothing(MobCategory.MISC));
-		ENTITY_TYPE_WITHOUT_LOOT_TABLE = createEntityType("entity_without_loot_table", EntityType.Builder.createNothing(MobCategory.MISC));
+		SIMPLE_ENTITY_TYPE = createEntityType(SIMPLE_ENTITY_TYPE_KEY, EntityType.Builder.createNothing(MobCategory.MISC));
+		ENTITY_TYPE_WITHOUT_LOOT_TABLE = createEntityType(ENTITY_TYPE_WITHOUT_LOOT_TABLE_KEY, EntityType.Builder.createNothing(MobCategory.MISC));
 
 		CreativeModeTabEvents.modifyOutputEvent(SIMPLE_ITEM_GROUP).register(entries -> entries.accept(SIMPLE_BLOCK));
 
@@ -97,20 +110,30 @@ public void onInitialize() {
 		DynamicRegistries.register(TEST_DATAGEN_DYNAMIC_EMPTY_REGISTRY_KEY, TestDatagenObject.CODEC);
 	}
 
-	private static Block createBlock(String name, boolean hasItem, BlockBehaviour.Properties settings) {
+	private static BlockItemId createBlockItemId(String name) {
 		Identifier identifier = Identifier.fromNamespaceAndPath(MOD_ID, name);
-		Block block = Registry.register(BuiltInRegistries.BLOCK, identifier, new Block(settings.setId(ResourceKey.create(Registries.BLOCK, identifier))));
+		return BlockItemId.create(identifier, identifier);
+	}
 
-		if (hasItem) {
-			Registry.register(BuiltInRegistries.ITEM, identifier, new BlockItem(block, new Item.Properties().setId(ResourceKey.create(Registries.ITEM, identifier))));
-		}
+	private static ResourceKey createBlockResourceKey(String name) {
+		return ResourceKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath(MOD_ID, name));
+	}
+
+	private static Block createBlock(ResourceKey key, BlockBehaviour.Properties settings) {
+		return Registry.register(BuiltInRegistries.BLOCK, key, new Block(settings.setId(key)));
+	}
 
+	private static Block createBlockItem(BlockItemId id, BlockBehaviour.Properties settings) {
+		Block block = createBlock(id.block(), settings);
+		Registry.register(BuiltInRegistries.ITEM, id.item(), new BlockItem(block, new Item.Properties().setId(id.item())));
 		return block;
 	}
 
-	private static  EntityType createEntityType(String name, EntityType.Builder builder) {
-		ResourceKey> key = ResourceKey.create(Registries.ENTITY_TYPE, Identifier.fromNamespaceAndPath(MOD_ID, name));
+	private static ResourceKey> createEntityTypeResourceKey(String name) {
+		return ResourceKey.create(Registries.ENTITY_TYPE, Identifier.fromNamespaceAndPath(MOD_ID, name));
+	}
 
+	private static  EntityType createEntityType(ResourceKey> key, EntityType.Builder builder) {
 		return Registry.register(BuiltInRegistries.ENTITY_TYPE, key, builder.build(key));
 	}
 
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 5028e1e25c..f1eec647e1 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
@@ -21,6 +21,7 @@
 import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.ENTITY_TYPE_WITHOUT_LOOT_TABLE;
 import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.MOD_ID;
 import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.SIMPLE_BLOCK;
+import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.SIMPLE_BLOCK_KEY;
 import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.SIMPLE_ENTITY_TYPE;
 import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.SIMPLE_ITEM_GROUP;
 import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.TEST_DATAGEN_DYNAMIC_REGISTRY_KEY;
@@ -38,11 +39,12 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.neoforged.neoforge.common.extensions.ITagAppenderExtension;
 
 import net.minecraft.advancements.Advancement;
 import net.minecraft.advancements.AdvancementHolder;
 import net.minecraft.advancements.AdvancementType;
-import net.minecraft.advancements.criterion.KilledTrigger;
+import net.minecraft.advancements.triggers.KilledTrigger;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderGetter;
 import net.minecraft.core.HolderLookup;
@@ -56,20 +58,26 @@
 import net.minecraft.data.recipes.RecipeOutput;
 import net.minecraft.data.recipes.RecipeProvider;
 import net.minecraft.data.registries.RegistryPatchGenerator;
+import net.minecraft.data.tags.TagsProvider;
 import net.minecraft.data.worldgen.BootstrapContext;
 import net.minecraft.network.chat.Component;
+import net.minecraft.references.BlockItemIds;
 import net.minecraft.resources.Identifier;
 import net.minecraft.resources.RegistryFixedCodec;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.tags.BlockItemTags;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.TagKey;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EntityTypes;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.Biomes;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.gameevent.GameEvent;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
@@ -102,7 +110,7 @@
 
 public class DataGeneratorTestEntrypoint implements DataGeneratorEntrypoint {
 	private static final ResourceCondition ALWAYS_LOADED = ResourceConditions.alwaysTrue();
-	private static final ResourceCondition NEVER_LOADED = ResourceConditions.not(ALWAYS_LOADED);
+	private static final ResourceCondition NEVER_LOADED = ResourceConditions.alwaysFalse();
 
 	@Override
 	public void addJsonKeySortOrders(JsonKeySortOrderCallback callback) {
@@ -128,6 +136,7 @@ public void onInitializeDataGenerator(FabricDataGenerator dataGenerator) {
 		pack.addProvider((output, registries) -> new TestItemTagsProvider(output, registries, blockTagsProvider));
 		pack.addProvider(TestBiomeTagsProvider::new);
 		pack.addProvider(TestGameEventTagsProvider::new);
+		pack.addProvider(TestVanillaSoundEventTagsProvider::new);
 
 		// TODO replace with a client only entrypoint with FMJ 2
 		if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
@@ -245,6 +254,9 @@ public void buildRecipes() {
 									Ingredient.of(Items.IRON_INGOT, Items.GOLD_INGOT, Items.DIAMOND)))
 							.unlockedBy("has_payment", has(ItemTags.BEACON_PAYMENT_ITEMS))
 							.save(this.output);
+
+					// Test stonecutting
+					stonecutterResultFromBase(RecipeCategory.BUILDING_BLOCKS, SIMPLE_BLOCK, Items.GLASS);
 				}
 			};
 		}
@@ -264,7 +276,7 @@ private ExistingEnglishLangProvider(FabricPackOutput output, CompletableFuture) builder(BlockTags.NEEDS_DIAMOND_TOOL))
+					.remove(
+							BlockItemIds.ANCIENT_DEBRIS.block(),
+							BlockItemIds.NETHERITE_BLOCK.block(),
+							BlockItemIds.OBSIDIAN.block()
+					);
+			builder(BlockTags.CLIMBABLE)
+					.add(BlockItemIds.GLAZED_TERRACOTTA.blue().block())
+					.add(BlockItemIds.GLAZED_TERRACOTTA.brown().block())
+					.remove(BlockItemIds.GLAZED_TERRACOTTA.blue().block());
 		}
 	}
 
@@ -383,6 +410,18 @@ public void generateAdvancement(HolderLookup.Provider registryLookup, Consumer biome) {
 			).apply(instance, Entry::new));
 		}
 	}
+
+	/**
+	 * Ensure that vanilla generators that do not extend {@linkplain FabricTagsProvider} still work.
+	 * @see github-5431
+	 */
+	private static class TestVanillaSoundEventTagsProvider extends TagsProvider {
+		private TestVanillaSoundEventTagsProvider(PackOutput output, CompletableFuture lookupProvider) {
+			super(output, Registries.SOUND_EVENT, lookupProvider);
+		}
+
+		private static ResourceKey key(Holder holder) {
+			return holder.unwrapKey().orElseThrow();
+		}
+
+		@Override
+		protected void addTags(HolderLookup.Provider registries) {
+			tag(DataGeneratorTestContent.EQUIP_SOUNDS)
+					.add(key(SoundEvents.ARMOR_EQUIP_TURTLE))
+					.add(key(SoundEvents.ARMOR_EQUIP_ELYTRA))
+					.add(key(SoundEvents.ARMOR_EQUIP_LEATHER))
+					.add(key(SoundEvents.ARMOR_EQUIP_CHAIN))
+					.add(key(SoundEvents.ARMOR_EQUIP_COPPER))
+					.add(key(SoundEvents.ARMOR_EQUIP_IRON))
+					.add(key(SoundEvents.ARMOR_EQUIP_GOLD))
+					.add(key(SoundEvents.ARMOR_EQUIP_DIAMOND))
+					.add(key(SoundEvents.ARMOR_EQUIP_NETHERITE))
+					.add(key(SoundEvents.ARMOR_EQUIP_GENERIC));
+		}
+	}
 }
diff --git a/fabric-data-generation-api-v1/template.classtweaker b/fabric-data-generation-api-v1/template.classtweaker
index 8ae37886a2..6ebc9f947b 100644
--- a/fabric-data-generation-api-v1/template.classtweaker
+++ b/fabric-data-generation-api-v1/template.classtweaker
@@ -48,9 +48,10 @@ accessible	class	net/minecraft/client/data/models/ModelProvider$ItemInfoCollecto
 accessible	class	net/minecraft/client/data/models/ModelProvider$BlockStateGeneratorCollector
 accessible	field	net/minecraft/client/data/models/ModelProvider$BlockStateGeneratorCollector	generators	Ljava/util/Map;
 
+transitive-inject-interface net/minecraft/advancements/Advancement$Builder net/fabricmc/fabric/api/datagen/v1/advancement/FabricAdvancementBuilder
 transitive-inject-interface	net/minecraft/data/loot/BlockLootSubProvider	net/fabricmc/fabric/api/datagen/v1/loot/FabricBlockLootSubProvider
 transitive-inject-interface	net/minecraft/data/loot/EntityLootSubProvider	net/fabricmc/fabric/api/datagen/v1/loot/FabricEntityLootSubProvider
 transitive-inject-interface	net/minecraft/data/recipes/RecipeOutput	net/fabricmc/fabric/api/datagen/v1/recipe/FabricRecipeOutput
-transitive-inject-interface	net/minecraft/data/tags/TagAppender	net/fabricmc/fabric/api/datagen/v1/provider/FabricTagAppender
+transitive-inject-interface	net/minecraft/data/tags/TagAppender	net/fabricmc/fabric/api/datagen/v1/provider/FabricTagAppender
 
 ### Generated access wideners below
diff --git a/fabric-debug-api-v1/src/main/resources/fabric.mod.json b/fabric-debug-api-v1/src/main/resources/fabric.mod.json
index 4b76263097..6be29e7c74 100644
--- a/fabric-debug-api-v1/src/main/resources/fabric.mod.json
+++ b/fabric-debug-api-v1/src/main/resources/fabric.mod.json
@@ -17,8 +17,7 @@
   ],
   "depends": {
     "fabricloader": ">=0.18.4",
-    "fabric-api-base": "*",
-    "fabric-registry-sync-v0": "*"
+    "fabric-api-base": "*"
   },
   "description": "A toolkit for registering and using debug subscriptions and other debug tools Mojang have created.",
   "mixins": [
diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/FailSoftMapCodec.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/FailSoftMapCodec.java
deleted file mode 100644
index 949dd1cf3f..0000000000
--- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/FailSoftMapCodec.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * 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.impl.dimension;
-
-import java.util.Map;
-import java.util.Optional;
-
-import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.util.Pair;
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.DataResult;
-import com.mojang.serialization.DynamicOps;
-import com.mojang.serialization.Lifecycle;
-import com.mojang.serialization.MapLike;
-import com.mojang.serialization.codecs.BaseMapCodec;
-import com.mojang.serialization.codecs.UnboundedMapCodec;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Has the same functionality as {@link UnboundedMapCodec}.
- * But it will fail-soft when an entry cannot be deserialized.
- */
-public record FailSoftMapCodec(Codec keyCodec, Codec elementCodec) implements BaseMapCodec, Codec> {
-	private static final Logger LOGGER = LoggerFactory.getLogger("FailSoftMapCodec");
-
-	@Override
-	public  DataResult, T>> decode(final DynamicOps ops, final T input) {
-		return ops.getMap(input).setLifecycle(Lifecycle.stable()).flatMap(map -> decode(ops, map)).map(r -> Pair.of(r, input));
-	}
-
-	@Override
-	public  DataResult encode(final Map input, final DynamicOps ops, final T prefix) {
-		return encode(input, ops, ops.mapBuilder()).build(prefix);
-	}
-
-	/**
-	 * In {@link BaseMapCodec#decode(DynamicOps, MapLike)},
-	 * the whole deserialization will fail if one element fails.
-	 * `apply2stable` will return fail when any of the two elements is failed.
-	 * In this implementation, if one deserialization fails, it will log and ignore.
-	 * The result will always be success.
-	 * It will not output partial result when some entries fail deserialization because
-	 * currently (MC 1.19.3) the dimension data deserialization rejects partial result.
-	 */
-	@Override
-	public  DataResult> decode(final DynamicOps ops, final MapLike input) {
-		final ImmutableMap.Builder builder = ImmutableMap.builder();
-
-		input.entries().forEach(pair -> {
-			try {
-				final DataResult k = keyCodec().parse(ops, pair.getFirst());
-				final DataResult v = elementCodec().parse(ops, pair.getSecond());
-
-				Optional optionalK = k.result();
-				Optional optionalV = v.result();
-
-				if (optionalK.isEmpty()) {
-					LOGGER.error("Failed to decode key {} from {}  {}", k, pair, k.resultOrPartial());
-				}
-
-				if (optionalV.isEmpty()) {
-					LOGGER.error("Failed to decode value {} from {}  {}", k, pair, v.resultOrPartial());
-				}
-
-				if (optionalK.isPresent() && optionalV.isPresent()) {
-					builder.put(optionalK.get(), optionalV.get());
-				} else {
-					// ignore failure
-				}
-			} catch (Throwable e) {
-				LOGGER.error("Decoding {}", pair, e);
-			}
-		});
-
-		final Map elements = builder.build();
-
-		return DataResult.success(elements);
-	}
-
-	@Override
-	public String toString() {
-		return "FailSoftMapCodec[" + keyCodec + " -> " + elementCodec + ']';
-	}
-}
diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/TaggedChoiceMixin.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/TaggedChoiceMixin.java
deleted file mode 100644
index aca98583f2..0000000000
--- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/TaggedChoiceMixin.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.mixin.dimension;
-
-import com.mojang.datafixers.types.Type;
-import com.mojang.datafixers.types.templates.TaggedChoice;
-import com.mojang.datafixers.util.Pair;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.fabricmc.fabric.impl.dimension.TaggedChoiceExtension;
-import net.fabricmc.fabric.impl.dimension.TaggedChoiceTypeExtension;
-
-@Mixin(value = TaggedChoice.class)
-public class TaggedChoiceMixin implements TaggedChoiceExtension {
-	@Unique
-	boolean failSoft = false;
-
-	@Override
-	public void fabric$setFailSoft(boolean cond) {
-		failSoft = cond;
-	}
-
-	/**
-	 * Pass the failSoft information into TaggedChoice.TaggedChoiceType.
-	 */
-	@SuppressWarnings("rawtypes")
-	@Inject(
-			method = "lambda$apply$0", at = @At("RETURN")
-	)
-	private void onApply(Pair key, CallbackInfoReturnable cir) {
-		if (failSoft) {
-			Type returnValue = cir.getReturnValue();
-
-			if (returnValue instanceof TaggedChoice.TaggedChoiceType taggedChoiceType) {
-				((TaggedChoiceTypeExtension) (Object) taggedChoiceType).fabric$setFailSoft(true);
-			}
-		}
-	}
-}
diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/TaggedChoiceTaggedChoiceTypeMixin.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/TaggedChoiceTaggedChoiceTypeMixin.java
deleted file mode 100644
index dce0ccf25e..0000000000
--- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/TaggedChoiceTaggedChoiceTypeMixin.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.mixin.dimension;
-
-import com.mojang.datafixers.types.Type;
-import com.mojang.datafixers.types.templates.TaggedChoice;
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.DataResult;
-import com.mojang.serialization.MapCodec;
-import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.fabricmc.fabric.impl.dimension.TaggedChoiceTypeExtension;
-
-@Mixin(value = TaggedChoice.TaggedChoiceType.class)
-public class TaggedChoiceTaggedChoiceTypeMixin implements TaggedChoiceTypeExtension {
-	@Unique
-	private static final Logger LOGGER = LoggerFactory.getLogger("TaggedChoiceType_DimDataFix");
-
-	@Shadow
-	@Final
-	protected Object2ObjectMap> types;
-
-	@Unique
-	private boolean failSoft;
-
-	/**
-	 * Make the DSL.taggedChoiceLazy to ignore mod custom generator types and not cause deserialization failure.
-	 * The Codec.PASSTHROUGH will not make Dynamic to be deserialized and serialized to Dynamic.
-	 * This will avoid deserialization failure from DFU when upgrading level.dat that contains mod custom generator types.
-	 */
-	@Inject(
-			method = "getMapCodec", at = @At("HEAD"), cancellable = true
-	)
-	private void onGetCodec(K k, CallbackInfoReturnable>> cir) {
-		if (failSoft) {
-			if (!types.containsKey(k)) {
-				LOGGER.warn("Not recognizing key {}. Using pass-through codec. {}", k, this);
-				cir.setReturnValue(DataResult.success(MapCodec.assumeMapUnsafe(Codec.PASSTHROUGH)));
-			}
-		}
-	}
-
-	@Override
-	public void fabric$setFailSoft(boolean cond) {
-		failSoft = cond;
-	}
-}
diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/V2832Mixin.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/V2832Mixin.java
deleted file mode 100644
index 471d9d1232..0000000000
--- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/V2832Mixin.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.mixin.dimension;
-
-import java.util.Map;
-import java.util.function.Supplier;
-
-import com.mojang.datafixers.DSL;
-import com.mojang.datafixers.types.Type;
-import com.mojang.datafixers.types.templates.TaggedChoice;
-import com.mojang.datafixers.types.templates.TypeTemplate;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import net.minecraft.util.datafix.schemas.V2832;
-
-import net.fabricmc.fabric.impl.dimension.TaggedChoiceExtension;
-
-@Mixin(V2832.class)
-public class V2832Mixin {
-	/**
-	 * Make the DSL.taggedChoiceLazy to ignore mod custom generator types and not cause deserialization failure.
-	 */
-	@Redirect(
-			method = {
-					"lambda$registerTypes$2", "lambda$registerTypes$4"
-			},
-			at = @At(
-					value = "INVOKE",
-					target = "Lcom/mojang/datafixers/DSL;taggedChoiceLazy(Ljava/lang/String;Lcom/mojang/datafixers/types/Type;Ljava/util/Map;)Lcom/mojang/datafixers/types/templates/TaggedChoice;"
-			)
-	)
-	private static  TaggedChoice redirectTaggedChoiceLazy(
-			String name, Type keyType, Map> templates
-	) {
-		TaggedChoice result = DSL.taggedChoiceLazy(name, keyType, templates);
-		((TaggedChoiceExtension) (Object) result).fabric$setFailSoft(true);
-		return result;
-	}
-}
diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/WorldDimensionsMixin.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/WorldDimensionsMixin.java
index c403dcd7ba..ea7e511533 100644
--- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/WorldDimensionsMixin.java
+++ b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/WorldDimensionsMixin.java
@@ -16,32 +16,52 @@
 
 package net.fabricmc.fabric.mixin.dimension;
 
-import com.mojang.datafixers.Products;
-import com.mojang.datafixers.kinds.App;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
+import java.util.Optional;
+
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.mojang.serialization.Lifecycle;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import net.minecraft.core.registries.Registries;
+import net.minecraft.core.RegistrationInfo;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.dimension.LevelStem;
 import net.minecraft.world.level.levelgen.WorldDimensions;
 
-import net.fabricmc.fabric.impl.dimension.FailSoftMapCodec;
-
 @Mixin(WorldDimensions.class)
 public class WorldDimensionsMixin {
+	@Unique
+	private static final ScopedValue> REGISTRY = ScopedValue.newInstance();
+
+	@WrapMethod(method = "bake")
+	private WorldDimensions.Complete wrapBakeToProvideContext(Registry baseDimensions, Operation original) {
+		return ScopedValue.where(REGISTRY, baseDimensions).call(() -> original.call(baseDimensions));
+	}
+
 	/**
-	 * Fix the issue that cannot load world after uninstalling a dimension mod/datapack.
-	 * After uninstalling a dimension mod/datapack, the dimension config in `level.dat` file cannot be deserialized.
-	 * The solution is to make it fail-soft.
+	 * Make all modded dimensions that are loaded from mod-provided resources use their defined lifecycle,
+	 * rather than always defaulting to experimental. This will hide the experimental message when creating/joining
+	 * a world.
+	 * This does not affect regular datapack provided changes or if mod overrides vanilla dimension!
 	 */
-	@Redirect(method = "lambda$static$0", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;group(Lcom/mojang/datafixers/kinds/App;)Lcom/mojang/datafixers/Products$P1;"))
-	private static Products.P1 useFailSoftMap(RecordCodecBuilder.Instance instance, App app) {
-		return instance.group(
-				new FailSoftMapCodec<>(ResourceKey.codec(Registries.LEVEL_STEM), LevelStem.CODEC)
-						.fieldOf("dimensions").forGetter(WorldDimensions::dimensions)
-		);
+	@Inject(method = "checkStability", at = @At("HEAD"), cancellable = true)
+	private static void betterModdedStabilityCheck(ResourceKey key, LevelStem dimension, CallbackInfoReturnable cir) {
+		if (key.identifier().getNamespace().equals(Identifier.DEFAULT_NAMESPACE) || !REGISTRY.isBound()) {
+			return;
+		}
+
+		Optional registrationInfo = REGISTRY.get().registrationInfo(key);
+
+		if (registrationInfo.isEmpty() || registrationInfo.get().knownPackInfo().isEmpty()) {
+			return;
+		}
+
+		cir.setReturnValue(registrationInfo.get().lifecycle());
 	}
 }
diff --git a/fabric-dimensions-v1/src/main/resources/fabric-dimensions-v1.mixins.json b/fabric-dimensions-v1/src/main/resources/fabric-dimensions-v1.mixins.json
index 61199ecd49..5a46e9a1f6 100644
--- a/fabric-dimensions-v1/src/main/resources/fabric-dimensions-v1.mixins.json
+++ b/fabric-dimensions-v1/src/main/resources/fabric-dimensions-v1.mixins.json
@@ -3,13 +3,10 @@
   "package": "net.fabricmc.fabric.mixin.dimension",
   "compatibilityLevel": "JAVA_25",
   "mixins": [
-    "WorldDimensionsMixin",
-    "V2832Mixin",
-    "TaggedChoiceMixin",
-    "TaggedChoiceTaggedChoiceTypeMixin",
     "DimensionTypeAccessor",
     "MappedRegistryAccessor",
-    "RegistryAccessImmutableRegistryAccessMixin"
+    "RegistryAccessImmutableRegistryAccessMixin",
+    "WorldDimensionsMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-dimensions-v1/src/testmodClient/java/net/fabricmc/fabric/test/dimension/client/FabricDimensionClientTest.java b/fabric-dimensions-v1/src/testmodClient/java/net/fabricmc/fabric/test/dimension/client/FabricDimensionClientTest.java
index 69325c7566..43b31c8ea1 100644
--- a/fabric-dimensions-v1/src/testmodClient/java/net/fabricmc/fabric/test/dimension/client/FabricDimensionClientTest.java
+++ b/fabric-dimensions-v1/src/testmodClient/java/net/fabricmc/fabric/test/dimension/client/FabricDimensionClientTest.java
@@ -24,7 +24,6 @@
 import net.minecraft.world.attribute.EnvironmentAttributes;
 import net.minecraft.world.clock.ClockTimeMarkers;
 import net.minecraft.world.clock.WorldClock;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
 
 import net.fabricmc.fabric.api.client.gametest.v1.FabricClientGameTest;
@@ -45,10 +44,10 @@ public void runTest(ClientGameTestContext context) {
 
 		try (TestSingleplayerContext spContext = context.worldBuilder().create()) {
 			spContext.getServer().runOnServer(server -> {
-				ServerLevel overworld = server.getLevel(Level.OVERWORLD);
-				Optional> defaultClock = overworld.dimensionType().defaultClock();
-				overworld.getServer().clockManager().moveToTimeMarker(defaultClock.get(), ClockTimeMarkers.NOON);
-				int overworldCloudColor = overworld.environmentAttributes().getValue(EnvironmentAttributes.CLOUD_COLOR, BlockPos.ZERO);
+				ServerLevel level = spContext.getConnection().getServerLevel();
+				Optional> defaultClock = level.dimensionType().defaultClock();
+				level.getServer().clockManager().moveToTimeMarker(defaultClock.get(), ClockTimeMarkers.NOON);
+				int overworldCloudColor = level.environmentAttributes().getValue(EnvironmentAttributes.CLOUD_COLOR, BlockPos.ZERO);
 
 				if (overworldCloudColor != PURPLE) {
 					throw new AssertionError("Expected overworld cloud color to be (%d) but was (%d)".formatted(PURPLE, overworldCloudColor));
diff --git a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/impl/entity/event/EntityEventHooks.java b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/impl/entity/event/EntityEventHooks.java
new file mode 100644
index 0000000000..ff987ff633
--- /dev/null
+++ b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/impl/entity/event/EntityEventHooks.java
@@ -0,0 +1,87 @@
+/*
+ * 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.impl.entity.event;
+
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.event.entity.living.LivingDamageEvent;
+import net.neoforged.neoforge.event.entity.living.LivingIncomingDamageEvent;
+import net.neoforged.neoforge.event.entity.living.MobEffectEvent;
+import net.neoforged.neoforge.event.entity.living.MobEffectEvent.Applicable.Result;
+import net.neoforged.neoforge.event.entity.player.CanPlayerSleepEvent;
+import net.neoforged.neoforge.event.entity.player.PlayerEvent;
+
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+
+import net.fabricmc.fabric.api.entity.event.v1.EntitySleepEvents;
+import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents;
+import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
+import net.fabricmc.fabric.api.entity.event.v1.effect.ServerMobEffectEvents;
+import net.fabricmc.fabric.impl.entity.event.effect.MobEffectUtil;
+
+@EventBusSubscriber
+public final class EntityEventHooks {
+
+    @SubscribeEvent
+    public static void onLivingAttack(LivingIncomingDamageEvent event) {
+        LivingEntity entity = event.getEntity();
+        if (!entity.level().isClientSide() && !ServerLivingEntityEvents.ALLOW_DAMAGE.invoker().allowDamage(entity, event.getSource(), event.getAmount())) {
+            event.setCanceled(true);
+        }
+    }
+
+    @SubscribeEvent
+    public static void afterLivingDamage(LivingDamageEvent.Post event) {
+        if (!event.getEntity().isDeadOrDying()) {
+            ServerLivingEntityEvents.AFTER_DAMAGE.invoker().afterDamage(event.getEntity(), event.getSource(), event.getOriginalDamage(), event.getHealthDamage(), event.getBlockedDamage() > 0);
+        }
+    }
+
+    @SubscribeEvent
+    public static void onPlayerSleepInBed(CanPlayerSleepEvent event) {
+        Player.BedSleepingProblem failureReason = EntitySleepEvents.ALLOW_SLEEPING.invoker().allowSleep(event.getEntity(), event.getPos());
+
+        if (failureReason != null) {
+            event.setProblem(failureReason);
+        }
+    }
+
+    @SubscribeEvent
+    public static void onPlayerClone(PlayerEvent.Clone event) {
+        ServerPlayerEvents.COPY_FROM.invoker().copyFromPlayer((ServerPlayer) event.getOriginal(), (ServerPlayer) event.getEntity(), !event.isWasDeath());
+    }
+	
+	@SubscribeEvent
+	public static void canApplyEffect(MobEffectEvent.Applicable event) {
+		if (!event.getEntity().level().isClientSide()
+				&& !ServerMobEffectEvents.ALLOW_ADD.invoker().allowAdd(event.getEffectInstance(), event.getEntity(), MobEffectUtil.getCommandContext())
+		) {
+			event.setResult(Result.DO_NOT_APPLY);
+		}
+	}
+	
+	@SubscribeEvent
+	public static void tryRemoveEffect(MobEffectEvent.Remove event) {
+		if (!ServerMobEffectEvents.ALLOW_EARLY_REMOVE.invoker().allowEarlyRemove(event.getEffectInstance(), event.getEntity(), MobEffectUtil.getCommandContext())) {
+			event.setCanceled(true);
+		}
+	}
+
+    private EntityEventHooks() {}
+}
diff --git a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/LivingEntityMixin.java b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/LivingEntityMixin.java
index e7ac67dfa5..d35733ee61 100644
--- a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/LivingEntityMixin.java
+++ b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/LivingEntityMixin.java
@@ -18,6 +18,8 @@
 
 import java.util.Optional;
 
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
@@ -27,7 +29,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -39,11 +41,8 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.CollisionGetter;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.BedBlock;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
 
@@ -77,20 +76,6 @@ boolean beforeEntityKilled(LivingEntity livingEntity, ServerLevel level, DamageS
 		return isDeadOrDying() && ServerLivingEntityEvents.ALLOW_DEATH.invoker().allowDeath(livingEntity, source, amount);
 	}
 
-	@Inject(method = "hurtServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;isSleeping()Z"), cancellable = true)
-	private void beforeDamage(ServerLevel level, DamageSource source, float amount, CallbackInfoReturnable cir) {
-		if (!ServerLivingEntityEvents.ALLOW_DAMAGE.invoker().allowDamage((LivingEntity) (Object) this, source, amount)) {
-			cir.setReturnValue(false);
-		}
-	}
-
-	@Inject(method = "hurtServer", at = @At("TAIL"))
-	private void afterDamage(ServerLevel level, DamageSource source, float amount, CallbackInfoReturnable cir, @Local(name = "originalDamage") float originalDamage, @Local(name = "blocked") boolean blocked) {
-		if (!isDeadOrDying()) {
-			ServerLivingEntityEvents.AFTER_DAMAGE.invoker().afterDamage((LivingEntity) (Object) this, source, originalDamage, amount, blocked);
-		}
-	}
-
 	@Inject(method = "startSleeping", at = @At("RETURN"))
 	private void onSleep(BlockPos pos, CallbackInfo info) {
 		EntitySleepEvents.START_SLEEPING.invoker().onStartSleeping((LivingEntity) (Object) this, pos);
@@ -117,42 +102,27 @@ private void onIsSleepingInBed(BlockPos sleepingPos, CallbackInfoReturnable operation) {
-		final Direction sleepingDirection = operation.call(level, sleepingPos);
+	@ModifyReturnValue(method = "getBedOrientation", at = @At("TAIL"))
+	private Direction onGetSleepingDirection(Direction sleepingDirection, @Local BlockPos sleepingPos) {
 		return EntitySleepEvents.MODIFY_SLEEPING_DIRECTION.invoker().modifySleepDirection((LivingEntity) (Object) this, sleepingPos, sleepingDirection);
 	}
 
 	// This is needed 1) so that the vanilla logic in wakeUp runs for modded beds and 2) for the injector below.
 	// The injector is shared because lambda$stopSleeping$23 and sleep share much of the structure here.
 	@Dynamic("lambda$stopSleeping$0: Synthetic lambda body for Optional.ifPresent in stopSleeping")
-	@ModifyVariable(method = {"lambda$stopSleeping$0", "startSleeping"}, at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/world/level/Level;getBlockState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState;"))
-	private BlockState modifyBedForOccupiedState(BlockState state, BlockPos sleepingPos) {
-		EventResult result = EntitySleepEvents.ALLOW_BED.invoker().allowBed((LivingEntity) (Object) this, sleepingPos, state, state.getBlock() instanceof BedBlock);
+	@ModifyExpressionValue(method = {"lambda$stopSleeping$0", "startSleeping"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;isBed(Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/LivingEntity;)Z"))
+	private boolean modifyBedForOccupiedState(boolean vanillaResult, @Local(argsOnly = true) BlockPos sleepingPos, @Local BlockState state) {
+		EventResult result = EntitySleepEvents.ALLOW_BED.invoker().allowBed((LivingEntity) (Object) this, sleepingPos, state, vanillaResult);
 
 		// If a valid bed, replace with vanilla red bed so that the vanilla instanceof check succeeds.
-		return result.allowAction(false) ? Blocks.RED_BED.defaultBlockState() : state;
+		return result.allowAction(false) || vanillaResult;
 	}
 
 	// The injector is shared because lambda$stopSleeping$23 and sleep share much of the structure here.
 	@Dynamic("lambda$stopSleeping$0: Synthetic lambda body for Optional.ifPresent in stopSleeping")
-	@Redirect(method = {"lambda$stopSleeping$0", "startSleeping"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;setBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)Z"))
-	private boolean setOccupiedState(Level level, BlockPos pos, BlockState state, int flags) {
-		// This might have been replaced by a red bed above, so we get it again.
-		// Note that we *need* to replace it so the state.with(OCCUPIED, ...) call doesn't crash
-		// when the bed doesn't have the property.
-		BlockState originalState = level.getBlockState(pos);
-		boolean occupied = state.getValue(BedBlock.OCCUPIED);
-
-		if (EntitySleepEvents.SET_BED_OCCUPATION_STATE.invoker().setBedOccupationState((LivingEntity) (Object) this, pos, originalState, occupied)) {
-			return true;
-		} else if (originalState.hasProperty(BedBlock.OCCUPIED)) {
-			// This check is widened from (instanceof BedBlock) to a property check to allow modded blocks
-			// that don't use the event.
-			return level.setBlock(pos, originalState.setValue(BedBlock.OCCUPIED, occupied), flags);
-		} else {
-			return false;
-		}
+	@ModifyArg(method = {"lambda$stopSleeping$0", "startSleeping"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;setBedOccupied(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/LivingEntity;Z)V"))
+	private boolean setOccupiedState(boolean occupied, @Local BlockPos pos, @Local BlockState originalState) {
+		return occupied || EntitySleepEvents.SET_BED_OCCUPATION_STATE.invoker().setBedOccupationState((LivingEntity) (Object) this, pos, originalState, occupied);
 	}
 
 	@Dynamic("lambda$stopSleeping$0: Synthetic lambda body for Optional.ifPresent in stopSleeping")
diff --git a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/PlayerMixin.java b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/PlayerMixin.java
index c90d62d809..b845830945 100644
--- a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/PlayerMixin.java
+++ b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/PlayerMixin.java
@@ -16,29 +16,17 @@
 
 package net.fabricmc.fabric.mixin.entity.event;
 
-import com.mojang.datafixers.util.Either;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import net.minecraft.core.BlockPos;
-import net.minecraft.util.Unit;
 import net.minecraft.world.entity.player.Player;
 
 import net.fabricmc.fabric.api.entity.event.v1.EntitySleepEvents;
 
 @Mixin(Player.class)
 abstract class PlayerMixin {
-	@Inject(method = "startSleepInBed", at = @At("HEAD"), cancellable = true)
-	private void onStartSleepInBed(BlockPos pos, CallbackInfoReturnable> info) {
-		Player.BedSleepingProblem failureReason = EntitySleepEvents.ALLOW_SLEEPING.invoker().allowSleep((Player) (Object) this, pos);
-
-		if (failureReason != null) {
-			info.setReturnValue(Either.left(failureReason));
-		}
-	}
-
 	@Inject(method = "isSleepingLongEnough", at = @At("RETURN"), cancellable = true)
 	private void onIsSleepingLongEnough(CallbackInfoReturnable info) {
 		if (info.getReturnValueZ()) {
diff --git a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/ServerPlayerMixin.java b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/ServerPlayerMixin.java
index 4eb056340b..f9cd10d7fd 100644
--- a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/ServerPlayerMixin.java
+++ b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/ServerPlayerMixin.java
@@ -47,7 +47,6 @@
 import net.fabricmc.fabric.api.entity.event.v1.ServerEntityCombatEvents;
 import net.fabricmc.fabric.api.entity.event.v1.ServerEntityLevelChangeEvents;
 import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents;
-import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
 import net.fabricmc.fabric.api.util.EventResult;
 
 @Mixin(ServerPlayer.class)
@@ -84,12 +83,7 @@ private void afterLevelChanged(ServerLevel origin, CallbackInfo ci) {
 		ServerEntityLevelChangeEvents.AFTER_PLAYER_CHANGE_LEVEL.invoker().afterChangeLevel((ServerPlayer) (Object) this, origin, this.level());
 	}
 
-	@Inject(method = "restoreFrom", at = @At("TAIL"))
-	private void onCopyFrom(ServerPlayer oldPlayer, boolean alive, CallbackInfo ci) {
-		ServerPlayerEvents.COPY_FROM.invoker().copyFromPlayer(oldPlayer, (ServerPlayer) (Object) this, alive);
-	}
-
-	@WrapOperation(method = "startSleepInBed", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;getValue(Lnet/minecraft/world/level/block/state/properties/Property;)Ljava/lang/Comparable;"))
+	@WrapOperation(method = "lambda$startSleepInBed$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;getValue(Lnet/minecraft/world/level/block/state/properties/Property;)Ljava/lang/Comparable;"))
 	private Comparable redirectSleepDirection(BlockState instance, Property property, Operation> original, BlockPos pos, @Cancellable CallbackInfoReturnable> cir) {
 		Direction initial = (Direction) (instance.hasProperty(property) ? original.call(instance, property) : null);
 		Direction dir = EntitySleepEvents.MODIFY_SLEEPING_DIRECTION.invoker().modifySleepDirection((LivingEntity) (Object) this, pos, initial);
@@ -101,14 +95,14 @@ private Comparable redirectSleepDirection(BlockState instance, Property original) {
 		if (EntitySleepEvents.ALLOW_SETTING_SPAWN.invoker().allowSettingSpawn(player, spawnPoint.respawnData().pos())) {
 			original.call(player, spawnPoint, sendMessage);
 		}
 	}
 
-	@Redirect(method = "startSleepInBed", at = @At(value = "INVOKE", target = "Ljava/util/List;isEmpty()Z"))
+	@Redirect(method = "lambda$startSleepInBed$0", at = @At(value = "INVOKE", target = "Ljava/util/List;isEmpty()Z"))
 	private boolean hasNoMonstersNearby(List monsters, BlockPos pos) {
 		boolean vanillaResult = monsters.isEmpty();
 		EventResult result = EntitySleepEvents.ALLOW_NEARBY_MONSTERS.invoker().allowNearbyMonsters((Player) (Object) this, pos, vanillaResult);
diff --git a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/effect/LivingEntityMixin.java b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/effect/LivingEntityMixin.java
index 51ec15682b..40f8230c3c 100644
--- a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/effect/LivingEntityMixin.java
+++ b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/effect/LivingEntityMixin.java
@@ -17,12 +17,7 @@
 package net.fabricmc.fabric.mixin.entity.event.effect;
 
 import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
 
-import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
@@ -48,19 +43,6 @@ private LivingEntityMixin(EntityType entityType, Level level) {
 		super(entityType, level);
 	}
 
-	@WrapMethod(method = "canBeAffected")
-	private boolean allowAddEffect(MobEffectInstance effectInstance, Operation original) {
-		if (this.isClient()) {
-			return original.call(effectInstance);
-		}
-
-		if (!ServerMobEffectEvents.ALLOW_ADD.invoker().allowAdd(effectInstance, this.self(), MobEffectUtil.getCommandContext())) {
-			return false;
-		}
-
-		return original.call(effectInstance);
-	}
-
 	@Inject(
 			method = "addEffect(Lnet/minecraft/world/effect/MobEffectInstance;Lnet/minecraft/world/entity/Entity;)Z",
 			at = @At(
@@ -73,14 +55,14 @@ private void beforeAddEffect(MobEffectInstance effectInstance, Entity entity, Ca
 			return;
 		}
 
-		ServerMobEffectEvents.BEFORE_ADD.invoker().beforeAdd(effectInstance, this.self(), MobEffectUtil.getCommandContext());
+		ServerMobEffectEvents.BEFORE_ADD.invoker().beforeAdd(effectInstance, this.fabric$self(), MobEffectUtil.getCommandContext());
 	}
 
 	@Inject(
 			method = "forceAddEffect",
 			at = @At(
 					value = "INVOKE",
-					target = "Lnet/minecraft/world/entity/LivingEntity;canBeAffected(Lnet/minecraft/world/effect/MobEffectInstance;)Z",
+					target = "Lnet/neoforged/neoforge/common/CommonHooks;canMobEffectBeApplied(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/effect/MobEffectInstance;Lnet/minecraft/world/entity/Entity;)Z",
 					shift = At.Shift.AFTER
 			)
 	)
@@ -89,7 +71,7 @@ private void beforeForceAddEffect(MobEffectInstance effectInstance, Entity entit
 			return;
 		}
 
-		ServerMobEffectEvents.BEFORE_ADD.invoker().beforeAdd(effectInstance, this.self(), MobEffectUtil.getCommandContext());
+		ServerMobEffectEvents.BEFORE_ADD.invoker().beforeAdd(effectInstance, this.fabric$self(), MobEffectUtil.getCommandContext());
 	}
 
 	@Inject(
@@ -101,56 +83,7 @@ private void afterAddEffect(MobEffectInstance effectInstance, Entity entity, Cal
 			return;
 		}
 
-		ServerMobEffectEvents.AFTER_ADD.invoker().afterAdd(effectInstance, this.self(), MobEffectUtil.getCommandContext());
-	}
-
-	@WrapOperation(
-			method = "removeAllEffects",
-			at = @At(
-					value = "INVOKE",
-					target = "Ljava/util/Map;clear()V"
-			)
-	)
-	private void allowRemoveAllEffects(Map, MobEffectInstance> instance, Operation original) {
-		if (this.isClient()) {
-			return;
-		}
-
-		Set, MobEffectInstance>> effectEntries = Set.copyOf(instance.entrySet());
-		original.call(instance);
-
-		for (Map.Entry, MobEffectInstance> entry : effectEntries) {
-			Holder effect = entry.getKey();
-			MobEffectInstance effectInstance = entry.getValue();
-			boolean cannotRemove = !ServerMobEffectEvents.ALLOW_EARLY_REMOVE.invoker()
-					.allowEarlyRemove(effectInstance, this.self(), MobEffectUtil.getCommandContext());
-
-			if (cannotRemove) {
-				instance.put(effect, effectInstance);
-			}
-		}
-	}
-
-	@WrapMethod(method = "removeEffect")
-	private boolean allowRemoveEffect(Holder holder, Operation original) {
-		if (this.isClient()) {
-			return original.call(holder);
-		}
-
-		MobEffectInstance effectInstance = this.self().getEffect(holder);
-
-		if (effectInstance == null) {
-			return original.call(holder);
-		}
-
-		boolean cannotRemove = !ServerMobEffectEvents.ALLOW_EARLY_REMOVE.invoker()
-				.allowEarlyRemove(effectInstance, this.self(), MobEffectUtil.getCommandContext());
-
-		if (cannotRemove) {
-			return false;
-		}
-
-		return original.call(holder);
+		ServerMobEffectEvents.AFTER_ADD.invoker().afterAdd(effectInstance, this.fabric$self(), MobEffectUtil.getCommandContext());
 	}
 
 	@Inject(
@@ -162,7 +95,7 @@ private void beforeRemoveEffect(Holder holder, CallbackInfoReturnable
 			return;
 		}
 
-		MobEffectInstance effectInstance = this.self().getEffect(holder);
+		MobEffectInstance effectInstance = this.fabric$self().getEffect(holder);
 
 		if (effectInstance == null) {
 			return;
@@ -185,14 +118,14 @@ private void beforeExpireRemoveEffect(CallbackInfo ci, @Local(name = "effect") M
 		}
 
 		ServerMobEffectEvents.BEFORE_REMOVE.invoker()
-				.beforeRemove(effect, this.self(), MobEffectUtil.getCommandContext());
+				.beforeRemove(effect, this.fabric$self(), MobEffectUtil.getCommandContext());
 	}
 
 	@Inject(
 			method = "removeAllEffects",
 			at = @At(
-					value = "INVOKE",
-					target = "Lcom/google/common/collect/Maps;newHashMap(Ljava/util/Map;)Ljava/util/HashMap;"
+					value = "NEW",
+					target = "java/util/HashMap"
 			)
 	)
 	private void beforeRemoveAllEffects(CallbackInfoReturnable cir) {
@@ -200,9 +133,9 @@ private void beforeRemoveAllEffects(CallbackInfoReturnable cir) {
 			return;
 		}
 
-		for (MobEffectInstance effectInstance : (this.self()).getActiveEffects()) {
+		for (MobEffectInstance effectInstance : (this.fabric$self()).getActiveEffects()) {
 			ServerMobEffectEvents.BEFORE_REMOVE.invoker()
-					.beforeRemove(effectInstance, this.self(), MobEffectUtil.getCommandContext());
+					.beforeRemove(effectInstance, this.fabric$self(), MobEffectUtil.getCommandContext());
 		}
 	}
 
@@ -217,7 +150,7 @@ private void afterRemoveEffect(Collection collection, Callbac
 
 		for (MobEffectInstance effectInstance : collection) {
 			ServerMobEffectEvents.AFTER_REMOVE.invoker()
-					.afterRemove(effectInstance, this.self(), MobEffectUtil.getCommandContext());
+					.afterRemove(effectInstance, this.fabric$self(), MobEffectUtil.getCommandContext());
 		}
 	}
 
@@ -227,7 +160,7 @@ private boolean isClient() {
 	}
 
 	@Unique
-	private LivingEntity self() {
+	private LivingEntity fabric$self() {
 		return (LivingEntity) (Object) this;
 	}
 }
diff --git a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/elytra/LivingEntityMixin.java b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/elytra/LivingEntityMixin.java
index b8931438f6..d2b32cc37e 100644
--- a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/elytra/LivingEntityMixin.java
+++ b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/elytra/LivingEntityMixin.java
@@ -62,7 +62,7 @@ void injectElytraTick(CallbackInfo info) {
 	}
 
 	@SuppressWarnings("ConstantConditions")
-	@Inject(at = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/EquipmentSlot;VALUES:Ljava/util/List;", opcode = Opcodes.GETSTATIC), method = "canGlide", allow = 1, cancellable = true)
+	@Inject(at = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/EquipmentSlot;VALUES:Ljava/util/List;", opcode = Opcodes.GETSTATIC), method = "canGlide(Z)Z", allow = 1, cancellable = true)
 	void injectElytraCheck(CallbackInfoReturnable cir) {
 		LivingEntity self = (LivingEntity) (Object) this;
 
diff --git a/fabric-entity-events-v1/src/testmod/java/net/fabricmc/fabric/test/entity/event/EntityEventTests.java b/fabric-entity-events-v1/src/testmod/java/net/fabricmc/fabric/test/entity/event/EntityEventTests.java
index 515403f5b7..f5f73bcc69 100644
--- a/fabric-entity-events-v1/src/testmod/java/net/fabricmc/fabric/test/entity/event/EntityEventTests.java
+++ b/fabric-entity-events-v1/src/testmod/java/net/fabricmc/fabric/test/entity/event/EntityEventTests.java
@@ -43,6 +43,7 @@
 import net.minecraft.world.item.equipment.EquipmentAssets;
 import net.minecraft.world.item.equipment.Equippable;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
@@ -149,7 +150,7 @@ public void onInitialize() {
 
 		EntitySleepEvents.ALLOW_SLEEPING.register((player, sleepingPos) -> {
 			// Can't sleep if holds blue wool
-			if (player.getItemInHand(InteractionHand.MAIN_HAND).is(Items.BLUE_WOOL)) {
+			if (player.getItemInHand(InteractionHand.MAIN_HAND).is(Blocks.WOOL.blue().asItem())) {
 				return SLEEP_FAILURE_REASON;
 			}
 
@@ -161,7 +162,7 @@ public void onInitialize() {
 			BlockState bedState = entity.level().getBlockState(sleepingPos);
 
 			if (bedState.is(TEST_BED)) {
-				boolean shouldBeOccupied = !entity.getItemInHand(InteractionHand.MAIN_HAND).is(Items.ORANGE_WOOL);
+				boolean shouldBeOccupied = !entity.getItemInHand(InteractionHand.MAIN_HAND).is(Blocks.WOOL.orange().asItem());
 
 				if (bedState.getValue(TestBedBlock.OCCUPIED) != shouldBeOccupied) {
 					throw new AssertionError("Test bed should " + (!shouldBeOccupied ? "not " : "") + "be occupied");
@@ -185,9 +186,9 @@ public void onInitialize() {
 			// Green wool allows monsters and red wool always "detects" monsters
 			ItemStack stack = player.getItemInHand(InteractionHand.MAIN_HAND);
 
-			if (stack.is(Items.GREEN_WOOL)) {
+			if (stack.is(Blocks.WOOL.green().asItem())) {
 				return EventResult.ALLOW;
-			} else if (stack.is(Items.RED_WOOL)) {
+			} else if (stack.is(Blocks.WOOL.red().asItem())) {
 				return EventResult.DENY;
 			}
 
@@ -196,22 +197,22 @@ public void onInitialize() {
 
 		EntitySleepEvents.ALLOW_SETTING_SPAWN.register((player, sleepingPos) -> {
 			// Don't set spawn if holding white wool
-			return !player.getItemInHand(InteractionHand.MAIN_HAND).is(Items.WHITE_WOOL);
+			return !player.getItemInHand(InteractionHand.MAIN_HAND).is(Blocks.WOOL.white().asItem());
 		});
 
 		EntitySleepEvents.ALLOW_RESETTING_TIME.register(player -> {
 			// Don't allow resetting time if holding black wool
-			return !player.getItemInHand(InteractionHand.MAIN_HAND).is(Items.BLACK_WOOL);
+			return !player.getItemInHand(InteractionHand.MAIN_HAND).is(Blocks.WOOL.black().asItem());
 		});
 
 		EntitySleepEvents.SET_BED_OCCUPATION_STATE.register((entity, sleepingPos, bedState, occupied) -> {
 			// Don't set occupied state if holding orange wool
-			return entity.getItemInHand(InteractionHand.MAIN_HAND).is(Items.ORANGE_WOOL);
+			return entity.getItemInHand(InteractionHand.MAIN_HAND).is(Blocks.WOOL.orange().asItem());
 		});
 
 		EntitySleepEvents.MODIFY_WAKE_UP_POSITION.register((entity, sleepingPos, bedState, wakeUpPos) -> {
 			// If holding cyan wool, wake up 10 blocks above the bed
-			if (entity.getItemInHand(InteractionHand.MAIN_HAND).is(Items.CYAN_WOOL)) {
+			if (entity.getItemInHand(InteractionHand.MAIN_HAND).is(Blocks.WOOL.cyan().asItem())) {
 				return Vec3.atCenterOf(sleepingPos).add(0, 10, 0);
 			}
 
@@ -243,14 +244,14 @@ public void onInitialize() {
 
 	private static void addSleepWools(Player player) {
 		Inventory inventory = player.getInventory();
-		inventory.placeItemBackInInventory(createNamedItem(Items.BLUE_WOOL, "Can't start sleeping"));
-		inventory.placeItemBackInInventory(createNamedItem(Items.YELLOW_WOOL, "Sleep whenever"));
-		inventory.placeItemBackInInventory(createNamedItem(Items.GREEN_WOOL, "Allow nearby monsters"));
-		inventory.placeItemBackInInventory(createNamedItem(Items.RED_WOOL, "Detect nearby monsters"));
-		inventory.placeItemBackInInventory(createNamedItem(Items.WHITE_WOOL, "Don't set spawn"));
-		inventory.placeItemBackInInventory(createNamedItem(Items.BLACK_WOOL, "Don't reset time"));
-		inventory.placeItemBackInInventory(createNamedItem(Items.ORANGE_WOOL, "Don't set occupied state"));
-		inventory.placeItemBackInInventory(createNamedItem(Items.CYAN_WOOL, "Wake up high above"));
+		inventory.placeItemBackInInventory(createNamedItem(Blocks.WOOL.blue().asItem(), "Can't start sleeping"));
+		inventory.placeItemBackInInventory(createNamedItem(Blocks.WOOL.yellow().asItem(), "Sleep whenever"));
+		inventory.placeItemBackInInventory(createNamedItem(Blocks.WOOL.green().asItem(), "Allow nearby monsters"));
+		inventory.placeItemBackInInventory(createNamedItem(Blocks.WOOL.red().asItem(), "Detect nearby monsters"));
+		inventory.placeItemBackInInventory(createNamedItem(Blocks.WOOL.white().asItem(), "Don't set spawn"));
+		inventory.placeItemBackInInventory(createNamedItem(Blocks.WOOL.black().asItem(), "Don't reset time"));
+		inventory.placeItemBackInInventory(createNamedItem(Blocks.WOOL.orange().asItem(), "Don't set occupied state"));
+		inventory.placeItemBackInInventory(createNamedItem(Blocks.WOOL.cyan().asItem(), "Wake up high above"));
 	}
 
 	private static void assertOnServerThread(MinecraftServer server) {
diff --git a/fabric-entity-events-v1/src/testmod/java/net/fabricmc/fabric/test/entity/event/gametest/ServerMobEffectsGameTest.java b/fabric-entity-events-v1/src/testmod/java/net/fabricmc/fabric/test/entity/event/gametest/ServerMobEffectsGameTest.java
index 3b5e553ba3..d57fbeaa74 100644
--- a/fabric-entity-events-v1/src/testmod/java/net/fabricmc/fabric/test/entity/event/gametest/ServerMobEffectsGameTest.java
+++ b/fabric-entity-events-v1/src/testmod/java/net/fabricmc/fabric/test/entity/event/gametest/ServerMobEffectsGameTest.java
@@ -22,7 +22,7 @@
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EntityTypes;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.animal.fish.Salmon;
 import net.minecraft.world.entity.player.Player;
@@ -149,7 +149,7 @@ public void removeNoneExistentEffect(GameTestHelper context) {
 	}
 
 	private static Salmon summonTheSalmon(GameTestHelper context) {
-		Salmon theSalmon = context.spawnWithNoFreeWill(EntityType.SALMON, context.relativeVec(new Vec3(0.0, 1.0, 0.0)));
+		Salmon theSalmon = context.spawnWithNoFreeWill(EntityTypes.SALMON, context.relativeVec(new Vec3(0.0, 1.0, 0.0)));
 		theSalmon.setItemInHand(InteractionHand.MAIN_HAND, new ItemStack(Items.POTATO));
 		return theSalmon;
 	}
diff --git a/fabric-events-interaction-v0/build.gradle b/fabric-events-interaction-v0/build.gradle
index 60da64c69a..5ea804ac6f 100644
--- a/fabric-events-interaction-v0/build.gradle
+++ b/fabric-events-interaction-v0/build.gradle
@@ -1,3 +1,7 @@
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base', 'fabric-networking-api-v1'])
+
+testDependencies(project, [
+    'fabric-client-gametest-api-v1'
+])
diff --git a/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/api/event/client/player/ClientHotbarScrollEvents.java b/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/api/event/client/player/ClientHotbarScrollEvents.java
new file mode 100644
index 0000000000..6f0ededb4b
--- /dev/null
+++ b/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/api/event/client/player/ClientHotbarScrollEvents.java
@@ -0,0 +1,114 @@
+/*
+ * 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.api.event.client.player;
+
+import net.minecraft.world.entity.player.Inventory;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+
+/**
+ * Events pertaining to using the scroll wheel in the hotbar to change the selected item.
+ */
+public final class ClientHotbarScrollEvents {
+	/**
+	 * An event that checks whether the player's scrolling will change the selected hotbar slot.
+	 *
+	 * 
Returning {@code false} cancels the hotbar selection change without running anymore
+	 * registered callbacks.
+	 */
+	public static final Event ALLOW = EventFactory.createArrayBacked(Allow.class, listeners -> (inventory, currentSlot, newSlot, xOffset, yOffset) -> {
+		for (Allow listener : listeners) {
+			boolean allow = listener.allowScroll(inventory, currentSlot, newSlot, xOffset, yOffset);
+
+			if (!allow) {
+				return false;
+			}
+		}
+
+		return true;
+	});
+
+	/**
+	 * An event that is invoked before player scrolling changes the selected hotbar slot.
+	 *
+	 * 
This event is only fired if the result of {@link #ALLOW} is {@code true}.
+	 */
+	public static final Event BEFORE = EventFactory.createArrayBacked(Before.class, listeners -> (inventory, currentSlot, newSlot, xOffset, yOffset) -> {
+		for (Before listener : listeners) {
+			listener.beforeScroll(inventory, currentSlot, newSlot, xOffset, yOffset);
+		}
+	});
+
+	/**
+	 * An event that is invoked after player scrolling changes the selected hotbar slot.
+	 *
+	 * 
This event is only fired if the result of {@link #ALLOW} is {@code true}.
+	 */
+	public static final Event AFTER = EventFactory.createArrayBacked(After.class, listeners -> (inventory, currentSlot, newSlot, xOffset, yOffset) -> {
+		for (After listener : listeners) {
+			listener.afterScroll(inventory, currentSlot, newSlot, xOffset, yOffset);
+		}
+	});
+
+	@FunctionalInterface
+	public interface Allow {
+		/**
+		 * Called before player scrolling changes the selected slot.
+		 *
+		 * @param inventory The player's inventory.
+		 * @param currentSlot The currently selected slot before changing.
+		 * @param newSlot The slot about to be selected.
+		 * @param xOffset The X scroll offset.
+		 * @param yOffset The Y scroll offset.
+		 * @return {@code true} if the selected slot will change to {@code newSlot}, otherwise
+		 * {@code false} if the slot will remain {@code currentSlot}.
+		 */
+		boolean allowScroll(Inventory inventory, int currentSlot, int newSlot, double xOffset, double yOffset);
+	}
+
+	@FunctionalInterface
+	public interface Before {
+		/**
+		 * Called before player scrolling changes the selected slot.
+		 *
+		 * @param inventory The player's inventory.
+		 * @param currentSlot The currently selected slot before changing.
+		 * @param newSlot The slot about to be selected.
+		 * @param xOffset The X scroll offset.
+		 * @param yOffset The Y scroll offset.
+		 */
+		void beforeScroll(Inventory inventory, int currentSlot, int newSlot, double xOffset, double yOffset);
+	}
+
+	@FunctionalInterface
+	public interface After {
+		/**
+		 * Called after player scrolling changes the selected slot.
+		 *
+		 * @param inventory The player's inventory.
+		 * @param currentSlot The currently selected slot before changing.
+		 * @param newSlot The slot about to be selected.
+		 * @param xOffset The X scroll offset.
+		 * @param yOffset The Y scroll offset.
+		 */
+		void afterScroll(Inventory inventory, int currentSlot, int newSlot, double xOffset, double yOffset);
+	}
+
+	private ClientHotbarScrollEvents() {
+	}
+}
diff --git a/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MinecraftMixin.java b/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MinecraftMixin.java
index 61ba2ca4ce..71b3a96f8d 100644
--- a/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MinecraftMixin.java
+++ b/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MinecraftMixin.java
@@ -16,7 +16,6 @@
 
 package net.fabricmc.fabric.mixin.event.interaction.client;
 
-import com.llamalad7.mixinextras.sugar.Local;
 import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -30,18 +29,10 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.Options;
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.client.multiplayer.MultiPlayerGameMode;
 import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.network.protocol.game.ServerboundInteractPacket;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.phys.EntityHitResult;
-import net.minecraft.world.phys.Vec3;
 
 import net.fabricmc.fabric.api.event.client.player.ClientPreAttackCallback;
-import net.fabricmc.fabric.api.event.player.UseEntityCallback;
 
 @Mixin(Minecraft.class)
 public abstract class MinecraftMixin {
@@ -51,9 +42,6 @@ public abstract class MinecraftMixin {
 	@Shadow
 	public LocalPlayer player;
 
-	@Shadow
-	public abstract ClientPacketListener getConnection();
-
 	@Shadow
 	@Final
 	public Options options;
@@ -66,33 +54,6 @@ public abstract class MinecraftMixin {
 	@Nullable
 	public ClientLevel level;
 
-	@Inject(
-			at = @At(
-					value = "INVOKE",
-					target = "Lnet/minecraft/client/multiplayer/MultiPlayerGameMode;interact(Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/EntityHitResult;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult;"
-			),
-			method = "startUseItem",
-			cancellable = true
-	)
-	private void injectUseEntityCallback(CallbackInfo ci, @Local(name = "hand") InteractionHand hand, @Local(name = "entityHit") EntityHitResult hitResult, @Local(name = "entity") Entity entity) {
-		InteractionResult result = UseEntityCallback.EVENT.invoker().interact(player, player.level(), hand, entity, hitResult);
-
-		if (result != InteractionResult.PASS) {
-			if (result.consumesAction()) {
-				Vec3 hitVec = hitResult.getLocation().subtract(entity.getX(), entity.getY(), entity.getZ());
-				getConnection().send(new ServerboundInteractPacket(entity.getId(), hand, hitVec, player.isShiftKeyDown()));
-			}
-
-			if (result instanceof InteractionResult.Success success) {
-				if (success.swingSource() == InteractionResult.SwingSource.CLIENT) {
-					player.swing(hand);
-				}
-			}
-
-			ci.cancel();
-		}
-	}
-
 	@Inject(
 			method = "handleKeybinds",
 			at = @At(
diff --git a/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MouseHandlerMixin.java b/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MouseHandlerMixin.java
new file mode 100644
index 0000000000..b7abbceb98
--- /dev/null
+++ b/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MouseHandlerMixin.java
@@ -0,0 +1,53 @@
+/*
+ * 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.mixin.event.interaction.client;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import net.minecraft.client.MouseHandler;
+import net.minecraft.world.entity.player.Inventory;
+
+import net.fabricmc.fabric.api.event.client.player.ClientHotbarScrollEvents;
+
+@Mixin(MouseHandler.class)
+public abstract class MouseHandlerMixin {
+	@WrapOperation(
+			method = "onScroll",
+			at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Inventory;setSelectedSlot(I)V")
+	)
+	private void wrapSelectedSlot(
+			Inventory instance,
+			int selected,
+			Operation original,
+			// we must use scaled offsets so that the scroll sensitivity applies
+			@Local(name = "scaledXOffset") double scaledXOffset,
+			@Local(name = "scaledYOffset") double scaledYOffset
+	) {
+		int currentSlot = instance.getSelectedSlot();
+		boolean allow = ClientHotbarScrollEvents.ALLOW.invoker().allowScroll(instance, currentSlot, selected, scaledXOffset, scaledYOffset);
+
+		if (allow) {
+			ClientHotbarScrollEvents.BEFORE.invoker().beforeScroll(instance, currentSlot, selected, scaledXOffset, scaledYOffset);
+			original.call(instance, selected);
+			ClientHotbarScrollEvents.AFTER.invoker().afterScroll(instance, currentSlot, selected, scaledXOffset, scaledYOffset);
+		}
+	}
+}
diff --git a/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MultiPlayerGameModeMixin.java b/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MultiPlayerGameModeMixin.java
index 2d03e488b6..da3af4a8e2 100644
--- a/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MultiPlayerGameModeMixin.java
+++ b/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MultiPlayerGameModeMixin.java
@@ -20,126 +20,25 @@
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.client.multiplayer.MultiPlayerGameMode;
-import net.minecraft.client.multiplayer.prediction.PredictiveAction;
-import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.network.protocol.game.ServerboundAttackPacket;
-import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
-import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
-import net.minecraft.network.protocol.game.ServerboundUseItemPacket;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.BlockHitResult;
 
 import net.fabricmc.fabric.api.event.client.player.ClientPlayerBlockBreakEvents;
-import net.fabricmc.fabric.api.event.player.AttackBlockCallback;
-import net.fabricmc.fabric.api.event.player.AttackEntityCallback;
-import net.fabricmc.fabric.api.event.player.UseBlockCallback;
-import net.fabricmc.fabric.api.event.player.UseItemCallback;
 
 @Mixin(MultiPlayerGameMode.class)
 public abstract class MultiPlayerGameModeMixin {
 	@Shadow
 	@Final
 	private Minecraft minecraft;
-	@Shadow
-	@Final
-	private ClientPacketListener connection;
-
-	@Shadow
-	protected abstract void startPrediction(ClientLevel clientLevel, PredictiveAction predictiveAction);
-
-	@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;getAbilities()Lnet/minecraft/world/entity/player/Abilities;", ordinal = 0), method = "startDestroyBlock", cancellable = true)
-	public void attackBlock(BlockPos pos, Direction direction, CallbackInfoReturnable info) {
-		fabric_fireAttackBlockCallback(pos, direction, info);
-	}
-
-	@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;getAbilities()Lnet/minecraft/world/entity/player/Abilities;", ordinal = 0), method = "continueDestroyBlock", cancellable = true)
-	public void method_2902(BlockPos pos, Direction direction, CallbackInfoReturnable info) {
-		if (this.minecraft.player.getAbilities().instabuild) {
-			fabric_fireAttackBlockCallback(pos, direction, info);
-		}
-	}
-
-	@Unique
-	private void fabric_fireAttackBlockCallback(BlockPos pos, Direction direction, CallbackInfoReturnable info) {
-		InteractionResult result = AttackBlockCallback.EVENT.invoker().interact(minecraft.player, minecraft.level, InteractionHand.MAIN_HAND, pos, direction);
-
-		if (result != InteractionResult.PASS) {
-			// Returning true will spawn particles and trigger the animation of the hand -> only for SUCCESS.
-			info.setReturnValue(result == InteractionResult.SUCCESS);
-
-			// We also need to let the server process the action if it's accepted.
-			if (result.consumesAction()) {
-				startPrediction(minecraft.level, id -> new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, pos, direction, id));
-			}
-		}
-	}
 
 	@Inject(method = "destroyBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/Block;destroy(Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V"))
 	private void fabric$onBlockBroken(BlockPos pos, CallbackInfoReturnable cir, @Local(name = "oldState") BlockState oldState) {
 		ClientPlayerBlockBreakEvents.AFTER.invoker().afterBlockBreak(minecraft.level, minecraft.player, pos, oldState);
 	}
-
-	@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/MultiPlayerGameMode;startPrediction(Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/client/multiplayer/prediction/PredictiveAction;)V"), method = "useItemOn", cancellable = true)
-	public void interactBlock(LocalPlayer player, InteractionHand hand, BlockHitResult blockHitResult, CallbackInfoReturnable info) {
-		// hook interactBlock between the world border check and the actual block interaction to invoke the use block event first
-		// this needs to be in interactBlock to avoid sending a packet in line with the event javadoc
-
-		if (player.isSpectator()) return; // vanilla spectator check happens later, repeat it before the event to avoid false invocations
-
-		InteractionResult result = UseBlockCallback.EVENT.invoker().interact(player, player.level(), hand, blockHitResult);
-
-		if (result != InteractionResult.PASS) {
-			if (result.consumesAction()) {
-				// send interaction packet to the server with a new sequentially assigned id
-				startPrediction((ClientLevel) player.level(), id -> new ServerboundUseItemOnPacket(hand, blockHitResult, id));
-			}
-
-			info.setReturnValue(result);
-		}
-	}
-
-	@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/MultiPlayerGameMode;ensureHasSentCarriedItem()V", ordinal = 0), method = "useItem", cancellable = true)
-	public void interactItem(Player player, InteractionHand hand, CallbackInfoReturnable info) {
-		// hook interactBlock between the spectator check and sending the first packet to invoke the use item event first
-		// this needs to be in interactBlock to avoid sending a packet in line with the event javadoc
-		InteractionResult result = UseItemCallback.EVENT.invoker().interact(player, player.level(), hand);
-
-		if (result != InteractionResult.PASS) {
-			if (result == InteractionResult.SUCCESS) {
-				// send interaction packet to the server with a new sequentially assigned id
-				startPrediction((ClientLevel) player.level(), id -> new ServerboundUseItemPacket(hand, id, player.getYRot(), player.getXRot()));
-			}
-
-			info.setReturnValue(result);
-		}
-	}
-
-	@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientPacketListener;send(Lnet/minecraft/network/protocol/Packet;)V", ordinal = 0), method = "attack", cancellable = true)
-	public void attackEntity(Player player, Entity entity, CallbackInfo info) {
-		InteractionResult result = AttackEntityCallback.EVENT.invoker().interact(player, player.level(), InteractionHand.MAIN_HAND /* TODO */, entity, null);
-
-		if (result != InteractionResult.PASS) {
-			if (result == InteractionResult.SUCCESS) {
-				this.connection.send(new ServerboundAttackPacket(entity.getId()));
-			}
-
-			info.cancel();
-		}
-	}
 }
diff --git a/fabric-events-interaction-v0/src/client/resources/fabric-events-interaction-v0.client.mixins.json b/fabric-events-interaction-v0/src/client/resources/fabric-events-interaction-v0.client.mixins.json
index ed78848007..c8d86f60cf 100644
--- a/fabric-events-interaction-v0/src/client/resources/fabric-events-interaction-v0.client.mixins.json
+++ b/fabric-events-interaction-v0/src/client/resources/fabric-events-interaction-v0.client.mixins.json
@@ -5,7 +5,8 @@
   "client": [
     "MultiPlayerGameModeMixin",
     "KeyMappingAccessor",
-    "MinecraftMixin"
+    "MinecraftMixin",
+    "MouseHandlerMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/api/entity/FakePlayer.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/api/entity/FakePlayer.java
index 13da2a6636..87205d735c 100644
--- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/api/entity/FakePlayer.java
+++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/api/entity/FakePlayer.java
@@ -18,25 +18,13 @@
 
 import java.util.Map;
 import java.util.Objects;
-import java.util.OptionalInt;
 import java.util.UUID;
 
 import com.google.common.collect.MapMaker;
 import com.mojang.authlib.GameProfile;
-import org.jspecify.annotations.Nullable;
 
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ClientInformation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.stats.Stat;
-import net.minecraft.world.Container;
-import net.minecraft.world.MenuProvider;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.animal.equine.AbstractHorse;
-import net.minecraft.world.level.block.entity.SignBlockEntity;
-import net.minecraft.world.scores.PlayerTeam;
 
 import net.fabricmc.fabric.impl.event.interaction.FakePlayerPacketListener;
 
@@ -61,7 +49,7 @@
  * In some edge cases, or for gameplay considerations, it might be necessary to check whether a {@link ServerPlayer} is a fake player.
  * This can be done with an {@code instanceof} check: {@code player instanceof FakePlayer}.
  */
-public class FakePlayer extends ServerPlayer {
+public class FakePlayer extends net.neoforged.neoforge.common.util.FakePlayer {
 	/**
 	 * Default UUID, for fake players not associated with a specific (human) player.
 	 */
@@ -102,53 +90,8 @@ private record FakePlayerKey(ServerLevel level, GameProfile profile) { }
 	private static final Map FAKE_PLAYER_MAP = new MapMaker().weakValues().makeMap();
 
 	protected FakePlayer(ServerLevel level, GameProfile profile) {
-		super(level.getServer(), level, profile, ClientInformation.createDefault());
+		super(level, profile);
 
 		this.connection = new FakePlayerPacketListener(this);
 	}
-
-	@Override
-	public void tick() { }
-
-	@Override
-	public void updateOptions(ClientInformation settings) { }
-
-	@Override
-	public void awardStat(Stat stat, int amount) { }
-
-	@Override
-	public void resetStat(Stat stat) { }
-
-	@Override
-	public boolean isInvulnerableTo(ServerLevel level, DamageSource damageSource) {
-		return true;
-	}
-
-	@Nullable
-	@Override
-	public PlayerTeam getTeam() {
-		// Scoreboard team is checked using the gameprofile name by default, which we don't want.
-		return null;
-	}
-
-	@Override
-	public void startSleeping(BlockPos pos) {
-		// Don't lock bed forever.
-	}
-
-	@Override
-	public boolean startRiding(Entity entity, boolean force, boolean emitEvent) {
-		return false;
-	}
-
-	@Override
-	public void openTextEdit(SignBlockEntity sign, boolean front) { }
-
-	@Override
-	public OptionalInt openMenu(@Nullable MenuProvider factory) {
-		return OptionalInt.empty();
-	}
-
-	@Override
-	public void openHorseInventory(AbstractHorse horse, Container inventory) { }
 }
diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/api/event/player/UseEntityCallback.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/api/event/player/UseEntityCallback.java
index 0bba571590..2692319a25 100644
--- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/api/event/player/UseEntityCallback.java
+++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/api/event/player/UseEntityCallback.java
@@ -16,15 +16,12 @@
 
 package net.fabricmc.fabric.api.event.player;
 
-import org.jspecify.annotations.Nullable;
-
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.EntityHitResult;
-import net.minecraft.world.phys.Vec3;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
@@ -46,10 +43,6 @@
  *     
  • PASS falls back to further processing.
    • 
  *     
  • Any other value cancels further processing.
    • 
  * 
- *
- * 
    Note that on the server, the {@link EntityHitResult} may be {@code null} if the client successfully interacted using
- * the {@linkplain Player#interactOn(Entity, InteractionHand, Vec3)}  position-less overload}.
- * On the client, the {@link EntityHitResult} will never be null.
  */
 public interface UseEntityCallback {
 	Event EVENT = EventFactory.createArrayBacked(UseEntityCallback.class,
@@ -66,5 +59,5 @@ public interface UseEntityCallback {
 			}
 	);
 
-	InteractionResult interact(Player player, Level level, InteractionHand hand, Entity entity, @Nullable EntityHitResult hitResult);
+	InteractionResult interact(Player player, Level level, InteractionHand hand, Entity entity, EntityHitResult hitResult);
 }
diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/impl/event/interaction/FakePlayerPacketListener.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/impl/event/interaction/FakePlayerPacketListener.java
index d842d44ca5..b994dfe2eb 100644
--- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/impl/event/interaction/FakePlayerPacketListener.java
+++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/impl/event/interaction/FakePlayerPacketListener.java
@@ -16,15 +16,71 @@
 
 package net.fabricmc.fabric.impl.event.interaction;
 
+import java.util.Set;
+
 import io.netty.channel.ChannelFutureListener;
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.network.Connection;
+import net.minecraft.network.DisconnectionDetails;
+import net.minecraft.network.PacketListener;
+import net.minecraft.network.chat.ChatType;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.PlayerChatMessage;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.PacketFlow;
+import net.minecraft.network.protocol.common.ServerboundClientInformationPacket;
+import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
+import net.minecraft.network.protocol.common.ServerboundKeepAlivePacket;
+import net.minecraft.network.protocol.common.ServerboundResourcePackPacket;
+import net.minecraft.network.protocol.game.ServerboundAcceptTeleportationPacket;
+import net.minecraft.network.protocol.game.ServerboundBlockEntityTagQueryPacket;
+import net.minecraft.network.protocol.game.ServerboundChangeDifficultyPacket;
+import net.minecraft.network.protocol.game.ServerboundChatAckPacket;
+import net.minecraft.network.protocol.game.ServerboundChatCommandPacket;
+import net.minecraft.network.protocol.game.ServerboundChatPacket;
+import net.minecraft.network.protocol.game.ServerboundChatSessionUpdatePacket;
+import net.minecraft.network.protocol.game.ServerboundClientCommandPacket;
+import net.minecraft.network.protocol.game.ServerboundCommandSuggestionPacket;
+import net.minecraft.network.protocol.game.ServerboundContainerButtonClickPacket;
+import net.minecraft.network.protocol.game.ServerboundContainerClickPacket;
+import net.minecraft.network.protocol.game.ServerboundContainerClosePacket;
+import net.minecraft.network.protocol.game.ServerboundEditBookPacket;
+import net.minecraft.network.protocol.game.ServerboundEntityTagQueryPacket;
+import net.minecraft.network.protocol.game.ServerboundInteractPacket;
+import net.minecraft.network.protocol.game.ServerboundJigsawGeneratePacket;
+import net.minecraft.network.protocol.game.ServerboundLockDifficultyPacket;
+import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
+import net.minecraft.network.protocol.game.ServerboundMoveVehiclePacket;
+import net.minecraft.network.protocol.game.ServerboundPaddleBoatPacket;
+import net.minecraft.network.protocol.game.ServerboundPlaceRecipePacket;
+import net.minecraft.network.protocol.game.ServerboundPlayerAbilitiesPacket;
+import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
+import net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket;
+import net.minecraft.network.protocol.game.ServerboundPlayerInputPacket;
+import net.minecraft.network.protocol.game.ServerboundRecipeBookChangeSettingsPacket;
+import net.minecraft.network.protocol.game.ServerboundRecipeBookSeenRecipePacket;
+import net.minecraft.network.protocol.game.ServerboundRenameItemPacket;
+import net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket;
+import net.minecraft.network.protocol.game.ServerboundSelectTradePacket;
+import net.minecraft.network.protocol.game.ServerboundSetBeaconPacket;
+import net.minecraft.network.protocol.game.ServerboundSetCarriedItemPacket;
+import net.minecraft.network.protocol.game.ServerboundSetCommandBlockPacket;
+import net.minecraft.network.protocol.game.ServerboundSetCommandMinecartPacket;
+import net.minecraft.network.protocol.game.ServerboundSetCreativeModeSlotPacket;
+import net.minecraft.network.protocol.game.ServerboundSetJigsawBlockPacket;
+import net.minecraft.network.protocol.game.ServerboundSetStructureBlockPacket;
+import net.minecraft.network.protocol.game.ServerboundSignUpdatePacket;
+import net.minecraft.network.protocol.game.ServerboundSwingPacket;
+import net.minecraft.network.protocol.game.ServerboundTeleportToEntityPacket;
+import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
+import net.minecraft.network.protocol.game.ServerboundUseItemPacket;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.CommonListenerCookie;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import net.minecraft.world.entity.PositionMoveRotation;
+import net.minecraft.world.entity.Relative;
 
 import net.fabricmc.fabric.impl.networking.UntrackedPacketListener;
 
@@ -36,11 +92,245 @@ public FakePlayerPacketListener(ServerPlayer player) {
 	}
 
 	@Override
-	public void send(Packet packet, @Nullable ChannelFutureListener callbacks) { }
+	public void tick() {
+	}
+
+	@Override
+	public void resetPosition() {
+	}
+
+	@Override
+	public void disconnect(Component message) {
+	}
+
+	@Override
+	public void handlePlayerInput(ServerboundPlayerInputPacket packet) {
+	}
+
+	@Override
+	public void handleMoveVehicle(ServerboundMoveVehiclePacket packet) {
+	}
+
+	@Override
+	public void handleAcceptTeleportPacket(ServerboundAcceptTeleportationPacket packet) {
+	}
+
+	@Override
+	public void handleRecipeBookSeenRecipePacket(ServerboundRecipeBookSeenRecipePacket packet) {
+	}
+
+	@Override
+	public void handleRecipeBookChangeSettingsPacket(ServerboundRecipeBookChangeSettingsPacket packet) {
+	}
+
+	@Override
+	public void handleSeenAdvancements(ServerboundSeenAdvancementsPacket packet) {
+	}
+
+	@Override
+	public void handleCustomCommandSuggestions(ServerboundCommandSuggestionPacket packet) {
+	}
+
+	@Override
+	public void handleSetCommandBlock(ServerboundSetCommandBlockPacket packet) {
+	}
+
+	@Override
+	public void handleSetCommandMinecart(ServerboundSetCommandMinecartPacket packet) {
+	}
+
+	@Override
+	public void handleRenameItem(ServerboundRenameItemPacket packet) {
+	}
+
+	@Override
+	public void handleSetBeaconPacket(ServerboundSetBeaconPacket packet) {
+	}
+
+	@Override
+	public void handleSetStructureBlock(ServerboundSetStructureBlockPacket packet) {
+	}
+
+	@Override
+	public void handleSetJigsawBlock(ServerboundSetJigsawBlockPacket packet) {
+	}
+
+	@Override
+	public void handleJigsawGenerate(ServerboundJigsawGeneratePacket packet) {
+	}
+
+	@Override
+	public void handleSelectTrade(ServerboundSelectTradePacket packet) {
+	}
+
+	@Override
+	public void handleEditBook(ServerboundEditBookPacket packet) {
+	}
+
+	@Override
+	public void handleEntityTagQuery(ServerboundEntityTagQueryPacket packet) {
+	}
+
+	@Override
+	public void handleBlockEntityTagQuery(ServerboundBlockEntityTagQueryPacket packet) {
+	}
+
+	@Override
+	public void handleMovePlayer(ServerboundMovePlayerPacket packet) {
+	}
+
+	@Override
+	public void teleport(double x, double y, double z, float yaw, float pitch) {
+	}
+
+	@Override
+	public void handlePlayerAction(ServerboundPlayerActionPacket packet) {
+	}
+
+	@Override
+	public void handleUseItemOn(ServerboundUseItemOnPacket packet) {
+	}
+
+	@Override
+	public void handleUseItem(ServerboundUseItemPacket packet) {
+	}
+
+	@Override
+	public void handleTeleportToEntityPacket(ServerboundTeleportToEntityPacket packet) {
+	}
+
+	@Override
+	public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
+	}
+
+	@Override
+	public void handlePaddleBoat(ServerboundPaddleBoatPacket packet) {
+	}
+
+	@Override
+	public void onDisconnect(DisconnectionDetails details) {
+	}
+
+	@Override
+	public void send(Packet packet) {
+	}
+
+	@Override
+	public void send(Packet packet, @Nullable ChannelFutureListener sendListener) {
+	}
+
+	@Override
+	public void handleSetCarriedItem(ServerboundSetCarriedItemPacket packet) {
+	}
+
+	@Override
+	public void handleChat(ServerboundChatPacket packet) {
+	}
+
+	@Override
+	public void handleAnimate(ServerboundSwingPacket packet) {
+	}
+
+	@Override
+	public void handlePlayerCommand(ServerboundPlayerCommandPacket packet) {
+	}
+
+	@Override
+	public void handleInteract(ServerboundInteractPacket packet) {
+	}
+
+	@Override
+	public void handleClientCommand(ServerboundClientCommandPacket packet) {
+	}
+
+	@Override
+	public void handleContainerClose(ServerboundContainerClosePacket packet) {
+	}
+
+	@Override
+	public void handleContainerClick(ServerboundContainerClickPacket packet) {
+	}
+
+	@Override
+	public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) {
+	}
+
+	@Override
+	public void handleContainerButtonClick(ServerboundContainerButtonClickPacket packet) {
+	}
+
+	@Override
+	public void handleSetCreativeModeSlot(ServerboundSetCreativeModeSlotPacket packet) {
+	}
+
+	@Override
+	public void handleSignUpdate(ServerboundSignUpdatePacket packet) {
+	}
+
+	@Override
+	public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
+	}
+
+	@Override
+	public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
+	}
+
+	@Override
+	public void handleClientInformation(ServerboundClientInformationPacket packet) {
+	}
+
+	@Override
+	public void handlePlayerAbilities(ServerboundPlayerAbilitiesPacket packet) {
+	}
+
+	@Override
+	public void handleChangeDifficulty(ServerboundChangeDifficultyPacket packet) {
+	}
+
+	@Override
+	public void handleLockDifficulty(ServerboundLockDifficultyPacket packet) {
+	}
+
+	@Override
+	public void teleport(PositionMoveRotation posMoveRot, Set relatives) {
+	}
+
+	@Override
+	public void ackBlockChangesUpTo(int sequence) {
+	}
+
+	@Override
+	public void handleChatCommand(ServerboundChatCommandPacket packet) {
+	}
+
+	@Override
+	public void handleChatAck(ServerboundChatAckPacket packet) {
+	}
+
+	@Override
+	public void sendPlayerChatMessage(PlayerChatMessage message, ChatType.Bound boundChatType) {
+	}
+
+	@Override
+	public void sendDisguisedChatMessage(Component content, ChatType.Bound boundChatType) {
+	}
+
+	@Override
+	public void handleChatSessionUpdate(ServerboundChatSessionUpdatePacket packet) {
+	}
+
+	@Override
+	public boolean hasChannel(Identifier payloadId) {
+		return false;
+	}
 
 	private static final class FakeConnection extends Connection {
 		private FakeConnection() {
 			super(PacketFlow.CLIENTBOUND);
 		}
+
+		@Override
+		public void setListenerForServerboundHandshake(PacketListener listener) {
+		}
 	}
 }
diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/impl/event/interaction/InteractionEventHooks.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/impl/event/interaction/InteractionEventHooks.java
new file mode 100644
index 0000000000..e641ef35e5
--- /dev/null
+++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/impl/event/interaction/InteractionEventHooks.java
@@ -0,0 +1,115 @@
+package net.fabricmc.fabric.impl.event.interaction;
+
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.event.entity.player.AttackEntityEvent;
+import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
+import net.neoforged.neoforge.event.entity.player.UseItemOnBlockEvent;
+import net.neoforged.neoforge.event.entity.player.UseItemOnBlockEvent.UsePhase;
+import net.neoforged.neoforge.event.level.block.BreakBlockEvent;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.util.TriState;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.EntityHitResult;
+
+import net.fabricmc.fabric.api.event.player.AttackBlockCallback;
+import net.fabricmc.fabric.api.event.player.AttackEntityCallback;
+import net.fabricmc.fabric.api.event.player.ItemEvents;
+import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents;
+import net.fabricmc.fabric.api.event.player.UseBlockCallback;
+import net.fabricmc.fabric.api.event.player.UseEntityCallback;
+import net.fabricmc.fabric.api.event.player.UseItemCallback;
+
+@EventBusSubscriber
+public final class InteractionEventHooks {
+
+	@SubscribeEvent
+	public static void onEntityInteractAt(PlayerInteractEvent.EntityInteract event) {
+		Entity entity = event.getTarget();
+		EntityHitResult hitResult = new EntityHitResult(entity, event.getLocation().add(entity.position()));
+		InteractionResult result = UseEntityCallback.EVENT.invoker().interact(event.getEntity(), event.getLevel(), event.getHand(), entity, hitResult);
+		if (result != InteractionResult.PASS) {
+			event.setCanceled(true);
+			event.setCancellationResult(result);
+		}
+	}
+
+	@SubscribeEvent
+	public static void onAttackEntity(AttackEntityEvent event) {
+		Player player = event.getEntity();
+		InteractionResult result = AttackEntityCallback.EVENT.invoker().interact(player, player.level(), InteractionHand.MAIN_HAND, event.getTarget(), null);
+		if (result != InteractionResult.PASS) {
+			event.setCanceled(true);
+		}
+	}
+
+	@SubscribeEvent
+	public static void onLeftClickBlock(PlayerInteractEvent.LeftClickBlock event) {
+		if (event.getAction() == PlayerInteractEvent.LeftClickBlock.Action.START) {
+			InteractionResult result = AttackBlockCallback.EVENT.invoker().interact(event.getEntity(), event.getLevel(), event.getHand(), event.getPos(), event.getFace());
+			if (result != InteractionResult.PASS) {
+				// Returning true will spawn particles and trigger the animation of the hand -> only for SUCCESS.
+				// TODO TEST
+				event.setUseBlock(result == InteractionResult.SUCCESS ? TriState.TRUE : TriState.FALSE);
+				event.setUseItem(result == InteractionResult.SUCCESS ? TriState.TRUE : TriState.FALSE);
+			}
+		}
+	}
+
+	@SubscribeEvent
+	public static void onRightClickBlock(PlayerInteractEvent.RightClickBlock event) {
+		InteractionResult result = UseBlockCallback.EVENT.invoker().interact(event.getEntity(), event.getLevel(), event.getHand(), event.getHitVec());
+		if (result != InteractionResult.PASS) {
+			event.setCanceled(true);
+			event.setCancellationResult(result);
+		}
+	}
+
+	@SubscribeEvent
+	public static void onRightClickItem(PlayerInteractEvent.RightClickItem event) {
+		InteractionResult result = UseItemCallback.EVENT.invoker().interact(event.getEntity(), event.getLevel(), event.getHand());
+		if (result != InteractionResult.PASS) {
+			event.setCanceled(true);
+			event.setCancellationResult(result);
+		}
+	}
+
+	@SubscribeEvent
+	public static void onBlockBreak(BreakBlockEvent event) {
+		Player player = event.getPlayer();
+		Level level = player.level();
+		if (level.isClientSide()) return;
+
+		BlockPos pos = event.getPos();
+		BlockState state = event.getState();
+		BlockEntity be = level.getBlockEntity(pos);
+		boolean result = PlayerBlockBreakEvents.BEFORE.invoker().beforeBlockBreak(level, player, pos, state, be);
+
+		if (!result) {
+			PlayerBlockBreakEvents.CANCELED.invoker().onBlockBreakCanceled(level, player, pos, state, be);
+
+			event.setCanceled(true);
+		}
+	}
+
+	@SubscribeEvent
+	public static void onUseItemOnBlock(UseItemOnBlockEvent event) {
+		if (event.getUsePhase() == UsePhase.ITEM_AFTER_BLOCK) {
+			InteractionResult result = ItemEvents.USE_ON.invoker().useOn(event.getUseOnContext());
+			if (result != null && result != InteractionResult.PASS) {
+				event.setCanceled(true);
+				event.setCancellationResult(result);
+			}
+		}
+	}
+
+	private InteractionEventHooks() {
+	}
+}
diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ItemStackMixin.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ItemStackMixin.java
index 08f5acb363..e34954deac 100644
--- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ItemStackMixin.java
+++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ItemStackMixin.java
@@ -26,7 +26,6 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
 
 import net.fabricmc.fabric.api.event.player.ItemEvents;
@@ -43,15 +42,4 @@ private InteractionResult handleUseEvent(Item instance, Level level, Player play
 
 		return original.call(instance, level, player, interactionHand);
 	}
-
-	@WrapOperation(method = "useOn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/Item;useOn(Lnet/minecraft/world/item/context/UseOnContext;)Lnet/minecraft/world/InteractionResult;"))
-	private InteractionResult handleUseOnEvent(Item instance, UseOnContext useOnContext, Operation original) {
-		InteractionResult result = ItemEvents.USE_ON.invoker().useOn(useOnContext);
-
-		if (result != null) {
-			return result;
-		}
-
-		return original.call(instance, useOnContext);
-	}
 }
diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerGamePacketListenerImplMixin.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerGamePacketListenerImplMixin.java
index 72b5705a50..bd75dcbdf5 100644
--- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerGamePacketListenerImplMixin.java
+++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerGamePacketListenerImplMixin.java
@@ -22,25 +22,19 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.core.BlockPos;
-import net.minecraft.network.protocol.game.ServerboundInteractPacket;
 import net.minecraft.network.protocol.game.ServerboundPickItemFromBlockPacket;
 import net.minecraft.network.protocol.game.ServerboundPickItemFromEntityPacket;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
-import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.EntityHitResult;
 
 import net.fabricmc.fabric.api.event.player.PlayerPickItemEvents;
-import net.fabricmc.fabric.api.event.player.UseEntityCallback;
 
 @Mixin(ServerGamePacketListenerImpl.class)
 public abstract class ServerGamePacketListenerImplMixin {
@@ -52,12 +46,12 @@ private void tryPickItem(ItemStack stack) {
 		throw new AssertionError();
 	}
 
-	@WrapOperation(method = "handlePickItemFromBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;getCloneItemStack(Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;Z)Lnet/minecraft/world/item/ItemStack;"))
-	public ItemStack onPickItemFromBlock(BlockState state, LevelReader level, BlockPos pos, boolean includeData, Operation operation, @Local(argsOnly = true) ServerboundPickItemFromBlockPacket packet) {
-		ItemStack stack = PlayerPickItemEvents.BLOCK.invoker().onPickItemFromBlock(player, pos, state, packet.includeData());
+	@WrapOperation(method = "handlePickItemFromBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;getCloneItemStack(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/LevelReader;ZLnet/minecraft/world/entity/player/Player;)Lnet/minecraft/world/item/ItemStack;"))
+	public ItemStack onPickItemFromBlock(BlockState state, BlockPos pos, LevelReader level, boolean includeData, Player player, Operation operation, @Local(argsOnly = true) ServerboundPickItemFromBlockPacket packet) {
+		ItemStack stack = PlayerPickItemEvents.BLOCK.invoker().onPickItemFromBlock(this.player, pos, state, packet.includeData());
 
 		if (stack == null) {
-			return operation.call(state, level, pos, includeData);
+			return operation.call(state, pos, level, includeData, player);
 		} else if (!stack.isEmpty()) {
 			this.tryPickItem(stack);
 		}
@@ -79,16 +73,4 @@ public ItemStack onPickItemFromEntity(Entity entity, Operation operat
 		// Prevent vanilla data-inclusion behavior
 		return ItemStack.EMPTY;
 	}
-
-	@Inject(method = "handleInteract", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;getItemInHand(Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/item/ItemStack;"), cancellable = true)
-	public void handleInteract(ServerboundInteractPacket packet, CallbackInfo info, @Local(name = "target") Entity target) {
-		Level level = player.level();
-
-		EntityHitResult hitResult = new EntityHitResult(target, packet.location().add(target.getX(), target.getY(), target.getZ()));
-		InteractionResult result = UseEntityCallback.EVENT.invoker().interact(player, level, packet.hand(), target, hitResult);
-
-		if (result != InteractionResult.PASS) {
-			info.cancel();
-		}
-	}
 }
diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerGameModeMixin.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerGameModeMixin.java
index 37580d2c10..aaf07e4298 100644
--- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerGameModeMixin.java
+++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerGameModeMixin.java
@@ -16,36 +16,24 @@
 
 package net.fabricmc.fabric.mixin.event.interaction;
 
-import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.world.item.ItemStack;
+
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.ClientGamePacketListener;
-import net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket;
-import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.level.ServerPlayerGameMode;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.BlockHitResult;
 
-import net.fabricmc.fabric.api.event.player.AttackBlockCallback;
 import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents;
-import net.fabricmc.fabric.api.event.player.UseBlockCallback;
-import net.fabricmc.fabric.api.event.player.UseItemCallback;
 
 @Mixin(ServerPlayerGameMode.class)
 public class ServerPlayerGameModeMixin {
@@ -56,66 +44,9 @@ public class ServerPlayerGameModeMixin {
 	@Shadow
 	protected ServerLevel level;
 
-	@Inject(at = @At("HEAD"), method = "handleBlockBreakAction", cancellable = true)
-	public void startBlockBreak(BlockPos pos, ServerboundPlayerActionPacket.Action playerAction, Direction direction, int worldHeight, int i, CallbackInfo info) {
-		if (playerAction != ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK) return;
-		InteractionResult result = AttackBlockCallback.EVENT.invoker().interact(player, level, InteractionHand.MAIN_HAND, pos, direction);
-
-		if (result != InteractionResult.PASS) {
-			// The client might have broken the block on its side, so make sure to let it know.
-			this.player.connection.send(new ClientboundBlockUpdatePacket(level, pos));
-
-			if (level.getBlockState(pos).hasBlockEntity()) {
-				BlockEntity blockEntity = level.getBlockEntity(pos);
-
-				if (blockEntity != null) {
-					Packet updatePacket = blockEntity.getUpdatePacket();
-
-					if (updatePacket != null) {
-						this.player.connection.send(updatePacket);
-					}
-				}
-			}
-
-			info.cancel();
-		}
-	}
-
-	@Inject(at = @At("HEAD"), method = "useItemOn", cancellable = true)
-	public void interactBlock(ServerPlayer player, Level level, ItemStack stack, InteractionHand hand, BlockHitResult blockHitResult, CallbackInfoReturnable info) {
-		InteractionResult result = UseBlockCallback.EVENT.invoker().interact(player, level, hand, blockHitResult);
-
-		if (result != InteractionResult.PASS) {
-			info.setReturnValue(result);
-			info.cancel();
-			return;
-		}
-	}
-
-	@Inject(at = @At("HEAD"), method = "useItem", cancellable = true)
-	public void interactItem(ServerPlayer player, Level level, ItemStack stack, InteractionHand hand, CallbackInfoReturnable info) {
-		InteractionResult result = UseItemCallback.EVENT.invoker().interact(player, level, hand);
-
-		if (result != InteractionResult.PASS) {
-			info.setReturnValue(result);
-			info.cancel();
-			return;
-		}
-	}
-
-	@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/Block;playerWillDestroy(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/world/level/block/state/BlockState;"), method = "destroyBlock", cancellable = true)
-	private void breakBlock(BlockPos pos, CallbackInfoReturnable cir, @Local(name = "blockEntity") BlockEntity blockEntity, @Local(name = "state") BlockState state) {
-		boolean result = PlayerBlockBreakEvents.BEFORE.invoker().beforeBlockBreak(this.level, this.player, pos, state, blockEntity);
-
-		if (!result) {
-			PlayerBlockBreakEvents.CANCELED.invoker().onBlockBreakCanceled(this.level, this.player, pos, state, blockEntity);
-
-			cir.setReturnValue(false);
-		}
-	}
-
-	@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/Block;destroy(Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V"), method = "destroyBlock")
-	private void onBlockBroken(BlockPos pos, CallbackInfoReturnable cir, @Local(name = "blockEntity") BlockEntity blockEntity, @Local(name = "adjustedState") BlockState adjustedState) {
-		PlayerBlockBreakEvents.AFTER.invoker().afterBlockBreak(this.level, this.player, pos, adjustedState, blockEntity);
+	@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/Block;destroy(Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V"), method = "removeBlock", locals = LocalCapture.CAPTURE_FAILHARD)
+	private void onBlockBroken(BlockPos pos, BlockState state, boolean canHarvest, ItemStack toolStack, CallbackInfoReturnable cir) {
+		BlockEntity entity = level.getBlockEntity(pos);
+		PlayerBlockBreakEvents.AFTER.invoker().afterBlockBreak(this.level, this.player, pos, state, entity);
 	}
 }
diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerMixin.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerMixin.java
deleted file mode 100644
index 0dba2871af..0000000000
--- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerMixin.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.mixin.event.interaction;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.GameType;
-
-import net.fabricmc.fabric.api.entity.FakePlayer;
-
-@Mixin(ServerPlayer.class)
-public class ServerPlayerMixin {
-	@Inject(method = "calculateGameModeForNewPlayer", at = @At("HEAD"), cancellable = true)
-	public void fakePlayerGameMode(GameType backupGameMode, CallbackInfoReturnable cir) {
-		// Set the default game mode of the fake player to survival, regardless of the servers forced game mode.
-		if ((Object) this instanceof FakePlayer) {
-			cir.setReturnValue(GameType.SURVIVAL);
-		}
-	}
-}
diff --git a/fabric-events-interaction-v0/src/main/resources/fabric-events-interaction-v0.mixins.json b/fabric-events-interaction-v0/src/main/resources/fabric-events-interaction-v0.mixins.json
index cfd8b8e0d6..f9da715898 100644
--- a/fabric-events-interaction-v0/src/main/resources/fabric-events-interaction-v0.mixins.json
+++ b/fabric-events-interaction-v0/src/main/resources/fabric-events-interaction-v0.mixins.json
@@ -6,11 +6,9 @@
     "BlockBehaviourBlockStateBaseMixin",
     "ItemStackMixin",
     "PlayerAdvancementsMixin",
-    "PlayerMixin",
     "ServerGamePacketListenerImplMixin",
     "ServerPlayerGameModeMixin",
-    "ServerGamePacketListenerImplMixin",
-    "ServerPlayerMixin"
+    "ServerGamePacketListenerImplMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-events-interaction-v0/src/main/resources/fabric.mod.json b/fabric-events-interaction-v0/src/main/resources/fabric.mod.json
index b194b3c6d1..63703e81c7 100644
--- a/fabric-events-interaction-v0/src/main/resources/fabric.mod.json
+++ b/fabric-events-interaction-v0/src/main/resources/fabric.mod.json
@@ -18,7 +18,6 @@
   "depends": {
     "fabricloader": ">=0.18.4",
     "fabric-api-base": "*",
-    "fabric-networking-api-v1": "*",
     "minecraft": ">=1.15-alpha.19.37.a"
   },
   "entrypoints": {
diff --git a/fabric-events-interaction-v0/src/testmod/java/net/fabricmc/fabric/test/event/interaction/FakePlayerTests.java b/fabric-events-interaction-v0/src/testmod/java/net/fabricmc/fabric/test/event/interaction/FakePlayerTests.java
index 6ba9e8999c..abfd4915a6 100644
--- a/fabric-events-interaction-v0/src/testmod/java/net/fabricmc/fabric/test/event/interaction/FakePlayerTests.java
+++ b/fabric-events-interaction-v0/src/testmod/java/net/fabricmc/fabric/test/event/interaction/FakePlayerTests.java
@@ -22,7 +22,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EntityTypes;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
@@ -38,7 +38,7 @@ public class FakePlayerTests {
 	/**
 	 * Try placing a sign with a fake player.
 	 */
-	@GameTest
+//	@GameTest FIXME
 	public void testFakePlayerPlaceSign(GameTestHelper helper) {
 		// This is for Fabric internal testing only, if you copy this to your mod you're on your own...
 
@@ -55,7 +55,7 @@ public void testFakePlayerPlaceSign(GameTestHelper helper) {
 		ItemStack signStack = Items.OAK_SIGN.getDefaultInstance();
 		fakePlayer.setItemInHand(InteractionHand.MAIN_HAND, signStack);
 
-		Vec3 hitPos = helper.absolutePos(basePos).getCenter().add(0, 0.5, 0);
+		Vec3 hitPos = Vec3.atCenterOf(helper.absolutePos(basePos)).add(0, 0.5, 0);
 		BlockHitResult hitResult = new BlockHitResult(hitPos, Direction.UP, helper.absolutePos(basePos), false);
 		signStack.useOn(new UseOnContext(fakePlayer, InteractionHand.MAIN_HAND, hitResult));
 
@@ -71,7 +71,7 @@ public void testFakePlayerPlaceSign(GameTestHelper helper) {
 	public void testFakePlayerBreakBeehive(GameTestHelper helper) {
 		BlockPos basePos = new BlockPos(0, 1, 0);
 		helper.setBlock(basePos, Blocks.BEEHIVE);
-		helper.spawn(EntityType.BEE, basePos.above());
+		helper.spawn(EntityTypes.BEE, basePos.above());
 
 		ServerPlayer fakePlayer = FakePlayer.get(helper.getLevel());
 
diff --git a/fabric-events-interaction-v0/src/testmod/resources/fabric.mod.json b/fabric-events-interaction-v0/src/testmod/resources/fabric.mod.json
index 18fb4a9ee8..4693883992 100644
--- a/fabric-events-interaction-v0/src/testmod/resources/fabric.mod.json
+++ b/fabric-events-interaction-v0/src/testmod/resources/fabric.mod.json
@@ -23,6 +23,9 @@
     "client": [
       "net.fabricmc.fabric.test.client.event.interaction.ClientPreAttackTests",
       "net.fabricmc.fabric.test.client.event.interaction.ClientPlayerBlockBreakTests"
+    ],
+    "fabric-client-gametest": [
+	    "net.fabricmc.fabric.test.client.event.interaction.ClientHotbarScrollEventsTests"
     ]
   }
 }
diff --git a/fabric-events-interaction-v0/src/testmodClient/java/net/fabricmc/fabric/test/client/event/interaction/ClientHotbarScrollEventsTests.java b/fabric-events-interaction-v0/src/testmodClient/java/net/fabricmc/fabric/test/client/event/interaction/ClientHotbarScrollEventsTests.java
new file mode 100644
index 0000000000..d5164d2678
--- /dev/null
+++ b/fabric-events-interaction-v0/src/testmodClient/java/net/fabricmc/fabric/test/client/event/interaction/ClientHotbarScrollEventsTests.java
@@ -0,0 +1,121 @@
+/*
+ * 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.client.event.interaction;
+
+import java.util.Objects;
+
+import net.minecraft.client.gui.screens.worldselection.WorldCreationUiState;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+
+import net.fabricmc.fabric.api.client.gametest.v1.FabricClientGameTest;
+import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext;
+import net.fabricmc.fabric.api.client.gametest.v1.context.TestSingleplayerContext;
+import net.fabricmc.fabric.api.event.client.player.ClientHotbarScrollEvents;
+
+public class ClientHotbarScrollEventsTests implements FabricClientGameTest {
+	@Override
+	public void runTest(ClientGameTestContext context) {
+		try (
+				TestSingleplayerContext spContext = context.worldBuilder()
+						.adjustSettings(creator ->
+								creator.setGameMode(WorldCreationUiState.SelectedGameMode.CREATIVE))
+						.create()) {
+			var ctx = new Object() {
+				int selectedSlot = 36;
+				boolean inScope = true; // scoped events at home
+				boolean before = false;
+				boolean after = false;
+				boolean allowDone = false;
+			};
+			context.runOnClient((minecraft) -> {
+				// player blaze powder testing
+				LocalPlayer player = spContext.getConnection().getClientPlayer();
+				Inventory playerInventory = player.getInventory();
+				int selectedSlot1 = playerInventory.getSelectedSlot();
+				ctx.selectedSlot = selectedSlot1;
+				playerInventory.setItem(selectedSlot1, new ItemStack(Items.BLAZE_POWDER));
+				ClientHotbarScrollEvents.ALLOW.register((inventory, currentSlot, _, _, _) -> {
+					if (!ctx.inScope) {
+						return true;
+					}
+
+					boolean allow = inventory.getItem(currentSlot).is(Items.BLAZE_POWDER);
+
+					if (!allow) {
+						ctx.allowDone = true;
+					}
+
+					return allow;
+				});
+				ClientHotbarScrollEvents.BEFORE.register(((inventory, _, newSlot, _, _) -> {
+					if (!ctx.inScope) {
+						return;
+					}
+
+					if (ctx.before) {
+						throw new IllegalStateException("Client item scroll BEFORE invoked twice");
+					}
+
+					if (ctx.after) {
+						throw new IllegalStateException("Client item scroll AFTER invoked before BEFORE event");
+					}
+
+					if (inventory.getItem(newSlot).is(Items.BLAZE_POWDER)) {
+						throw new IllegalStateException("Client item scroll BEFORE invoked on canceled item scroll event");
+					}
+
+					ctx.before = true;
+				}));
+				ClientHotbarScrollEvents.AFTER.register(((inventory, _, newSlot, _, _) -> {
+					if (!ctx.inScope) {
+						return;
+					}
+
+					if (ctx.after) {
+						throw new IllegalStateException("Client item scroll AFTER invoked twice");
+					}
+
+					if (!ctx.before) {
+						throw new IllegalStateException("Client item scroll AFTER invoked before BEFORE event");
+					}
+
+					if (inventory.getItem(newSlot).is(Items.BLAZE_POWDER)) {
+						throw new IllegalStateException("Client item scroll AFTER invoked on canceled item scroll event");
+					}
+
+					ctx.after = true;
+				}));
+			});
+			context.getInput().scroll(-1.0);
+			context.waitFor(mc ->
+					Objects.requireNonNull(mc.player)
+							.getInventory()
+							.getSelectedSlot() == ctx.selectedSlot + 1);
+
+			if (!ctx.before || !ctx.after) {
+				throw new IllegalStateException("The before- and after- client item scroll events never fired");
+			}
+
+			context.getInput().scroll(-1.0);
+			context.waitFor(_ -> ctx.allowDone);
+			ctx.inScope = false;
+		}
+	}
+}
diff --git a/fabric-events-interaction-v0/src/testmodClient/java/net/fabricmc/fabric/test/client/event/interaction/ClientPlayerBlockBreakTests.java b/fabric-events-interaction-v0/src/testmodClient/java/net/fabricmc/fabric/test/client/event/interaction/ClientPlayerBlockBreakTests.java
index 8c4a6d834d..1050704abe 100644
--- a/fabric-events-interaction-v0/src/testmodClient/java/net/fabricmc/fabric/test/client/event/interaction/ClientPlayerBlockBreakTests.java
+++ b/fabric-events-interaction-v0/src/testmodClient/java/net/fabricmc/fabric/test/client/event/interaction/ClientPlayerBlockBreakTests.java
@@ -27,6 +27,6 @@ public class ClientPlayerBlockBreakTests implements ClientModInitializer {
 
 	@Override
 	public void onInitializeClient() {
-		ClientPlayerBlockBreakEvents.AFTER.register(((level, player, pos, state) -> LOGGER.info("Block broken at {}, {}, {} (client-side = {})", pos.getX(), pos.getY(), pos.getZ(), level.isClientSide())));
+		ClientPlayerBlockBreakEvents.AFTER.register(((level, _, pos, _) -> LOGGER.info("Block broken at {}, {}, {} (client-side = {})", pos.getX(), pos.getY(), pos.getZ(), level.isClientSide())));
 	}
 }
diff --git a/fabric-events-interaction-v0/src/testmodClient/java/net/fabricmc/fabric/test/client/event/interaction/ClientPreAttackTests.java b/fabric-events-interaction-v0/src/testmodClient/java/net/fabricmc/fabric/test/client/event/interaction/ClientPreAttackTests.java
index c8a49d67d1..e0f511dbac 100644
--- a/fabric-events-interaction-v0/src/testmodClient/java/net/fabricmc/fabric/test/client/event/interaction/ClientPreAttackTests.java
+++ b/fabric-events-interaction-v0/src/testmodClient/java/net/fabricmc/fabric/test/client/event/interaction/ClientPreAttackTests.java
@@ -29,7 +29,7 @@ public class ClientPreAttackTests implements ClientModInitializer {
 
 	@Override
 	public void onInitializeClient() {
-		ClientPreAttackCallback.EVENT.register((client, player, clickCount) -> {
+		ClientPreAttackCallback.EVENT.register((_, player, clickCount) -> {
 			if (!player.isSpectator() && player.getMainHandItem().getItem() == Items.TORCH) {
 				LOGGER.info("Attacking using torch intercepted. Attack key clicks: {}", clickCount != 0);
 				return true;
diff --git a/fabric-game-rule-api-v1/src/client/java/net/fabricmc/fabric/mixin/gamerule/client/RuleListEntryTypeVisitorMixin.java b/fabric-game-rule-api-v1/src/client/java/net/fabricmc/fabric/mixin/gamerule/client/RuleListEntryTypeVisitorMixin.java
index 6d90c782be..f37fad5cb9 100644
--- a/fabric-game-rule-api-v1/src/client/java/net/fabricmc/fabric/mixin/gamerule/client/RuleListEntryTypeVisitorMixin.java
+++ b/fabric-game-rule-api-v1/src/client/java/net/fabricmc/fabric/mixin/gamerule/client/RuleListEntryTypeVisitorMixin.java
@@ -29,6 +29,7 @@
 import net.minecraft.client.gui.screens.worldselection.AbstractGameRulesScreen;
 import net.minecraft.client.gui.screens.worldselection.WorldCreationGameRulesScreen;
 import net.minecraft.client.resources.language.I18n;
+import net.minecraft.locale.Language;
 import net.minecraft.world.level.gamerules.GameRule;
 import net.minecraft.world.level.gamerules.GameRuleTypeVisitor;
 
@@ -78,7 +79,7 @@ private  String displayProperEnumName(GameRule instance, T value, Operatio
 
 		String translationKey = instance.getDescriptionId() + "." + valueName.toLowerCase(Locale.ROOT);
 
-		if (I18n.exists(translationKey)) {
+		if (Language.getInstance().has(translationKey)) {
 			return I18n.get(translationKey);
 		}
 
diff --git a/fabric-game-rule-api-v1/src/test/java/net/fabricmc/fabric/test/gamerule/MinecraftGameRuleServiceImplTest.java b/fabric-game-rule-api-v1/src/test/java/net/fabricmc/fabric/test/gamerule/MinecraftGameRuleServiceImplTest.java
index b95133d50a..95a55b6ecb 100644
--- a/fabric-game-rule-api-v1/src/test/java/net/fabricmc/fabric/test/gamerule/MinecraftGameRuleServiceImplTest.java
+++ b/fabric-game-rule-api-v1/src/test/java/net/fabricmc/fabric/test/gamerule/MinecraftGameRuleServiceImplTest.java
@@ -29,6 +29,7 @@
 import org.intellij.lang.annotations.Language;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import net.minecraft.SharedConstants;
@@ -41,6 +42,7 @@
 import net.minecraft.server.jsonrpc.internalapi.MinecraftGameRuleServiceImpl;
 import net.minecraft.server.jsonrpc.methods.ClientInfo;
 import net.minecraft.server.jsonrpc.methods.GameRulesService;
+import net.minecraft.server.notifications.NotificationManager;
 import net.minecraft.world.flag.FeatureFlagSet;
 import net.minecraft.world.level.gamerules.GameRule;
 import net.minecraft.world.level.gamerules.GameRules;
@@ -58,10 +60,19 @@ static void bootstrap() {
 	private static final JsonRpcLogger MANAGEMENT_LOGGER = new JsonRpcLogger();
 	private final GameRules gameRules = new GameRules(FeatureFlagSet.of());
 
+	DedicatedServer server;
+	NotificationManager notificationManager;
+
+	@BeforeEach
+	void setUp() {
+		server = mockServer();
+		notificationManager = new NotificationManager();
+		notificationManager.setServer(server);
+	}
+
 	@Test
 	void testUpdateDouble() {
-		DedicatedServer server = mockServer();
-		MinecraftGameRuleService service = new GameRuleManagementHandlerTestImpl(server, MANAGEMENT_LOGGER);
+		MinecraftGameRuleService service = new GameRuleManagementHandlerTestImpl(notificationManager, MANAGEMENT_LOGGER);
 
 		GameRulesService.GameRuleUpdate result = service.updateGameRule(new GameRulesService.GameRuleUpdate<>(GameRulesTestMod.ONE_TO_TEN_DOUBLE, 5.5D), CONNECTION_ID);
 
@@ -76,8 +87,7 @@ void testUpdateDouble() {
 
 	@Test
 	void testFabricId() {
-		DedicatedServer server = mockServer();
-		MinecraftGameRuleService handler = new GameRuleManagementHandlerTestImpl(server, MANAGEMENT_LOGGER);
+		MinecraftGameRuleService handler = new GameRuleManagementHandlerTestImpl(notificationManager, MANAGEMENT_LOGGER);
 
 		GameRulesService.GameRuleUpdate result = handler.updateGameRule(new GameRulesService.GameRuleUpdate<>(GameRulesTestMod.RED_BOOLEAN, false), CONNECTION_ID);
 
@@ -88,8 +98,7 @@ void testFabricId() {
 
 	@Test
 	void testUpdateEnum() {
-		DedicatedServer server = mockServer();
-		MinecraftGameRuleService handler = new GameRuleManagementHandlerTestImpl(server, MANAGEMENT_LOGGER);
+		MinecraftGameRuleService handler = new GameRuleManagementHandlerTestImpl(notificationManager, MANAGEMENT_LOGGER);
 
 		GameRulesService.GameRuleUpdate result = handler.updateGameRule(new GameRulesService.GameRuleUpdate<>(GameRulesTestMod.CARDINAL_DIRECTION_ENUM_RULE, Direction.EAST), CONNECTION_ID);
 
@@ -105,8 +114,7 @@ void testUpdateEnum() {
 
 	@Test
 	void testUpdateVanillaBoolean() {
-		DedicatedServer server = mockServer();
-		MinecraftGameRuleService handler = new GameRuleManagementHandlerTestImpl(server, MANAGEMENT_LOGGER);
+		MinecraftGameRuleService handler = new GameRuleManagementHandlerTestImpl(notificationManager, MANAGEMENT_LOGGER);
 
 		GameRulesService.GameRuleUpdate result = handler.updateGameRule(new GameRulesService.GameRuleUpdate<>(GameRules.FIRE_DAMAGE, false), CONNECTION_ID);
 
@@ -121,8 +129,7 @@ void testUpdateVanillaBoolean() {
 
 	@Test
 	void testUpdateVanillaInt() {
-		DedicatedServer server = mockServer();
-		MinecraftGameRuleService handler = new GameRuleManagementHandlerTestImpl(server, MANAGEMENT_LOGGER);
+		MinecraftGameRuleService handler = new GameRuleManagementHandlerTestImpl(notificationManager, MANAGEMENT_LOGGER);
 
 		GameRulesService.GameRuleUpdate result = handler.updateGameRule(new GameRulesService.GameRuleUpdate<>(GameRules.RANDOM_TICK_SPEED, 123), CONNECTION_ID);
 
@@ -149,8 +156,8 @@ private static  void assertEquals(@Language("JSON") String expected, GameRule
 	}
 
 	private static final class GameRuleManagementHandlerTestImpl extends MinecraftGameRuleServiceImpl {
-		private GameRuleManagementHandlerTestImpl(DedicatedServer server, JsonRpcLogger logger) {
-			super(server, logger);
+		private GameRuleManagementHandlerTestImpl(NotificationManager notificationManager, JsonRpcLogger jsonrpcLogger) {
+			super(notificationManager, jsonrpcLogger);
 		}
 
 		public Stream> getAvailableGameRules() {
diff --git a/fabric-gametest-api-v1/build.gradle b/fabric-gametest-api-v1/build.gradle
index 08e8c3d9fa..8721b2f556 100644
--- a/fabric-gametest-api-v1/build.gradle
+++ b/fabric-gametest-api-v1/build.gradle
@@ -2,21 +2,9 @@ version = getSubprojectVersion(project)
 
 loom {
 	accessWidenerPath = file("src/main/resources/fabric-gametest-api-v1.classtweaker")
-
-	runs {
-		testmodClient {
-			client()
-			name = "Testmod Client"
-			vmArg "-Dfabric-api.gametest.structures.output-dir=${file("src/testmod/resources/data/fabric-gametest-api-v1-testmod/gametest/structure")}"
-
-			ideConfigGenerated = false
-			source sourceSets.testmodClient
-		}
-	}
 }
 
 moduleDependencies(project, [
 	'fabric-api-base',
-	'fabric-registry-sync-v0',
 	'fabric-resource-loader-v1',
 ])
diff --git a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/impl/gametest/FabricGameTestInit.java b/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/impl/gametest/FabricGameTestInit.java
new file mode 100644
index 0000000000..f0b94506e9
--- /dev/null
+++ b/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/impl/gametest/FabricGameTestInit.java
@@ -0,0 +1,53 @@
+package net.fabricmc.fabric.impl.gametest;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+import com.mojang.logging.LogUtils;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.event.RegisterGameTestsEvent;
+import net.neoforged.neoforge.registries.RegisterEvent;
+import org.sinytra.fabric.gametest_api.generated.GeneratedEntryPoint;
+import org.slf4j.Logger;
+
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.gametest.framework.TestEnvironmentDefinition;
+
+import net.fabricmc.fabric.impl.gametest.TestAnnotationLocator.TestMethod;
+
+@Mod(GeneratedEntryPoint.MOD_ID)
+public class FabricGameTestInit {
+	private static final Logger LOGGER = LogUtils.getLogger();
+
+	public FabricGameTestInit(IEventBus bus) {
+		TestAnnotationLocator locator = new TestAnnotationLocator();
+		List methods = locator.getTestMethods();
+
+		bus.addListener(RegisterGameTestsEvent.class, e -> {
+			Registry> registry = getEnvironmentsRegistry(e);
+			
+			for (TestMethod method : methods) {
+				e.registerTest(method.identifier(), method.testInstance(registry));
+			}
+		});
+
+		bus.addListener(RegisterEvent.class, e -> {
+			for (TestAnnotationLocator.TestMethod testMethod : methods) {
+				LOGGER.debug("Registering test method: {}", testMethod.identifier());
+				e.register(Registries.TEST_FUNCTION, testMethod.identifier(), testMethod::testFunction);
+			}
+		});
+	}
+
+	private Registry> getEnvironmentsRegistry(RegisterGameTestsEvent event) {
+		try {
+			Field field = RegisterGameTestsEvent.class.getDeclaredField("environmentsRegistry");
+			field.setAccessible(true);
+			return (Registry>) field.get(event);
+		} catch (Exception ex) {
+			throw new RuntimeException(ex);
+		}
+	}
+}
diff --git a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/impl/gametest/FabricGameTestModInitializer.java b/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/impl/gametest/FabricGameTestModInitializer.java
deleted file mode 100644
index 1cc55af276..0000000000
--- a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/impl/gametest/FabricGameTestModInitializer.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.impl.gametest;
-
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.minecraft.core.Registry;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.gametest.framework.GameTestInstance;
-import net.minecraft.gametest.framework.TestEnvironmentDefinition;
-import net.minecraft.resources.RegistryLoadTask;
-import net.minecraft.resources.ResourceKey;
-
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.loader.api.FabricLoader;
-
-public final class FabricGameTestModInitializer implements ModInitializer {
-	private static final Logger LOGGER = LoggerFactory.getLogger(FabricGameTestModInitializer.class);
-	private static TestAnnotationLocator locator = new TestAnnotationLocator(FabricLoader.getInstance());
-
-	@Override
-	public void onInitialize() {
-		if (!(FabricGameTestRunner.ENABLED || FabricLoader.getInstance().isDevelopmentEnvironment())) {
-			// Don't try to load the tests if the game test runner is disabled or we are not in a development environment
-			return;
-		}
-
-		for (TestAnnotationLocator.TestMethod testMethod : locator.getTestMethods()) {
-			LOGGER.debug("Registering test method: {}", testMethod.identifier());
-			Registry.register(BuiltInRegistries.TEST_FUNCTION, testMethod.identifier(), testMethod.testFunction());
-		}
-	}
-
-	public static void registerDynamicEntries(List> loadTasks) {
-		Map>, Registry> registries = new IdentityHashMap<>(loadTasks.size());
-
-		for (RegistryLoadTask entry : loadTasks) {
-			registries.put(entry.registry.key(), entry.registry);
-		}
-
-		Registry testInstances = (Registry) registries.get(Registries.TEST_INSTANCE);
-		Registry> testEnvironmentDefinitionRegistry = (Registry>) Objects.requireNonNull(registries.get(Registries.TEST_ENVIRONMENT));
-
-		for (TestAnnotationLocator.TestMethod testMethod : locator.getTestMethods()) {
-			GameTestInstance testInstance = testMethod.testInstance(testEnvironmentDefinitionRegistry);
-			Registry.register(testInstances, testMethod.identifier(), testInstance);
-		}
-	}
-}
diff --git a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/impl/gametest/TestAnnotationLocator.java b/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/impl/gametest/TestAnnotationLocator.java
index 945532ffd7..c2c520c2ad 100644
--- a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/impl/gametest/TestAnnotationLocator.java
+++ b/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/impl/gametest/TestAnnotationLocator.java
@@ -51,8 +51,8 @@ final class TestAnnotationLocator {
 
 	private List testMethods = null;
 
-	TestAnnotationLocator(FabricLoader fabricLoader) {
-		this.fabricLoader = fabricLoader;
+	TestAnnotationLocator() {
+		this.fabricLoader = FabricLoader.getInstance();
 	}
 
 	public List getTestMethods() {
@@ -143,14 +143,17 @@ Consumer testFunction() {
 
 					method.invoke(instance, context);
 				} catch (InvocationTargetException e) {
+					LOGGER.error("Failed to invoke test method", e);
+
 					// Ensure that any GameTestException are propagated without wrapping
 					if (e.getTargetException() instanceof RuntimeException runtimeException) {
 						throw runtimeException;
 					}
 
-					throw new RuntimeException("Failed to invoke test method", e);
+					throw new RuntimeException("Failed to invoke test method: " + e.getMessage(), e);
 				} catch (ReflectiveOperationException e) {
-					throw new RuntimeException("Failed to invoke test method", e);
+					LOGGER.error("Failed to invoke test method", e);
+					throw new RuntimeException("Failed to invoke test method: " + e.getMessage(), e);
 				}
 			};
 		}
diff --git a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/GameTestServerMixin.java b/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/GameTestServerMixin.java
deleted file mode 100644
index 5495618700..0000000000
--- a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/GameTestServerMixin.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.mixin.gametest;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.gametest.framework.GameTestServer;
-
-@Mixin(GameTestServer.class)
-public abstract class GameTestServerMixin {
-	@Inject(method = "isDedicatedServer", at = @At("HEAD"), cancellable = true)
-	public void isDedicated(CallbackInfoReturnable cir) {
-		// Allow dedicated server commands to be registered.
-		// Should aid with mods that use this to detect if they are running on a dedicated server as well.
-		cir.setReturnValue(true);
-	}
-}
diff --git a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/RegistryDataLoaderMixin.java b/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/RegistryDataLoaderMixin.java
deleted file mode 100644
index 5ddd05d437..0000000000
--- a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/RegistryDataLoaderMixin.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.mixin.gametest;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.core.HolderLookup;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.RegistryDataLoader;
-import net.minecraft.resources.RegistryLoadTask;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.server.packs.resources.ResourceManager;
-
-import net.fabricmc.fabric.impl.gametest.FabricGameTestModInitializer;
-
-@Mixin(RegistryDataLoader.class)
-public class RegistryDataLoaderMixin {
-	@Unique
-	private static final AtomicBoolean LOADING_DYNAMIC_REGISTRIES = new AtomicBoolean(false);
-
-	@Inject(method = "load(Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/List;Ljava/util/List;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;", at = @At("HEAD"))
-	private static void loadFromResources(ResourceManager resourceManager, List> registries, List> entries, Executor executor, CallbackInfoReturnable cir) {
-		LOADING_DYNAMIC_REGISTRIES.set(entries.stream().anyMatch(entry -> entry.key() == Registries.TEST_INSTANCE));
-	}
-
-	@Inject(
-			method = "lambda$load$2(Ljava/util/List;Ljava/util/Map;Ljava/lang/Void;)Lnet/minecraft/core/RegistryAccess$Frozen;",
-			at = @At(value = "HEAD")
-	)
-	private static void beforeFreeze(List> loadTasks, Map, Exception> loadingErrors, Void ignored, CallbackInfoReturnable cir) {
-		if (LOADING_DYNAMIC_REGISTRIES.getAndSet(false)) {
-			FabricGameTestModInitializer.registerDynamicEntries(loadTasks);
-		}
-	}
-}
diff --git a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/server/MainMixin.java b/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/server/MainMixin.java
deleted file mode 100644
index a2582a3694..0000000000
--- a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/server/MainMixin.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.mixin.gametest.server;
-
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import com.llamalad7.mixinextras.sugar.Local;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.server.Main;
-import net.minecraft.server.packs.repository.PackRepository;
-import net.minecraft.world.level.storage.LevelStorageSource;
-
-import net.fabricmc.fabric.impl.gametest.FabricGameTestRunner;
-
-@Mixin(Main.class)
-public class MainMixin {
-	@ModifyExpressionValue(method = "main", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/Eula;hasAgreedToEULA()Z"))
-	private static boolean isEulaAgreedTo(boolean isEulaAgreedTo) {
-		return FabricGameTestRunner.ENABLED || isEulaAgreedTo;
-	}
-
-	// Inject after packRepository is stored
-	@Inject(method = "main", cancellable = true, at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/server/packs/repository/ServerPacksSource;createPackRepository(Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;)Lnet/minecraft/server/packs/repository/PackRepository;"))
-	private static void main(String[] args, CallbackInfo info, @Local(name = "access") LevelStorageSource.LevelStorageAccess storageAccess, @Local(name = "packRepository") PackRepository packRepository) {
-		if (FabricGameTestRunner.ENABLED) {
-			FabricGameTestRunner.runHeadlessServer(storageAccess, packRepository);
-			info.cancel();  // Do not progress in starting the normal dedicated server
-		}
-	}
-
-	// Exit with a non-zero exit code when the server fails to start.
-	// Otherwise gradlew test will succeed without errors, although no tests have been run.
-	@Inject(method = "main", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Lorg/slf4j/Marker;Ljava/lang/String;Ljava/lang/Throwable;)V", shift = At.Shift.AFTER))
-	private static void exitOnError(CallbackInfo info) {
-		if (FabricGameTestRunner.ENABLED) {
-			System.exit(-1);
-		}
-	}
-}
diff --git a/fabric-gametest-api-v1/src/main/resources/fabric-gametest-api-v1.mixins.json b/fabric-gametest-api-v1/src/main/resources/fabric-gametest-api-v1.mixins.json
index a4a3f0cd99..abaf6d3505 100644
--- a/fabric-gametest-api-v1/src/main/resources/fabric-gametest-api-v1.mixins.json
+++ b/fabric-gametest-api-v1/src/main/resources/fabric-gametest-api-v1.mixins.json
@@ -3,12 +3,9 @@
   "package": "net.fabricmc.fabric.mixin.gametest",
   "compatibilityLevel": "JAVA_25",
   "mixins": [
-    "RegistryDataLoaderMixin",
-    "StructureTemplateManagerMixin",
-    "GameTestServerMixin"
+    "StructureTemplateManagerMixin"
   ],
   "server": [
-    "server.MainMixin"
   ],
   "injectors": {
     "defaultRequire": 1,
diff --git a/fabric-gametest-api-v1/src/main/resources/fabric.mod.json b/fabric-gametest-api-v1/src/main/resources/fabric.mod.json
index 6664eeaac5..b1c9d036bd 100644
--- a/fabric-gametest-api-v1/src/main/resources/fabric.mod.json
+++ b/fabric-gametest-api-v1/src/main/resources/fabric.mod.json
@@ -22,7 +22,6 @@
   },
   "depends": {
     "fabricloader": ">=0.18.4",
-    "fabric-registry-sync-v0": "*",
     "fabric-resource-loader-v1": "*"
   },
   "description": "Allows registration of custom game tests.",
diff --git a/fabric-item-api-v1/src/client/java/net/fabricmc/fabric/impl/client/item/ClientItemEventHooks.java b/fabric-item-api-v1/src/client/java/net/fabricmc/fabric/impl/client/item/ClientItemEventHooks.java
new file mode 100644
index 0000000000..68bfe52ec2
--- /dev/null
+++ b/fabric-item-api-v1/src/client/java/net/fabricmc/fabric/impl/client/item/ClientItemEventHooks.java
@@ -0,0 +1,15 @@
+package net.fabricmc.fabric.impl.client.item;
+
+import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.event.entity.player.ItemTooltipEvent;
+
+@EventBusSubscriber
+public class ClientItemEventHooks {
+
+    @SubscribeEvent
+    public static void onItemTooltip(ItemTooltipEvent event) {
+        ItemTooltipCallback.EVENT.invoker().getTooltip(event.getItemStack(), event.getContext(), event.getFlags(), event.getToolTip());
+    }
+}
diff --git a/fabric-item-api-v1/src/client/java/net/fabricmc/fabric/mixin/item/client/IItemExtensionClientMixin.java b/fabric-item-api-v1/src/client/java/net/fabricmc/fabric/mixin/item/client/IItemExtensionClientMixin.java
new file mode 100644
index 0000000000..3511e12db6
--- /dev/null
+++ b/fabric-item-api-v1/src/client/java/net/fabricmc/fabric/mixin/item/client/IItemExtensionClientMixin.java
@@ -0,0 +1,35 @@
+package net.fabricmc.fabric.mixin.item.client;
+
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import net.fabricmc.fabric.api.item.v1.FabricItem;
+import net.fabricmc.fabric.impl.item.RecursivityHelper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+import net.neoforged.neoforge.common.extensions.IItemExtension;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(IItemExtension.class)
+public interface IItemExtensionClientMixin {
+
+    @ModifyReturnValue(method = "shouldCauseReequipAnimation", at = @At("RETURN"))
+    default boolean shouldCauseReequipAnimation(boolean result, ItemStack oldStack, ItemStack newStack, boolean slotChanged) {
+        if (result) {
+            Player player = Minecraft.getInstance().player;
+            InteractionHand hand = oldStack == player.getMainHandItem() ? InteractionHand.MAIN_HAND : InteractionHand.OFF_HAND;
+            return RecursivityHelper.nonRecursiveApiCall(() -> ((FabricItem) this).allowComponentsUpdateAnimation(player, hand, oldStack, newStack));
+        }
+        return false;
+    }
+
+    @Inject(method = "shouldCauseBlockBreakReset", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;isDamageableItem()Z"), cancellable = true)
+    default void shouldCauseBlockBreakReset(ItemStack oldStack, ItemStack newStack, CallbackInfoReturnable cir) {
+        if (!ItemStack.isSameItemSameComponents(newStack, oldStack) && oldStack.getItem().allowContinuingBlockBreaking(Minecraft.getInstance().player, oldStack, newStack)) {
+            cir.setReturnValue(false);
+        }
+    }
+}
diff --git a/fabric-item-api-v1/src/client/java/net/fabricmc/fabric/mixin/item/client/ItemInHandRendererMixin.java b/fabric-item-api-v1/src/client/java/net/fabricmc/fabric/mixin/item/client/ItemInHandRendererMixin.java
deleted file mode 100644
index c6a136aeb9..0000000000
--- a/fabric-item-api-v1/src/client/java/net/fabricmc/fabric/mixin/item/client/ItemInHandRendererMixin.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.mixin.item.client;
-
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.ItemInHandRenderer;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.item.ItemStack;
-
-import net.fabricmc.fabric.api.item.v1.FabricItem;
-
-/**
- * Allow canceling the held item update animation if {@link FabricItem#allowComponentsUpdateAnimation} returns false.
- */
-@Mixin(ItemInHandRenderer.class)
-public class ItemInHandRendererMixin {
-	@Shadow
-	private ItemStack mainHandItem;
-
-	@Shadow
-	private ItemStack offHandItem;
-
-	@Shadow
-	@Final
-	private Minecraft minecraft;
-
-	@Inject(method = "tick", at = @At("HEAD"))
-	private void modifyProgressAnimation(CallbackInfo ci) {
-		// Modify main hand
-		ItemStack newMainStack = minecraft.player.getMainHandItem();
-
-		if (mainHandItem.getItem() == newMainStack.getItem()) {
-			if (!mainHandItem.getItem().allowComponentsUpdateAnimation(minecraft.player, InteractionHand.MAIN_HAND, mainHandItem, newMainStack)) {
-				mainHandItem = newMainStack;
-			}
-		}
-
-		// Modify off hand
-		ItemStack newOffStack = minecraft.player.getOffhandItem();
-
-		if (offHandItem.getItem() == newOffStack.getItem()) {
-			if (!offHandItem.getItem().allowComponentsUpdateAnimation(minecraft.player, InteractionHand.OFF_HAND, offHandItem, newOffStack)) {
-				offHandItem = newOffStack;
-			}
-		}
-	}
-}
diff --git a/fabric-item-api-v1/src/client/java/net/fabricmc/fabric/mixin/item/client/ItemStackMixin.java b/fabric-item-api-v1/src/client/java/net/fabricmc/fabric/mixin/item/client/ItemStackMixin.java
deleted file mode 100644
index 70e0cacccc..0000000000
--- a/fabric-item-api-v1/src/client/java/net/fabricmc/fabric/mixin/item/client/ItemStackMixin.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.mixin.item.client;
-
-import java.util.List;
-
-import org.jspecify.annotations.Nullable;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.TooltipFlag;
-
-import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
-
-@Mixin(ItemStack.class)
-public abstract class ItemStackMixin {
-	// Only target the second RETURN, the first RETURN is for no tooltip
-	@Inject(method = "getTooltipLines", at = @At(value = "RETURN", ordinal = 1))
-	private void getTooltip(Item.TooltipContext tooltipContext, @Nullable Player entity, TooltipFlag tooltipFlag, CallbackInfoReturnable> info) {
-		ItemTooltipCallback.EVENT.invoker().getTooltip((ItemStack) (Object) this, tooltipContext, tooltipFlag, info.getReturnValue());
-	}
-}
diff --git a/fabric-item-api-v1/src/client/java/net/fabricmc/fabric/mixin/item/client/MultiPlayerGameModeMixin.java b/fabric-item-api-v1/src/client/java/net/fabricmc/fabric/mixin/item/client/MultiPlayerGameModeMixin.java
deleted file mode 100644
index daf0e9f583..0000000000
--- a/fabric-item-api-v1/src/client/java/net/fabricmc/fabric/mixin/item/client/MultiPlayerGameModeMixin.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.mixin.item.client;
-
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.MultiPlayerGameMode;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.item.ItemStack;
-
-@Mixin(MultiPlayerGameMode.class)
-public class MultiPlayerGameModeMixin {
-	@Shadow
-	@Final
-	private Minecraft minecraft;
-	@Shadow
-	private BlockPos destroyBlockPos;
-	@Shadow
-	private ItemStack destroyingItem;
-
-	/**
-	 * Allows a FabricItem to continue block breaking progress even if the count or nbt changed.
-	 * For this, we inject after vanilla decided that the stack was "not unchanged", and we set if back to "unchanged"
-	 * if the item wishes to continue mining.
-	 */
-	@Redirect(
-			at = @At(
-					value = "INVOKE",
-					target = "Lnet/minecraft/world/item/ItemStack;isSameItemSameComponents(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Z"
-			),
-			method = "sameDestroyTarget"
-	)
-	private boolean fabricItemContinueBlockBreakingInject(ItemStack stack, ItemStack otherStack) {
-		boolean stackUnchanged = ItemStack.isSameItemSameComponents(stack, this.destroyingItem);
-
-		if (!stackUnchanged) {
-			// The stack changed and vanilla is about to cancel block breaking progress. Check if the item wants to continue block breaking instead.
-			ItemStack oldStack = this.destroyingItem;
-			ItemStack newStack = this.minecraft.player.getMainHandItem();
-
-			if (oldStack.is(newStack.getItem()) && oldStack.getItem().allowContinuingBlockBreaking(this.minecraft.player, oldStack, newStack)) {
-				stackUnchanged = true;
-			}
-		}
-
-		return stackUnchanged;
-	}
-}
diff --git a/fabric-item-api-v1/src/client/resources/fabric-item-api-v1.client.mixins.json b/fabric-item-api-v1/src/client/resources/fabric-item-api-v1.client.mixins.json
index af0460dc59..a63b44b7c9 100644
--- a/fabric-item-api-v1/src/client/resources/fabric-item-api-v1.client.mixins.json
+++ b/fabric-item-api-v1/src/client/resources/fabric-item-api-v1.client.mixins.json
@@ -3,9 +3,7 @@
   "package": "net.fabricmc.fabric.mixin.item.client",
   "compatibilityLevel": "JAVA_25",
   "client": [
-    "MultiPlayerGameModeMixin",
-    "ItemInHandRendererMixin",
-    "ItemStackMixin"
+    "IItemExtensionClientMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/EnchantmentEvents.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/EnchantmentEvents.java
index 542fe959fb..c3bff43658 100644
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/EnchantmentEvents.java
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/EnchantmentEvents.java
@@ -17,6 +17,7 @@
 package net.fabricmc.fabric.api.item.v1;
 
 import net.minecraft.core.Holder;
+import net.minecraft.resources.RegistryOps;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.Enchantment;
@@ -76,7 +77,10 @@ private EnchantmentEvents() { }
 	 *
 	 * 
    Note: If you wish to modify the exclusive set of the enchantment, consider extending the
 	 * {@linkplain net.minecraft.tags.EnchantmentTags relevant tag} through your mod's data pack instead.
+	 *
+	 * @deprecated Use {@link #MODIFY_WITH_LOOKUP} instead, which provides registry access via {@link RegistryOps.RegistryInfoLookup}
 	 */
+	@Deprecated
 	public static final Event MODIFY = EventFactory.createArrayBacked(
 			Modify.class,
 			callbacks -> (key, builder, source) -> {
@@ -86,6 +90,29 @@ private EnchantmentEvents() { }
 			}
 	);
 
+	/**
+	 * An event that allows an {@link Enchantment} to be modified without needing to fully override an enchantment.
+	 *
+	 * 
    This should only be used to modify the behavior of external enchantments, where 'external' means
+	 * either vanilla or from another mod. For instance, a mod might add a bleed effect to Sharpness (and only Sharpness).
+	 * For your own enchantments, you should simply define them in your mod's data pack. See the
+	 * Enchantment Definition page on the Minecraft Wiki
+	 * for more information.
+	 *
+	 * 
    Note: If you wish to modify the exclusive set of the enchantment, consider extending the
+	 * {@linkplain net.minecraft.tags.EnchantmentTags relevant tag} through your mod's data pack instead.
+	 *
+	 * 
    This is the preferred replacement for {@link #MODIFY}, providing access to registry information via {@link RegistryOps.RegistryInfoLookup}.
+	 */
+	public static final Event MODIFY_WITH_LOOKUP = EventFactory.createArrayBacked(
+			ModifyWithLookup.class,
+			callbacks -> (key, builder, source, registries) -> {
+				for (ModifyWithLookup callback : callbacks) {
+					callback.modify(key, builder, source, registries);
+				}
+			}
+	);
+
 	@FunctionalInterface
 	public interface AllowEnchanting {
 		/**
@@ -106,6 +133,7 @@ TriState allowEnchanting(
 	}
 
 	@FunctionalInterface
+	@Deprecated
 	public interface Modify {
 		/**
 		 * Modifies the effects of an {@link Enchantment}.
@@ -120,4 +148,22 @@ void modify(
 				EnchantmentSource source
 		);
 	}
+
+	@FunctionalInterface
+	public interface ModifyWithLookup {
+		/**
+		 * Modifies the effects of an {@link Enchantment}.
+		 *
+		 * @param key The ID of the enchantment
+		 * @param builder The enchantment builder
+		 * @param source The source of the enchantment
+		 * @param registryInfoLookup Lookup interface used to access registry information
+		 */
+		void modify(
+				ResourceKey key,
+				Enchantment.Builder builder,
+				EnchantmentSource source,
+				RegistryOps.RegistryInfoLookup registryInfoLookup
+		);
+	}
 }
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricComponentMapBuilder.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricComponentMapBuilder.java
index c673962aa7..e16702fd08 100644
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricComponentMapBuilder.java
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricComponentMapBuilder.java
@@ -21,6 +21,7 @@
 import java.util.function.Supplier;
 
 import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.Nullable;
 
 import net.minecraft.core.component.DataComponentType;
 
@@ -31,6 +32,16 @@
  */
 @ApiStatus.NonExtendable
 public interface FabricComponentMapBuilder {
+	/**
+	 * Gets the current value for the component type in the builder, or {@code null} if it is not present.
+	 * @param type The component type
+	 * @param  The type of the component data
+	 * @return Returns the current value in the map builder, or {@code null} if not present
+	 */
+	default  @Nullable T get(DataComponentType type) {
+		throw new AssertionError("Implemented in Mixin");
+	}
+
 	/**
 	 * Gets the current value for the component type in the builder, or creates and adds a new value if it is not present.
 	 *
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java
index 5b63587cdc..25712f451f 100644
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java
@@ -19,9 +19,16 @@
 import java.util.Optional;
 import java.util.Set;
 
+import net.fabricmc.fabric.impl.item.RecursivityHelper;
+
+import net.neoforged.neoforge.common.extensions.IItemExtension;
+import org.apache.commons.lang3.function.TriFunction;
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.core.Holder;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.core.component.DataComponentInitializers;
+import net.minecraft.core.component.DataComponentType;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
@@ -59,7 +66,7 @@ public interface FabricItem {
 	 * @return true to run the vanilla animation, false to cancel it.
 	 */
 	default boolean allowComponentsUpdateAnimation(Player player, InteractionHand hand, ItemStack oldStack, ItemStack newStack) {
-		return true;
+		return !RecursivityHelper.allowForgeCall() || ((IItemExtension) this).shouldCauseReequipAnimation(oldStack, newStack, false);
 	}
 
 	/**
@@ -105,7 +112,7 @@ default boolean allowContinuingBlockBreaking(Player player, ItemStack oldStack,
 	 * @return the leftover item stack
 	 */
 	default @Nullable ItemStackTemplate getCraftingRemainder(ItemStack stack) {
-		return ((Item) this).getCraftingRemainder();
+		return RecursivityHelper.allowForgeCall() ? stack.getCraftingRemainder() : null;
 	}
 
 	/**
@@ -125,6 +132,8 @@ default boolean allowContinuingBlockBreaking(Player player, ItemStack oldStack,
 	 * @return whether the enchantment is allowed to apply to the stack
 	 */
 	default boolean canBeEnchantedWith(ItemStack stack, Holder enchantment, EnchantingContext context) {
+		if (!RecursivityHelper.allowForgeCall()) return false;
+
 		return context == EnchantingContext.PRIMARY
 				? enchantment.value().isPrimaryItem(stack)
 				: enchantment.value().canEnchant(stack);
@@ -168,6 +177,30 @@ default String getCreatorNamespace(ItemStack stack) {
 	 * This interface is automatically implemented on all item properties via Mixin and interface injection.
 	 */
 	interface Properties {
+		/**
+		 * Modifies the value of a component. The original value may be null if no initializer for this component type was registered, or the initializer for this component type was registered after the modifier. Returning null will remove the value for this component type.
+		 * @param type the {@link DataComponentType} of the component to modify
+		 * @param modifier the modifier to run on the component
+		 * @param  the type of the component
+		 * @return this builder
+		 */
+		default  Item.Properties modifyComponent(DataComponentType type, TriFunction<@Nullable T, HolderLookup.Provider, ResourceKey, @Nullable T> modifier) {
+			return this.modifyComponents((builder, registries, id) -> {
+				builder.set(type, modifier.apply(builder.get(type), registries, id));
+			});
+		}
+
+		/**
+		 * Modifies the value of all components initialized by initializers up to this point.
+		 * @param modifier the modifier to apply
+		 * @return this builder
+		 */
+		default Item.Properties modifyComponents(DataComponentInitializers.Initializer modifier) {
+			Item.Properties self = (Item.Properties) this;
+			self.componentInitializer = self.componentInitializer.andThen(modifier);
+			return self;
+		}
+
 		/**
 		 * Sets the equipment slot provider of the item.
 		 *
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItemStack.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItemStack.java
index 9db4639370..fc4c9ea4e9 100644
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItemStack.java
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItemStack.java
@@ -16,6 +16,7 @@
 
 package net.fabricmc.fabric.api.item.v1;
 
+import net.neoforged.neoforge.common.extensions.IItemStackExtension;
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.core.Holder;
@@ -30,7 +31,7 @@
  * Fabric-provided extensions for {@link ItemStack}.
  * This interface is automatically implemented on all item stacks via Mixin and interface injection.
  */
-public interface FabricItemStack {
+public interface FabricItemStack extends IItemStackExtension {
 	/**
 	 * Return a leftover item for use in recipes.
 	 *
@@ -41,7 +42,7 @@ public interface FabricItemStack {
 	 * @return the leftover item
 	 */
 	default @Nullable ItemStackTemplate getCraftingRemainder() {
-		return ((ItemStack) this).getItem().getCraftingRemainder((ItemStack) this);
+		return IItemStackExtension.super.getCraftingRemainder();
 	}
 
 	/**
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricTooltipFlag.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricTooltipFlag.java
new file mode 100644
index 0000000000..e3ba3b0315
--- /dev/null
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricTooltipFlag.java
@@ -0,0 +1,31 @@
+/*
+ * 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.api.item.v1;
+
+/// General-purpose Fabric-provided extensions for [net.minecraft.world.item.TooltipFlag].
+///
+/// Note: This interface is automatically implemented on all tooltip flags via interface injection.
+public interface FabricTooltipFlag {
+	/// {@return all information that it may show under varying circumstances}
+	///
+	/// Modded tooltips often have requirements to hold keys like Shift or Ctrl in order
+	/// to see more information. With this flag enabled, all information provided
+	/// by this tooltip should be shown regardless of whether a key is held.
+	default boolean shouldDisplayAllInformation() {
+		return false;
+	}
+}
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/ItemClickBehaviorCallback.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/ItemClickBehaviorCallback.java
new file mode 100644
index 0000000000..4bada53b68
--- /dev/null
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/ItemClickBehaviorCallback.java
@@ -0,0 +1,78 @@
+/*
+ * 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.api.item.v1;
+
+import net.minecraft.world.entity.SlotAccess;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.ClickAction;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.fabricmc.fabric.api.util.EventResult;
+
+/// A single event that allows for overriding item behavior otherwise implemented via
+/// [ItemStack#overrideStackedOnOther(Slot, ClickAction, Player)] and
+/// [ItemStack#overrideOtherStackedOnMe(ItemStack, Slot, ClickAction, Player, SlotAccess)] on a
+/// per-item basis.
+///
+/// The event runs whenever a slot in an [net.minecraft.world.inventory.AbstractContainerMenu] is
+/// clicked and provides the item in the slot and the item currently carried by the cursor. Either
+/// item can be empty.
+///
+/// This behavior runs on both the client and server side except the creative mode inventory menu,
+/// which is only ever handled client-side.
+@FunctionalInterface
+public interface ItemClickBehaviorCallback {
+	/// Callback that runs in
+	/// [net.minecraft.world.inventory.AbstractContainerMenu#tryItemClickBehaviourOverride(Player,
+	/// ClickAction, Slot, ItemStack, ItemStack)].
+	Event EVENT = EventFactory.createArrayBacked(
+			ItemClickBehaviorCallback.class,
+			callbacks -> (ItemStack hoveredItem, Slot hoveredSlot, ItemStack itemHeldByCursor, SlotAccess slotHeldByCursor, ClickAction clickAction, Player player) -> {
+				for (ItemClickBehaviorCallback callback : callbacks) {
+					EventResult result = callback.onItemClickBehavior(hoveredItem,
+							hoveredSlot,
+							itemHeldByCursor,
+							slotHeldByCursor,
+							clickAction,
+							player);
+					if (result != EventResult.PASS) {
+						return result;
+					}
+				}
+
+				return EventResult.PASS;
+			});
+
+	/// Handles menu interactions when clicking items on top of each other in a container menu.
+	///
+	/// @param hoveredItem      the item in the slot hovered by the mouse cursor
+	/// @param hoveredSlot      the slot hovered by the mouse cursor
+	/// @param itemHeldByCursor the item carried by the cursor
+	/// @param slotHeldByCursor the slot abstraction for the cursor
+	/// @param clickAction      the mouse button that was used in the click
+	/// @param player           the player
+	/// @return [EventResult#ALLOW] to allow normal container menu click behavior to run,
+	/// 		[EventResult#DENY] to prevent normal click behavior, which allows for implementing a
+	/// 		custom interaction as vanilla does for bundles, [EventResult#PASS] to fall back to other
+	/// 		callbacks and eventually resolve [ItemStack#overrideStackedOnOther(Slot, ClickAction,
+	/// 		Player)] and [ItemStack#overrideOtherStackedOnMe(ItemStack, Slot, ClickAction, Player,
+	/// 		SlotAccess)]
+	EventResult onItemClickBehavior(ItemStack hoveredItem, Slot hoveredSlot, ItemStack itemHeldByCursor, SlotAccess slotHeldByCursor, ClickAction clickAction, Player player);
+}
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/EnchantmentUtil.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/EnchantmentUtil.java
index d884756c76..a1e96a5e11 100644
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/EnchantmentUtil.java
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/EnchantmentUtil.java
@@ -18,11 +18,14 @@
 
 import java.util.List;
 
+import net.fabricmc.fabric.api.resource.v1.FabricResource;
+
 import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import net.minecraft.core.component.DataComponentType;
+import net.minecraft.resources.RegistryOps;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.packs.repository.PackSource;
 import net.minecraft.server.packs.resources.Resource;
@@ -37,9 +40,9 @@
 public class EnchantmentUtil {
 	private static final Logger LOGGER = LoggerFactory.getLogger(EnchantmentUtil.class);
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({"unchecked", "deprecation"})
 	@Nullable
-	public static Enchantment modify(ResourceKey key, Enchantment originalEnchantment, EnchantmentSource source) {
+	public static Enchantment modify(ResourceKey key, Enchantment originalEnchantment, EnchantmentSource source, RegistryOps.RegistryInfoLookup registryInfoLookup) {
 		Enchantment.Builder builder = Enchantment.enchantment(originalEnchantment.definition());
 		EnchantmentBuilderAccessor accessor = (EnchantmentBuilderAccessor) builder;
 		BuilderExtensions builderExtensions = (BuilderExtensions) builder;
@@ -60,6 +63,7 @@ public static Enchantment modify(ResourceKey key, Enchantment origi
 		builderExtensions.fabric$resetModified();
 
 		EnchantmentEvents.MODIFY.invoker().modify(key, builder, source);
+		EnchantmentEvents.MODIFY_WITH_LOOKUP.invoker().modify(key, builder, source, registryInfoLookup);
 
 		if (builderExtensions.fabric$didModify()) {
 			LOGGER.debug("Enchantment {} was modified", key.identifier());
@@ -77,11 +81,11 @@ public static Enchantment modify(ResourceKey key, Enchantment origi
 
 	public static EnchantmentSource determineSource(Resource resource) {
 		if (resource != null) {
-			PackSource packSource = resource.getFabricPackSource();
+			PackSource packSource = ((FabricResource) resource).getFabricPackSource();
 
 			if (packSource == PackSource.BUILT_IN) {
 				return EnchantmentSource.VANILLA;
-			} else if (packSource == ModResourcePackCreator.RESOURCE_PACK_SOURCE || packSource instanceof BuiltinModPackSource) {
+			} else if (packSource == ModResourcePackCreator.RESOURCE_PACK_SOURCE || packSource instanceof BuiltinModPackSource || resource.knownPackInfo().map(p -> !p.isVanilla()).orElse(false)) {
 				return EnchantmentSource.MOD;
 			}
 		}
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/FabricItemImpl.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/FabricItemImpl.java
new file mode 100644
index 0000000000..3aee344647
--- /dev/null
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/FabricItemImpl.java
@@ -0,0 +1,13 @@
+package net.fabricmc.fabric.impl.item;
+
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.common.Mod;
+import org.sinytra.fabric.item_api.generated.GeneratedEntryPoint;
+
+@Mod(GeneratedEntryPoint.MOD_ID)
+public class FabricItemImpl {
+
+	public FabricItemImpl(IEventBus bus) {
+		bus.addListener(ItemComponentTooltipProviderRegistryImpl::register);
+	}
+}
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/ItemComponentTooltipProviderRegistryImpl.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/ItemComponentTooltipProviderRegistryImpl.java
index feb9761b78..b012dd27de 100644
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/ItemComponentTooltipProviderRegistryImpl.java
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/ItemComponentTooltipProviderRegistryImpl.java
@@ -17,19 +17,14 @@
 package net.fabricmc.fabric.impl.item;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.function.Consumer;
+
+import net.neoforged.neoforge.common.tooltip.TooltipAppender;
+import net.neoforged.neoforge.event.RegisterTooltipAppendersEvent;
 
 import net.minecraft.core.component.DataComponentType;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.item.component.TooltipDisplay;
 import net.minecraft.world.item.component.TooltipProvider;
 
 public final class ItemComponentTooltipProviderRegistryImpl {
@@ -37,118 +32,35 @@ public final class ItemComponentTooltipProviderRegistryImpl {
 	private static final List> last = new ArrayList<>();
 	private static final Map, List>> before = new IdentityHashMap<>();
 	private static final Map, List>> after = new IdentityHashMap<>();
-	private static boolean hasModdedEntries = false;
+
+	public static void register(RegisterTooltipAppendersEvent event) {
+		for (DataComponentType type : first) {
+			event.registerComponentAppenderBeforeAll(type, TooltipAppender.createComponentAppender(type));
+		}
+		for (DataComponentType type : last) {
+			event.registerComponentAppenderAfterAll(type, TooltipAppender.createComponentAppender(type));
+		}
+		before.forEach((type, others) -> 
+			others.forEach(other ->
+				event.registerComponentAppenderBefore(other, type, TooltipAppender.createComponentAppender(other))));
+		after.forEach((type, others) -> 
+			others.forEach(other ->
+				event.registerComponentAppenderAfter(other, type, TooltipAppender.createComponentAppender(other))));
+	}
 
 	public static void addFirst(DataComponentType componentType) {
 		first.add(componentType);
-		onModified();
 	}
 
 	public static void addLast(DataComponentType componentType) {
 		last.add(componentType);
-		onModified();
 	}
 
 	public static void addBefore(DataComponentType anchor, DataComponentType componentType) {
 		before.computeIfAbsent(anchor, k -> new ArrayList<>()).add(componentType);
-		onModified();
 	}
 
 	public static void addAfter(DataComponentType anchor, DataComponentType componentType) {
 		after.computeIfAbsent(anchor, k -> new ArrayList<>()).add(componentType);
-		onModified();
-	}
-
-	private static void onModified() {
-		hasModdedEntries = true;
-		VanillaTooltipProviderOrder.load();
-	}
-
-	public static boolean hasModdedEntries() {
-		return hasModdedEntries;
-	}
-
-	public static void onFirst(
-			ItemStack stack,
-			Item.TooltipContext context,
-			TooltipDisplay displayComponent,
-			Consumer componentConsumer,
-			TooltipFlag flag
-	) {
-		Set> cycleDetector = new HashSet<>();
-
-		for (DataComponentType componentType : first) {
-			appendCustomComponentTooltip(stack, componentType, context, displayComponent, componentConsumer, flag, cycleDetector);
-		}
-	}
-
-	public static void onLast(
-			ItemStack stack,
-			Item.TooltipContext context,
-			TooltipDisplay displayComponent,
-			Consumer componentConsumer,
-			TooltipFlag flag
-	) {
-		Set> cycleDetector = new HashSet<>();
-
-		for (DataComponentType componentType : last) {
-			appendCustomComponentTooltip(stack, componentType, context, displayComponent, componentConsumer, flag, cycleDetector);
-		}
-	}
-
-	public static void onBefore(
-			ItemStack stack,
-			DataComponentType componentType,
-			Item.TooltipContext context,
-			TooltipDisplay displayComponent,
-			Consumer componentConsumer,
-			TooltipFlag flag,
-			Set> cycleDetector
-	) {
-		List> befores = before.get(componentType);
-
-		if (befores != null) {
-			for (DataComponentType beforeComponentType : befores) {
-				appendCustomComponentTooltip(stack, beforeComponentType, context, displayComponent, componentConsumer, flag, cycleDetector);
-			}
-		}
-	}
-
-	public static void onAfter(
-			ItemStack stack,
-			DataComponentType componentType,
-			Item.TooltipContext context,
-			TooltipDisplay displayComponent,
-			Consumer componentConsumer,
-			TooltipFlag flag,
-			Set> cycleDetector
-	) {
-		List> afters = after.get(componentType);
-
-		if (afters != null) {
-			for (DataComponentType afterComponentType : afters) {
-				appendCustomComponentTooltip(stack, afterComponentType, context, displayComponent, componentConsumer, flag, cycleDetector);
-			}
-		}
-	}
-
-	private static void appendCustomComponentTooltip(
-			ItemStack stack,
-			DataComponentType componentType,
-			Item.TooltipContext context,
-			TooltipDisplay displayComponent,
-			Consumer componentConsumer,
-			TooltipFlag flag,
-			Set> cycleDetector
-	) {
-		if (!cycleDetector.add(componentType)) {
-			return;
-		}
-
-		onBefore(stack, componentType, context, displayComponent, componentConsumer, flag, cycleDetector);
-		stack.addToTooltip(componentType, context, displayComponent, componentConsumer, flag);
-		onAfter(stack, componentType, context, displayComponent, componentConsumer, flag, cycleDetector);
-
-		cycleDetector.remove(componentType);
 	}
 }
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/RecursivityHelper.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/RecursivityHelper.java
new file mode 100644
index 0000000000..c2ce4351f5
--- /dev/null
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/RecursivityHelper.java
@@ -0,0 +1,21 @@
+package net.fabricmc.fabric.impl.item;
+
+import java.util.function.Supplier;
+
+public final class RecursivityHelper {
+    public static final ThreadLocal FORGE_CALL = ThreadLocal.withInitial(() -> false);
+
+    public static  T nonRecursiveApiCall(Supplier supplier) {
+        FORGE_CALL.set(true);
+        T result = supplier.get();
+        FORGE_CALL.set(false);
+        return result;
+    }
+
+    public static boolean allowForgeCall() {
+        return !FORGE_CALL.get();
+    }
+
+    private RecursivityHelper() {
+    }
+}
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/VanillaTooltipProviderOrder.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/VanillaTooltipProviderOrder.java
deleted file mode 100644
index fcc886e6fa..0000000000
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/VanillaTooltipProviderOrder.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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.impl.item;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Consumer;
-
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.FieldInsnNode;
-import org.objectweb.asm.tree.MethodInsnNode;
-import org.objectweb.asm.tree.MethodNode;
-import org.spongepowered.asm.service.MixinService;
-
-import net.minecraft.core.component.DataComponentType;
-import net.minecraft.core.component.DataComponents;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.item.component.TooltipDisplay;
-
-public final class VanillaTooltipProviderOrder {
-	private static final List> VANILLA_ORDER = scrapeVanillaOrder();
-
-	private VanillaTooltipProviderOrder() {
-	}
-
-	public static void load() {
-		// calling this method loads the class, eagerly populating VANILLA_ORDER
-	}
-
-	// Find the order in which vanilla tooltip providers are run by inspecting the bytecode of ItemStack.appendTooltip.
-	private static List> scrapeVanillaOrder() {
-		try {
-			ClassNode itemStackNode = MixinService.getService().getBytecodeProvider().getClassNode(Type.getInternalName(ItemStack.class));
-
-			String methodName = "addDetailsToTooltip";
-			String methodDesc = Type.getMethodDescriptor(
-					Type.VOID_TYPE,
-					Type.getType(Item.TooltipContext.class),
-					Type.getType(TooltipDisplay.class),
-					Type.getType(Player.class),
-					Type.getType(TooltipFlag.class),
-					Type.getType(Consumer.class)
-			);
-
-			String appendAttributeModifiersTooltipName = "addAttributeTooltips";
-			String appendAttributeModifiersTooltipDesc = Type.getMethodDescriptor(
-					Type.VOID_TYPE,
-					Type.getType(Consumer.class),
-					Type.getType(TooltipDisplay.class),
-					Type.getType(Player.class)
-			);
-
-			MethodNode appendTooltipMethod = itemStackNode.methods.stream()
-					.filter(method -> method.name.equals(methodName) && method.desc.equals(methodDesc))
-					.findAny()
-					.orElseThrow(() -> new IllegalStateException("No appendTooltip method in ItemStack"));
-
-			// Search for data component accesses within this method
-			List> componentTypes = new ArrayList<>();
-			Set alreadyAddedComponents = new HashSet<>();
-			String owner = Type.getInternalName(DataComponents.class);
-			String desc = Type.getDescriptor(DataComponentType.class);
-
-			for (AbstractInsnNode insn : appendTooltipMethod.instructions) {
-				if (insn instanceof FieldInsnNode fieldInsn
-						&& fieldInsn.getOpcode() == Opcodes.GETSTATIC
-						&& fieldInsn.owner.equals(owner)
-						&& fieldInsn.desc.equals(desc)
-				) {
-					String fieldName = fieldInsn.name;
-
-					if (alreadyAddedComponents.add(fieldName)) {
-						componentTypes.add((DataComponentType) DataComponents.class.getField(fieldName).get(null));
-					}
-				} else if (insn instanceof MethodInsnNode methodInsn
-						&& methodInsn.name.equals(appendAttributeModifiersTooltipName)
-						&& methodInsn.desc.equals(appendAttributeModifiersTooltipDesc)
-						&& methodInsn.owner.equals(Type.getInternalName(ItemStack.class))
-				) {
-					// Special case: attribute modifiers are extracted into a separate method
-					componentTypes.add(DataComponents.ATTRIBUTE_MODIFIERS);
-				}
-			}
-
-			if (componentTypes.isEmpty()) {
-				throw new IllegalStateException("Found no component types in appendTooltip method");
-			}
-
-			return Collections.unmodifiableList(componentTypes);
-		} catch (ReflectiveOperationException | IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	public static List> getVanillaOrder() {
-		return VANILLA_ORDER;
-	}
-}
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractContainerMenuMixin.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractContainerMenuMixin.java
new file mode 100644
index 0000000000..eba9155732
--- /dev/null
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractContainerMenuMixin.java
@@ -0,0 +1,55 @@
+/*
+ * 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.mixin.item;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.world.entity.SlotAccess;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.ClickAction;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+
+import net.fabricmc.fabric.api.item.v1.ItemClickBehaviorCallback;
+import net.fabricmc.fabric.api.util.EventResult;
+
+@Mixin(AbstractContainerMenu.class)
+abstract class AbstractContainerMenuMixin {
+	@Inject(method = "tryItemClickBehaviourOverride", at = @At("HEAD"), cancellable = true)
+	private void overrideContainerMenuItemClickBehaviour(Player player, ClickAction clickAction, Slot slot, ItemStack clicked, ItemStack carried, CallbackInfoReturnable callback) {
+		EventResult result = ItemClickBehaviorCallback.EVENT.invoker()
+				.onItemClickBehavior(clicked,
+						slot,
+						carried,
+						this.createCarriedSlotAccess(),
+						clickAction,
+						player);
+		if (result != EventResult.PASS) {
+			callback.setReturnValue(!result.allowAction());
+		}
+	}
+
+	@Shadow
+	private SlotAccess createCarriedSlotAccess() {
+		throw new RuntimeException();
+	}
+}
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractFurnaceBlockEntityMixin.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractFurnaceBlockEntityMixin.java
deleted file mode 100644
index 17c824db56..0000000000
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractFurnaceBlockEntityMixin.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.mixin.item;
-
-import com.llamalad7.mixinextras.sugar.Share;
-import com.llamalad7.mixinextras.sugar.ref.LocalRef;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.core.NonNullList;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.ItemStackTemplate;
-import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
-
-@Mixin(AbstractFurnaceBlockEntity.class)
-public abstract class AbstractFurnaceBlockEntityMixin {
-	// Copy the stack before the .shrink
-	@Inject(method = "consumeFuel", at = @At("HEAD"))
-	private static void copyStack(NonNullList items, ItemStack fuel, CallbackInfo ci, @Share("itemStack") LocalRef copiedStack) {
-		copiedStack.set(fuel.copy());
-	}
-
-	@Redirect(method = "consumeFuel", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/Item;getCraftingRemainder()Lnet/minecraft/world/item/ItemStackTemplate;"))
-	private static ItemStackTemplate getCraftingRemainder(Item item, @Share("itemStack") LocalRef stack) {
-		return stack.get().getCraftingRemainder();
-	}
-}
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AnvilMenuMixin.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AnvilMenuMixin.java
index a178fdf89b..5997eae028 100644
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AnvilMenuMixin.java
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AnvilMenuMixin.java
@@ -16,11 +16,11 @@
 
 package net.fabricmc.fabric.mixin.item;
 
-import com.llamalad7.mixinextras.sugar.Local;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
 import net.minecraft.core.Holder;
 import net.minecraft.world.entity.player.Inventory;
@@ -40,14 +40,14 @@ abstract class AnvilMenuMixin extends ItemCombinerMenu {
 		super(type, syncId, playerInventory, context, forgingSlotsManager);
 	}
 
-	@Redirect(
-			method = "createResult",
+	@WrapOperation(
+			method = "createResultInternal",
 			at = @At(
 					value = "INVOKE",
-					target = "Lnet/minecraft/world/item/enchantment/Enchantment;canEnchant(Lnet/minecraft/world/item/ItemStack;)Z"
+					target = "Lnet/minecraft/world/item/ItemStack;supportsEnchantment(Lnet/minecraft/core/Holder;)Z"
 			)
 	)
-	private boolean callAllowEnchantingEvent(Enchantment instance, ItemStack stack, @Local(name = "enchantmentHolder") Holder enchantmentHolder) {
-		return stack.canBeEnchantedWith(enchantmentHolder, EnchantingContext.ACCEPTABLE);
+	private boolean callAllowEnchantingEvent(ItemStack instance, Holder registryEntry, Operation original) {
+		return instance.canBeEnchantedWith(registryEntry, EnchantingContext.ACCEPTABLE) || original.call(instance, registryEntry);
 	}
 }
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/BrewingStandBlockEntityMixin.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/BrewingStandBlockEntityMixin.java
deleted file mode 100644
index 6859b309ab..0000000000
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/BrewingStandBlockEntityMixin.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.mixin.item;
-
-import com.llamalad7.mixinextras.sugar.Local;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.ItemStackTemplate;
-import net.minecraft.world.level.block.entity.BrewingStandBlockEntity;
-
-@Mixin(BrewingStandBlockEntity.class)
-public class BrewingStandBlockEntityMixin {
-	@Redirect(method = "doBrew", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/Item;getCraftingRemainder()Lnet/minecraft/world/item/ItemStackTemplate;"))
-	private static ItemStackTemplate getCraftingRemainder(Item item, @Local(name = "ingredient") ItemStack ingredient) {
-		return ingredient.getCraftingRemainder();
-	}
-}
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/CraftingRecipeMixin.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/CraftingRecipeMixin.java
deleted file mode 100644
index c876b90845..0000000000
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/CraftingRecipeMixin.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.mixin.item;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Share;
-import com.llamalad7.mixinextras.sugar.ref.LocalRef;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.ItemStackTemplate;
-import net.minecraft.world.item.crafting.CraftingRecipe;
-
-@Mixin(CraftingRecipe.class)
-public interface CraftingRecipeMixin {
-	@WrapOperation(method = "defaultCraftingReminder", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;getItem()Lnet/minecraft/world/item/Item;"))
-	private static Item captureStack(ItemStack stack, Operation operation, @Share("stack") LocalRef stackRef) {
-		stackRef.set(stack);
-		return operation.call(stack);
-	}
-
-	@Redirect(method = "defaultCraftingReminder", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/Item;getCraftingRemainder()Lnet/minecraft/world/item/ItemStackTemplate;"))
-	private static ItemStackTemplate getStackRemainder(Item item, @Share("stack") LocalRef stackRef) {
-		return stackRef.get().getCraftingRemainder();
-	}
-}
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/EnchantCommandMixin.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/EnchantCommandMixin.java
index e31d528d0e..1c78eac1bf 100644
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/EnchantCommandMixin.java
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/EnchantCommandMixin.java
@@ -16,16 +16,13 @@
 
 package net.fabricmc.fabric.mixin.item;
 
-import java.util.Collection;
-
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
-import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.core.Holder;
 import net.minecraft.server.commands.EnchantCommand;
-import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.Enchantment;
 
@@ -33,11 +30,11 @@
 
 @Mixin(EnchantCommand.class)
 abstract class EnchantCommandMixin {
-	@Redirect(
+	@WrapOperation(
 			method = "enchant",
-			at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/enchantment/Enchantment;canEnchant(Lnet/minecraft/world/item/ItemStack;)Z")
+			at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;supportsEnchantment(Lnet/minecraft/core/Holder;)Z")
 	)
-	private static boolean callAllowEnchantingEvent(Enchantment instance, ItemStack stack, CommandSourceStack source, Collection targets, Holder enchantment) {
-		return stack.canBeEnchantedWith(enchantment, EnchantingContext.ACCEPTABLE);
+	private static boolean callAllowEnchantingEvent(ItemStack instance, Holder enchantment, Operation original) {
+		return instance.canBeEnchantedWith(enchantment, EnchantingContext.ACCEPTABLE) || original.call(instance, enchantment);
 	}
 }
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/EnchantRandomlyFunctionMixin.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/EnchantRandomlyFunctionMixin.java
index 6332397304..dca428d472 100644
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/EnchantRandomlyFunctionMixin.java
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/EnchantRandomlyFunctionMixin.java
@@ -16,9 +16,10 @@
 
 package net.fabricmc.fabric.mixin.item;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
 import net.minecraft.core.Holder;
 import net.minecraft.world.item.ItemStack;
@@ -29,11 +30,11 @@
 
 @Mixin(EnchantRandomlyFunction.class)
 abstract class EnchantRandomlyFunctionMixin {
-	@Redirect(
+	@WrapOperation(
 			method = "lambda$run$1",
-			at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/enchantment/Enchantment;canEnchant(Lnet/minecraft/world/item/ItemStack;)Z")
+			at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;supportsEnchantment(Lnet/minecraft/core/Holder;)Z")
 	)
-	private static boolean callAllowEnchantingEvent(Enchantment enchantment, ItemStack stack, boolean bl, ItemStack itemStack, Holder holder) {
-		return stack.canBeEnchantedWith(holder, EnchantingContext.ACCEPTABLE);
+	private static boolean callAllowEnchantingEvent(ItemStack stack, Holder registryEntry, Operation original) {
+		return stack.canBeEnchantedWith(registryEntry, EnchantingContext.ACCEPTABLE) || original.call(stack, registryEntry);
 	}
 }
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/EnchantmentHelperMixin.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/EnchantmentHelperMixin.java
deleted file mode 100644
index 5a4da78ed0..0000000000
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/EnchantmentHelperMixin.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.mixin.item;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import net.minecraft.core.Holder;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.enchantment.Enchantment;
-import net.minecraft.world.item.enchantment.EnchantmentHelper;
-
-import net.fabricmc.fabric.api.item.v1.EnchantingContext;
-
-@Mixin(EnchantmentHelper.class)
-abstract class EnchantmentHelperMixin {
-	@Redirect(
-			method = "lambda$getAvailableEnchantmentResults$0",
-			at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/enchantment/Enchantment;isPrimaryItem(Lnet/minecraft/world/item/ItemStack;)Z")
-	)
-	private static boolean useCustomEnchantingChecks(Enchantment instance, ItemStack stack, ItemStack itemStack, boolean bl, Holder holder) {
-		return stack.canBeEnchantedWith(holder, EnchantingContext.PRIMARY);
-	}
-}
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/IItemExtensionMixin.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/IItemExtensionMixin.java
new file mode 100644
index 0000000000..7106627cfd
--- /dev/null
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/IItemExtensionMixin.java
@@ -0,0 +1,53 @@
+package net.fabricmc.fabric.mixin.item;
+
+import net.fabricmc.fabric.api.item.v1.EnchantingContext;
+import net.fabricmc.fabric.impl.item.RecursivityHelper;
+
+import net.minecraft.core.Holder;
+import net.minecraft.world.item.ItemInstance;
+import net.minecraft.world.item.ItemStackTemplate;
+
+import net.minecraft.world.item.enchantment.Enchantment;
+
+import net.neoforged.neoforge.common.extensions.IItemExtension;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.item.ItemStack;
+
+import net.fabricmc.fabric.api.item.v1.EquipmentSlotProvider;
+import net.fabricmc.fabric.api.item.v1.FabricItem;
+import net.fabricmc.fabric.impl.item.ItemExtensions;
+
+@Mixin(IItemExtension.class)
+public interface IItemExtensionMixin extends FabricItem {
+
+    @Inject(method = "getCraftingRemainder", at = @At("HEAD"), cancellable = true)
+    default void getCraftingRemainder(ItemInstance item, CallbackInfoReturnable cir) {
+		ItemStack stack = item instanceof ItemStack s ? s : new ItemStack(item.typeHolder(), item.count());
+        ItemStackTemplate fabricRemainder = RecursivityHelper.nonRecursiveApiCall(() -> this.getCraftingRemainder(stack));
+        if (fabricRemainder != null) {
+            cir.setReturnValue(fabricRemainder);
+        }
+    }
+
+    @Inject(method = "getEquipmentSlot", at = @At("HEAD"), cancellable = true)
+    default void getEquipmentSlot(ItemStack stack, CallbackInfoReturnable cir) {
+        EquipmentSlotProvider equipmentSlotProvider = ((ItemExtensions) this).fabric_getEquipmentSlotProvider();
+
+        if (equipmentSlotProvider != null) {
+            cir.setReturnValue(equipmentSlotProvider.getEquipmentSlotForItem((LivingEntity) this, stack));
+        }
+    }
+	
+	@Inject(method = "isPrimaryItemFor", at = @At("HEAD"), cancellable = true)
+	default void isPrimaryItemFor(ItemStack stack, Holder enchantment, CallbackInfoReturnable cir) {
+		if (RecursivityHelper.nonRecursiveApiCall(() -> stack.canBeEnchantedWith(enchantment, EnchantingContext.PRIMARY))) {
+			cir.setReturnValue(true);
+		}
+	}
+}
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/ItemStackMixin.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/ItemStackMixin.java
index 8717347162..86a798b3b5 100644
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/ItemStackMixin.java
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/ItemStackMixin.java
@@ -16,44 +16,25 @@
 
 package net.fabricmc.fabric.mixin.item;
 
-import java.util.HashSet;
-import java.util.List;
 import java.util.function.Consumer;
 
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
-import com.llamalad7.mixinextras.sugar.Share;
-import com.llamalad7.mixinextras.sugar.ref.LocalIntRef;
 import org.apache.commons.lang3.mutable.MutableBoolean;
-import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyArg;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.core.component.DataComponentType;
-import net.minecraft.core.component.DataComponents;
-import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.item.component.TooltipDisplay;
 
 import net.fabricmc.fabric.api.item.v1.CustomDamageHandler;
 import net.fabricmc.fabric.api.item.v1.FabricItemStack;
-import net.fabricmc.fabric.impl.item.ItemComponentTooltipProviderRegistryImpl;
 import net.fabricmc.fabric.impl.item.ItemExtensions;
-import net.fabricmc.fabric.impl.item.VanillaTooltipProviderOrder;
 
 @Mixin(ItemStack.class)
 public abstract class ItemStackMixin implements FabricItemStack {
@@ -63,8 +44,8 @@ public abstract class ItemStackMixin implements FabricItemStack {
 	@Shadow
 	public abstract void shrink(int i);
 
-	@WrapOperation(method = "hurtAndBreak(ILnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/EquipmentSlot;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;hurtAndBreak(ILnet/minecraft/server/level/ServerLevel;Lnet/minecraft/server/level/ServerPlayer;Ljava/util/function/Consumer;)V"))
-	private void hookDamage(ItemStack instance, int amount, ServerLevel serverLevel, ServerPlayer serverPlayer, Consumer consumer, Operation original, @Local(argsOnly = true) LivingEntity entity, @Local(argsOnly = true) EquipmentSlot slot) {
+	@WrapOperation(method = "hurtAndBreak(ILnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/EquipmentSlot;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;hurtAndBreak(ILnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Ljava/util/function/Consumer;)V"))
+	private void hookDamage(ItemStack instance, int amount, ServerLevel serverLevel, LivingEntity serverPlayer, Consumer consumer, Operation original, @Local(argsOnly = true) LivingEntity entity, @Local(argsOnly = true) EquipmentSlot slot) {
 		CustomDamageHandler handler = ((ItemExtensions) getItem()).fabric_getCustomDamageHandler();
 
 		/*
@@ -90,128 +71,4 @@ The other damage method (which original.call discards) handles the creative mode
 
 		original.call(instance, amount, serverLevel, serverPlayer, consumer);
 	}
-
-	@ModifyArg(method = "addDetailsToTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;addToTooltip(Lnet/minecraft/core/component/DataComponentType;Lnet/minecraft/world/item/Item$TooltipContext;Lnet/minecraft/world/item/component/TooltipDisplay;Ljava/util/function/Consumer;Lnet/minecraft/world/item/TooltipFlag;)V"))
-	private DataComponentType preAppendComponentTooltip(
-			DataComponentType componentType,
-			@Local(argsOnly = true) Item.TooltipContext context,
-			@Local(argsOnly = true) TooltipDisplay displayComponent,
-			@Local(argsOnly = true) TooltipFlag type,
-			@Local(argsOnly = true) Consumer componentConsumer,
-			@Share("index") LocalIntRef index
-	) {
-		preAppendTooltip(componentType, context, displayComponent, componentConsumer, type, index);
-		return componentType;
-	}
-
-	@ModifyArg(method = "addDetailsToTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/component/TooltipDisplay;shows(Lnet/minecraft/core/component/DataComponentType;)Z"))
-	private DataComponentType preShouldDisplay(
-			DataComponentType componentType,
-			@Local(argsOnly = true) Item.TooltipContext context,
-			@Local(argsOnly = true) TooltipDisplay displayComponent,
-			@Local(argsOnly = true) TooltipFlag type,
-			@Local(argsOnly = true) Consumer componentConsumer,
-			@Share("index") LocalIntRef index
-	) {
-		preAppendTooltip(componentType, context, displayComponent, componentConsumer, type, index);
-		return componentType;
-	}
-
-	@Inject(method = "addDetailsToTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;addAttributeTooltips(Ljava/util/function/Consumer;Lnet/minecraft/world/item/component/TooltipDisplay;Lnet/minecraft/world/entity/player/Player;)V"))
-	private void preAttributeModifiers(
-			Item.TooltipContext context,
-			TooltipDisplay displayComponent,
-			@Nullable Player player,
-			TooltipFlag type,
-			Consumer componentConsumer,
-			CallbackInfo ci,
-			@Share("index") LocalIntRef index
-	) {
-		// Special case: attribute modifiers are extracted into a separate method
-		preAppendTooltip(DataComponents.ATTRIBUTE_MODIFIERS, context, displayComponent, componentConsumer, type, index);
-	}
-
-	@Inject(method = "addDetailsToTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/DefaultedRegistry;getKey(Ljava/lang/Object;)Lnet/minecraft/resources/Identifier;"))
-	private void postTooltipsAdvanced(
-			Item.TooltipContext context,
-			TooltipDisplay displayComponent,
-			@Nullable Player player,
-			TooltipFlag type,
-			Consumer componentConsumer,
-			CallbackInfo ci,
-			@Share("index") LocalIntRef index
-	) {
-		preAppendTooltip(null, context, displayComponent, componentConsumer, type, index);
-	}
-
-	@ModifyExpressionValue(method = "addDetailsToTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/TooltipFlag;isAdvanced()Z"))
-	private boolean postTooltipsNonAdvanced(
-			boolean isAdvanced,
-			Item.TooltipContext context,
-			TooltipDisplay displayComponent,
-			@Nullable Player player,
-			TooltipFlag type,
-			Consumer componentConsumer,
-			@Share("index") LocalIntRef index
-	) {
-		if (!isAdvanced) {
-			preAppendTooltip(null, context, displayComponent, componentConsumer, type, index);
-		}
-
-		return isAdvanced;
-	}
-
-	@Unique
-	private void preAppendTooltip(
-			@Nullable DataComponentType componentType,
-			Item.TooltipContext context,
-			TooltipDisplay displayComponent,
-			Consumer componentConsumer,
-			TooltipFlag tooltipFlag,
-			LocalIntRef index
-	) {
-		if (!ItemComponentTooltipProviderRegistryImpl.hasModdedEntries()) {
-			return;
-		}
-
-		if (index.get() == 0) {
-			ItemComponentTooltipProviderRegistryImpl.onFirst((ItemStack) (Object) this, context, displayComponent, componentConsumer, tooltipFlag);
-		}
-
-		List> vanillaOrder = VanillaTooltipProviderOrder.getVanillaOrder();
-
-		if (index.get() > vanillaOrder.size()) {
-			return;
-		}
-
-		// Find out which vanilla tooltip providers we may have skipped over and run their anchored providers first
-
-		while (true) {
-			if (index.get() > 0) {
-				DataComponentType prevComponentInOrder = vanillaOrder.get(index.get() - 1);
-				HashSet> cycleDetector = new HashSet<>();
-				cycleDetector.add(prevComponentInOrder);
-				ItemComponentTooltipProviderRegistryImpl.onAfter((ItemStack) (Object) this, prevComponentInOrder, context, displayComponent, componentConsumer, tooltipFlag, cycleDetector);
-			}
-
-			if (index.get() == vanillaOrder.size()) {
-				index.set(index.get() + 1);
-				break;
-			}
-
-			DataComponentType componentInOrder = vanillaOrder.get(index.get());
-			HashSet> cycleDetector = new HashSet<>();
-			cycleDetector.add(componentInOrder);
-			ItemComponentTooltipProviderRegistryImpl.onBefore((ItemStack) (Object) this, componentInOrder, context, displayComponent, componentConsumer, tooltipFlag, cycleDetector);
-			index.set(index.get() + 1);
-
-			if (componentInOrder == componentType) {
-				break;
-			}
-		}
-
-		if (componentType == null) {
-			ItemComponentTooltipProviderRegistryImpl.onLast((ItemStack) (Object) this, context, displayComponent, componentConsumer, tooltipFlag);
-		}
-	}
 }
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/LivingEntityMixin.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/LivingEntityMixin.java
deleted file mode 100644
index 602f127df2..0000000000
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/LivingEntityMixin.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.mixin.item;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.item.ItemStack;
-
-import net.fabricmc.fabric.api.item.v1.EquipmentSlotProvider;
-import net.fabricmc.fabric.impl.item.ItemExtensions;
-
-@Mixin(LivingEntity.class)
-abstract class LivingEntityMixin {
-	@Inject(method = "getEquipmentSlotForItem", at = @At(value = "HEAD"), cancellable = true)
-	private void onGetPreferredEquipmentSlot(ItemStack stack, CallbackInfoReturnable info) {
-		EquipmentSlotProvider equipmentSlotProvider = ((ItemExtensions) stack.getItem()).fabric_getEquipmentSlotProvider();
-
-		if (equipmentSlotProvider != null) {
-			info.setReturnValue(equipmentSlotProvider.getEquipmentSlotForItem((LivingEntity) (Object) this, stack));
-		}
-	}
-}
diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/ResourceManagerRegistryLoadTaskMixin.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/ResourceManagerRegistryLoadTaskMixin.java
index e00bd30213..3b1bd02d39 100644
--- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/ResourceManagerRegistryLoadTaskMixin.java
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/ResourceManagerRegistryLoadTaskMixin.java
@@ -17,16 +17,22 @@
 package net.fabricmc.fabric.mixin.item;
 
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.datafixers.util.Either;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import net.minecraft.core.RegistrationInfo;
 import net.minecraft.resources.RegistryLoadTask;
+import net.minecraft.resources.RegistryOps;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceManagerRegistryLoadTask;
 import net.minecraft.server.packs.resources.Resource;
@@ -36,11 +42,14 @@
 
 @Mixin(ResourceManagerRegistryLoadTask.class)
 public class ResourceManagerRegistryLoadTaskMixin {
+	@Unique
+	private volatile RegistryOps.RegistryInfoLookup registryInfoLookup;
+
 	@WrapOperation(method = "lambda$load$2", at = @At(value = "NEW", target = "net/minecraft/resources/RegistryLoadTask$PendingRegistration"))
 	private  RegistryLoadTask.PendingRegistration modify(ResourceKey key, Either value, RegistrationInfo registrationInfo, Operation> original, @Local(argsOnly = true) Resource resource) {
 		if (value.left().isPresent()) {
 			if (value.left().get() instanceof Enchantment enchantment) {
-				Enchantment modified = EnchantmentUtil.modify((ResourceKey) key, enchantment, EnchantmentUtil.determineSource(resource));
+				Enchantment modified = EnchantmentUtil.modify((ResourceKey) key, enchantment, EnchantmentUtil.determineSource(resource), registryInfoLookup);
 
 				if (modified != null) {
 					// Clear the knownPackInfo to force the server to sync the data pack to the client
@@ -52,4 +61,9 @@ private  RegistryLoadTask.PendingRegistration modify(ResourceKey key, E
 
 		return original.call(key, value, registrationInfo);
 	}
+
+	@Inject(method = "load", at = @At("HEAD"))
+	private void captureRegistries(RegistryOps.RegistryInfoLookup context, Executor executor, CallbackInfoReturnable> cir) {
+		this.registryInfoLookup = context;
+	}
 }
diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/KeyMappingAccessor.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/TooltipFlagExtensionMixin.java
similarity index 68%
rename from fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/KeyMappingAccessor.java
rename to fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/TooltipFlagExtensionMixin.java
index c63963e4ac..802c7f4ab8 100644
--- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/KeyMappingAccessor.java
+++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/TooltipFlagExtensionMixin.java
@@ -14,16 +14,13 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.client.gametest.input;
+package net.fabricmc.fabric.mixin.item;
 
-import com.mojang.blaze3d.platform.InputConstants;
+import net.neoforged.neoforge.common.extensions.TooltipFlagExtension;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
 
-import net.minecraft.client.KeyMapping;
+import net.fabricmc.fabric.api.item.v1.FabricTooltipFlag;
 
-@Mixin(KeyMapping.class)
-public interface KeyMappingAccessor {
-	@Accessor
-	InputConstants.Key getKey();
+@Mixin(TooltipFlagExtension.class)
+public interface TooltipFlagExtensionMixin extends FabricTooltipFlag {
 }
diff --git a/fabric-item-api-v1/src/main/resources/fabric-item-api-v1.classtweaker b/fabric-item-api-v1/src/main/resources/fabric-item-api-v1.classtweaker
index 65c23fdab7..3f24938f32 100644
--- a/fabric-item-api-v1/src/main/resources/fabric-item-api-v1.classtweaker
+++ b/fabric-item-api-v1/src/main/resources/fabric-item-api-v1.classtweaker
@@ -1,4 +1,5 @@
 classTweaker	v1	official
+accessible field net/minecraft/world/item/Item$Properties componentInitializer Lnet/minecraft/core/component/DataComponentInitializers$Initializer;
 accessible class net/minecraft/resources/RegistryLoadTask$PendingRegistration
 accessible class net/minecraft/core/component/DataComponentInitializers$BakedEntry
 accessible class net/minecraft/core/component/DataComponentInitializers$PendingComponentBuilders
@@ -6,3 +7,4 @@ transitive-inject-interface	net/minecraft/world/item/Item	net/fabricmc/fabric/ap
 transitive-inject-interface	net/minecraft/world/item/Item$Properties	net/fabricmc/fabric/api/item/v1/FabricItem$Properties
 transitive-inject-interface	net/minecraft/world/item/ItemStack	net/fabricmc/fabric/api/item/v1/FabricItemStack
 transitive-inject-interface	net/minecraft/core/component/DataComponentMap$Builder	net/fabricmc/fabric/api/item/v1/FabricComponentMapBuilder
+transitive-inject-interface net/minecraft/world/item/TooltipFlag net/fabricmc/fabric/api/item/v1/FabricTooltipFlag
diff --git a/fabric-item-api-v1/src/main/resources/fabric-item-api-v1.mixins.json b/fabric-item-api-v1/src/main/resources/fabric-item-api-v1.mixins.json
index 26788baf90..c35392b94b 100644
--- a/fabric-item-api-v1/src/main/resources/fabric-item-api-v1.mixins.json
+++ b/fabric-item-api-v1/src/main/resources/fabric-item-api-v1.mixins.json
@@ -3,24 +3,22 @@
   "package": "net.fabricmc.fabric.mixin.item",
   "compatibilityLevel": "JAVA_25",
   "mixins": [
-    "AbstractFurnaceBlockEntityMixin",
+    "AbstractContainerMenuMixin",
     "AnvilMenuMixin",
-    "BrewingStandBlockEntityMixin",
     "BuiltInRegistriesMixin",
-    "CraftingRecipeMixin",
     "DataComponentInitializersMixin",
     "DataComponentInitializersPendingComponentsMixin",
     "DataComponentMapBuilderMixin",
     "EnchantCommandMixin",
     "EnchantmentBuilderAccessor",
     "EnchantmentBuilderMixin",
-    "EnchantmentHelperMixin",
     "EnchantRandomlyFunctionMixin",
+    "IItemExtensionMixin",
     "ItemMixin",
     "ItemPropertiesMixin",
     "ItemStackMixin",
-    "LivingEntityMixin",
-    "ResourceManagerRegistryLoadTaskMixin"
+    "ResourceManagerRegistryLoadTaskMixin",
+    "TooltipFlagExtensionMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java
index 4c6acfb92d..10e204972b 100644
--- a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java
+++ b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java
@@ -16,6 +16,8 @@
 
 package net.fabricmc.fabric.test.item;
 
+import net.fabricmc.fabric.api.item.v1.FabricItem;
+
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.core.Holder;
@@ -79,7 +81,13 @@ public void onInitialize() {
 
 	public static class WeirdPick extends Item {
 		protected WeirdPick(ResourceKey resourceKey) {
-			super(new Item.Properties().pickaxe(ToolMaterial.GOLD, 3f, 5f).customDamage(WEIRD_DAMAGE_HANDLER).setId(resourceKey));
+			super(buildProperties(resourceKey));
+		}
+		
+		private static Item.Properties buildProperties(ResourceKey resourceKey) {
+			Item.Properties props = new Item.Properties().pickaxe(ToolMaterial.GOLD, 3f, 5f).setId(resourceKey);
+			((FabricItem.Properties) props).customDamage(WEIRD_DAMAGE_HANDLER);
+			return props;
 		}
 
 		@Override
diff --git a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomEnchantmentEffectsTest.java b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomEnchantmentEffectsTest.java
index 13ac84df8a..c4e5bb199b 100644
--- a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomEnchantmentEffectsTest.java
+++ b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomEnchantmentEffectsTest.java
@@ -16,14 +16,15 @@
 
 package net.fabricmc.fabric.test.item;
 
-import net.minecraft.advancements.criterion.DamageSourcePredicate;
-import net.minecraft.advancements.criterion.EntityPredicate;
-import net.minecraft.advancements.criterion.EntityTypePredicate;
+import net.minecraft.advancements.predicates.DamageSourcePredicate;
+import net.minecraft.advancements.predicates.entity.EntityPredicate;
+import net.minecraft.advancements.predicates.entity.EntityTypePredicate;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.tags.EnchantmentTags;
+import net.minecraft.world.entity.EntityTypes;
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.EnchantmentEffectComponents;
 import net.minecraft.world.item.enchantment.EnchantmentTarget;
@@ -46,8 +47,8 @@ public class CustomEnchantmentEffectsTest implements ModInitializer {
 
 	@Override
 	public void onInitialize() {
-		EnchantmentEvents.MODIFY.register(
-				(key, builder, source) -> {
+		EnchantmentEvents.MODIFY_WITH_LOOKUP.register(
+				(key, builder, source, registries) -> {
 					if (source.isBuiltin() && key == WEIRD_IMPALING) {
 						// make impaling set things on fire
 						builder.withEffect(
@@ -67,9 +68,12 @@ public void onInitialize() {
 								LootItemEntityPropertyCondition.hasProperties(
 										LootContext.EntityTarget.THIS,
 										EntityPredicate.Builder.entity()
-												.entityType(EntityTypePredicate.of(BuiltInRegistries.ENTITY_TYPE, EntityType.ZOMBIE))
+												.entityType(EntityTypePredicate.of(BuiltInRegistries.ENTITY_TYPE, EntityTypes.ZOMBIE))
 								)
 						);
+
+						// make it exclusive with treasure enchantments
+						builder.exclusiveWith(registries.lookup(Registries.ENCHANTMENT).orElseThrow().getter().getOrThrow(EnchantmentTags.TREASURE));
 					}
 				}
 		);
diff --git a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomModelIdTest.java b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomModelIdTest.java
index 9f109619e3..bea3ed50ec 100644
--- a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomModelIdTest.java
+++ b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomModelIdTest.java
@@ -27,10 +27,16 @@
 
 public class CustomModelIdTest implements ModInitializer {
 	public static final ResourceKey NOT_A_DIAMOND_KEY = ResourceKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath("fabric-item-api-v1-testmod", "not_a_diamond"));
-	public static final Item NOT_A_DIAMOND = new Item(new Item.Properties().setId(NOT_A_DIAMOND_KEY).modelId(Identifier.withDefaultNamespace("diamond")));
+	public static final Item NOT_A_DIAMOND = new Item(buildProperties());
 
 	@Override
 	public void onInitialize() {
 		Registry.register(BuiltInRegistries.ITEM, NOT_A_DIAMOND_KEY, NOT_A_DIAMOND);
 	}
+
+	private static Item.Properties buildProperties() {
+		Item.Properties props = new Item.Properties().setId(NOT_A_DIAMOND_KEY);
+		props.modelId(Identifier.withDefaultNamespace("diamond"));
+		return props;
+	}
 }
diff --git a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/ItemClickBehaviorTest.java b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/ItemClickBehaviorTest.java
new file mode 100644
index 0000000000..e0446f8e66
--- /dev/null
+++ b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/ItemClickBehaviorTest.java
@@ -0,0 +1,47 @@
+/*
+ * 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.item;
+
+import net.minecraft.world.entity.SlotAccess;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.ClickAction;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.item.v1.ItemClickBehaviorCallback;
+import net.fabricmc.fabric.api.util.EventResult;
+
+public class ItemClickBehaviorTest implements ModInitializer {
+	@Override
+	public void onInitialize() {
+		ItemClickBehaviorCallback.EVENT.register((ItemStack hoveredItem, Slot hoveredSlot, ItemStack itemHeldByCursor, SlotAccess slotHeldByCursor, ClickAction clickAction, Player player) -> {
+			if (hoveredItem.is(Items.DYED_BUNDLE.yellow())
+					|| itemHeldByCursor.is(Items.DYED_BUNDLE.yellow())) {
+				// Disables any special click behavior for yellow bundles, so they behave like most other items in container menus.
+				return EventResult.ALLOW;
+			} else if (hoveredItem.is(Items.COPPER_NUGGET) && !itemHeldByCursor.isEmpty()
+					|| !hoveredItem.isEmpty() && itemHeldByCursor.is(Items.COPPER_NUGGET)) {
+				// Prevents click interactions for copper nugget in container menus (without providing any special handling).
+				return EventResult.DENY;
+			} else {
+				return EventResult.PASS;
+			}
+		});
+	}
+}
diff --git a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/ModifyComponentsInPropertiesTestSetup.java b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/ModifyComponentsInPropertiesTestSetup.java
new file mode 100644
index 0000000000..5e128739ee
--- /dev/null
+++ b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/ModifyComponentsInPropertiesTestSetup.java
@@ -0,0 +1,63 @@
+/*
+ * 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.item;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import net.minecraft.core.HolderSet;
+import net.minecraft.core.Registry;
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ToolMaterial;
+import net.minecraft.world.item.component.Tool;
+import net.minecraft.world.level.block.Blocks;
+
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
+
+public class ModifyComponentsInPropertiesTestSetup implements ModInitializer {
+	@Override
+	public void onInitialize() {
+		Item item = Registry.register(
+				BuiltInRegistries.ITEM,
+				Identifier.fromNamespaceAndPath("fabric-item-api-v1-testmod", "op_sword"),
+				new Item(new Item.Properties().setId(ResourceKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath("fabric-item-api-v1-testmod", "op_sword"))).sword(ToolMaterial.NETHERITE, 3.0F, -2.4F).fireResistant().modifyComponent(DataComponents.TOOL, (original, _, _) -> {
+					// derived from ToolMaterial#applySwordProperties
+					var newRules = new ArrayList<>(Objects.requireNonNull(original, "sword method did not add a tool component?").rules());
+					newRules.addFirst(new Tool.Rule(HolderSet.direct(Blocks.DIRT.builtInRegistryHolder()), Optional.of(44f), Optional.of(false)));
+					return new Tool(List.copyOf(newRules), original.defaultMiningSpeed(), original.damagePerBlock(), original.canDestroyBlocksInCreative());
+				}))
+		);
+
+		ServerLifecycleEvents.SERVER_STARTED.register(server -> {
+			if (item.getDefaultInstance().getDestroySpeed(Blocks.ACACIA_BUTTON.defaultBlockState()) == 44f) {
+				throw new AssertionError("ModifyComponentsInPropertiesTestSetup failed");
+			}
+
+			if (item.getDefaultInstance().getDestroySpeed(Blocks.DIRT.defaultBlockState()) != 44f) {
+				throw new AssertionError("ModifyComponentsInPropertiesTestSetup failed");
+			}
+		});
+	}
+}
diff --git a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/gametest/BrewingStandGameTest.java b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/gametest/BrewingStandGameTest.java
index d42e7e97e1..31de4f2fd3 100644
--- a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/gametest/BrewingStandGameTest.java
+++ b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/gametest/BrewingStandGameTest.java
@@ -71,7 +71,7 @@ public void vanillaRemainderTest(GameTestHelper helper) {
 				setPotion(new ItemStack(Items.LINGERING_POTION), Potions.AWKWARD),
 				setPotion(new ItemStack(Items.LINGERING_POTION), Potions.AWKWARD),
 				setPotion(new ItemStack(Items.LINGERING_POTION), Potions.AWKWARD),
-				ItemStack.EMPTY,
+				new ItemStack(Items.GLASS_BOTTLE),
 				ItemStack.EMPTY);
 
 		helper.succeed();
diff --git a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/gametest/CustomEnchantmentEffectsGameTest.java b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/gametest/CustomEnchantmentEffectsGameTest.java
index fe38411cb4..0999bce442 100644
--- a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/gametest/CustomEnchantmentEffectsGameTest.java
+++ b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/gametest/CustomEnchantmentEffectsGameTest.java
@@ -28,7 +28,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EntityTypes;
 import net.minecraft.world.entity.monster.Creeper;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
@@ -46,7 +46,7 @@ public class CustomEnchantmentEffectsGameTest {
 	@GameTest
 	public void weirdImpalingSetsFireToTargets(GameTestHelper helper) {
 		BlockPos pos = new BlockPos(3, 3, 3);
-		Creeper creeper = helper.spawn(EntityType.CREEPER, pos);
+		Creeper creeper = helper.spawn(EntityTypes.CREEPER, pos);
 		Player player = helper.makeMockPlayer(GameType.CREATIVE);
 
 		ItemStack trident = Items.TRIDENT.getDefaultInstance();
@@ -60,9 +60,9 @@ public void weirdImpalingSetsFireToTargets(GameTestHelper helper) {
 
 		player.setItemInHand(InteractionHand.MAIN_HAND, trident);
 
-		helper.assertEntityData(pos, EntityType.CREEPER, Entity::isOnFire, false);
+		helper.assertEntityData(pos, EntityTypes.CREEPER, Entity::isOnFire, false);
 		player.attack(creeper);
-		helper.succeedWhenEntityData(pos, EntityType.CREEPER, Entity::isOnFire, true);
+		helper.succeedWhenEntityData(pos, EntityTypes.CREEPER, Entity::isOnFire, true);
 	}
 
 	@GameTest
diff --git a/fabric-item-api-v1/src/testmod/resources/assets/fabric-item-api-v1-testmod/items/op_sword.json b/fabric-item-api-v1/src/testmod/resources/assets/fabric-item-api-v1-testmod/items/op_sword.json
new file mode 100644
index 0000000000..aad713a0b7
--- /dev/null
+++ b/fabric-item-api-v1/src/testmod/resources/assets/fabric-item-api-v1-testmod/items/op_sword.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "minecraft:item/netherite_shovel"
+  }
+}
diff --git a/fabric-item-api-v1/src/testmod/resources/assets/fabric-item-api-v1-testmod/models/item/op_sword.json b/fabric-item-api-v1/src/testmod/resources/assets/fabric-item-api-v1-testmod/models/item/op_sword.json
new file mode 100644
index 0000000000..c714603736
--- /dev/null
+++ b/fabric-item-api-v1/src/testmod/resources/assets/fabric-item-api-v1-testmod/models/item/op_sword.json
@@ -0,0 +1,3 @@
+{
+  "parent": "minecraft:item/netherite_shovel"
+}
diff --git a/fabric-item-api-v1/src/testmod/resources/data/fabric-item-api-v1-testmod/enchantment/weird_impaling.json b/fabric-item-api-v1/src/testmod/resources/data/fabric-item-api-v1-testmod/enchantment/weird_impaling.json
index e091a2db8c..446b0ce052 100644
--- a/fabric-item-api-v1/src/testmod/resources/data/fabric-item-api-v1-testmod/enchantment/weird_impaling.json
+++ b/fabric-item-api-v1/src/testmod/resources/data/fabric-item-api-v1-testmod/enchantment/weird_impaling.json
@@ -33,7 +33,7 @@
           "condition": "minecraft:entity_properties",
           "entity": "this",
           "predicate": {
-            "type": "#minecraft:sensitive_to_impaling"
+            "minecraft:entity_type": "#minecraft:sensitive_to_impaling"
           }
         }
       }
diff --git a/fabric-item-api-v1/src/testmod/resources/fabric.mod.json b/fabric-item-api-v1/src/testmod/resources/fabric.mod.json
index c837050fee..1cac45b9ea 100644
--- a/fabric-item-api-v1/src/testmod/resources/fabric.mod.json
+++ b/fabric-item-api-v1/src/testmod/resources/fabric.mod.json
@@ -10,13 +10,15 @@
   },
   "entrypoints": {
     "main": [
+      "net.fabricmc.fabric.test.item.ComponentTooltipProviderTest",
+      "net.fabricmc.fabric.test.item.CreatorNamespaceTest",
       "net.fabricmc.fabric.test.item.CustomDamageTest",
-      "net.fabricmc.fabric.test.item.DefaultItemComponentTest",
+      "net.fabricmc.fabric.test.item.CustomEnchantmentEffectsTest",
       "net.fabricmc.fabric.test.item.CustomModelIdTest",
+      "net.fabricmc.fabric.test.item.DefaultItemComponentTest",
+      "net.fabricmc.fabric.test.item.ItemClickBehaviorTest",
       "net.fabricmc.fabric.test.item.ItemUpdateAnimationTest",
-      "net.fabricmc.fabric.test.item.CustomEnchantmentEffectsTest",
-      "net.fabricmc.fabric.test.item.ComponentTooltipProviderTest",
-      "net.fabricmc.fabric.test.item.CreatorNamespaceTest"
+      "net.fabricmc.fabric.test.item.ModifyComponentsInPropertiesTestSetup"
     ],
     "client": [
       "net.fabricmc.fabric.test.item.client.TooltipTests"
diff --git a/fabric-key-mapping-api-v1/src/client/java/net/fabricmc/fabric/impl/client/keymapping/FabricKeyMappingImpl.java b/fabric-key-mapping-api-v1/src/client/java/net/fabricmc/fabric/impl/client/keymapping/FabricKeyMappingImpl.java
new file mode 100644
index 0000000000..cd569a4936
--- /dev/null
+++ b/fabric-key-mapping-api-v1/src/client/java/net/fabricmc/fabric/impl/client/keymapping/FabricKeyMappingImpl.java
@@ -0,0 +1,15 @@
+package net.fabricmc.fabric.impl.client.keymapping;
+
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
+
+import net.fabricmc.api.ClientModInitializer;
+
+public class FabricKeyMappingImpl implements ClientModInitializer {
+    @Override
+    public void onInitializeClient() {
+        IEventBus bus = ModLoadingContext.get().getActiveContainer().getEventBus();
+        bus.addListener(RegisterKeyMappingsEvent.class, KeyMappingRegistryImpl::process);
+    }
+}
diff --git a/fabric-key-mapping-api-v1/src/client/java/net/fabricmc/fabric/impl/client/keymapping/KeyMappingRegistryImpl.java b/fabric-key-mapping-api-v1/src/client/java/net/fabricmc/fabric/impl/client/keymapping/KeyMappingRegistryImpl.java
index b3e16ca9a6..88c6ab6925 100644
--- a/fabric-key-mapping-api-v1/src/client/java/net/fabricmc/fabric/impl/client/keymapping/KeyMappingRegistryImpl.java
+++ b/fabric-key-mapping-api-v1/src/client/java/net/fabricmc/fabric/impl/client/keymapping/KeyMappingRegistryImpl.java
@@ -18,20 +18,20 @@
 
 import java.util.List;
 
-import com.google.common.collect.Lists;
 import it.unimi.dsi.fastutil.objects.ReferenceArrayList;
+import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
 
 import net.minecraft.client.KeyMapping;
-import net.minecraft.client.Minecraft;
 
 public final class KeyMappingRegistryImpl {
 	private static final List MODDED_KEY_BINDINGS = new ReferenceArrayList<>(); // ArrayList with identity based comparisons for contains/remove/indexOf etc., required for correctly handling duplicate keybinds
+	private static boolean processed;
 
 	private KeyMappingRegistryImpl() {
 	}
 
 	public static KeyMapping registerKeyMapping(KeyMapping binding) {
-		if (Minecraft.getInstance().options != null) {
+		if (processed) {
 			throw new IllegalStateException("GameOptions has already been initialised");
 		}
 
@@ -51,10 +51,8 @@ public static KeyMapping registerKeyMapping(KeyMapping binding) {
 	 * Processes the keymappings array for our modded ones by first removing existing modded keymappings and readding them,
 	 * we can make sure that there are no duplicates this way.
 	 */
-	public static KeyMapping[] process(KeyMapping[] keysAll) {
-		List newKeysAll = Lists.newArrayList(keysAll);
-		newKeysAll.removeAll(MODDED_KEY_BINDINGS);
-		newKeysAll.addAll(MODDED_KEY_BINDINGS);
-		return newKeysAll.toArray(new KeyMapping[0]);
+	public static void process(RegisterKeyMappingsEvent event) {
+		MODDED_KEY_BINDINGS.forEach(event::register);
+		processed = true;
 	}
 }
diff --git a/fabric-key-mapping-api-v1/src/client/resources/fabric-key-mapping-api-v1.mixins.json b/fabric-key-mapping-api-v1/src/client/resources/fabric-key-mapping-api-v1.mixins.json
index cef3ac709a..ae8b3892b3 100644
--- a/fabric-key-mapping-api-v1/src/client/resources/fabric-key-mapping-api-v1.mixins.json
+++ b/fabric-key-mapping-api-v1/src/client/resources/fabric-key-mapping-api-v1.mixins.json
@@ -3,7 +3,6 @@
   "package": "net.fabricmc.fabric.mixin.client.keymapping",
   "compatibilityLevel": "JAVA_25",
   "client": [
-    "OptionsMixin",
     "KeyMappingAccessor",
     "KeyMappingCategoryMixin"
   ],
diff --git a/fabric-key-mapping-api-v1/src/client/resources/fabric.mod.json b/fabric-key-mapping-api-v1/src/client/resources/fabric.mod.json
index ac56dc3a75..910fbb6943 100644
--- a/fabric-key-mapping-api-v1/src/client/resources/fabric.mod.json
+++ b/fabric-key-mapping-api-v1/src/client/resources/fabric.mod.json
@@ -24,5 +24,10 @@
   ],
   "custom": {
     "fabric-api:module-lifecycle": "stable"
+  },
+  "entrypoints": {
+    "client": [
+      "net.fabricmc.fabric.impl.client.keymapping.FabricKeyMappingImpl"
+    ]
   }
 }
diff --git a/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/ClientConfigurationPacketListenerImplMixin.java b/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/ClientConfigurationPacketListenerImplMixin.java
index 2282e24218..51264df4d0 100644
--- a/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/ClientConfigurationPacketListenerImplMixin.java
+++ b/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/ClientConfigurationPacketListenerImplMixin.java
@@ -16,21 +16,22 @@
 
 package net.fabricmc.fabric.mixin.event.lifecycle.client;
 
+import com.llamalad7.mixinextras.sugar.Local;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.client.multiplayer.ClientConfigurationPacketListenerImpl;
 import net.minecraft.core.RegistryAccess;
-import net.minecraft.server.packs.resources.ResourceProvider;
+import net.minecraft.network.protocol.configuration.ClientboundFinishConfigurationPacket;
 
 import net.fabricmc.fabric.api.event.lifecycle.v1.CommonLifecycleEvents;
 
 @Mixin(ClientConfigurationPacketListenerImpl.class)
 public class ClientConfigurationPacketListenerImplMixin {
-	@Inject(method = "lambda$handleConfigurationFinished$0", at = @At(value = "RETURN"))
-	private void invokeTagsLoaded(ResourceProvider provider, CallbackInfoReturnable cir) {
-		CommonLifecycleEvents.TAGS_LOADED.invoker().onTagsLoaded(cir.getReturnValue(), true);
+	@Inject(method = "handleConfigurationFinished", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/Connection;setupInboundProtocol(Lnet/minecraft/network/ProtocolInfo;Lnet/minecraft/network/PacketListener;)V"))
+	private void invokeTagsLoaded(ClientboundFinishConfigurationPacket packet, CallbackInfo ci, @Local(name = "registries") RegistryAccess.Frozen registries) {
+		CommonLifecycleEvents.TAGS_LOADED.invoker().onTagsLoaded(registries, true);
 	}
 }
diff --git a/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/LevelChunkMixin.java b/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/LevelChunkMixin.java
index 9ec1b54e80..8364e0b994 100644
--- a/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/LevelChunkMixin.java
+++ b/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/LevelChunkMixin.java
@@ -21,6 +21,7 @@
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.sugar.Local;
 import org.jspecify.annotations.Nullable;
+import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -73,8 +74,20 @@ private void onRemoveBlockEntity(BlockEntity blockEntity, CallbackInfo info, @Lo
 	}
 
 	// Use the slice to not redirect codepath where block entity is loaded
-	@Redirect(method = "getBlockEntity(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk$EntityCreationType;)Lnet/minecraft/world/level/block/entity/BlockEntity;", at = @At(value = "INVOKE", target = "Ljava/util/Map;remove(Ljava/lang/Object;)Ljava/lang/Object;"),
-			slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/chunk/LevelChunk;createBlockEntity(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/entity/BlockEntity;")))
+	@Redirect(
+			method = "getBlockEntity(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk$EntityCreationType;)Lnet/minecraft/world/level/block/entity/BlockEntity;", 
+			at = @At(
+					value = "INVOKE",
+					target = "Ljava/util/Map;remove(Ljava/lang/Object;)Ljava/lang/Object;"
+			),
+			slice = @Slice(
+						to = @At(
+							value = "FIELD",
+							target = "Lnet/minecraft/world/level/chunk/LevelChunk;pendingBlockEntities:Ljava/util/Map;",
+							opcode = Opcodes.GETFIELD
+						)
+					)
+	)
 	private  Object onRemoveBlockEntity(Map map, K key) {
 		@Nullable final V removed = map.remove(key);
 
diff --git a/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/MinecraftMixin.java b/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/MinecraftMixin.java
index 5f5c36c2cd..f9cc0993dd 100644
--- a/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/MinecraftMixin.java
+++ b/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/MinecraftMixin.java
@@ -41,7 +41,7 @@ private void onEndTick(CallbackInfo info) {
 		ClientTickEvents.END_CLIENT_TICK.invoker().onEndTick((Minecraft) (Object) this);
 	}
 
-	@Inject(at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;info(Ljava/lang/String;)V", shift = At.Shift.AFTER), method = "destroy")
+	@Inject(at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;info(Ljava/lang/String;)V", shift = At.Shift.AFTER), method = "exitWorldAndClose")
 	private void onStopping(CallbackInfo ci) {
 		ClientLifecycleEvents.CLIENT_STOPPING.invoker().onClientStopping((Minecraft) (Object) this);
 	}
diff --git a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/api/event/lifecycle/v1/EntityLoadData.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/api/event/lifecycle/v1/EntityLoadData.java
new file mode 100644
index 0000000000..7366521ec4
--- /dev/null
+++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/api/event/lifecycle/v1/EntityLoadData.java
@@ -0,0 +1,43 @@
+/*
+ * 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.api.event.lifecycle.v1;
+
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntitySpawnReason;
+
+/**
+ * Represents extra load data for an {@link Entity}.
+ */
+public interface EntityLoadData {
+	/**
+	 * @return The {@link EntitySpawnReason}, which can be null.
+	 * On the client, this is almost always {@link EntitySpawnReason#LOAD}.
+	 */
+	default @Nullable EntitySpawnReason spawnReason() {
+		throw new UnsupportedOperationException("Implemented via mixin!");
+	}
+
+	/**
+	 * @return true if the entity was loaded from disk.
+	 * On the client, this is always false.
+	 */
+	default boolean isLoadedFromDisk() {
+		throw new UnsupportedOperationException("Implemented via mixin!");
+	}
+}
diff --git a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/api/event/lifecycle/v1/ServerEntityEvents.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/api/event/lifecycle/v1/ServerEntityEvents.java
index c88507f825..2ec01b479b 100644
--- a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/api/event/lifecycle/v1/ServerEntityEvents.java
+++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/api/event/lifecycle/v1/ServerEntityEvents.java
@@ -16,8 +16,11 @@
 
 package net.fabricmc.fabric.api.event.lifecycle.v1;
 
+import org.jspecify.annotations.Nullable;
+
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntitySpawnReason;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
@@ -33,6 +36,9 @@ private ServerEntityEvents() {
 	 * Called when an Entity is loaded into a ServerLevel.
 	 *
 	 * 
    When this event is called, the entity is already in the level.
+	 *
+	 * @see Entity#spawnReason()
+	 * @see Entity#isLoadedFromDisk()
 	 */
 	public static final Event ENTITY_LOAD = EventFactory.createArrayBacked(ServerEntityEvents.Load.class, callbacks -> (entity, level) -> {
 		for (Load callback : callbacks) {
@@ -40,6 +46,19 @@ private ServerEntityEvents() {
 		}
 	});
 
+	/**
+	 * Called right before an {@link Entity} is loaded into a {@link ServerLevel}. Mods can cancel this to prevent the entity from loading in.
+	 */
+	public static final Event ALLOW_LOAD = EventFactory.createArrayBacked(AllowLoad.class, callbacks -> (entity, level, spawnReason, isLoadedFromDisk) -> {
+		for (AllowLoad callback : callbacks) {
+			if (!callback.onAllowLoad(entity, level, spawnReason, isLoadedFromDisk)) {
+				return false;
+			}
+		}
+
+		return true;
+	});
+
 	/**
 	 * Called when an Entity is unloaded from a ServerLevel.
 	 *
@@ -68,6 +87,16 @@ public interface Load {
 		void onLoad(Entity entity, ServerLevel level);
 	}
 
+	@FunctionalInterface
+	public interface AllowLoad {
+		/**
+		 * Called right before an {@link Entity} is loaded into a {@link ServerLevel}.
+		 *
+		 * @return true to allow the load, false to cancel the load.
+		 */
+		boolean onAllowLoad(Entity entity, ServerLevel level, @Nullable EntitySpawnReason spawnReason, boolean isLoadedFromDisk);
+	}
+
 	@FunctionalInterface
 	public interface Unload {
 		void onUnload(Entity entity, ServerLevel level);
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/GenericPayloadAccessor.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/EntityLoadDataSetter.java
similarity index 70%
rename from fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/GenericPayloadAccessor.java
rename to fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/EntityLoadDataSetter.java
index 9d49b0cd55..2b44d528e9 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/GenericPayloadAccessor.java
+++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/EntityLoadDataSetter.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.networking;
+package net.fabricmc.fabric.impl.event.lifecycle;
 
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.minecraft.world.entity.EntitySpawnReason;
 
-public interface GenericPayloadAccessor {
-	CustomPacketPayload fabric_payload();
+public interface EntityLoadDataSetter {
+	void fabric_setSpawnReason(EntitySpawnReason reason);
+	void fabric_setLoadedFromDisk(boolean isLoadedFromDisk);
 }
diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/TaggedChoiceExtension.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/MinecraftServerHooks.java
similarity index 83%
rename from fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/TaggedChoiceExtension.java
rename to fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/MinecraftServerHooks.java
index 2bb7340afb..10881b5e8a 100644
--- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/TaggedChoiceExtension.java
+++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/impl/event/lifecycle/MinecraftServerHooks.java
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.dimension;
+package net.fabricmc.fabric.impl.event.lifecycle;
 
-public interface TaggedChoiceExtension {
-	void fabric$setFailSoft(boolean cond);
+public interface MinecraftServerHooks {
+	boolean fabric$isStartupReady();
 }
diff --git a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/EntityMixin.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/EntityMixin.java
new file mode 100644
index 0000000000..e857a5f5ea
--- /dev/null
+++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/EntityMixin.java
@@ -0,0 +1,57 @@
+/*
+ * 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.mixin.event.lifecycle;
+
+import org.jspecify.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntitySpawnReason;
+
+import net.fabricmc.fabric.api.event.lifecycle.v1.EntityLoadData;
+import net.fabricmc.fabric.impl.event.lifecycle.EntityLoadDataSetter;
+
+@Mixin(Entity.class)
+abstract class EntityMixin implements EntityLoadDataSetter, EntityLoadData {
+	@Unique
+	@Nullable
+	private EntitySpawnReason fabric_spawnReason = null;
+
+	@Unique
+	private boolean fabric_isLoadedFromDisk = false;
+
+	@Unique
+	public void fabric_setSpawnReason(EntitySpawnReason spawnReason) {
+		this.fabric_spawnReason = spawnReason;
+	}
+
+	@Unique
+	public void fabric_setLoadedFromDisk(boolean isLoadedFromDisk) {
+		this.fabric_isLoadedFromDisk = isLoadedFromDisk;
+	}
+
+	@Unique
+	public @Nullable EntitySpawnReason spawnReason() {
+		return fabric_spawnReason;
+	}
+
+	@Unique
+	public boolean isLoadedFromDisk() {
+		return fabric_isLoadedFromDisk;
+	}
+}
diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/PlayerMixin.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/EntityTypeMixin.java
similarity index 54%
rename from fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/PlayerMixin.java
rename to fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/EntityTypeMixin.java
index 84d109e655..e4b74118b3 100644
--- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/PlayerMixin.java
+++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/EntityTypeMixin.java
@@ -14,31 +14,31 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.event.interaction;
+package net.fabricmc.fabric.mixin.event.lifecycle;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.EntitySpawnRequest;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.Level;
 
-import net.fabricmc.fabric.api.event.player.AttackEntityCallback;
+import net.fabricmc.fabric.impl.event.lifecycle.EntityLoadDataSetter;
 
-@Mixin(Player.class)
-public class PlayerMixin {
-	@Inject(method = "attack", at = @At("HEAD"), cancellable = true)
-	public void onPlayerInteractEntity(Entity target, CallbackInfo info) {
-		if ((Object) this instanceof ServerPlayer player) {
-			InteractionResult result = AttackEntityCallback.EVENT.invoker().interact(player, player.level(), InteractionHand.MAIN_HAND, target, null);
+@Mixin(EntityType.class)
+public class EntityTypeMixin {
+	@Inject(
+			method = "create(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/EntitySpawnRequest;)Lnet/minecraft/world/entity/Entity;",
+			at = @At("RETURN")
+	)
+	private  void setSpawnReason(Level level, EntitySpawnRequest request, CallbackInfoReturnable cir) {
+		T entity = cir.getReturnValue();
 
-			if (result != InteractionResult.PASS) {
-				info.cancel();
-			}
+		if (entity != null) {
+			((EntityLoadDataSetter) entity).fabric_setSpawnReason(request.reason());
 		}
 	}
 }
diff --git a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MinecraftServerMixin.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MinecraftServerMixin.java
index dcdf88734f..b8631502fe 100644
--- a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MinecraftServerMixin.java
+++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MinecraftServerMixin.java
@@ -19,6 +19,7 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BooleanSupplier;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
@@ -26,6 +27,7 @@
 import com.llamalad7.mixinextras.sugar.Local;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -33,16 +35,24 @@
 
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.notifications.NotificationManager;
 
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLevelEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
+import net.fabricmc.fabric.impl.event.lifecycle.MinecraftServerHooks;
 
 @Mixin(MinecraftServer.class)
-public abstract class MinecraftServerMixin {
+public abstract class MinecraftServerMixin implements MinecraftServerHooks {
 	@Shadow
 	private MinecraftServer.ReloadableResources resources;
 
+	@Shadow
+	public abstract NotificationManager notificationManager();
+
+	@Unique
+	protected final AtomicBoolean startupReady = new AtomicBoolean(false);
+
 	@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;initServer()Z"), method = "runServer")
 	private void beforeSetupServer(CallbackInfo info) {
 		ServerLifecycleEvents.SERVER_STARTING.invoker().onServerStarting((MinecraftServer) (Object) this);
@@ -51,6 +61,7 @@ private void beforeSetupServer(CallbackInfo info) {
 	@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;buildServerStatus()Lnet/minecraft/network/protocol/status/ServerStatus;", ordinal = 0), method = "runServer")
 	private void afterSetupServer(CallbackInfo info) {
 		ServerLifecycleEvents.SERVER_STARTED.invoker().onServerStarted((MinecraftServer) (Object) this);
+		afterServerStartedEvent();
 	}
 
 	@Inject(at = @At("HEAD"), method = "stopServer")
@@ -109,4 +120,16 @@ private void startSave(boolean suppressLogs, boolean flush, boolean force, Callb
 	private void endSave(boolean suppressLogs, boolean flush, boolean force, CallbackInfoReturnable cir) {
 		ServerLifecycleEvents.AFTER_SAVE.invoker().onAfterSave((MinecraftServer) (Object) this, flush, force);
 	}
+
+	@Override
+	public boolean fabric$isStartupReady() {
+		return this.startupReady.get();
+	}
+
+	@Unique
+	protected void afterServerStartedEvent() {
+		if (this.startupReady.getAndSet(true)) {
+			throw new IllegalStateException("Fabric: Server is already marked as started");
+		}
+	}
 }
diff --git a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/PersistentEntitySectionManagerMixin.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/PersistentEntitySectionManagerMixin.java
new file mode 100644
index 0000000000..7fe250968b
--- /dev/null
+++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/PersistentEntitySectionManagerMixin.java
@@ -0,0 +1,43 @@
+/*
+ * 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.mixin.event.lifecycle;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.entity.EntityAccess;
+import net.minecraft.world.level.entity.PersistentEntitySectionManager;
+
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerEntityEvents;
+import net.fabricmc.fabric.impl.event.lifecycle.EntityLoadDataSetter;
+
+@Mixin(PersistentEntitySectionManager.class)
+public class PersistentEntitySectionManagerMixin {
+	@Inject(method = "addEntity", at = @At("HEAD"), cancellable = true)
+	private  void beforeAddEntity(T entityAccess, boolean loaded, CallbackInfoReturnable cir) {
+		Entity entity = (Entity) entityAccess;
+		((EntityLoadDataSetter) entity).fabric_setLoadedFromDisk(loaded);
+
+		if (!ServerEntityEvents.ALLOW_LOAD.invoker().onAllowLoad(entity, (ServerLevel) entity.level(), entity.spawnReason(), loaded)) {
+			cir.cancel();
+		}
+	}
+}
diff --git a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/server/DedicatedServerMixin.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/server/DedicatedServerMixin.java
new file mode 100644
index 0000000000..17bb6edfc6
--- /dev/null
+++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/server/DedicatedServerMixin.java
@@ -0,0 +1,42 @@
+/*
+ * 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.mixin.event.lifecycle.server;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import net.minecraft.server.dedicated.DedicatedServer;
+import net.minecraft.server.notifications.NotificationManager;
+
+import net.fabricmc.fabric.mixin.event.lifecycle.MinecraftServerMixin;
+
+@Mixin(DedicatedServer.class)
+public abstract class DedicatedServerMixin extends MinecraftServerMixin {
+	@Redirect(method = "initServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/notifications/NotificationManager;serverStarted()V"))
+	private void deferServerStartedNotification(NotificationManager instance) {
+		// Delay the JSON RPC server started notification until the ServerLifecycleEvents.SERVER_STARTED event is fired.
+	}
+
+	@Unique
+	@Override
+	public void afterServerStartedEvent() {
+		super.afterServerStartedEvent();
+		this.notificationManager().serverStarted();
+	}
+}
diff --git a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/server/LevelChunkMixin.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/server/LevelChunkMixin.java
index 658a4bba6d..0f3f7c2128 100644
--- a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/server/LevelChunkMixin.java
+++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/server/LevelChunkMixin.java
@@ -21,6 +21,7 @@
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.sugar.Local;
 import org.jspecify.annotations.Nullable;
+import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -70,8 +71,20 @@ private void onRemoveBlockEntity(BlockEntity blockEntity, CallbackInfo info, @Lo
 	}
 
 	// Use the slice to not redirect codepath where block entity is loaded
-	@Redirect(method = "getBlockEntity(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk$EntityCreationType;)Lnet/minecraft/world/level/block/entity/BlockEntity;", at = @At(value = "INVOKE", target = "Ljava/util/Map;remove(Ljava/lang/Object;)Ljava/lang/Object;"),
-			slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/chunk/LevelChunk;createBlockEntity(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/entity/BlockEntity;")))
+	@Redirect(
+				method = "getBlockEntity(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk$EntityCreationType;)Lnet/minecraft/world/level/block/entity/BlockEntity;", 
+				at = @At(
+						value = "INVOKE",
+						target = "Ljava/util/Map;remove(Ljava/lang/Object;)Ljava/lang/Object;"
+				),
+				slice = @Slice(
+							to = @At(
+								value = "FIELD",
+								target = "Lnet/minecraft/world/level/chunk/LevelChunk;pendingBlockEntities:Ljava/util/Map;",
+								opcode = Opcodes.GETFIELD
+							)
+						)
+		)
 	private  Object onRemoveBlockEntity(Map map, K key) {
 		@Nullable final V removed = map.remove(key);
 
diff --git a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/server/ServerHandshakePacketListenerImplMixin.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/server/ServerHandshakePacketListenerImplMixin.java
new file mode 100644
index 0000000000..752ec8bf7f
--- /dev/null
+++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/server/ServerHandshakePacketListenerImplMixin.java
@@ -0,0 +1,65 @@
+/*
+ * 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.mixin.event.lifecycle.server;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.network.Connection;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.handshake.ClientIntentionPacket;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.network.ServerHandshakePacketListenerImpl;
+
+import net.fabricmc.fabric.impl.event.lifecycle.MinecraftServerHooks;
+
+@Mixin(ServerHandshakePacketListenerImpl.class)
+public abstract class ServerHandshakePacketListenerImplMixin {
+	@Unique
+	private static final Component STARTUP_DISCONNET_REASON = Component.literal("Server is still starting!");
+
+	@Shadow
+	@Final
+	private Connection connection;
+	@Shadow
+	@Final
+	private MinecraftServer server;
+
+	@Unique
+	private boolean hasBecomeReady = false;
+
+	// Reject connections untill after ServerLifecycleEvents.SERVER_STARTED has been fired
+	@Inject(method = "handleIntention", at = @At("HEAD"), cancellable = true)
+	private void rejectConnectionsDuringStartup(ClientIntentionPacket packet, CallbackInfo ci) {
+		if (hasBecomeReady) {
+			return;
+		}
+
+		if (!this.server.isDedicatedServer() || this.connection.isMemoryConnection() || ((MinecraftServerHooks) this.server).fabric$isStartupReady()) {
+			hasBecomeReady = true;
+			return;
+		}
+
+		this.connection.disconnect(STARTUP_DISCONNET_REASON);
+		ci.cancel();
+	}
+}
diff --git a/fabric-lifecycle-events-v1/src/main/resources/fabric-lifecycle-events-v1.classtweaker b/fabric-lifecycle-events-v1/src/main/resources/fabric-lifecycle-events-v1.classtweaker
index ff70d98635..ae0f2a8fa8 100644
--- a/fabric-lifecycle-events-v1/src/main/resources/fabric-lifecycle-events-v1.classtweaker
+++ b/fabric-lifecycle-events-v1/src/main/resources/fabric-lifecycle-events-v1.classtweaker
@@ -2,3 +2,5 @@ classTweaker	v1	official
 accessible	class	net/minecraft/server/MinecraftServer$ReloadableResources
 accessible	class	net/minecraft/client/multiplayer/ClientChunkCache$Storage
 accessible	method	net/minecraft/client/multiplayer/ClientChunkCache$Storage	inRange	(II)Z
+
+transitive-inject-interface	net/minecraft/world/entity/Entity	net/fabricmc/fabric/api/event/lifecycle/v1/EntityLoadData
diff --git a/fabric-lifecycle-events-v1/src/main/resources/fabric-lifecycle-events-v1.mixins.json b/fabric-lifecycle-events-v1/src/main/resources/fabric-lifecycle-events-v1.mixins.json
index dbbe06d803..f07f95a044 100644
--- a/fabric-lifecycle-events-v1/src/main/resources/fabric-lifecycle-events-v1.mixins.json
+++ b/fabric-lifecycle-events-v1/src/main/resources/fabric-lifecycle-events-v1.mixins.json
@@ -6,16 +6,21 @@
     "ChunkHolderMixin",
     "ChunkMapMixin",
     "ChunkStatusTasksMixin",
+    "EntityMixin",
+    "EntityTypeMixin",
     "LevelMixin",
     "LivingEntityMixin",
     "MinecraftServerMixin",
+    "PersistentEntitySectionManagerMixin",
     "PlayerListMixin",
     "ReloadableServerResourcesMixin",
     "ServerLevelEntityCallbacksMixin",
     "ServerLevelMixin"
   ],
   "server": [
-    "server.LevelChunkMixin"
+    "server.DedicatedServerMixin",
+    "server.LevelChunkMixin",
+    "server.ServerHandshakePacketListenerImplMixin"
   ],
   "injectors": {
     "defaultRequire": 1,
diff --git a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerEntityLifecycleTests.java b/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerEntityLifecycleTests.java
index 4a9ccaddd0..ad48ce5455 100644
--- a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerEntityLifecycleTests.java
+++ b/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerEntityLifecycleTests.java
@@ -24,6 +24,8 @@
 
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntitySpawnReason;
+import net.minecraft.world.entity.animal.sniffer.Sniffer;
 
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerEntityEvents;
@@ -46,10 +48,19 @@ public void onInitialize() {
 			this.serverEntities.add(entity);
 
 			if (PRINT_SERVER_ENTITY_MESSAGES) {
-				logger.info("[SERVER] LOADED " + entity.toString() + " - Entities: " + this.serverEntities.size());
+				logger.info("[SERVER] LOADED {} with reason {} and isFromDisk {} - Entities: {}", entity.toString(), entity.spawnReason(), entity.isLoadedFromDisk(), this.serverEntities.size());
 			}
 		});
 
+		ServerEntityEvents.ALLOW_LOAD.register(((entity, level, spawnReason, isLoadedFromDisk) -> {
+			if (entity instanceof Sniffer && spawnReason == EntitySpawnReason.COMMAND) {
+				logger.info("Stopped sniffer from spawning via command.");
+				return false;
+			}
+
+			return true;
+		}));
+
 		ServerEntityEvents.ENTITY_UNLOAD.register((entity, level) -> {
 			this.serverEntities.remove(entity);
 
diff --git a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerLifecycleTests.java b/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerLifecycleTests.java
index 4c885a0614..71ad5bbb3d 100644
--- a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerLifecycleTests.java
+++ b/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerLifecycleTests.java
@@ -16,6 +16,8 @@
 
 package net.fabricmc.fabric.test.event.lifecycle;
 
+import java.time.Duration;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,10 +30,21 @@
  */
 public final class ServerLifecycleTests implements ModInitializer {
 	public static final Logger LOGGER = LoggerFactory.getLogger("LifecycleEventsTest");
+	private static final boolean SLOW_START_TEST = Boolean.getBoolean("fabric-lifecycle-events-v1.test.slow-start");
 
 	@Override
 	public void onInitialize() {
 		ServerLifecycleEvents.SERVER_STARTED.register(server -> {
+			if (SLOW_START_TEST) {
+				LOGGER.info("Simulating slow server start...");
+
+				try {
+					Thread.sleep(Duration.ofSeconds(10));
+				} catch (InterruptedException e) {
+					LOGGER.warn("Sleep was interrupted", e);
+				}
+			}
+
 			LOGGER.info("Started Server!");
 		});
 
diff --git a/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/impl/loot/LootUtil.java b/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/impl/loot/LootUtil.java
index dff7b7df6d..789e334a33 100644
--- a/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/impl/loot/LootUtil.java
+++ b/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/impl/loot/LootUtil.java
@@ -20,6 +20,8 @@
 import java.util.Map;
 import java.util.function.Function;
 
+import net.fabricmc.fabric.api.resource.v1.FabricResource;
+
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.registries.Registries;
@@ -38,11 +40,11 @@ public final class LootUtil {
 
 	public static LootTableSource determineSource(Resource resource) {
 		if (resource != null) {
-			PackSource packSource = resource.getFabricPackSource();
+			PackSource packSource = ((FabricResource) resource).getFabricPackSource();
 
 			if (packSource == PackSource.BUILT_IN) {
 				return LootTableSource.VANILLA;
-			} else if (packSource == ModResourcePackCreator.RESOURCE_PACK_SOURCE || packSource instanceof BuiltinModPackSource) {
+			} else if (packSource == ModResourcePackCreator.RESOURCE_PACK_SOURCE || packSource instanceof BuiltinModPackSource || resource.knownPackInfo().map(p -> !p.isVanilla()).orElse(false)) {
 				return LootTableSource.MOD;
 			}
 		}
diff --git a/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/ReloadableServerRegistriesMixin.java b/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/ReloadableServerRegistriesMixin.java
index 68b561b676..ea69451311 100644
--- a/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/ReloadableServerRegistriesMixin.java
+++ b/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/ReloadableServerRegistriesMixin.java
@@ -82,7 +82,7 @@ private static CompletableFuture> removeOps
 	}
 
 	@Inject(method = "lambda$scheduleRegistryLoad$0", at = @At(value = "INVOKE", target = "Ljava/util/Map;forEach(Ljava/util/function/BiConsumer;)V"))
-	private static  void modifyLootTable(LootDataType lootDataType, ResourceManager resourceManager, RegistryOps registryOps, CallbackInfoReturnable> cir, @Local(name = "elements") Map elements) {
+	private static  void modifyLootTable(LootDataType lootDataType, RegistryOps registryOps, ResourceManager resourceManager, CallbackInfoReturnable> cir, @Local(name = "elements") Map elements) {
 		elements.replaceAll((identifier, t) -> modifyLootTable(t, identifier, registryOps));
 	}
 
@@ -109,12 +109,17 @@ private static  T modifyLootTable(T value, Identifier id, RegistryOps void onLootTablesLoaded(LootDataType lootDataType, ResourceManager resourceManager, RegistryOps registryOps, CallbackInfoReturnable> cir) {
+	private static  void onLootTablesLoaded(LootDataType lootDataType, RegistryOps registryOps, ResourceManager resourceManager, CallbackInfoReturnable> cir) {
 		if (lootDataType != LootDataType.TABLE) return;
 
 		Registry lootTableRegistry = (Registry) cir.getReturnValue();
diff --git a/fabric-loot-api-v3/src/testmod/java/net/fabricmc/fabric/test/loot/LootGameTest.java b/fabric-loot-api-v3/src/testmod/java/net/fabricmc/fabric/test/loot/LootGameTest.java
index 68672999c8..deefe525a7 100644
--- a/fabric-loot-api-v3/src/testmod/java/net/fabricmc/fabric/test/loot/LootGameTest.java
+++ b/fabric-loot-api-v3/src/testmod/java/net/fabricmc/fabric/test/loot/LootGameTest.java
@@ -21,7 +21,7 @@
 import net.minecraft.gametest.framework.GameTestHelper;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EntityTypes;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.enchantment.Enchantment;
@@ -38,7 +38,7 @@ public final class LootGameTest {
 	@GameTest
 	public void testReplace(GameTestHelper helper) {
 		// Black wool should drop an iron ingot
-		LootTableDrops drops = LootTableDrops.block(helper, Blocks.BLACK_WOOL).drop();
+		LootTableDrops drops = LootTableDrops.block(helper, Blocks.WOOL.black()).drop();
 		drops.assertEquals(new ItemStack(Items.IRON_INGOT));
 		helper.succeed();
 	}
@@ -46,8 +46,8 @@ public void testReplace(GameTestHelper helper) {
 	@GameTest
 	public void testAddingPools(GameTestHelper helper) {
 		// White wool should drop a white wool and a gold ingot
-		LootTableDrops drops = LootTableDrops.block(helper, Blocks.WHITE_WOOL).drop();
-		drops.assertContains(new ItemStack(Items.WHITE_WOOL));
+		LootTableDrops drops = LootTableDrops.block(helper, Blocks.WOOL.white()).drop();
+		drops.assertContains(new ItemStack(Blocks.WOOL.white()));
 		ItemStack goldIngot = new ItemStack(Items.GOLD_INGOT);
 		goldIngot.set(DataComponents.CUSTOM_NAME, Component.literal("Gold from White Wool"));
 		drops.assertContains(goldIngot);
@@ -58,10 +58,10 @@ public void testAddingPools(GameTestHelper helper) {
 	public void testModifyingPools(GameTestHelper helper) {
 		// Yellow wool should drop either yellow wool or emeralds.
 		// Let's generate the drops with specific seeds to check.
-		LootTableDrops emeraldDrops = LootTableDrops.block(helper, Blocks.YELLOW_WOOL).seed(1).drop();
+		LootTableDrops emeraldDrops = LootTableDrops.block(helper, Blocks.WOOL.yellow()).seed(1).drop();
 		emeraldDrops.assertEquals(new ItemStack(Items.EMERALD));
-		LootTableDrops woolDrops = LootTableDrops.block(helper, Blocks.YELLOW_WOOL).seed(490234).drop();
-		woolDrops.assertEquals(new ItemStack(Items.YELLOW_WOOL));
+		LootTableDrops woolDrops = LootTableDrops.block(helper, Blocks.WOOL.yellow()).seed(490234).drop();
+		woolDrops.assertEquals(new ItemStack(Blocks.WOOL.yellow()));
 		helper.succeed();
 	}
 
@@ -74,7 +74,7 @@ public void testRegistryAccess(GameTestHelper helper) {
 				.getOrThrow(Enchantments.LURE);
 		EnchantmentHelper.updateEnchantments(expected, builder -> builder.set(lure, 1));
 
-		LootTableDrops drops = LootTableDrops.entity(helper, EntityType.SALMON).drop();
+		LootTableDrops drops = LootTableDrops.entity(helper, EntityTypes.SALMON).drop();
 		drops.assertContains(expected);
 		helper.succeed();
 	}
@@ -94,7 +94,7 @@ public void testModifyDropsSmelting(GameTestHelper helper) {
 	@GameTest
 	public void testModifyDropsDoubling(GameTestHelper helper) {
 		// Red banners should drop two red banners
-		LootTableDrops drops = LootTableDrops.block(helper, Blocks.RED_BANNER).drop();
+		LootTableDrops drops = LootTableDrops.block(helper, Blocks.BANNER.red()).drop();
 		drops.assertTotalCount(2);
 		helper.succeed();
 	}
diff --git a/fabric-loot-api-v3/src/testmod/java/net/fabricmc/fabric/test/loot/LootTest.java b/fabric-loot-api-v3/src/testmod/java/net/fabricmc/fabric/test/loot/LootTest.java
index d958982b1e..06b6fbcdc5 100644
--- a/fabric-loot-api-v3/src/testmod/java/net/fabricmc/fabric/test/loot/LootTest.java
+++ b/fabric-loot-api-v3/src/testmod/java/net/fabricmc/fabric/test/loot/LootTest.java
@@ -24,7 +24,7 @@
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EntityTypes;
 import net.minecraft.world.item.ItemInstance;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
@@ -57,7 +57,7 @@ public void onInitialize() {
 		// The LootTable.Builder LootPool.Builder methods here should use
 		// prebuilt entries and pools to test the injected methods.
 		LootTableEvents.REPLACE.register((key, original, source, provider) -> {
-			if (Blocks.BLACK_WOOL.getLootTable().orElse(null) == key) {
+			if (Blocks.WOOL.black().getLootTable().orElse(null) == key) {
 				if (source != LootTableSource.VANILLA) {
 					throw new AssertionError("black wool loot table should have LootTableSource.VANILLA, got " + source);
 				}
@@ -75,7 +75,7 @@ public void onInitialize() {
 
 		// Test that the event is stopped when the loot table is replaced
 		LootTableEvents.REPLACE.register((key, original, source, provider) -> {
-			if (Blocks.BLACK_WOOL.getLootTable().orElse(null) == key) {
+			if (Blocks.WOOL.black().getLootTable().orElse(null) == key) {
 				throw new AssertionError("Event should have been stopped from replaced loot table");
 			}
 
@@ -83,11 +83,11 @@ public void onInitialize() {
 		});
 
 		LootTableEvents.MODIFY.register((key, tableBuilder, source, provider) -> {
-			if (Blocks.BLACK_WOOL.getLootTable().orElse(null) == key && source != LootTableSource.REPLACED) {
+			if (Blocks.WOOL.black().getLootTable().orElse(null) == key && source != LootTableSource.REPLACED) {
 				throw new AssertionError("black wool loot table should have LootTableSource.REPLACED, got " + source);
 			}
 
-			if (Blocks.WHITE_WOOL.getLootTable().orElse(null) == key) {
+			if (Blocks.WOOL.white().getLootTable().orElse(null) == key) {
 				if (source != LootTableSource.VANILLA) {
 					throw new AssertionError("white wool loot table should have LootTableSource.VANILLA, got " + source);
 				}
@@ -103,19 +103,19 @@ public void onInitialize() {
 			}
 
 			// We modify red wool to drop diamonds in the test mod resources.
-			if (Blocks.RED_WOOL.getLootTable().orElse(null) == key && source != LootTableSource.MOD) {
+			if (Blocks.WOOL.red().getLootTable().orElse(null) == key && source != LootTableSource.MOD) {
 				throw new AssertionError("red wool loot table should have LootTableSource.MOD, got " + source);
 			}
 
 			// Modify yellow wool to drop *either* yellow wool or emeralds by adding
 			// emeralds to the same loot pool.
-			if (Blocks.YELLOW_WOOL.getLootTable().orElse(null) == key) {
+			if (Blocks.WOOL.yellow().getLootTable().orElse(null) == key) {
 				tableBuilder.modifyPools(poolBuilder -> poolBuilder.add(LootItem.lootTableItem(Items.EMERALD)));
 			}
 		});
 
 		LootTableEvents.MODIFY.register((key, tableBuilder, source, provider) -> {
-			if (EntityType.SALMON.getDefaultLootTable().orElse(null) == key) {
+			if (EntityTypes.SALMON.getDefaultLootTable().orElse(null) == key) {
 				Optional> lure = provider.lookup(Registries.ENCHANTMENT).flatMap(registry -> registry.get(Enchantments.LURE));
 
 				lure.ifPresent((lureEnchantment) -> tableBuilder.withPool(LootPool.lootPool().add(
@@ -127,7 +127,7 @@ public void onInitialize() {
 		});
 
 		LootTableEvents.ALL_LOADED.register((resourceManager, lootRegistry) -> {
-			Optional blackWoolTable = lootRegistry.getOptional(Blocks.BLACK_WOOL.getLootTable().orElse(null));
+			Optional blackWoolTable = lootRegistry.getOptional(Blocks.WOOL.black().getLootTable().orElse(null));
 
 			if (blackWoolTable.isEmpty() || blackWoolTable.get() == LootTable.EMPTY) {
 				throw new AssertionError("black wool loot table should not be empty");
diff --git a/fabric-menu-api-v1/build.gradle b/fabric-menu-api-v1/build.gradle
index 7f20fc8753..c27b71268f 100644
--- a/fabric-menu-api-v1/build.gradle
+++ b/fabric-menu-api-v1/build.gradle
@@ -6,12 +6,12 @@ loom {
 
 moduleDependencies(project, [
 	'fabric-api-base',
-	'fabric-networking-api-v1',
+//	'fabric-networking-api-v1',
 	'fabric-registry-sync-v0'
 ])
 
 testDependencies(project, [
 	':fabric-object-builder-api-v1',
 	':fabric-resource-loader-v1',
-	':fabric-transitive-access-wideners-v1'
+//	':fabric-transitive-access-wideners-v1'
 ])
diff --git a/fabric-menu-api-v1/src/client/java/net/fabricmc/fabric/impl/menu/client/ClientNetworking.java b/fabric-menu-api-v1/src/client/java/net/fabricmc/fabric/impl/menu/client/ClientNetworking.java
deleted file mode 100644
index c75cc85f45..0000000000
--- a/fabric-menu-api-v1/src/client/java/net/fabricmc/fabric/impl/menu/client/ClientNetworking.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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.impl.menu.client;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.MenuScreens;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.inventory.MenuAccess;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.Identifier;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.MenuType;
-
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
-import net.fabricmc.fabric.api.menu.v1.ExtendedMenuType;
-import net.fabricmc.fabric.impl.menu.Networking;
-
-public final class ClientNetworking implements ClientModInitializer {
-	private static final Logger LOGGER = LoggerFactory.getLogger("fabric-menu-api-v1/client");
-
-	@Override
-	public void onInitializeClient() {
-		ClientPlayNetworking.registerGlobalReceiver(Networking.OpenScreenPayload.ID, (payload, context) -> {
-			this.openScreen(payload);
-		});
-	}
-
-	@SuppressWarnings({"rawtypes", "unchecked"})
-	private  void openScreen(Networking.OpenScreenPayload payload) {
-		Identifier typeId = payload.identifier();
-		int syncId = payload.containerId();
-		Component title = payload.title();
-
-		MenuType type = BuiltInRegistries.MENU.getValue(typeId);
-
-		if (type == null || payload.data() == null) {
-			LOGGER.warn("Unknown menu ID: {}", typeId);
-			return;
-		}
-
-		if (!(type instanceof ExtendedMenuType)) {
-			LOGGER.warn("Received extended opening packet for non-extended menu {}", typeId);
-			return;
-		}
-
-		MenuScreens.ScreenConstructor screenFactory = MenuScreens.getConstructor(type);
-
-		if (screenFactory != null) {
-			Minecraft client = Minecraft.getInstance();
-			Player player = client.player;
-
-			Screen screen = screenFactory.create(
-					((ExtendedMenuType) type).create(syncId, player.getInventory(), payload.data()),
-					player.getInventory(),
-					title
-			);
-
-			player.containerMenu = ((MenuAccess) screen).getMenu();
-			client.setScreen(screen);
-		} else {
-			LOGGER.warn("Screen not registered for menu {}!", typeId);
-		}
-	}
-}
diff --git a/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/api/menu/v1/ExtendedMenuType.java b/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/api/menu/v1/ExtendedMenuType.java
index 8cebc4a3b4..dc700d57b6 100644
--- a/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/api/menu/v1/ExtendedMenuType.java
+++ b/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/api/menu/v1/ExtendedMenuType.java
@@ -18,6 +18,8 @@
 
 import java.util.Objects;
 
+import net.neoforged.neoforge.network.IContainerFactory;
+
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.world.MenuProvider;
@@ -27,6 +29,7 @@
 import net.minecraft.world.inventory.MenuType;
 
 // TODO: This example needs an overhaul
+
 /**
  * A {@link MenuType} for an extended menus that
  * synchronizes additional data to the client when it is opened.
@@ -59,7 +62,7 @@
  * public class OvenMenu extends AbstractContainerMenu {
  * 	public OvenMenu(int syncId) {
  * 		super(MyMenus.OVEN, syncId);
- * 	}
+ *    }
  * }
  *
  * // Opening the extended menu
@@ -83,7 +86,7 @@ public class ExtendedMenuType extends MenuTy
 	 * @param factory the menu factory used for {@link #create(int, Inventory, Object)}
 	 */
 	public ExtendedMenuType(ExtendedFactory factory, StreamCodec streamCodec) {
-		super(null, FeatureFlags.VANILLA_SET);
+		super(new ExtendedMenuContainerFactory<>(factory, streamCodec), FeatureFlags.VANILLA_SET);
 		this.factory = Objects.requireNonNull(factory, "menu factory cannot be null");
 		this.streamCodec = Objects.requireNonNull(streamCodec, "stream codec cannot be null");
 	}
@@ -101,9 +104,9 @@ public final T create(int containerId, Inventory inventory) {
 	/**
 	 * Creates a new menu using the extra opening data.
 	 *
-	 * @param containerId    the container ID
-	 * @param inventory the player inventory
-	 * @param data      the synced opening data
+	 * @param containerId the container ID
+	 * @param inventory   the player inventory
+	 * @param data        the synced opening data
 	 * @return the created menu
 	 */
 	public T create(int containerId, Inventory inventory, D data) {
@@ -132,11 +135,21 @@ public interface ExtendedFactory {
 		/**
 		 * Creates a new menu with additional screen opening data.
 		 *
-		 * @param containerId    the container ID
-		 * @param inventory the player inventory
-		 * @param data      the synced data
+		 * @param containerId the container ID
+		 * @param inventory   the player inventory
+		 * @param data        the synced data
 		 * @return the created menu
 		 */
 		T create(int containerId, Inventory inventory, D data);
 	}
+
+	private record ExtendedMenuContainerFactory(
+			ExtendedFactory factory,
+			StreamCodec packetCodec) implements IContainerFactory {
+		@Override
+		public T create(int syncId, Inventory inventory, RegistryFriendlyByteBuf buf) {
+			D data = buf == null ? null : packetCodec.decode(buf);
+			return factory.create(syncId, inventory, data);
+		}
+	}
 }
diff --git a/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/impl/menu/Networking.java b/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/impl/menu/Networking.java
deleted file mode 100644
index e0180e725b..0000000000
--- a/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/impl/menu/Networking.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * 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.impl.menu;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.BiConsumer;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.minecraft.core.Registry;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.network.RegistryFriendlyByteBuf;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.ComponentSerialization;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.Identifier;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.inventory.AbstractContainerMenu;
-
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
-import net.fabricmc.fabric.api.menu.v1.ExtendedMenuProvider;
-import net.fabricmc.fabric.api.menu.v1.ExtendedMenuType;
-import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
-import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
-
-public final class Networking implements ModInitializer {
-	private static final Logger LOGGER = LoggerFactory.getLogger("fabric-menu-api-v1/server");
-
-	// [Packet format]
-	// typeId: identifier
-	// containerId: varInt
-	// title: text
-	// customData: buf
-	public static final Identifier OPEN_ID = Identifier.fromNamespaceAndPath("fabric-menu-api-v1", "open_screen");
-	public static final Map> CODEC_BY_ID = new HashMap<>();
-
-	/**
-	 * Opens an extended menu by sending a custom packet to the client.
-	 *
-	 * @param player  the player
-	 * @param factory the menu factory
-	 * @param menu the menu instance
-	 * @param containerId  the container ID
-	 */
-	@SuppressWarnings("unchecked")
-	public static  void sendOpenPacket(ServerPlayer player, ExtendedMenuProvider factory, AbstractContainerMenu menu, int containerId) {
-		Objects.requireNonNull(player, "player is null");
-		Objects.requireNonNull(factory, "factory is null");
-		Objects.requireNonNull(menu, "menu is null");
-
-		Identifier typeId = BuiltInRegistries.MENU.getKey(menu.getType());
-
-		if (typeId == null) {
-			LOGGER.warn("Trying to open unregistered menu {}", menu);
-			return;
-		}
-
-		StreamCodec codec = (StreamCodec) Objects.requireNonNull(CODEC_BY_ID.get(typeId), () -> "Codec for " + typeId + " is not registered!");
-		D data = factory.getScreenOpeningData(player);
-
-		ServerPlayNetworking.send(player, new OpenScreenPayload<>(typeId, containerId, factory.getDisplayName(), codec, data));
-	}
-
-	@Override
-	public void onInitialize() {
-		PayloadTypeRegistry.clientboundPlay().register(OpenScreenPayload.ID, OpenScreenPayload.CODEC);
-
-		forEachEntry(BuiltInRegistries.MENU, (type, id) -> {
-			if (type instanceof ExtendedMenuType extended) {
-				CODEC_BY_ID.put(id, extended.getStreamCodec());
-			}
-		});
-	}
-
-	// Calls the consumer for each holder that has been registered or will be registered.
-	private static  void forEachEntry(Registry registry, BiConsumer consumer) {
-		for (T type : registry) {
-			consumer.accept(type, registry.getKey(type));
-		}
-
-		RegistryEntryAddedCallback.event(registry).register((rawId, id, type) -> {
-			consumer.accept(type, id);
-		});
-	}
-
-	public record OpenScreenPayload(Identifier identifier, int containerId, Component title, StreamCodec innerCodec, D data) implements CustomPacketPayload {
-		public static final StreamCodec> CODEC = CustomPacketPayload.codec(OpenScreenPayload::write, OpenScreenPayload::fromBuf);
-		public static final CustomPacketPayload.Type> ID = new Type<>(OPEN_ID);
-
-		@SuppressWarnings("unchecked")
-		private static  OpenScreenPayload fromBuf(RegistryFriendlyByteBuf buf) {
-			Identifier id = buf.readIdentifier();
-			StreamCodec codec = (StreamCodec) CODEC_BY_ID.get(id);
-
-			return new OpenScreenPayload<>(id, buf.readByte(), ComponentSerialization.STREAM_CODEC.decode(buf), codec, codec == null ? null : codec.decode(buf));
-		}
-
-		private void write(RegistryFriendlyByteBuf buf) {
-			buf.writeIdentifier(this.identifier);
-			buf.writeByte(this.containerId);
-			ComponentSerialization.STREAM_CODEC.encode(buf, this.title);
-			this.innerCodec.encode(buf, this.data);
-		}
-
-		@Override
-		public Type type() {
-			return ID;
-		}
-	}
-}
diff --git a/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/mixin/menu/MenuProviderMixin.java b/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/mixin/menu/MenuProviderMixin.java
index f21add4b12..455f463ff7 100644
--- a/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/mixin/menu/MenuProviderMixin.java
+++ b/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/mixin/menu/MenuProviderMixin.java
@@ -16,6 +16,7 @@
 
 package net.fabricmc.fabric.mixin.menu;
 
+import net.neoforged.neoforge.common.extensions.IMenuProviderExtension;
 import org.spongepowered.asm.mixin.Mixin;
 
 import net.minecraft.world.MenuProvider;
@@ -23,5 +24,9 @@
 import net.fabricmc.fabric.api.menu.v1.FabricMenuProvider;
 
 @Mixin(MenuProvider.class)
-public interface MenuProviderMixin extends FabricMenuProvider {
+public interface MenuProviderMixin extends IMenuProviderExtension, FabricMenuProvider {
+	@Override
+	default boolean shouldTriggerClientSideContainerClosingOnOpen() {
+		return shouldCloseCurrentScreen();
+	}
 }
diff --git a/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/mixin/menu/ServerPlayerMixin.java b/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/mixin/menu/ServerPlayerMixin.java
index 6d7c006938..e20340371c 100644
--- a/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/mixin/menu/ServerPlayerMixin.java
+++ b/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/mixin/menu/ServerPlayerMixin.java
@@ -16,23 +16,19 @@
 
 package net.fabricmc.fabric.mixin.menu;
 
-import java.util.Objects;
-import java.util.OptionalInt;
+import java.util.function.Consumer;
+
+import javax.annotation.Nullable;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.authlib.GameProfile;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.resources.Identifier;
+import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.network.ServerGamePacketListenerImpl;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.SimpleMenuProvider;
 import net.minecraft.world.entity.player.Player;
@@ -41,59 +37,29 @@
 
 import net.fabricmc.fabric.api.menu.v1.ExtendedMenuProvider;
 import net.fabricmc.fabric.api.menu.v1.ExtendedMenuType;
-import net.fabricmc.fabric.impl.menu.Networking;
 
 @Mixin(ServerPlayer.class)
 public abstract class ServerPlayerMixin extends Player {
-	@Shadow
-	private int containerCounter;
-
 	private ServerPlayerMixin(Level level, GameProfile gameProfile) {
 		super(level, gameProfile);
 	}
 
-	@Shadow
-	public abstract void closeContainer();
-
-	@Redirect(method = "openMenu(Lnet/minecraft/world/MenuProvider;)Ljava/util/OptionalInt;", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;closeContainer()V"))
-	private void fabric_closeContainerScreenIfAllowed(ServerPlayer player, MenuProvider factory) {
-		if (factory.shouldCloseCurrentScreen()) {
-			this.closeContainer();
-		} else {
-			// Called by closeContainer in vanilla
-			this.doCloseContainer();
+	@ModifyArg(method = "openMenu(Lnet/minecraft/world/MenuProvider;)Ljava/util/OptionalInt;", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;openMenu(Lnet/minecraft/world/MenuProvider;Ljava/util/function/Consumer;)Ljava/util/OptionalInt;"), index = 0)
+	private MenuProvider fabric_replaceMenuProvider(@Nullable MenuProvider arg) {
+		if (arg instanceof SimpleMenuProvider simpleFactory && simpleFactory.menuConstructor instanceof ExtendedMenuProvider extendedFactory) {
+			return extendedFactory;
 		}
+		return arg;
 	}
 
-	@Inject(method = "openMenu(Lnet/minecraft/world/MenuProvider;)Ljava/util/OptionalInt;", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;send(Lnet/minecraft/network/protocol/Packet;)V"))
-	private void fabric_storeOpenedMenu(MenuProvider factory, CallbackInfoReturnable info, @Local(name = "menu") AbstractContainerMenu menu) {
-		if (factory instanceof ExtendedMenuProvider || (factory instanceof SimpleMenuProvider simpleFactory && simpleFactory.menuConstructor instanceof ExtendedMenuProvider)) {
-			// Set the menu, so the factory method can access it through the player.
-			containerMenu = menu;
-		} else if (menu.getType() instanceof ExtendedMenuType) {
-			Identifier id = BuiltInRegistries.MENU.getKey(menu.getType());
-			throw new IllegalArgumentException("[Fabric] Extended menu " + id + " must be opened with an ExtendedMenuProvider!");
-		}
-	}
-
-	@Redirect(method = "openMenu(Lnet/minecraft/world/MenuProvider;)Ljava/util/OptionalInt;", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;send(Lnet/minecraft/network/protocol/Packet;)V"))
-	private void fabric_replaceVanillaScreenPacket(ServerGamePacketListenerImpl networkHandler, Packet packet, MenuProvider factory) {
-		if (factory instanceof SimpleMenuProvider simpleProvider && simpleProvider.menuConstructor instanceof ExtendedMenuProvider extendedProvider) {
-			factory = extendedProvider;
-		}
-
-		if (factory instanceof ExtendedMenuProvider extendedFactory) {
-			AbstractContainerMenu handler = Objects.requireNonNull(containerMenu);
-
-			if (handler.getType() instanceof ExtendedMenuType) {
-				Networking.sendOpenPacket((ServerPlayer) (Object) this, extendedFactory, handler, containerCounter);
-			} else {
-				Identifier id = BuiltInRegistries.MENU.getKey(handler.getType());
-				throw new IllegalArgumentException("[Fabric] Non-extended menu " + id + " must not be opened with an ExtendedMenuProvider!");
-			}
-		} else {
-			// Use vanilla logic for non-extended menus
-			networkHandler.send(packet);
+	@ModifyVariable(method = "openMenu(Lnet/minecraft/world/MenuProvider;Ljava/util/function/Consumer;)Ljava/util/OptionalInt;", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/world/MenuProvider;createMenu(ILnet/minecraft/world/entity/player/Inventory;Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/world/inventory/AbstractContainerMenu;"), argsOnly = true)
+	private Consumer fabric_replaceExtraDataWriter(@Nullable Consumer extraDataWriter, MenuProvider arg, @Local @Nullable AbstractContainerMenu menu) {
+		if (menu != null && arg instanceof ExtendedMenuProvider extendedFactory && menu.getType() instanceof ExtendedMenuType extendedType) {
+			return buf -> {
+				Object data = extendedFactory.getScreenOpeningData((ServerPlayer) (Object) this);
+				extendedType.getStreamCodec().encode(buf, data);
+			};
 		}
+		return extraDataWriter;
 	}
 }
diff --git a/fabric-menu-api-v1/src/main/resources/fabric.mod.json b/fabric-menu-api-v1/src/main/resources/fabric.mod.json
index 1ba16a4c3e..2ecabd7450 100644
--- a/fabric-menu-api-v1/src/main/resources/fabric.mod.json
+++ b/fabric-menu-api-v1/src/main/resources/fabric.mod.json
@@ -17,14 +17,9 @@
   ],
   "depends": {
     "fabricloader": ">=0.18.4",
-    "fabric-api-base": "*",
-    "fabric-networking-api-v1": "*"
+    "fabric-api-base": "*"
   },
   "entrypoints": {
-    "main": ["net.fabricmc.fabric.impl.menu.Networking"],
-    "client": [
-      "net.fabricmc.fabric.impl.menu.client.ClientNetworking"
-    ]
   },
   "description": "Hooks and extensions for creating menus.",
   "mixins": [
diff --git a/fabric-message-api-v1/build.gradle b/fabric-message-api-v1/build.gradle
index a733beb92b..2c23702466 100644
--- a/fabric-message-api-v1/build.gradle
+++ b/fabric-message-api-v1/build.gradle
@@ -2,4 +2,7 @@ version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base'])
 
-testDependencies(project, ['fabric-command-api-v2'])
+testDependencies(project, [
+	'fabric-command-api-v2',
+	'fabric-events-interaction-v0'
+])
diff --git a/fabric-message-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/message/ChatListenerMixin.java b/fabric-message-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/message/ChatListenerMixin.java
index 06864b7bf9..7c2dfb64d2 100644
--- a/fabric-message-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/message/ChatListenerMixin.java
+++ b/fabric-message-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/message/ChatListenerMixin.java
@@ -38,12 +38,12 @@
 
 @Mixin(ChatListener.class)
 public abstract class ChatListenerMixin {
-	@Inject(method = "showMessageToPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;getChat()Lnet/minecraft/client/gui/components/ChatComponent;", ordinal = 0), cancellable = true)
+	@Inject(method = "showMessageToPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Hud;getChat()Lnet/minecraft/client/gui/components/ChatComponent;", ordinal = 0), cancellable = true)
 	private void fabric_onSignedChatMessage(ChatType.Bound boundChatType, PlayerChatMessage message, Component decorated, GameProfile sender, boolean onlyShowSecureChat, Instant receptionTimestamp, CallbackInfoReturnable cir) {
 		fabric_onChatMessage(decorated, message, sender, boundChatType, receptionTimestamp, cir);
 	}
 
-	@Inject(method = "showMessageToPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;getChat()Lnet/minecraft/client/gui/components/ChatComponent;", ordinal = 1), cancellable = true)
+	@Inject(method = "showMessageToPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Hud;getChat()Lnet/minecraft/client/gui/components/ChatComponent;", ordinal = 1), cancellable = true)
 	private void fabric_onFilteredSignedChatMessage(ChatType.Bound boundChatType, PlayerChatMessage message, Component decorated, GameProfile sender, boolean onlyShowSecureChat, Instant receptionTimestamp, CallbackInfoReturnable cir) {
 		Component filtered = message.filterMask().applyWithFormatting(message.signedContent());
 
diff --git a/fabric-message-api-v1/src/main/java/net/fabricmc/fabric/mixin/message/PlayerListMixin.java b/fabric-message-api-v1/src/main/java/net/fabricmc/fabric/mixin/message/PlayerListMixin.java
index b08ab11c21..25fc01ffac 100644
--- a/fabric-message-api-v1/src/main/java/net/fabricmc/fabric/mixin/message/PlayerListMixin.java
+++ b/fabric-message-api-v1/src/main/java/net/fabricmc/fabric/mixin/message/PlayerListMixin.java
@@ -69,5 +69,20 @@ private void onSendCommandMessage(PlayerChatMessage message, CommandSourceStack
 		}
 
 		ServerMessageEvents.COMMAND_MESSAGE.invoker().onCommandMessage(message, source, boundChatType);
+
+		// Vanilla used to delegate to the ServerPlayer overload when the source is a player,
+		// which triggered the chat events as documented. It no longer does, so trigger them here.
+		ServerPlayer sender = source.getPlayer();
+
+		if (sender == null) {
+			return;
+		}
+
+		if (!ServerMessageEvents.ALLOW_CHAT_MESSAGE.invoker().allowChatMessage(message, sender, boundChatType)) {
+			ci.cancel();
+			return;
+		}
+
+		ServerMessageEvents.CHAT_MESSAGE.invoker().onChatMessage(message, sender, boundChatType);
 	}
 }
diff --git a/fabric-message-api-v1/src/testmod/java/net/fabricmc/fabric/test/message/ChatGameTest.java b/fabric-message-api-v1/src/testmod/java/net/fabricmc/fabric/test/message/ChatGameTest.java
new file mode 100644
index 0000000000..0f36f5dcd9
--- /dev/null
+++ b/fabric-message-api-v1/src/testmod/java/net/fabricmc/fabric/test/message/ChatGameTest.java
@@ -0,0 +1,62 @@
+/*
+ * 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.message;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+
+import net.fabricmc.fabric.api.entity.FakePlayer;
+import net.fabricmc.fabric.api.gametest.v1.GameTest;
+import net.fabricmc.fabric.api.message.v1.ServerMessageEvents;
+
+public class ChatGameTest {
+	private static final String MARKER = "fabric message api gametest";
+	private static final List FIRED_EVENTS = new CopyOnWriteArrayList<>();
+
+	static {
+		ServerMessageEvents.COMMAND_MESSAGE.register((message, source, params) -> {
+			if (message.signedContent().contains(MARKER)) FIRED_EVENTS.add("command");
+		});
+		ServerMessageEvents.ALLOW_CHAT_MESSAGE.register((message, sender, params) -> {
+			if (message.signedContent().contains(MARKER)) FIRED_EVENTS.add("allow_chat");
+			return true;
+		});
+		ServerMessageEvents.CHAT_MESSAGE.register((message, sender, params) -> {
+			if (message.signedContent().contains(MARKER)) FIRED_EVENTS.add("chat");
+		});
+	}
+
+	/**
+	 * A command message sent by a player must trigger the chat events after the
+	 * command events, as documented in {@link ServerMessageEvents}.
+	 */
+	@GameTest
+	public void playerCommandMessageTriggersChatEvents(GameTestHelper helper) {
+		FIRED_EVENTS.clear();
+		ServerPlayer player = FakePlayer.get(helper.getLevel());
+		helper.getLevel().getServer().getCommands().performPrefixedCommand(player.createCommandSourceStack(), "/me " + MARKER);
+
+		helper.succeedWhen(() -> helper.assertTrue(
+				FIRED_EVENTS.equals(List.of("command", "allow_chat", "chat")),
+				Component.literal("Expected [command, allow_chat, chat] for a player-executed /me, got " + FIRED_EVENTS)
+		));
+	}
+}
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 89bf6e19ae..d3c550747d 100644
--- a/fabric-message-api-v1/src/testmod/resources/fabric.mod.json
+++ b/fabric-message-api-v1/src/testmod/resources/fabric.mod.json
@@ -7,12 +7,16 @@
   "license": "Apache-2.0",
   "depends": {
     "fabric-message-api-v1": "*",
-    "fabric-command-api-v2": "*"
+    "fabric-command-api-v2": "*",
+    "fabric-events-interaction-v0": "*"
   },
   "entrypoints": {
     "main": [
       "net.fabricmc.fabric.test.message.ChatTest"
     ],
+    "fabric-gametest": [
+      "net.fabricmc.fabric.test.message.ChatGameTest"
+    ],
     "client": [
       "net.fabricmc.fabric.test.message.client.ChatTestClient"
     ]
diff --git a/fabric-model-loading-api-v1/build.gradle b/fabric-model-loading-api-v1/build.gradle
index 84af296072..0330286b71 100644
--- a/fabric-model-loading-api-v1/build.gradle
+++ b/fabric-model-loading-api-v1/build.gradle
@@ -15,3 +15,7 @@ testDependencies(project, [
 loom {
 	accessWidenerPath = file('src/client/resources/fabric-model-loading-api-v1.classtweaker')
 }
+
+dependencies {
+	interfaceInjectionData project(':fabric-renderer-api-v1')
+}
diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/UnbakedModelDeserializer.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/UnbakedModelDeserializer.java
index 564d03c397..2ab947974c 100644
--- a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/UnbakedModelDeserializer.java
+++ b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/UnbakedModelDeserializer.java
@@ -21,6 +21,7 @@
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
+import net.neoforged.neoforge.client.model.UnbakedModelParser;
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.client.resources.model.UnbakedModel;
@@ -77,7 +78,7 @@ static UnbakedModelDeserializer get(Identifier id) {
 	 * method to {@link CuboidModel#fromStream(Reader)}.
 	 */
 	static UnbakedModel deserialize(Reader reader) throws JsonParseException {
-		return UnbakedModelDeserializerRegistry.deserialize(reader);
+		return UnbakedModelParser.parse(reader);
 	}
 
 	/**
diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/wrapper/WrapperBlockStateModel.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/wrapper/WrapperBlockStateModel.java
index c213f9fbcd..5cfc7d549d 100644
--- a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/wrapper/WrapperBlockStateModel.java
+++ b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/wrapper/WrapperBlockStateModel.java
@@ -25,6 +25,7 @@
 import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
 import net.minecraft.client.renderer.block.dispatch.BlockStateModelPart;
 import net.minecraft.client.resources.model.geometry.BakedQuad;
+import net.minecraft.client.resources.model.geometry.BakedQuad.MaterialFlags;
 import net.minecraft.client.resources.model.sprite.Material;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -93,4 +94,19 @@ public int materialFlags(BlockAndTintGetter level, BlockPos pos, BlockState stat
 	public boolean hasMaterialFlag(BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random, @BakedQuad.MaterialFlags int flag) {
 		return wrapped.hasMaterialFlag(level, pos, state, random, flag);
 	}
+
+	@Override
+	public void collectParts(BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random, List parts) {
+		wrapped.collectParts(level, pos, state, random, parts);
+	}
+
+	@Override
+	public @MaterialFlags int materialFlags(BlockAndTintGetter level, BlockPos pos, BlockState state) {
+		return wrapped.materialFlags(level, pos, state);
+	}
+
+	@Override
+	public boolean hasMaterialFlag(BlockAndTintGetter level, BlockPos pos, BlockState state, @MaterialFlags int flag) {
+		return wrapped.hasMaterialFlag(level, pos, state, flag);
+	}
 }
diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/wrapper/WrapperUnbakedModel.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/wrapper/WrapperUnbakedModel.java
index 8d52e6b81a..28aafa7f3b 100644
--- a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/wrapper/WrapperUnbakedModel.java
+++ b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/wrapper/WrapperUnbakedModel.java
@@ -16,6 +16,8 @@
 
 package net.fabricmc.fabric.api.client.model.loading.v1.wrapper;
 
+import net.minecraft.util.context.ContextMap.Builder;
+
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.client.resources.model.UnbakedModel;
@@ -72,4 +74,14 @@ public UnbakedGeometry geometry() {
 	public Identifier parent() {
 		return wrapped.parent();
 	}
+
+	@Override
+	public void fillAdditionalProperties(Builder propertiesBuilder) {
+		wrapped.fillAdditionalProperties(propertiesBuilder);
+	}
+
+	@Override
+	public void resolveDependencies(Resolver resolver) {
+		wrapped.resolveDependencies(resolver);
+	}
 }
diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/CompositeBlockStateModelImpl.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/CompositeBlockStateModelImpl.java
index 4379fdf5d2..ad1e6fde4a 100644
--- a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/CompositeBlockStateModelImpl.java
+++ b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/CompositeBlockStateModelImpl.java
@@ -87,6 +87,16 @@ public void collectParts(RandomSource random, List parts) {
 		}
 	}
 
+	@Override
+	public void collectParts(BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random, List parts) {
+		long seed = random.nextLong();
+		
+		for (BlockStateModel model : models) {
+			random.setSeed(seed);
+			model.collectParts(level, pos, state, random, parts);
+		}
+	}
+
 	@Override
 	public void emitQuads(QuadEmitter emitter, BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random, Predicate<@Nullable Direction> cullTest) {
 		long seed = random.nextLong();
diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/CustomUnbakedBlockStateModelRegistry.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/CustomUnbakedBlockStateModelRegistry.java
index 843435b528..5c00709700 100644
--- a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/CustomUnbakedBlockStateModelRegistry.java
+++ b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/CustomUnbakedBlockStateModelRegistry.java
@@ -16,132 +16,45 @@
 
 package net.fabricmc.fabric.impl.client.model.loading;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
 import java.util.function.Function;
-import java.util.stream.Stream;
 
-import com.google.common.collect.Lists;
 import com.mojang.datafixers.util.Either;
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.DataResult;
-import com.mojang.serialization.DynamicOps;
 import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.MapLike;
-import com.mojang.serialization.RecordBuilder;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.neoforged.neoforge.client.model.block.CustomUnbakedBlockStateModel;
+import net.neoforged.neoforge.common.util.NeoForgeExtraCodecs;
 
-import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
 import net.minecraft.client.renderer.block.dispatch.SingleVariant;
-import net.minecraft.client.renderer.block.dispatch.Variant;
-import net.minecraft.client.renderer.block.dispatch.WeightedVariants;
 import net.minecraft.resources.Identifier;
-import net.minecraft.util.ExtraCodecs;
-import net.minecraft.util.random.Weighted;
-import net.minecraft.util.random.WeightedList;
 
-import net.fabricmc.fabric.api.client.model.loading.v1.CustomUnbakedBlockStateModel;
+import net.fabricmc.fabric.mixin.client.model.loading.BlockStateModelHooksAccessor;
 
 public class CustomUnbakedBlockStateModelRegistry {
-	private static final String TYPE_KEY = "fabric:type";
-	private static final ExtraCodecs.LateBoundIdMapper> ID_MAPPER = new ExtraCodecs.LateBoundIdMapper<>();
+	public static final String TYPE_KEY = "fabric:type";
 
-	/** Map codec for a custom model. Must be a map codec to allow combining with weighted model entry's "weight" field. */
-	private static final MapCodec CUSTOM_MODEL_MAP_CODEC = ID_MAPPER.codec(Identifier.CODEC).dispatchMap(TYPE_KEY, CustomUnbakedBlockStateModel::codec, codec -> codec);
-	/** Map codec for a simple model. Must be a map codec to allow checking presence of type key before parsing. */
-	private static final MapCodec SIMPLE_MODEL_MAP_CODEC = Variant.MAP_CODEC
-			.xmap(SingleVariant.Unbaked::new, SingleVariant.Unbaked::variant);
-	/** Map codec for a custom model or a simple model. Uses {@link SingleVariant.Unbaked} instead of {@link Variant} like vanilla to also allow use in {@link #MODEL_CODEC} for convenience and consistent behavior. Must be a map codec to allow combining with weighted model entry's "weight" field. */
-	private static final MapCodec> VARIANT_MAP_CODEC = new KeyExistsCodec<>(TYPE_KEY, CUSTOM_MODEL_MAP_CODEC, SIMPLE_MODEL_MAP_CODEC);
-	/** Codec for a custom model or a simple model. */
-	private static final Codec> VARIANT_CODEC = VARIANT_MAP_CODEC.codec();
-	/** Codec for a weighted variant, with support for custom models. Used as list elements in a weighted model. */
-	private static final Codec>> WEIGHTED_VARIANT_CODEC = RecordCodecBuilder.create(
-			instance -> instance.group(
-					VARIANT_MAP_CODEC.forGetter(Weighted::value),
-					ExtraCodecs.POSITIVE_INT.optionalFieldOf("weight", 1).forGetter(Weighted::weight)
-			).apply(instance, Weighted::new)
-	);
-	/** Extended codec for a vanilla weighted model that supports using custom models instead of regular variants. Replaces {@link BlockStateModel.Unbaked#HARDCODED_WEIGHTED_CODEC}. */
-	public static final Codec WEIGHTED_MODEL_CODEC = ExtraCodecs.nonEmptyList(WEIGHTED_VARIANT_CODEC.listOf())
-			.flatComapMap(
-					weightedVariants -> new WeightedVariants.Unbaked(WeightedList.of(Lists.transform(weightedVariants, weighted -> weighted.map(either -> either.map(Function.identity(), Function.identity()))))),
-					model -> {
-						List> entries = model.entries().unwrap();
-						List>> weightedVariants = new ArrayList<>(entries.size());
-
-						for (Weighted weighted : entries) {
-							switch (weighted.value()) {
-								case CustomUnbakedBlockStateModel custom -> {
-									weightedVariants.add(new Weighted<>(Either.left(custom), weighted.weight()));
-								}
-								case SingleVariant.Unbaked simple -> {
-									weightedVariants.add(new Weighted<>(Either.right(simple), weighted.weight()));
-								}
-								default -> {
-									return DataResult.error(() -> "Only custom models or single variants are supported");
-								}
-							}
-						}
-
-						return DataResult.success(weightedVariants);
-					}
-			);
-	/** Extended codec for an unbaked model that supports using a custom model directly or inside weighted entries. Replaces {@link BlockStateModel.Unbaked#CODEC}. */
-	public static final Codec MODEL_CODEC = Codec.either(WEIGHTED_MODEL_CODEC, VARIANT_CODEC)
-			.flatComapMap(either -> either.map(Function.identity(), right -> right.map(Function.identity(), Function.identity())), model -> {
-				Objects.requireNonNull(model);
-
-				return switch (model) {
-				case CustomUnbakedBlockStateModel custom -> DataResult.success(Either.right(Either.left(custom)));
-				case SingleVariant.Unbaked simple -> DataResult.success(Either.right(Either.right(simple)));
-				case WeightedVariants.Unbaked weighted -> DataResult.success(Either.left(weighted));
-				default -> DataResult.error(() -> "Only a custom model or a single variant or a list of variants are supported");
-				};
-			});
-
-	public static void register(Identifier id, MapCodec codec) {
-		ID_MAPPER.put(id, codec);
+	public static void register(Identifier id, MapCodec codec) {
+		BlockStateModelHooksAccessor.getBlockStateModelIDs().put(id, wrapCodec(codec));
 	}
 
-	/** When decoding, uses a different codec depending on whether a certain key exists or not. */
-	private static class KeyExistsCodec extends MapCodec> {
-		private final String key;
-		private final MapCodec exists;
-		private final MapCodec notExists;
-
-		KeyExistsCodec(String key, MapCodec exists, MapCodec notExists) {
-			this.key = key;
-			this.exists = exists;
-			this.notExists = notExists;
-		}
-
-		@Override
-		public  Stream keys(DynamicOps ops) {
-			return Stream.concat(exists.keys(ops), notExists.keys(ops));
-		}
-
-		@Override
-		public  DataResult> decode(DynamicOps ops, MapLike input) {
-			if (input.get(key) != null) {
-				return exists.decode(ops, input).map(Either::left);
-			} else {
-				return notExists.decode(ops, input).map(Either::right);
-			}
-		}
-
-		@Override
-		public  RecordBuilder encode(Either input, DynamicOps ops, RecordBuilder prefix) {
-			return input.map(
-					left -> exists.encode(left, ops, prefix),
-					right -> notExists.encode(right, ops, prefix)
-			);
-		}
+	@SuppressWarnings("unchecked")
+	public static MapCodec wrapCodec(
+			MapCodec fabricCodec
+	) {
+		return ((MapCodec) fabricCodec)
+				.xmap(FabricCustomUnbakedModel::new, FabricCustomUnbakedModel::getInner);
+	}
 
-		@Override
-		public String toString() {
-			return "KeyExistsCodec[" + key + " " + exists + " " + notExists + "]";
-		}
+	public static MapCodec> wrapMakeSingleModelCodec(
+			MapCodec> original
+	) {
+		var nested = NeoForgeExtraCodecs.dispatchMapOrElse(
+				TYPE_KEY,
+				BlockStateModelHooksAccessor.getBlockStateModelIDs().codec(Identifier.CODEC),
+				CustomUnbakedBlockStateModel::codec,
+				Function.identity(),
+				original);
+		return nested.xmap(
+				either -> either.map(Either::left, Function.identity()),
+				u -> Either.right(u)
+		);
 	}
 }
diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/FabricCustomUnbakedModel.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/FabricCustomUnbakedModel.java
new file mode 100644
index 0000000000..2a52162954
--- /dev/null
+++ b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/FabricCustomUnbakedModel.java
@@ -0,0 +1,40 @@
+package net.fabricmc.fabric.impl.client.model.loading;
+
+import com.mojang.serialization.MapCodec;
+import net.neoforged.neoforge.client.model.block.CustomUnbakedBlockStateModel;
+
+import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
+import net.minecraft.client.renderer.block.dispatch.BlockStateModel.UnbakedRoot;
+import net.minecraft.client.resources.model.ModelBaker;
+
+public class FabricCustomUnbakedModel implements CustomUnbakedBlockStateModel {
+	private final net.fabricmc.fabric.api.client.model.loading.v1.CustomUnbakedBlockStateModel inner;
+
+	public FabricCustomUnbakedModel(net.fabricmc.fabric.api.client.model.loading.v1.CustomUnbakedBlockStateModel inner) {
+		this.inner = inner;
+	}
+
+	public net.fabricmc.fabric.api.client.model.loading.v1.CustomUnbakedBlockStateModel getInner() {
+		return inner;
+	}
+
+	@Override
+	public UnbakedRoot asRoot() {
+		return this.inner.asRoot();
+	}
+
+	@Override
+	public MapCodec codec() {
+		return CustomUnbakedBlockStateModelRegistry.wrapCodec(this.inner.codec());
+	}
+
+	@Override
+	public BlockStateModel bake(ModelBaker modelBaker) {
+		return this.inner.bake(modelBaker);
+	}
+
+	@Override
+	public void resolveDependencies(Resolver resolver) {
+		this.inner.resolveDependencies(resolver);
+	}
+}
diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/UnbakedModelDeserializerRegistry.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/UnbakedModelDeserializerRegistry.java
index 0bafb28d25..c08a4bfeba 100644
--- a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/UnbakedModelDeserializerRegistry.java
+++ b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/UnbakedModelDeserializerRegistry.java
@@ -16,22 +16,16 @@
 
 package net.fabricmc.fabric.impl.client.model.loading;
 
-import java.io.Reader;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 
-import com.google.gson.JsonParseException;
-
-import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.resources.Identifier;
-import net.minecraft.util.GsonHelper;
 
 import net.fabricmc.fabric.api.client.model.loading.v1.UnbakedModelDeserializer;
-import net.fabricmc.fabric.mixin.client.model.loading.CuboidModelAccessor;
 
 public class UnbakedModelDeserializerRegistry {
-	private static final Map DESERIALIZERS = new HashMap<>();
+	private static final Map DESERIALIZERS = new ConcurrentHashMap<>();
 
 	public static void register(Identifier id, UnbakedModelDeserializer deserializer) {
 		Objects.requireNonNull(id, "id cannot be null");
@@ -47,8 +41,4 @@ public static UnbakedModelDeserializer get(Identifier id) {
 
 		return DESERIALIZERS.get(id);
 	}
-
-	public static UnbakedModel deserialize(Reader reader) throws JsonParseException {
-		return GsonHelper.fromJson(CuboidModelAccessor.fabric_getGson(), reader, UnbakedModel.class);
-	}
 }
diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/UnbakedModelJsonDeserializer.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/UnbakedModelJsonDeserializer.java
index 5aeb2512ff..098f769f82 100644
--- a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/UnbakedModelJsonDeserializer.java
+++ b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/UnbakedModelJsonDeserializer.java
@@ -33,6 +33,8 @@
 import net.fabricmc.fabric.api.client.model.loading.v1.UnbakedModelDeserializer;
 
 public class UnbakedModelJsonDeserializer implements JsonDeserializer {
+	public static UnbakedModelJsonDeserializer INSTANCE = new UnbakedModelJsonDeserializer(); 
+	
 	private static final String TYPE_KEY = "fabric:type";
 	private static final String TYPE_ID_KEY = "id";
 	private static final String TYPE_OPTIONAL_KEY = "optional";
@@ -67,6 +69,6 @@ public UnbakedModel deserialize(JsonElement jsonElement, Type typeOfT, JsonDeser
 			}
 		}
 
-		return context.deserialize(jsonElement, CuboidModel.class);
+		return null;
 	}
 }
diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/BlockStateModelHooksAccessor.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/BlockStateModelHooksAccessor.java
new file mode 100644
index 0000000000..402c63d252
--- /dev/null
+++ b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/BlockStateModelHooksAccessor.java
@@ -0,0 +1,19 @@
+package net.fabricmc.fabric.mixin.client.model.loading;
+
+import com.mojang.serialization.MapCodec;
+
+import net.minecraft.resources.Identifier;
+import net.minecraft.util.ExtraCodecs;
+
+import net.neoforged.neoforge.client.model.block.BlockStateModelHooks;
+import net.neoforged.neoforge.client.model.block.CustomUnbakedBlockStateModel;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(BlockStateModelHooks.class)
+public interface BlockStateModelHooksAccessor {
+	@Accessor("BLOCK_STATE_MODEL_IDS")
+	static ExtraCodecs.LateBoundIdMapper> getBlockStateModelIDs() {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/BlockStateModelHooksMixin.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/BlockStateModelHooksMixin.java
new file mode 100644
index 0000000000..81b58a5a1a
--- /dev/null
+++ b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/BlockStateModelHooksMixin.java
@@ -0,0 +1,21 @@
+package net.fabricmc.fabric.mixin.client.model.loading;
+
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import com.mojang.datafixers.util.Either;
+import com.mojang.serialization.MapCodec;
+import net.neoforged.neoforge.client.model.block.BlockStateModelHooks;
+import net.neoforged.neoforge.client.model.block.CustomUnbakedBlockStateModel;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import net.minecraft.client.renderer.block.dispatch.SingleVariant.Unbaked;
+
+import net.fabricmc.fabric.impl.client.model.loading.CustomUnbakedBlockStateModelRegistry;
+
+@Mixin(BlockStateModelHooks.class)
+public class BlockStateModelHooksMixin {
+	@ModifyReturnValue(method = "makeSingleModelCodec", at = @At("RETURN"))
+	private static MapCodec> wrapMakeSingleModelCodec(MapCodec> original) {
+		return CustomUnbakedBlockStateModelRegistry.wrapMakeSingleModelCodec(original);
+	}
+}
diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/BlockStateModelUnbakedMixin.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/BlockStateModelUnbakedMixin.java
deleted file mode 100644
index 2438911e2b..0000000000
--- a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/BlockStateModelUnbakedMixin.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.mixin.client.model.loading;
-
-import java.util.List;
-import java.util.function.Function;
-
-import com.mojang.datafixers.util.Either;
-import com.mojang.serialization.Codec;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
-import net.minecraft.client.renderer.block.dispatch.SingleVariant;
-import net.minecraft.client.renderer.block.dispatch.Variant;
-import net.minecraft.client.renderer.block.dispatch.WeightedVariants;
-import net.minecraft.util.random.Weighted;
-
-import net.fabricmc.fabric.impl.client.model.loading.CustomUnbakedBlockStateModelRegistry;
-
-@Mixin(BlockStateModel.Unbaked.class)
-interface BlockStateModelUnbakedMixin {
-	@Redirect(method = "()V", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/Codec;flatComapMap(Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;", ordinal = 0))
-	private static Codec replaceWeightedCodec(Codec>> codec, Function to, Function from) {
-		return CustomUnbakedBlockStateModelRegistry.WEIGHTED_MODEL_CODEC;
-	}
-
-	@Redirect(method = "()V", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/Codec;flatComapMap(Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;", ordinal = 1))
-	private static Codec replaceCodec(Codec> codec, Function to, Function from) {
-		return CustomUnbakedBlockStateModelRegistry.MODEL_CODEC;
-	}
-}
diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/CuboidModelMixin.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/CuboidModelMixin.java
deleted file mode 100644
index 933f3e752b..0000000000
--- a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/CuboidModelMixin.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.mixin.client.model.loading;
-
-import com.google.gson.GsonBuilder;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.client.resources.model.cuboid.CuboidModel;
-
-import net.fabricmc.fabric.impl.client.model.loading.UnbakedModelJsonDeserializer;
-
-@Mixin(CuboidModel.class)
-abstract class CuboidModelMixin {
-	@ModifyExpressionValue(method = "()V", at = @At(value = "NEW", target = "com/google/gson/GsonBuilder"))
-	private static GsonBuilder addUnbakedModelAdapter(GsonBuilder builder) {
-		return builder.registerTypeHierarchyAdapter(UnbakedModel.class, new UnbakedModelJsonDeserializer());
-	}
-}
diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelBakeryMixin.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelBakeryMixin.java
index 00ecc1aa65..26bff1d263 100644
--- a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelBakeryMixin.java
+++ b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelBakeryMixin.java
@@ -64,7 +64,7 @@ abstract class ModelBakeryMixin {
 	@Nullable
 	private ModelLoadingEventDispatcher fabric_eventDispatcher;
 
-	@Inject(method = "", at = @At("RETURN"))
+	@Inject(method = "(Lnet/minecraft/client/model/geom/EntityModelSet;Lnet/minecraft/client/resources/model/sprite/SpriteGetter;Lnet/minecraft/client/renderer/PlayerSkinRenderCache;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/client/resources/model/ResolvedModel;Lnet/neoforged/neoforge/client/model/standalone/StandaloneModelLoader$LoadedModels;Lnet/neoforged/neoforge/client/entity/animation/json/AnimationLoader$PendingAnimations;)V", at = @At("RETURN"))
 	private void onReturnInit(CallbackInfo ci) {
 		fabric_eventDispatcher = ModelLoadingEventDispatcher.CURRENT.get();
 	}
diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelManagerMixin.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelManagerMixin.java
index 9299beb1b7..450e7c7eea 100644
--- a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelManagerMixin.java
+++ b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelManagerMixin.java
@@ -16,7 +16,6 @@
 
 package net.fabricmc.fabric.mixin.client.model.loading;
 
-import java.io.Reader;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
@@ -25,13 +24,13 @@
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.llamalad7.mixinextras.sugar.Local;
+import net.neoforged.neoforge.client.model.standalone.StandaloneModelLoader;
 import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
@@ -41,13 +40,11 @@
 import net.minecraft.client.resources.model.ModelDiscovery;
 import net.minecraft.client.resources.model.ModelManager;
 import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.client.resources.model.cuboid.CuboidModel;
 import net.minecraft.resources.Identifier;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
 
 import net.fabricmc.fabric.api.client.model.loading.v1.ExtraModelKey;
 import net.fabricmc.fabric.api.client.model.loading.v1.FabricModelManager;
-import net.fabricmc.fabric.api.client.model.loading.v1.UnbakedModelDeserializer;
 import net.fabricmc.fabric.impl.client.model.loading.BakedModelsHooks;
 import net.fabricmc.fabric.impl.client.model.loading.ModelLoadingEventDispatcher;
 import net.fabricmc.fabric.impl.client.model.loading.ModelLoadingPluginManager;
@@ -116,9 +113,12 @@ private  Function withModelDispatcher(Function function) {
 		};
 	}
 
-	@Inject(method = "discoverModelDependencies", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/model/ModelDiscovery;resolve()Ljava/util/Map;"))
+	@Inject(
+			method = "discoverModelDependencies(Ljava/util/Map;Lnet/minecraft/client/resources/model/BlockStateModelLoader$LoadedModels;Lnet/minecraft/client/resources/model/ClientItemInfoLoader$LoadedClientInfos;Lnet/neoforged/neoforge/client/model/standalone/StandaloneModelLoader$LoadedModels;)Lnet/minecraft/client/resources/model/ModelManager$ResolvedModels;",
+			at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/model/ModelDiscovery;resolve()Ljava/util/Map;")
+	)
 	private static void resolveExtraModels(
-			Map modelMap, BlockStateModelLoader.LoadedModels stateDefinition, ClientItemInfoLoader.LoadedClientInfos loadedClientInfos, CallbackInfoReturnable cir,
+			Map modelMap, BlockStateModelLoader.LoadedModels stateDefinition, ClientItemInfoLoader.LoadedClientInfos loadedClientInfos, StandaloneModelLoader.LoadedModels standaloneModels, CallbackInfoReturnable cir,
 			@Local(name = "result") ModelDiscovery result
 	) {
 		// We know eventDispatcherFuture is available, as it is required by the item and block models (hookModels).
@@ -130,21 +130,4 @@ private static void resolveExtraModels(
 	private void onReturnUpload(CallbackInfo ci, @Local(name = "bakedModels") ModelBakery.BakingResult bakedModels) {
 		extraModels = ((BakedModelsHooks) (Object) bakedModels).fabric_getExtraModels();
 	}
-
-	// We want to redirect the BlockModel.deserialize call, but its return type is BlockModel, so we can't
-	// do that directly.
-	// Instead, cancel the original call and then modify the null value when it's being used to construct the Pair.
-	@Redirect(method = "lambda$loadBlockModels$2(Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair;", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/model/cuboid/CuboidModel;fromStream(Ljava/io/Reader;)Lnet/minecraft/client/resources/model/cuboid/CuboidModel;"))
-	private static CuboidModel cancelVanillaDeserialize(Reader reader) {
-		return null;
-	}
-
-	// Here we replace the null model with one produced by our own deserializer.
-	// The Pair's type is actually Pair, but since generics don't really exist, vanilla
-	// code doesn't explicitly cast the model to BlockModel, and the enclosing method returns UnbakedModels per
-	// its return type, it's safe to return an UnbakedModel here.
-	@ModifyArg(method = "lambda$loadBlockModels$2(Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair;", at = @At(value = "INVOKE", target = "Lcom/mojang/datafixers/util/Pair;of(Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/datafixers/util/Pair;"), index = 1)
-	private static Object actuallyDeserializeModel(Object originalModel, @Local(name = "reader") Reader reader) {
-		return UnbakedModelDeserializer.deserialize(reader);
-	}
 }
diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/UnbakedModelParserDeserializerMixin.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/UnbakedModelParserDeserializerMixin.java
new file mode 100644
index 0000000000..fdb7adc769
--- /dev/null
+++ b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/UnbakedModelParserDeserializerMixin.java
@@ -0,0 +1,29 @@
+package net.fabricmc.fabric.mixin.client.model.loading;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+
+import net.fabricmc.fabric.impl.client.model.loading.UnbakedModelJsonDeserializer;
+
+import net.minecraft.client.resources.model.UnbakedModel;
+
+import net.neoforged.neoforge.client.model.UnbakedModelParser;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.lang.reflect.Type;
+
+@Mixin(UnbakedModelParser.Deserializer.class)
+public class UnbakedModelParserDeserializerMixin {
+	
+	@Inject(method = "deserialize", at = @At(value = "INVOKE", target = "Lcom/google/gson/JsonDeserializationContext;deserialize(Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;)Ljava/lang/Object;"), cancellable = true)
+	private static void deserializeFabricModel(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext, CallbackInfoReturnable cir) throws JsonParseException {
+		UnbakedModel fabricModel = UnbakedModelJsonDeserializer.INSTANCE.deserialize(jsonElement, type, jsonDeserializationContext);
+		if (fabricModel != null) {
+			cir.setReturnValue(fabricModel);
+		}
+	}
+}
diff --git a/fabric-model-loading-api-v1/src/client/resources/fabric-model-loading-api-v1.mixins.json b/fabric-model-loading-api-v1/src/client/resources/fabric-model-loading-api-v1.mixins.json
index a17743e086..e58e8d30d1 100644
--- a/fabric-model-loading-api-v1/src/client/resources/fabric-model-loading-api-v1.mixins.json
+++ b/fabric-model-loading-api-v1/src/client/resources/fabric-model-loading-api-v1.mixins.json
@@ -3,12 +3,12 @@
   "package": "net.fabricmc.fabric.mixin.client.model.loading",
   "compatibilityLevel": "JAVA_25",
   "client": [
-    "ModelManagerMixin",
-    "CuboidModelAccessor",
-    "CuboidModelMixin",
+    "BlockStateModelHooksAccessor",
+    "BlockStateModelHooksMixin",
     "ModelBakeryBakingResultMixin",
     "ModelBakeryMixin",
-    "BlockStateModelUnbakedMixin"
+    "ModelManagerMixin",
+    "UnbakedModelParserDeserializerMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/impl/networking/client/ClientCommonNetworkAddon.java b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/impl/networking/client/ClientCommonNetworkAddon.java
index d7051637e0..fd2a7e1de8 100644
--- a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/impl/networking/client/ClientCommonNetworkAddon.java
+++ b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/impl/networking/client/ClientCommonNetworkAddon.java
@@ -21,6 +21,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl;
 import net.minecraft.network.Connection;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.Identifier;
 
 import net.fabricmc.fabric.impl.networking.AbstractChanneledNetworkAddon;
@@ -48,7 +49,7 @@ public void onServerReady() {
 	protected void handleRegistration(Identifier channelName) {
 		// If we can already send packets, immediately send the register packet for this channel
 		if (this.isServerReady) {
-			final RegistrationPayload payload = this.createRegistrationPayload(RegistrationPayload.REGISTER, Collections.singleton(channelName));
+			final CustomPacketPayload payload = this.createRegistrationPayload(RegistrationPayload.REGISTER, Collections.singleton(channelName));
 
 			if (payload != null) {
 				this.sendPacket(payload);
@@ -60,7 +61,7 @@ protected void handleRegistration(Identifier channelName) {
 	protected void handleUnregistration(Identifier channelName) {
 		// If we can already send packets, immediately send the unregister packet for this channel
 		if (this.isServerReady) {
-			final RegistrationPayload payload = this.createRegistrationPayload(RegistrationPayload.UNREGISTER, Collections.singleton(channelName));
+			final CustomPacketPayload payload = this.createRegistrationPayload(RegistrationPayload.UNREGISTER, Collections.singleton(channelName));
 
 			if (payload != null) {
 				this.sendPacket(payload);
diff --git a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/impl/networking/client/ClientConfigurationNetworkAddon.java b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/impl/networking/client/ClientConfigurationNetworkAddon.java
index 85f3041f95..f9378cd9d3 100644
--- a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/impl/networking/client/ClientConfigurationNetworkAddon.java
+++ b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/impl/networking/client/ClientConfigurationNetworkAddon.java
@@ -34,7 +34,6 @@
 import net.fabricmc.fabric.api.networking.v1.PacketSender;
 import net.fabricmc.fabric.impl.networking.ChannelInfoHolder;
 import net.fabricmc.fabric.impl.networking.RegistrationPayload;
-import net.fabricmc.fabric.mixin.networking.client.accessor.ClientCommonPacketListenerImplAccessor;
 import net.fabricmc.fabric.mixin.networking.client.accessor.ClientConfigurationPacketListenerImplAccessor;
 
 public final class ClientConfigurationNetworkAddon extends ClientCommonNetworkAddon, ClientConfigurationPacketListenerImpl> {
@@ -43,7 +42,7 @@ public final class ClientConfigurationNetworkAddon extends ClientCommonNetworkAd
 	private boolean hasStarted;
 
 	public ClientConfigurationNetworkAddon(ClientConfigurationPacketListenerImpl listener, Minecraft client) {
-		super(ClientNetworkingImpl.CONFIGURATION, ((ClientCommonPacketListenerImplAccessor) listener).getConnection(), "ClientPlayNetworkAddon for " + ((ClientConfigurationPacketListenerImplAccessor) listener).getLocalGameProfile().name(), listener, client);
+		super(ClientNetworkingImpl.CONFIGURATION, listener.getConnection(), "ClientPlayNetworkAddon for " + ((ClientConfigurationPacketListenerImplAccessor) listener).getLocalGameProfile().name(), listener, client);
 		this.context = new ContextImpl(client, listener, this);
 
 		// Must register pending channels via lateinit
@@ -131,7 +130,7 @@ protected void invokeDisconnectEvent() {
 	}
 
 	public ChannelInfoHolder getChannelInfoHolder() {
-		return (ChannelInfoHolder) ((ClientCommonPacketListenerImplAccessor) listener).getConnection();
+		return (ChannelInfoHolder) listener.getConnection();
 	}
 
 	private record ContextImpl(Minecraft client, ClientConfigurationPacketListenerImpl packetListener, PacketSender responseSender) implements ClientConfigurationNetworking.Context {
diff --git a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/impl/networking/client/ClientNetworkingImpl.java b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/impl/networking/client/ClientNetworkingImpl.java
index 86bac9831d..826dfae6d1 100644
--- a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/impl/networking/client/ClientNetworkingImpl.java
+++ b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/impl/networking/client/ClientNetworkingImpl.java
@@ -38,12 +38,7 @@
 import net.fabricmc.fabric.api.client.networking.v1.ClientLoginNetworking;
 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.impl.networking.CommonPacketsImpl;
-import net.fabricmc.fabric.impl.networking.CommonRegisterPayload;
-import net.fabricmc.fabric.impl.networking.CommonVersionPayload;
 import net.fabricmc.fabric.impl.networking.GlobalReceiverRegistry;
-import net.fabricmc.fabric.impl.networking.NetworkingImpl;
 import net.fabricmc.fabric.impl.networking.PacketListenerExtensions;
 import net.fabricmc.fabric.impl.networking.PayloadTypeRegistryImpl;
 import net.fabricmc.fabric.mixin.networking.client.accessor.ConnectScreenAccessor;
@@ -90,8 +85,8 @@ public static Connection getLoginConnection() {
 			return connection;
 		} else if (CONNECTION_SCOPED_VALUE.isBound()) {
 			return CONNECTION_SCOPED_VALUE.get();
-		} else if (Minecraft.getInstance().screen instanceof ConnectScreen) {
-			return ((ConnectScreenAccessor) Minecraft.getInstance().screen).getConnection();
+		} else if (Minecraft.getInstance().gui.screen() instanceof ConnectScreen) {
+			return ((ConnectScreenAccessor) Minecraft.getInstance().gui.screen()).getConnection();
 		}
 
 		// We are not connected to a server at all.
@@ -142,43 +137,5 @@ public static void clientInit() {
 		ClientConfigurationConnectionEvents.DISCONNECT.register((listener, client) -> {
 			currentConfigurationAddon = null;
 		});
-
-		// Version packet
-		ClientConfigurationNetworking.registerGlobalReceiver(CommonVersionPayload.TYPE, (listener, context) -> {
-			int negotiatedVersion = handleVersionPacket(listener, context.responseSender());
-			ClientNetworkingImpl.getClientConfigurationAddon().onCommonVersionPacket(negotiatedVersion);
-		});
-
-		// Register packet
-		ClientConfigurationNetworking.registerGlobalReceiver(CommonRegisterPayload.TYPE, (listener, context) -> {
-			ClientConfigurationNetworkAddon addon = ClientNetworkingImpl.getClientConfigurationAddon();
-
-			if (CommonRegisterPayload.PLAY_PROTOCOL.equals(listener.protocol())) {
-				if (listener.version() != addon.getNegotiatedVersion()) {
-					throw new IllegalStateException("Negotiated common packet version: %d but received packet with version: %d".formatted(addon.getNegotiatedVersion(), listener.version()));
-				}
-
-				addon.getChannelInfoHolder().fabric_getPendingChannelsNames(ConnectionProtocol.PLAY).addAll(listener.channels());
-				NetworkingImpl.LOGGER.debug("Received accepted channels from the server");
-				context.responseSender().sendPacket(new CommonRegisterPayload(addon.getNegotiatedVersion(), CommonRegisterPayload.PLAY_PROTOCOL, ClientPlayNetworking.getGlobalReceivers()));
-			} else {
-				addon.onCommonRegisterPacket(listener);
-				context.responseSender().sendPacket(addon.createRegisterPayload());
-			}
-		});
-	}
-
-	// Disconnect if there are no commonly supported versions.
-	// Client responds with the intersection of supported versions.
-	// Return the highest supported version
-	private static int handleVersionPacket(CommonVersionPayload payload, PacketSender packetSender) {
-		int version = CommonPacketsImpl.getHighestCommonVersion(payload.versions(), CommonPacketsImpl.SUPPORTED_COMMON_PACKET_VERSIONS);
-
-		if (version <= 0) {
-			throw new UnsupportedOperationException("Client does not support any requested versions from server");
-		}
-
-		packetSender.sendPacket(new CommonVersionPayload(new int[]{ version }));
-		return version;
 	}
 }
diff --git a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientCommonPacketListenerImplMixin.java b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientCommonPacketListenerImplMixin.java
index 10dc1aede0..82e2b8d2ad 100644
--- a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientCommonPacketListenerImplMixin.java
+++ b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientCommonPacketListenerImplMixin.java
@@ -16,6 +16,8 @@
 
 package net.fabricmc.fabric.mixin.networking.client;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -28,6 +30,7 @@
 import net.minecraft.network.Connection;
 import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.RunningOnDifferentThreadException;
 
 import net.fabricmc.fabric.api.networking.v1.context.PacketContext;
@@ -70,6 +73,18 @@ public void onCustomPayload(ClientboundCustomPayloadPacket packet, CallbackInfo
 		}
 	}
 
+	@WrapOperation(method = "handleCustomPayload", at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/network/registration/NetworkRegistry;isModdedPayload(Lnet/minecraft/network/protocol/common/custom/CustomPacketPayload;)Z"))
+	private boolean cancelNeoHandling(CustomPacketPayload payload, Operation original) {
+		if (this.getAddon() instanceof ClientPlayNetworkAddon addon) {
+			final Identifier channelName = payload.type().id();
+
+			if (addon.getPayloadTypeRegistry().get(channelName) != null) {
+				return false;
+			}
+		}
+		return original.call(payload);
+	}
+
 	@Override
 	public PacketContext getPacketContext() {
 		return this.connection.getPacketContext();
diff --git a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientNetworkRegistryMixin.java b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientNetworkRegistryMixin.java
new file mode 100644
index 0000000000..cbb47de5f9
--- /dev/null
+++ b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientNetworkRegistryMixin.java
@@ -0,0 +1,32 @@
+package net.fabricmc.fabric.mixin.networking.client;
+
+import com.google.common.collect.ImmutableSet;
+import net.neoforged.neoforge.client.network.registration.ClientNetworkRegistry;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.network.protocol.common.ClientCommonPacketListener;
+import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
+import net.minecraft.resources.Identifier;
+
+import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationNetworking;
+import net.fabricmc.fabric.impl.networking.NetworkingImpl;
+
+@Mixin(ClientNetworkRegistry.class)
+public class ClientNetworkRegistryMixin {
+	@Inject(method = "handleModdedPayload", at = @At(value = "INVOKE", target = "Ljava/util/Map;containsKey(Ljava/lang/Object;)Z"), cancellable = true)
+	private static void preventDisconnect(ClientCommonPacketListener listener, ClientboundCustomPayloadPacket packet, CallbackInfo ci) {
+		if (NetworkingImpl.getCodec(packet.payload().type().id(), listener.protocol(), listener.flow()) != null) {
+			ci.cancel();
+		}
+	}
+
+	@ModifyVariable(method = "sendInitialListeningChannels", at = @At(value = "STORE"))
+	private static ImmutableSet.Builder sendInitialFabricChannels(ImmutableSet.Builder nowListeningOn) {
+		nowListeningOn.addAll(ClientConfigurationNetworking.getGlobalReceivers());
+		return nowListeningOn;
+	}
+}
diff --git a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/NetworkRegistryClientMixin.java b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/NetworkRegistryClientMixin.java
new file mode 100644
index 0000000000..63cd10d034
--- /dev/null
+++ b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/NetworkRegistryClientMixin.java
@@ -0,0 +1,57 @@
+package net.fabricmc.fabric.mixin.networking.client;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import net.neoforged.neoforge.network.registration.NetworkRegistry;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.network.ConnectionProtocol;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.common.ClientCommonPacketListener;
+import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload.Type;
+import net.minecraft.resources.Identifier;
+
+import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationNetworking;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.fabricmc.fabric.impl.networking.NetworkingImpl;
+
+@Mixin(NetworkRegistry.class)
+public class NetworkRegistryClientMixin {
+	@Inject(
+			method = "checkPacket(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/protocol/common/ClientCommonPacketListener;)V",
+			at = @At(
+					value = "INVOKE",
+					target = "Lnet/neoforged/neoforge/network/registration/NetworkRegistry;hasChannel(Lnet/neoforged/neoforge/common/extensions/ICommonPacketListener;Lnet/minecraft/resources/Identifier;)Z"
+			),
+			cancellable = true
+	)
+	private static void checkFabricClientPacket(Packet packet, ClientCommonPacketListener listener, CallbackInfo ci) {
+		ServerboundCustomPayloadPacket customPayloadPacket = (ServerboundCustomPayloadPacket) packet;
+		Type type = customPayloadPacket.payload().type();
+
+		if (listener.protocol() == ConnectionProtocol.CONFIGURATION && ClientConfigurationNetworking.canSend(type)) {
+			ci.cancel();
+		}
+
+		if (listener.protocol() == ConnectionProtocol.PLAY && ClientPlayNetworking.canSend(type)) {
+			ci.cancel();
+		}
+
+		if (NetworkingImpl.getCodec(type.id(), listener.protocol(), listener.flow()) != null) {
+			ci.cancel();
+		}
+	}
+
+	@ModifyExpressionValue(method = "onCommonRegister", at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/network/registration/NetworkRegistry;getCommonPlayChannels(Lnet/minecraft/network/protocol/PacketFlow;)Ljava/util/Set;"))
+	private static Set addFabricChannels(Set original) {
+		Set all = new HashSet<>(original);
+		all.addAll(ClientPlayNetworking.getGlobalReceivers());
+		return all;
+	}
+}
diff --git a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/accessor/ClientCommonPacketListenerImplAccessor.java b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/accessor/ClientCommonPacketListenerImplAccessor.java
deleted file mode 100644
index 6b21144802..0000000000
--- a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/accessor/ClientCommonPacketListenerImplAccessor.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.mixin.networking.client.accessor;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl;
-import net.minecraft.network.Connection;
-
-@Mixin(ClientCommonPacketListenerImpl.class)
-public interface ClientCommonPacketListenerImplAccessor {
-	@Accessor
-	Connection getConnection();
-}
diff --git a/fabric-networking-api-v1/src/client/resources/fabric-networking-api-v1.client.mixins.json b/fabric-networking-api-v1/src/client/resources/fabric-networking-api-v1.client.mixins.json
index 9b561b5290..afe6da3b68 100644
--- a/fabric-networking-api-v1/src/client/resources/fabric-networking-api-v1.client.mixins.json
+++ b/fabric-networking-api-v1/src/client/resources/fabric-networking-api-v1.client.mixins.json
@@ -3,7 +3,6 @@
   "package": "net.fabricmc.fabric.mixin.networking.client",
   "compatibilityLevel": "JAVA_25",
   "client": [
-    "accessor.ClientCommonPacketListenerImplAccessor",
     "accessor.ClientConfigurationPacketListenerImplAccessor",
     "accessor.ClientHandshakePacketListenerImplAccessor",
     "accessor.ConnectScreenAccessor",
@@ -12,7 +11,9 @@
     "ClientConfigurationPacketListenerImplMixin",
     "ClientHandshakePacketListenerImplMixin",
     "ClientPacketListenerMixin",
-    "LocalPlayerMixin"
+    "LocalPlayerMixin",
+    "ClientNetworkRegistryMixin",
+    "NetworkRegistryClientMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/AbstractChanneledNetworkAddon.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/AbstractChanneledNetworkAddon.java
index 8ed954591a..e24df1f1b5 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/AbstractChanneledNetworkAddon.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/AbstractChanneledNetworkAddon.java
@@ -25,6 +25,9 @@
 import java.util.Set;
 
 import io.netty.channel.ChannelFutureListener;
+import net.neoforged.neoforge.network.payload.MinecraftRegisterPayload;
+import net.neoforged.neoforge.network.payload.MinecraftUnregisterPayload;
+import net.neoforged.neoforge.network.registration.ChannelAttributes;
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.network.Connection;
@@ -60,13 +63,20 @@ protected AbstractChanneledNetworkAddon(GlobalReceiverRegistry receiver, Conn
 		this.receiver = receiver;
 		this.sendableChannels = Collections.synchronizedSet(new HashSet<>());
 	}
+	
+	public @Nullable PayloadTypeRegistryImpl getPayloadTypeRegistry() {
+		return this.receiver.getPayloadTypeRegistry();
+	}
 
 	protected void registerPendingChannels(ChannelInfoHolder holder, ConnectionProtocol state) {
-		final Collection pending = holder.fabric_getPendingChannelsNames(state);
+		if (this.connection.channel() == null) {
+			return;
+		}
+
+		final Collection pending = ChannelAttributes.getOrCreateCommonChannels(this.connection, state);
 
 		if (!pending.isEmpty()) {
 			register(new ArrayList<>(pending));
-			pending.clear();
 		}
 	}
 
@@ -76,16 +86,16 @@ public boolean handle(CustomPacketPayload payload) {
 		this.logger.debug("Handling inbound packet from channel with name \"{}\"", channelName);
 
 		// Handle reserved packets
-		if (payload instanceof RegistrationPayload registrationPayload) {
-			if (NetworkingImpl.REGISTER_CHANNEL.equals(channelName)) {
-				this.receiveRegistration(true, registrationPayload);
-				return true;
-			}
-
-			if (NetworkingImpl.UNREGISTER_CHANNEL.equals(channelName)) {
-				this.receiveRegistration(false, registrationPayload);
-				return true;
-			}
+		if (payload instanceof MinecraftRegisterPayload registrationPayload) {
+			this.receiveRegistration(true, new RegistrationPayload(RegistrationPayload.REGISTER,
+					new ArrayList<>(registrationPayload.newChannels())));
+			return false; // Propagate to Neo
+		}
+		
+		if (payload instanceof MinecraftUnregisterPayload unregisterPayload) {
+			this.receiveRegistration(false, new RegistrationPayload(RegistrationPayload.UNREGISTER,
+					new ArrayList<>(unregisterPayload.forgottenChannels())));
+			return false; // Propagate to Neo
 		}
 
 		@Nullable H handler = this.getHandler(channelName);
@@ -113,7 +123,7 @@ public boolean handle(CustomPacketPayload payload) {
 	protected abstract void receive(H handler, CustomPacketPayload payload);
 
 	protected void sendInitialChannelRegistrationPacket() {
-		final RegistrationPayload payload = createRegistrationPayload(RegistrationPayload.REGISTER, this.getReceivableChannels());
+		final CustomPacketPayload payload = createRegistrationPayload(RegistrationPayload.REGISTER, this.getReceivableChannels());
 
 		if (payload != null) {
 			this.sendPacket(payload);
@@ -121,12 +131,13 @@ protected void sendInitialChannelRegistrationPacket() {
 	}
 
 	@Nullable
-	protected RegistrationPayload createRegistrationPayload(CustomPacketPayload.Type type, Collection channels) {
+	protected CustomPacketPayload createRegistrationPayload(CustomPacketPayload.Type type, Set channels) {
 		if (channels.isEmpty()) {
 			return null;
 		}
 
-		return new RegistrationPayload(type, new ArrayList<>(channels));
+		return type == RegistrationPayload.REGISTER ? new MinecraftRegisterPayload(channels)
+				: new MinecraftUnregisterPayload(channels);
 	}
 
 	// wrap in try with res (buf)
@@ -153,13 +164,19 @@ private void registerChannel(Identifier id) {
 		}
 
 		this.sendableChannels.add(id);
+		onUpdateSendableChannels();
 	}
 
 	void unregister(List ids) {
 		this.sendableChannels.removeAll(ids);
+		onUpdateSendableChannels();
 		schedule(() -> this.invokeUnregisterEvent(ids));
 	}
 
+	protected void onUpdateSendableChannels() {
+		
+	}
+
 	@Override
 	public void sendPacket(Packet packet, ChannelFutureListener callback) {
 		Objects.requireNonNull(packet, "Packet cannot be null");
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/AbstractNetworkAddon.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/AbstractNetworkAddon.java
index d5d887f480..ab9612e943 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/AbstractNetworkAddon.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/AbstractNetworkAddon.java
@@ -52,7 +52,7 @@ protected AbstractNetworkAddon(GlobalReceiverRegistry receiver, String descri
 		this.logger = LoggerFactory.getLogger(description);
 	}
 
-	public final void lateInit() {
+	public void lateInit() {
 		this.receiver.startSession(this);
 		invokeInitEvent();
 	}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CommonPacketsImpl.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CommonPacketsImpl.java
index 78c28f1f39..6b6c08e212 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CommonPacketsImpl.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CommonPacketsImpl.java
@@ -17,110 +17,9 @@
 package net.fabricmc.fabric.impl.networking;
 
 import java.util.Arrays;
-import java.util.function.Consumer;
-
-import net.minecraft.network.ConnectionProtocol;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.server.network.ConfigurationTask;
-
-import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
-import net.fabricmc.fabric.api.networking.v1.ServerConfigurationConnectionEvents;
-import net.fabricmc.fabric.api.networking.v1.ServerConfigurationNetworking;
-import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
-import net.fabricmc.fabric.impl.networking.server.ServerConfigurationNetworkAddon;
-import net.fabricmc.fabric.impl.networking.server.ServerNetworkingImpl;
 
 public class CommonPacketsImpl {
-	public static final int PACKET_VERSION_1 = 1;
-	public static final int[] SUPPORTED_COMMON_PACKET_VERSIONS = new int[]{ PACKET_VERSION_1 };
-
 	public static void init() {
-		PayloadTypeRegistry.serverboundConfiguration().register(CommonVersionPayload.TYPE, CommonVersionPayload.CODEC);
-		PayloadTypeRegistry.clientboundConfiguration().register(CommonVersionPayload.TYPE, CommonVersionPayload.CODEC);
-		PayloadTypeRegistry.serverboundPlay().register(CommonVersionPayload.TYPE, CommonVersionPayload.CODEC);
-		PayloadTypeRegistry.clientboundPlay().register(CommonVersionPayload.TYPE, CommonVersionPayload.CODEC);
-		PayloadTypeRegistry.serverboundConfiguration().register(CommonRegisterPayload.TYPE, CommonRegisterPayload.CODEC);
-		PayloadTypeRegistry.clientboundConfiguration().register(CommonRegisterPayload.TYPE, CommonRegisterPayload.CODEC);
-		PayloadTypeRegistry.serverboundPlay().register(CommonRegisterPayload.TYPE, CommonRegisterPayload.CODEC);
-		PayloadTypeRegistry.clientboundPlay().register(CommonRegisterPayload.TYPE, CommonRegisterPayload.CODEC);
-
-		ServerConfigurationNetworking.registerGlobalReceiver(CommonVersionPayload.TYPE, (payload, context) -> {
-			ServerConfigurationNetworkAddon addon = ServerNetworkingImpl.getAddon(context.packetListener());
-			addon.onCommonVersionPacket(getNegotiatedVersion(payload));
-			context.packetListener().completeTask(CommonVersionConfigurationTask.KEY);
-		});
-
-		ServerConfigurationNetworking.registerGlobalReceiver(CommonRegisterPayload.TYPE, (payload, context) -> {
-			ServerConfigurationNetworkAddon addon = ServerNetworkingImpl.getAddon(context.packetListener());
-
-			if (CommonRegisterPayload.PLAY_PROTOCOL.equals(payload.protocol())) {
-				if (payload.version() != addon.getNegotiatedVersion()) {
-					throw new IllegalStateException("Negotiated common packet version: %d but received packet with version: %d".formatted(addon.getNegotiatedVersion(), payload.version()));
-				}
-
-				// Play phase hasnt started yet, add them to the pending names.
-				addon.getChannelInfoHolder().fabric_getPendingChannelsNames(ConnectionProtocol.PLAY).addAll(payload.channels());
-				NetworkingImpl.LOGGER.debug("Received accepted channels from the client for play phase");
-			} else {
-				addon.onCommonRegisterPacket(payload);
-			}
-
-			context.packetListener().completeTask(CommonRegisterConfigurationTask.KEY);
-		});
-
-		// Create a configuration task to send and receive the common packets
-		ServerConfigurationConnectionEvents.CONFIGURE.register((listener, server) -> {
-			final ServerConfigurationNetworkAddon addon = ServerNetworkingImpl.getAddon(listener);
-
-			if (ServerConfigurationNetworking.canSend(listener, CommonVersionPayload.TYPE)) {
-				// Tasks are processed in order.
-				listener.addTask(new CommonVersionConfigurationTask(addon));
-
-				if (ServerConfigurationNetworking.canSend(listener, CommonRegisterPayload.TYPE)) {
-					listener.addTask(new CommonRegisterConfigurationTask(addon));
-				}
-			}
-		});
-	}
-
-	// A configuration phase task to send and receive the version packets.
-	private record CommonVersionConfigurationTask(ServerConfigurationNetworkAddon addon) implements ConfigurationTask {
-		public static final Type KEY = new Type(CommonVersionPayload.TYPE.id().toString());
-
-		@Override
-		public void start(Consumer> sender) {
-			addon.sendPacket(new CommonVersionPayload(SUPPORTED_COMMON_PACKET_VERSIONS));
-		}
-
-		@Override
-		public Type type() {
-			return KEY;
-		}
-	}
-
-	// A configuration phase task to send and receive the registration packets.
-	private record CommonRegisterConfigurationTask(ServerConfigurationNetworkAddon addon) implements ConfigurationTask {
-		public static final Type KEY = new Type(CommonRegisterPayload.TYPE.id().toString());
-
-		@Override
-		public void start(Consumer> sender) {
-			addon.sendPacket(new CommonRegisterPayload(addon.getNegotiatedVersion(), CommonRegisterPayload.PLAY_PROTOCOL, ServerPlayNetworking.getGlobalReceivers()));
-		}
-
-		@Override
-		public Type type() {
-			return KEY;
-		}
-	}
-
-	private static int getNegotiatedVersion(CommonVersionPayload payload) {
-		int version = getHighestCommonVersion(payload.versions(), SUPPORTED_COMMON_PACKET_VERSIONS);
-
-		if (version <= 0) {
-			throw new UnsupportedOperationException("server does not support any requested versions from client");
-		}
-
-		return version;
 	}
 
 	public static int getHighestCommonVersion(int[] a, int[] b) {
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CustomPayloadTypeProvider.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CustomPayloadTypeProvider.java
deleted file mode 100644
index 0f15d6006e..0000000000
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CustomPayloadTypeProvider.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.impl.networking;
-
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.Identifier;
-
-public interface CustomPayloadTypeProvider {
-	CustomPacketPayload.TypeAndCodec get(B buf, Identifier identifier);
-}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/GlobalReceiverRegistry.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/GlobalReceiverRegistry.java
index a3b7cbbac5..ba61fd374c 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/GlobalReceiverRegistry.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/GlobalReceiverRegistry.java
@@ -231,4 +231,8 @@ public void assertPayloadType(Identifier channelName) {
 	public ConnectionProtocol getProtocol() {
 		return protocol;
 	}
+
+	public @Nullable PayloadTypeRegistryImpl getPayloadTypeRegistry() {
+		return payloadTypeRegistry;
+	}
 }
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/NetworkingEventHooks.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/NetworkingEventHooks.java
new file mode 100644
index 0000000000..2fa5353846
--- /dev/null
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/NetworkingEventHooks.java
@@ -0,0 +1,36 @@
+package net.fabricmc.fabric.impl.networking;
+
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.entity.player.PlayerEvent;
+import net.neoforged.neoforge.network.event.RegisterConfigurationTasksEvent;
+import org.sinytra.fabric.networking_api.generated.GeneratedEntryPoint;
+
+import net.minecraft.server.level.ServerPlayer;
+
+import net.fabricmc.fabric.api.networking.v1.EntityTrackingEvents;
+import net.fabricmc.fabric.impl.networking.server.ServerConfigurationNetworkAddon;
+
+@Mod(GeneratedEntryPoint.MOD_ID)
+public class NetworkingEventHooks {
+
+	public NetworkingEventHooks(IEventBus bus) {
+		bus.addListener(NetworkingEventHooks::onConfiguration);
+		NeoForge.EVENT_BUS.addListener(NetworkingEventHooks::onStartTrackingEntity);
+		NeoForge.EVENT_BUS.addListener(NetworkingEventHooks::onStopTrackingEntity);
+	}
+
+	private static void onConfiguration(RegisterConfigurationTasksEvent event) {
+		ServerConfigurationNetworkAddon addon = (ServerConfigurationNetworkAddon) ((PacketListenerExtensions) event.getListener()).getAddon();
+		addon.configuration();
+	}
+	
+	private static void onStartTrackingEntity(PlayerEvent.StartTracking event) {
+		EntityTrackingEvents.START_TRACKING.invoker().onStartTracking(event.getTarget(), (ServerPlayer) event.getEntity());
+	}
+	
+	private static void onStopTrackingEntity(PlayerEvent.StopTracking event) {
+		EntityTrackingEvents.STOP_TRACKING.invoker().onStopTracking(event.getTarget(), (ServerPlayer) event.getEntity());
+	}
+}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/NetworkingImpl.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/NetworkingImpl.java
index c4152dfa2d..e82e7a254d 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/NetworkingImpl.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/NetworkingImpl.java
@@ -16,17 +16,19 @@
 
 package net.fabricmc.fabric.impl.networking;
 
+import java.util.Set;
+
+import io.netty.util.AttributeKey;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.minecraft.network.ConnectionProtocol;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.PacketFlow;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.Identifier;
 
-import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
-import net.fabricmc.fabric.impl.networking.splitter.FabricSplitPacketPayload;
-
 public final class NetworkingImpl {
 	public static final String MOD_ID = "fabric-networking-api-v1";
 	public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
@@ -41,29 +43,29 @@ public final class NetworkingImpl {
 	 */
 	public static final Identifier UNREGISTER_CHANNEL = Identifier.withDefaultNamespace("unregister");
 
+	public static final AttributeKey> SENDABLE_CHANNELS = AttributeKey.valueOf("fabric:channels");
+
 	public static boolean isReservedCommonChannel(Identifier channelName) {
 		return channelName.equals(REGISTER_CHANNEL) || channelName.equals(UNREGISTER_CHANNEL);
 	}
 
-	public static void init() {
-		// Legacy register / unregister packets
-		PayloadTypeRegistry.clientboundConfiguration().register(RegistrationPayload.REGISTER, RegistrationPayload.REGISTER_CODEC);
-		PayloadTypeRegistry.clientboundConfiguration().register(RegistrationPayload.UNREGISTER, RegistrationPayload.UNREGISTER_CODEC);
-		PayloadTypeRegistry.serverboundConfiguration().register(RegistrationPayload.REGISTER, RegistrationPayload.REGISTER_CODEC);
-		PayloadTypeRegistry.serverboundConfiguration().register(RegistrationPayload.UNREGISTER, RegistrationPayload.UNREGISTER_CODEC);
-		PayloadTypeRegistry.clientboundPlay().register(RegistrationPayload.REGISTER, RegistrationPayload.REGISTER_CODEC);
-		PayloadTypeRegistry.clientboundPlay().register(RegistrationPayload.UNREGISTER, RegistrationPayload.UNREGISTER_CODEC);
-		PayloadTypeRegistry.serverboundPlay().register(RegistrationPayload.REGISTER, RegistrationPayload.REGISTER_CODEC);
-		PayloadTypeRegistry.serverboundPlay().register(RegistrationPayload.UNREGISTER, RegistrationPayload.UNREGISTER_CODEC);
-
-		// Fabric Packet Splitter packet
-		registerGeneric(FabricSplitPacketPayload.TYPE, FabricSplitPacketPayload.CODEC);
-	}
-
-	private static  void registerGeneric(CustomPacketPayload.Type id, StreamCodec codec) {
-		PayloadTypeRegistry.clientboundConfiguration().register(id, codec);
-		PayloadTypeRegistry.serverboundConfiguration().register(id, codec);
-		PayloadTypeRegistry.clientboundPlay().register(id, codec);
-		PayloadTypeRegistry.serverboundPlay().register(id, codec);
+	public static CustomPacketPayload.@Nullable TypeAndCodec getCodec(Identifier id, ConnectionProtocol protocol, PacketFlow flow) {
+		if (flow == PacketFlow.CLIENTBOUND) {
+			if (protocol == ConnectionProtocol.PLAY) {
+				return PayloadTypeRegistryImpl.CLIENTBOUND_PLAY.get(id);
+			}
+			if (protocol == ConnectionProtocol.CONFIGURATION) {
+				return PayloadTypeRegistryImpl.CLIENTBOUND_CONFIGURATION.get(id);
+			}
+		}
+		if (flow == PacketFlow.SERVERBOUND) {
+			if (protocol == ConnectionProtocol.PLAY) {
+				return PayloadTypeRegistryImpl.SERVERBOUND_PLAY.get(id);
+			}
+			if (protocol == ConnectionProtocol.CONFIGURATION) {
+				return PayloadTypeRegistryImpl.SERVERBOUND_CONFIGURATION.get(id);
+			}
+		}
+		return null;
 	}
 }
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/PayloadTypeRegistryImpl.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/PayloadTypeRegistryImpl.java
index 3d12e595ee..602f14c087 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/PayloadTypeRegistryImpl.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/PayloadTypeRegistryImpl.java
@@ -129,25 +129,6 @@ private void padAndSetMaxPacketSize(Identifier id, int maxSize) {
 		return (CustomPacketPayload.TypeAndCodec) packetTypes.get(type.id());
 	}
 
-	/**
-	 * @return the max packet size, or -1 if the payload type does not need splitting.
-	 */
-	public int getMaxPacketSizeForSplitting(Identifier id) {
-		IntSupplier supplier = this.pendingMaxPacketSizes.remove(id);
-
-		if (supplier != null) {
-			int maxPacketSize = supplier.getAsInt();
-
-			if (maxPacketSize < 0) {
-				throw new IllegalArgumentException("maxPacketSize supplier for packet type " + id + ": must be positive!");
-			}
-
-			padAndSetMaxPacketSize(id, maxPacketSize);
-		}
-
-		return this.maxPacketSizes.getOrDefault(id, -1);
-	}
-
 	public ConnectionProtocol getProtocol() {
 		return protocol;
 	}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/RegistrationPayload.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/RegistrationPayload.java
index 77a218bdec..5a5018d1ec 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/RegistrationPayload.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/RegistrationPayload.java
@@ -16,74 +16,12 @@
 
 package net.fabricmc.fabric.impl.networking;
 
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
-import io.netty.util.AsciiString;
-
-import net.minecraft.IdentifierException;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.Identifier;
 
 public record RegistrationPayload(Type type, List channels) implements CustomPacketPayload {
 	public static final CustomPacketPayload.Type REGISTER = new CustomPacketPayload.Type<>(NetworkingImpl.REGISTER_CHANNEL);
 	public static final CustomPacketPayload.Type UNREGISTER = new CustomPacketPayload.Type<>(NetworkingImpl.UNREGISTER_CHANNEL);
-	public static final StreamCodec REGISTER_CODEC = codec(REGISTER);
-	public static final StreamCodec UNREGISTER_CODEC = codec(UNREGISTER);
-
-	private RegistrationPayload(Type id, FriendlyByteBuf buf) {
-		this(id, read(buf));
-	}
-
-	private void write(FriendlyByteBuf buf) {
-		boolean first = true;
-
-		for (Identifier channel : channels) {
-			if (first) {
-				first = false;
-			} else {
-				buf.writeByte(0);
-			}
-
-			buf.writeBytes(channel.toString().getBytes(StandardCharsets.US_ASCII));
-		}
-	}
-
-	private static List read(FriendlyByteBuf buf) {
-		List ids = new ArrayList<>();
-		StringBuilder active = new StringBuilder();
-
-		while (buf.isReadable()) {
-			byte b = buf.readByte();
-
-			if (b != 0) {
-				active.append(AsciiString.b2c(b));
-			} else {
-				addId(ids, active);
-				active = new StringBuilder();
-			}
-		}
-
-		addId(ids, active);
-
-		return Collections.unmodifiableList(ids);
-	}
-
-	private static void addId(List ids, StringBuilder sb) {
-		String literal = sb.toString();
-
-		try {
-			ids.add(Identifier.parse(literal));
-		} catch (IdentifierException ex) {
-			NetworkingImpl.LOGGER.warn("Received invalid channel identifier \"{}\"", literal);
-		}
-	}
-
-	private static StreamCodec codec(Type id) {
-		return CustomPacketPayload.codec(RegistrationPayload::write, buf -> new RegistrationPayload(id, buf));
-	}
 }
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/VanillaPacketTypes.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/VanillaPacketTypes.java
deleted file mode 100644
index 9eb779ab3d..0000000000
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/VanillaPacketTypes.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.impl.networking;
-
-import java.util.ArrayList;
-
-import org.jspecify.annotations.Nullable;
-
-import net.minecraft.network.ProtocolInfo;
-import net.minecraft.network.protocol.PacketFlow;
-import net.minecraft.network.protocol.PacketType;
-import net.minecraft.network.protocol.configuration.ConfigurationProtocols;
-import net.minecraft.network.protocol.game.GameProtocols;
-
-public record VanillaPacketTypes(PacketType[] types) {
-	public static final VanillaPacketTypes PLAY_S2C = of(GameProtocols.CLIENTBOUND_TEMPLATE);
-	public static final VanillaPacketTypes PLAY_C2S = of(GameProtocols.SERVERBOUND_TEMPLATE);
-	public static final VanillaPacketTypes CONFIGURATION_S2C = of(ConfigurationProtocols.CLIENTBOUND_TEMPLATE);
-	public static final VanillaPacketTypes CONFIGURATION_C2S = of(ConfigurationProtocols.SERVERBOUND_TEMPLATE);
-
-	@Nullable
-	public PacketType get(int id) {
-		return id > 0 && id < this.types.length ? this.types[id] : null;
-	}
-
-	private static VanillaPacketTypes of(ProtocolInfo.DetailsProvider factory) {
-		var list = new ArrayList>();
-
-		// See ProtocolInfoBuilder#buildDetails for reference.
-		factory.details().listPackets((type, i) -> list.add(type));
-
-		return new VanillaPacketTypes(list.toArray(PacketType[]::new));
-	}
-
-	public static VanillaPacketTypes get(ProtocolInfo protocolInfo) {
-		return switch (protocolInfo.id()) {
-		case CONFIGURATION -> protocolInfo.flow() == PacketFlow.CLIENTBOUND ? CONFIGURATION_S2C : CONFIGURATION_C2S;
-		case PLAY -> protocolInfo.flow() == PacketFlow.CLIENTBOUND ? PLAY_S2C : PLAY_C2S;
-		default -> throw new IllegalArgumentException("Not implemented for " + protocolInfo.id() + "!");
-		};
-	}
-}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/context/PacketContextSetter.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/context/PacketContextSetter.java
index 42f89fdf7b..11d23e60d2 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/context/PacketContextSetter.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/context/PacketContextSetter.java
@@ -19,5 +19,7 @@
 import net.fabricmc.fabric.api.networking.v1.context.PacketContext;
 
 public interface PacketContextSetter {
+	PacketContext fabric_getPacketContext();
+	
 	void fabric_setPacketContext(PacketContext context);
 }
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/server/ServerConfigurationNetworkAddon.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/server/ServerConfigurationNetworkAddon.java
index 5e64a3385a..409840dbcf 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/server/ServerConfigurationNetworkAddon.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/server/ServerConfigurationNetworkAddon.java
@@ -21,11 +21,10 @@
 import java.util.Objects;
 
 import io.netty.channel.ChannelFutureListener;
-import org.jspecify.annotations.Nullable;
+import net.neoforged.neoforge.network.connection.ConnectionType;
 
 import net.minecraft.network.ConnectionProtocol;
 import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.common.ClientboundPingPacket;
 import net.minecraft.network.protocol.common.custom.BrandPayload;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.Identifier;
@@ -40,19 +39,16 @@
 import net.fabricmc.fabric.impl.networking.ChannelInfoHolder;
 import net.fabricmc.fabric.impl.networking.NetworkingImpl;
 import net.fabricmc.fabric.impl.networking.RegistrationPayload;
-import net.fabricmc.fabric.mixin.networking.accessor.ServerCommonPacketListenerImplAccessor;
 
 public final class ServerConfigurationNetworkAddon extends AbstractChanneledNetworkAddon> {
 	private final ServerConfigurationPacketListenerImpl listener;
 	private final MinecraftServer server;
 	private final ServerConfigurationNetworking.Context context;
 	private RegisterState registerState = RegisterState.NOT_SENT;
-	@Nullable
-	private String clientBrand = null;
 	private boolean isReconfiguring = false;
 
 	public ServerConfigurationNetworkAddon(ServerConfigurationPacketListenerImpl listener, MinecraftServer server) {
-		super(ServerNetworkingImpl.CONFIGURATION, ((ServerCommonPacketListenerImplAccessor) listener).getConnection(), "ServerConfigurationNetworkAddon for " + listener.getOwner().name());
+		super(ServerNetworkingImpl.CONFIGURATION, listener.getConnection(), "ServerConfigurationNetworkAddon for " + listener.getOwner().name());
 		this.listener = listener;
 		this.server = server;
 		this.context = new ContextImpl(server, listener, this);
@@ -63,12 +59,7 @@ public ServerConfigurationNetworkAddon(ServerConfigurationPacketListenerImpl lis
 
 	@Override
 	public boolean handle(CustomPacketPayload payload) {
-		if (payload instanceof BrandPayload brandPayload) {
-			clientBrand = brandPayload.brand();
-			return false;
-		}
-
-		return super.handle(payload);
+		return !(payload instanceof BrandPayload) && super.handle(payload);
 	}
 
 	@Override
@@ -82,6 +73,10 @@ protected void invokeInitEvent() {
 	}
 
 	public void preConfiguration() {
+		if (listener.getConnectionType() == ConnectionType.NEOFORGE) {
+			registerState = RegisterState.RECEIVED;
+		}
+
 		ServerConfigurationConnectionEvents.BEFORE_CONFIGURE.invoker().onSendConfiguration(listener, server);
 	}
 
@@ -89,45 +84,6 @@ public void configuration() {
 		ServerConfigurationConnectionEvents.CONFIGURE.invoker().onSendConfiguration(listener, server);
 	}
 
-	public boolean startConfiguration() {
-		if (this.registerState == RegisterState.NOT_SENT) {
-			// Send the registration packet, followed by a ping
-			this.sendInitialChannelRegistrationPacket();
-			this.sendPacket(new ClientboundPingPacket(0xFAB71C));
-
-			this.registerState = RegisterState.SENT;
-
-			// Cancel the configuration for now, the response from the ping or registration packet will continue.
-			return true;
-		}
-
-		// We should have received a response
-		if (!(registerState == RegisterState.RECEIVED || registerState == RegisterState.NOT_RECEIVED)) {
-			throw new IllegalStateException();
-		}
-
-		return false;
-	}
-
-	@Override
-	protected void receiveRegistration(boolean register, RegistrationPayload resolvable) {
-		super.receiveRegistration(register, resolvable);
-
-		if (register && registerState == RegisterState.SENT) {
-			// We received the registration packet, thus we know this is a modded client, continue with configuration.
-			registerState = RegisterState.RECEIVED;
-			listener.startConfiguration();
-		}
-	}
-
-	public void onPong(int parameter) {
-		if (registerState == RegisterState.SENT) {
-			// We did not receive the registration packet, thus we think this is a vanilla client, continue with configuration.
-			registerState = RegisterState.NOT_RECEIVED;
-			listener.startConfiguration();
-		}
-	}
-
 	@Override
 	protected void receive(ServerConfigurationNetworking.ConfigurationPacketHandler listener, CustomPacketPayload payload) {
 		((ServerConfigurationNetworking.ConfigurationPacketHandler) listener).receive(payload, this.context);
@@ -159,7 +115,7 @@ protected void invokeUnregisterEvent(List ids) {
 	protected void handleRegistration(Identifier channelName) {
 		// If we can already send packets, immediately send the register packet for this channel
 		if (this.registerState != RegisterState.NOT_SENT) {
-			RegistrationPayload registrationPayload = this.createRegistrationPayload(RegistrationPayload.REGISTER, Collections.singleton(channelName));
+			CustomPacketPayload registrationPayload = this.createRegistrationPayload(RegistrationPayload.REGISTER, Collections.singleton(channelName));
 
 			if (registrationPayload != null) {
 				this.sendPacket(registrationPayload);
@@ -171,7 +127,7 @@ protected void handleRegistration(Identifier channelName) {
 	protected void handleUnregistration(Identifier channelName) {
 		// If we can already send packets, immediately send the unregister packet for this channel
 		if (this.registerState != RegisterState.NOT_SENT) {
-			RegistrationPayload registrationPayload = this.createRegistrationPayload(RegistrationPayload.UNREGISTER, Collections.singleton(channelName));
+			CustomPacketPayload registrationPayload = this.createRegistrationPayload(RegistrationPayload.UNREGISTER, Collections.singleton(channelName));
 
 			if (registrationPayload != null) {
 				this.sendPacket(registrationPayload);
@@ -194,10 +150,6 @@ public void sendPacket(Packet packet, ChannelFutureListener callback) {
 		listener.send(packet, callback);
 	}
 
-	public @Nullable String getClientBrand() {
-		return clientBrand;
-	}
-
 	public boolean isReconfiguring() {
 		return isReconfiguring;
 	}
@@ -214,7 +166,7 @@ private enum RegisterState {
 	}
 
 	public ChannelInfoHolder getChannelInfoHolder() {
-		return (ChannelInfoHolder) ((ServerCommonPacketListenerImplAccessor) listener).getConnection();
+		return (ChannelInfoHolder) listener.getConnection();
 	}
 
 	private record ContextImpl(MinecraftServer server, ServerConfigurationPacketListenerImpl packetListener, PacketSender responseSender) implements ServerConfigurationNetworking.Context {
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/server/ServerPlayNetworkAddon.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/server/ServerPlayNetworkAddon.java
index 3439770c35..a80ce1354b 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/server/ServerPlayNetworkAddon.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/server/ServerPlayNetworkAddon.java
@@ -19,6 +19,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 
 import net.minecraft.network.Connection;
 import net.minecraft.network.ConnectionProtocol;
@@ -52,9 +53,14 @@ public ServerPlayNetworkAddon(ServerGamePacketListenerImpl listener, Connection
 		this.listener = listener;
 		this.server = server;
 		this.context = new ContextImpl(server, listener, this);
+	}
 
+	@Override
+	public void lateInit() {
 		// Must register pending channels via lateinit
 		this.registerPendingChannels((ChannelInfoHolder) this.connection, ConnectionProtocol.PLAY);
+
+		super.lateInit();
 	}
 
 	@Override
@@ -105,7 +111,7 @@ protected void invokeUnregisterEvent(List ids) {
 	protected void handleRegistration(Identifier channelName) {
 		// If we can already send packets, immediately send the register packet for this channel
 		if (this.sentInitialRegisterPacket) {
-			RegistrationPayload registrationPayload = this.createRegistrationPayload(RegistrationPayload.REGISTER, Collections.singleton(channelName));
+			CustomPacketPayload registrationPayload = this.createRegistrationPayload(RegistrationPayload.REGISTER, Collections.singleton(channelName));
 
 			if (registrationPayload != null) {
 				this.sendPacket(registrationPayload);
@@ -117,7 +123,7 @@ protected void handleRegistration(Identifier channelName) {
 	protected void handleUnregistration(Identifier channelName) {
 		// If we can already send packets, immediately send the unregister packet for this channel
 		if (this.sentInitialRegisterPacket) {
-			RegistrationPayload registrationPayload = this.createRegistrationPayload(RegistrationPayload.UNREGISTER, Collections.singleton(channelName));
+			CustomPacketPayload registrationPayload = this.createRegistrationPayload(RegistrationPayload.UNREGISTER, Collections.singleton(channelName));
 
 			if (registrationPayload != null) {
 				this.sendPacket(registrationPayload);
@@ -135,6 +141,12 @@ protected boolean isReservedChannel(Identifier channelName) {
 		return NetworkingImpl.isReservedCommonChannel(channelName);
 	}
 
+	@Override
+	protected void onUpdateSendableChannels() {
+		super.onUpdateSendableChannels();
+		this.listener.getConnection().channel().attr(NetworkingImpl.SENDABLE_CHANNELS).set(Set.copyOf(this.sendableChannels));
+	}
+
 	public void reconfigure() {
 		if (requestedReconfigure) {
 			throw new IllegalStateException("Already requested reconfigure");
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/ChannelEncoderContextProvider.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/ChannelEncoderContextProvider.java
new file mode 100644
index 0000000000..3ff302cf5b
--- /dev/null
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/ChannelEncoderContextProvider.java
@@ -0,0 +1,38 @@
+package net.fabricmc.fabric.impl.networking.splitter;
+
+import java.util.List;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.MessageToMessageEncoder;
+
+import net.minecraft.network.HandlerNames;
+import net.minecraft.network.protocol.Packet;
+
+import net.fabricmc.fabric.impl.networking.context.PacketContextImpl;
+import net.fabricmc.fabric.impl.networking.context.PacketContextSetter;
+
+public class ChannelEncoderContextProvider extends MessageToMessageEncoder> {
+	public static final String ID = "fabric:context";
+
+	@Override
+	public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+		if (ctx.pipeline().get(HandlerNames.ENCODER) instanceof PacketContextSetter setter && setter.fabric_getPacketContext() != null) {
+			ScopedValue.where(PacketContextImpl.VALUE, setter.fabric_getPacketContext())
+					.run(() -> {
+						try {
+							super.write(ctx, msg, promise);
+						} catch (Throwable e) {
+							throw new RuntimeException(e);
+						}
+					});
+		} else {
+			super.write(ctx, msg, promise);
+		}
+	}
+
+	@Override
+	protected void encode(ChannelHandlerContext ctx, Packet msg, List out) {
+		out.add(msg);
+	}
+}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/FabricPacketMerger.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/FabricPacketMerger.java
deleted file mode 100644
index fc64416b3c..0000000000
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/FabricPacketMerger.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * 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.impl.networking.splitter;
-
-import java.util.List;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.DecoderException;
-import io.netty.handler.codec.MessageToMessageDecoder;
-import org.jspecify.annotations.Nullable;
-
-import net.minecraft.network.PacketDecoder;
-import net.minecraft.network.VarInt;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.PacketType;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.Identifier;
-
-import net.fabricmc.fabric.impl.networking.GenericPayloadAccessor;
-import net.fabricmc.fabric.impl.networking.PayloadTypeRegistryImpl;
-import net.fabricmc.fabric.impl.networking.VanillaPacketTypes;
-import net.fabricmc.fabric.mixin.networking.accessor.PacketDecoderAccessor;
-
-public class FabricPacketMerger extends MessageToMessageDecoder> {
-	private final PacketDecoder packetDecoder;
-	private final PayloadTypeRegistryImpl payloadTypeRegistry;
-	private final VanillaPacketTypes vanillaPacketTypes;
-	@Nullable
-	private Merger packetMerger;
-
-	public FabricPacketMerger(PacketDecoder packetDecoder, PayloadTypeRegistryImpl payloadTypeRegistry, VanillaPacketTypes vanillaPacketTypes) {
-		this.packetDecoder = packetDecoder;
-		this.payloadTypeRegistry = payloadTypeRegistry;
-		this.vanillaPacketTypes = vanillaPacketTypes;
-	}
-
-	protected void decode(ChannelHandlerContext channelHandlerContext, Packet packet, List list) throws Exception {
-		if (this.packetMerger != null) {
-			ensureNotTransitioning(packet);
-
-			CustomPacketPayload payload = packet instanceof GenericPayloadAccessor accessor ? accessor.fabric_payload() : null;
-
-			if (payload == null) {
-				throw new DecoderException("Received '" + packet.type().id() + "' packet, while expecting 'minecraft:custom_payload'!");
-			}
-
-			if (!(payload instanceof FabricSplitPacketPayload splitPacketPayload)) {
-				throw new DecoderException("Expected '" + FabricSplitPacketPayload.TYPE.id() +"' payload packet, but received '" + payload.type().id() + "'!");
-			}
-
-			if (this.packetMerger.add(channelHandlerContext, splitPacketPayload, list)) {
-				this.packetMerger = null;
-			}
-		} else if (packet instanceof GenericPayloadAccessor accessor && accessor.fabric_payload() instanceof FabricSplitPacketPayload payload) {
-			ensureNotTransitioning(packet);
-			ByteBuf buf = payload.byteBuf();
-			int packetSize = VarInt.read(buf);
-			int readerIndex = buf.readerIndex();
-
-			PacketType packetType = this.vanillaPacketTypes.get(VarInt.read(buf));
-
-			if (packetType != packet.type()) {
-				throw new DecoderException("Received unsupported split packet type! Expected '" + packet.type().id() + " got '" + (packetType != null ? packetType.id() : "") + "'!");
-			}
-
-			Identifier payloadId = Identifier.STREAM_CODEC.decode(payload.byteBuf());
-
-			buf.readerIndex(readerIndex);
-			int maxSize = payloadTypeRegistry.getMaxPacketSizeForSplitting(payloadId);
-
-			if (maxSize == -1) {
-				throw new DecoderException("Received '" + payloadId + "' packet doesn't support splitting, but received split data!");
-			} else if (maxSize < packetSize) {
-				throw new DecoderException("Received '" + payloadId + "' packet is larger than max allowed size! Got " + packetSize + " bytes, expected " + maxSize + " bytes!");
-			}
-
-			this.packetMerger = new Merger(this.packetDecoder, payloadId, packetSize);
-
-			if (this.packetMerger.add(channelHandlerContext, payload, list)) {
-				throw new DecoderException("Received '" + payloadId + "' as a split packet, but it wasn't actually split!");
-			}
-		} else {
-			list.add(packet);
-
-			if (packet.isTerminal()) {
-				channelHandlerContext.pipeline().remove(channelHandlerContext.name());
-			}
-		}
-	}
-
-	private static void ensureNotTransitioning(Packet packet) {
-		if (packet.isTerminal()) {
-			throw new DecoderException("Terminal message received in bundle");
-		}
-	}
-
-	private static class Merger {
-		private final PacketDecoderAccessor packetDecoder;
-		private final Identifier packetId;
-		private final int finalSize;
-
-		private final ByteBuf byteBuf;
-
-		Merger(PacketDecoder packetDecoder, Identifier identifier, int finalSize) {
-			this.packetDecoder = (PacketDecoderAccessor) packetDecoder;
-			this.packetId = identifier;
-			this.byteBuf = Unpooled.buffer(finalSize);
-			this.finalSize = finalSize;
-		}
-
-		boolean add(ChannelHandlerContext channelHandlerContext, FabricSplitPacketPayload payload, List objects) throws Exception {
-			int newSize = this.byteBuf.readableBytes() + payload.byteBuf().readableBytes();
-
-			if (this.finalSize < newSize) {
-				throw new DecoderException("Received too much data for packet '" + this.packetId + "'! Expected " + this.finalSize + " bytes, received " + newSize + " bytes!");
-			}
-
-			this.byteBuf.writeBytes(payload.byteBuf());
-
-			if (this.byteBuf.readableBytes() == this.finalSize) {
-				this.packetDecoder.fabric_decode(channelHandlerContext, byteBuf, objects);
-				return true;
-			}
-
-			return false;
-		}
-	}
-}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/FabricPacketSplitter.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/FabricPacketSplitter.java
index 473102fac1..ff04434469 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/FabricPacketSplitter.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/FabricPacketSplitter.java
@@ -16,75 +16,10 @@
 
 package net.fabricmc.fabric.impl.networking.splitter;
 
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.EncoderException;
-import io.netty.handler.codec.MessageToMessageEncoder;
-
-import net.minecraft.network.PacketEncoder;
-import net.minecraft.network.VarInt;
-import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
 import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.Identifier;
-
-import net.fabricmc.fabric.impl.networking.PayloadTypeRegistryImpl;
-import net.fabricmc.fabric.mixin.networking.accessor.PacketEncoderAccessor;
 
-public class FabricPacketSplitter extends MessageToMessageEncoder> {
+public class FabricPacketSplitter {
 	public static final int SAFE_S2C_SPLIT_SIZE = ClientboundCustomPayloadPacket.MAX_PAYLOAD_SIZE;
 	public static final int SAFE_C2S_SPLIT_SIZE = ServerboundCustomPayloadPacket.MAX_PAYLOAD_SIZE;
-	private final PacketEncoder encoder;
-	private final PayloadTypeRegistryImpl payloadTypeRegistry;
-
-	public FabricPacketSplitter(PacketEncoder encoder, PayloadTypeRegistryImpl payloadTypeRegistry) {
-		this.encoder = encoder;
-		this.payloadTypeRegistry = payloadTypeRegistry;
-	}
-
-	protected void encode(ChannelHandlerContext channelHandlerContext, Packet packet, List list) throws Exception {
-		if (packet instanceof SplittablePacket splittablePacket) {
-			splittablePacket.fabric_split(this.payloadTypeRegistry, channelHandlerContext, this.encoder, packet, list::add);
-		} else {
-			list.add(packet);
-		}
-
-		if (packet.isTerminal()) {
-			channelHandlerContext.pipeline().remove(channelHandlerContext.name());
-		}
-	}
-
-	public static void genericPacketSplitter(Identifier packetId, ChannelHandlerContext channelHandlerContext, PacketEncoder encoder, Packet packet,
-											Function> packetConstructor, Consumer> consumer, int maxChunkSize, int maxPacketSize) throws Exception {
-		ByteBuf buf = Unpooled.buffer();
-		((PacketEncoderAccessor) encoder).fabric_encode(channelHandlerContext, packet, buf);
-
-		if (buf.readableBytes() < maxChunkSize) {
-			consumer.accept(new PassthroughPacket(buf));
-			return;
-		}
-
-		if (buf.readableBytes() > maxPacketSize) {
-			throw new EncoderException("Packet '" + packetId + "' may not be larger than " + maxPacketSize + " bytes!");
-		}
-
-		// First packet split with added packet size
-		ByteBuf firstSplit = Unpooled.buffer(maxChunkSize);
-		VarInt.write(firstSplit, buf.readableBytes());
-		// First slice needs to be slightly smaller to accommodate the header (by the already written data amount)
-		firstSplit.writeBytes(buf.readSlice(maxChunkSize - firstSplit.readableBytes()));
-
-		consumer.accept(packetConstructor.apply(new FabricSplitPacketPayload(firstSplit)));
-
-		// Remaining packets, as needed to send everything
-		while (buf.isReadable()) {
-			consumer.accept(packetConstructor.apply(new FabricSplitPacketPayload(buf.readSlice(Math.min(buf.readableBytes(), maxChunkSize)))));
-		}
-	}
 }
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/FabricSplitPacketPayload.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/FabricSplitPacketPayload.java
deleted file mode 100644
index 56ff8ca4f7..0000000000
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/FabricSplitPacketPayload.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.impl.networking.splitter;
-
-import io.netty.buffer.ByteBuf;
-
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.Identifier;
-
-public record FabricSplitPacketPayload(ByteBuf byteBuf) implements CustomPacketPayload {
-	public static final Type TYPE = new Type<>(Identifier.fromNamespaceAndPath("fabric", "split"));
-	public static final StreamCodec CODEC = StreamCodec.of(FabricSplitPacketPayload::write, FabricSplitPacketPayload::read);
-
-	private static FabricSplitPacketPayload read(ByteBuf buf) {
-		return new FabricSplitPacketPayload(buf.readBytes(buf.readableBytes()));
-	}
-
-	private static void write(ByteBuf buf, FabricSplitPacketPayload payload) {
-		buf.writeBytes(payload.byteBuf());
-	}
-
-	@Override
-	public Type type() {
-		return TYPE;
-	}
-}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/PassthroughPacket.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/PassthroughPacket.java
deleted file mode 100644
index 0ae820b185..0000000000
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/PassthroughPacket.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.impl.networking.splitter;
-
-import io.netty.buffer.ByteBuf;
-
-import net.minecraft.network.PacketEncoder;
-import net.minecraft.network.PacketListener;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.PacketFlow;
-import net.minecraft.network.protocol.PacketType;
-import net.minecraft.resources.Identifier;
-
-import net.fabricmc.fabric.impl.networking.NetworkingImpl;
-
-/**
- * A fake packet implementation used to pass already encoded data from {@link FabricPacketSplitter} to {@link PacketEncoder}.
- * Allows to avoid requiring to serialize the packet twice.
- */
-public record PassthroughPacket(ByteBuf buf) implements Packet {
-	private static final PacketType> FAKE_TYPE = new PacketType<>(PacketFlow.SERVERBOUND, Identifier.fromNamespaceAndPath(NetworkingImpl.MOD_ID, "passthrough"));
-
-	@Override
-	public PacketType> type() {
-		return FAKE_TYPE;
-	}
-
-	@Override
-	public void handle(PacketListener listener) {
-		throw new UnsupportedOperationException("This is not a real packet!");
-	}
-}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/SplittablePacket.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/SplittablePacket.java
deleted file mode 100644
index 50c06e8597..0000000000
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/splitter/SplittablePacket.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.impl.networking.splitter;
-
-import java.util.function.Consumer;
-
-import io.netty.channel.ChannelHandlerContext;
-
-import net.minecraft.network.PacketEncoder;
-import net.minecraft.network.protocol.Packet;
-
-import net.fabricmc.fabric.impl.networking.PayloadTypeRegistryImpl;
-
-public interface SplittablePacket {
-	void fabric_split(PayloadTypeRegistryImpl payloadTypeRegistry, ChannelHandlerContext channelHandlerContext, PacketEncoder encoder, Packet packet, Consumer> consumer) throws Exception;
-}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/BundlePacketMixin.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/BundlePacketMixin.java
deleted file mode 100644
index 9427181b67..0000000000
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/BundlePacketMixin.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.mixin.networking;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-
-import net.minecraft.network.protocol.BundlePacket;
-import net.minecraft.network.protocol.Packet;
-
-@Mixin(BundlePacket.class)
-public class BundlePacketMixin {
-	@ModifyVariable(method = "", at = @At("HEAD"), argsOnly = true, name = "packets")
-	private static Iterable> flattenBundlePackets(Iterable> value) {
-		var packets = new ArrayList>();
-		iterateBundle(value, packets);
-		return packets;
-	}
-
-	@Unique
-	private static void iterateBundle(Iterable> value, List> result) {
-		for (Packet packet : value) {
-			if (packet instanceof BundlePacket bundlePacket) {
-				iterateBundle(bundlePacket.subPackets(), result);
-			} else {
-				result.add(packet);
-			}
-		}
-	}
-}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ClientboundCustomPayloadPacketMixin.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ClientboundCustomPayloadPacketMixin.java
deleted file mode 100644
index 8688934e3b..0000000000
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ClientboundCustomPayloadPacketMixin.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * 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.mixin.networking;
-
-import java.util.List;
-import java.util.function.Consumer;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import io.netty.channel.ChannelHandlerContext;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.PacketEncoder;
-import net.minecraft.network.RegistryFriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-
-import net.fabricmc.fabric.impl.networking.FabricCustomPayloadStreamCodec;
-import net.fabricmc.fabric.impl.networking.GenericPayloadAccessor;
-import net.fabricmc.fabric.impl.networking.PayloadTypeRegistryImpl;
-import net.fabricmc.fabric.impl.networking.splitter.FabricPacketSplitter;
-import net.fabricmc.fabric.impl.networking.splitter.SplittablePacket;
-
-@Mixin(ClientboundCustomPayloadPacket.class)
-public class ClientboundCustomPayloadPacketMixin implements SplittablePacket, GenericPayloadAccessor {
-	@Shadow
-	@Final
-	private CustomPacketPayload payload;
-
-	@WrapOperation(
-			method = "",
-			at = @At(
-					value = "INVOKE",
-					target = "Lnet/minecraft/network/protocol/common/custom/CustomPacketPayload;codec(Lnet/minecraft/network/protocol/common/custom/CustomPacketPayload$FallbackProvider;Ljava/util/List;)Lnet/minecraft/network/codec/StreamCodec;",
-					ordinal = 0
-			)
-	)
-	private static StreamCodec wrapPlayCodec(CustomPacketPayload.FallbackProvider unknownCodecFactory, List> types, Operation> original) {
-		StreamCodec codec = original.call(unknownCodecFactory, types);
-		FabricCustomPayloadStreamCodec fabricCodec = (FabricCustomPayloadStreamCodec) codec;
-		fabricCodec.fabric_setCustomPayloadTypeProvider((buf, identifier) -> PayloadTypeRegistryImpl.CLIENTBOUND_PLAY.get(identifier));
-		return codec;
-	}
-
-	@WrapOperation(
-			method = "",
-			at = @At(
-					value = "INVOKE",
-					target = "Lnet/minecraft/network/protocol/common/custom/CustomPacketPayload;codec(Lnet/minecraft/network/protocol/common/custom/CustomPacketPayload$FallbackProvider;Ljava/util/List;)Lnet/minecraft/network/codec/StreamCodec;",
-					ordinal = 1
-			)
-	)
-	private static StreamCodec wrapConfigCodec(CustomPacketPayload.FallbackProvider unknownCodecFactory, List> types, Operation> original) {
-		StreamCodec codec = original.call(unknownCodecFactory, types);
-		FabricCustomPayloadStreamCodec fabricCodec = (FabricCustomPayloadStreamCodec) codec;
-		fabricCodec.fabric_setCustomPayloadTypeProvider((buf, identifier) -> PayloadTypeRegistryImpl.CLIENTBOUND_CONFIGURATION.get(identifier));
-		return codec;
-	}
-
-	@Override
-	public void fabric_split(PayloadTypeRegistryImpl payloadTypeRegistry, ChannelHandlerContext channelHandlerContext, PacketEncoder encoder, Packet packet, Consumer> consumer) throws Exception {
-		int size = payloadTypeRegistry.getMaxPacketSizeForSplitting(this.payload.type().id());
-
-		if (size == -1) {
-			consumer.accept((Packet) this);
-			return;
-		}
-
-		FabricPacketSplitter.genericPacketSplitter(this.payload.type().id(), channelHandlerContext, encoder, packet, ClientboundCustomPayloadPacket::new, consumer, FabricPacketSplitter.SAFE_S2C_SPLIT_SIZE, size);
-	}
-
-	@Override
-	public CustomPacketPayload fabric_payload() {
-		return this.payload;
-	}
-}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/CommonRegisterTaskMixin.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/CommonRegisterTaskMixin.java
new file mode 100644
index 0000000000..501d9ea7a6
--- /dev/null
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/CommonRegisterTaskMixin.java
@@ -0,0 +1,29 @@
+package net.fabricmc.fabric.mixin.networking;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import net.neoforged.neoforge.network.configuration.CommonRegisterTask;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import net.minecraft.resources.Identifier;
+
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+
+@Mixin(CommonRegisterTask.class)
+public class CommonRegisterTaskMixin {
+	@ModifyExpressionValue(
+			method = "run",
+			at = @At(
+					value = "INVOKE",
+					target = "Lnet/neoforged/neoforge/network/registration/NetworkRegistry;getCommonPlayChannels(Lnet/minecraft/network/protocol/PacketFlow;)Ljava/util/Set;"
+			)
+	)
+    private static Set sendFabricChannels(Set original) {
+		Set all = new HashSet<>(original);
+		all.addAll(ServerPlayNetworking.getGlobalReceivers());
+		return all;
+    }
+}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ConnectionMixin.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ConnectionMixin.java
index 8ee01bdce0..3e11867a13 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ConnectionMixin.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ConnectionMixin.java
@@ -21,6 +21,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.sugar.Local;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
@@ -35,8 +36,7 @@
 
 import net.minecraft.network.Connection;
 import net.minecraft.network.ConnectionProtocol;
-import net.minecraft.network.PacketDecoder;
-import net.minecraft.network.PacketEncoder;
+import net.minecraft.network.HandlerNames;
 import net.minecraft.network.PacketListener;
 import net.minecraft.network.ProtocolInfo;
 import net.minecraft.network.UnconfiguredPipelineHandler;
@@ -49,12 +49,9 @@
 import net.fabricmc.fabric.impl.networking.ChannelInfoHolder;
 import net.fabricmc.fabric.impl.networking.PacketCallbackListener;
 import net.fabricmc.fabric.impl.networking.PacketListenerExtensions;
-import net.fabricmc.fabric.impl.networking.PayloadTypeRegistryImpl;
-import net.fabricmc.fabric.impl.networking.VanillaPacketTypes;
 import net.fabricmc.fabric.impl.networking.context.PacketContextImpl;
 import net.fabricmc.fabric.impl.networking.context.PacketContextSetter;
-import net.fabricmc.fabric.impl.networking.splitter.FabricPacketMerger;
-import net.fabricmc.fabric.impl.networking.splitter.FabricPacketSplitter;
+import net.fabricmc.fabric.impl.networking.splitter.ChannelEncoderContextProvider;
 
 @Mixin(Connection.class)
 abstract class ConnectionMixin implements ChannelInfoHolder, PacketContextProvider {
@@ -103,40 +100,24 @@ private void disconnectAddon(CallbackInfo ci) {
 	@ModifyArg(method = "setupInboundProtocol", at = @At(value = "INVOKE", target = "Lio/netty/channel/Channel;writeAndFlush(Ljava/lang/Object;)Lio/netty/channel/ChannelFuture;"))
 	private Object injectFabricPacketSlitterHandlerInbound(Object transitioner, @Local(argsOnly = true) ProtocolInfo protocolInfo) {
 		transitioner = ((UnconfiguredPipelineHandler.InboundConfigurationTask) transitioner).andThen((context) -> {
-			if (context.pipeline().get("decoder") instanceof PacketContextSetter setter) {
+			if (context.pipeline().get(HandlerNames.DECODER) instanceof PacketContextSetter setter) {
 				setter.fabric_setPacketContext(this.packetContext);
 			}
 		});
-
-		PayloadTypeRegistryImpl payloadTypeRegistry = PayloadTypeRegistryImpl.get(protocolInfo);
-
-		if (payloadTypeRegistry == null) {
-			return transitioner;
-		}
-
-		return ((UnconfiguredPipelineHandler.InboundConfigurationTask) transitioner).andThen((context) -> {
-			FabricPacketMerger merger = new FabricPacketMerger(context.pipeline().get(PacketDecoder.class), payloadTypeRegistry, VanillaPacketTypes.get(protocolInfo));
-			context.pipeline().addAfter("decoder", "fabric:merger", merger);
-		});
+		return transitioner;
 	}
 
-	@ModifyArg(method = "setupOutboundProtocol", at = @At(value = "INVOKE", target = "Lio/netty/channel/Channel;writeAndFlush(Ljava/lang/Object;)Lio/netty/channel/ChannelFuture;"))
-	private Object injectFabricPacketSlitterHandlerOutbound(Object transitioner, @Local(argsOnly = true) ProtocolInfo protocolInfo) {
-		transitioner = ((UnconfiguredPipelineHandler.OutboundConfigurationTask) transitioner).andThen((context) -> {
-			if (context.pipeline().get("encoder") instanceof PacketContextSetter setter) {
+	@ModifyExpressionValue(method = "setupOutboundProtocol", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/UnconfiguredPipelineHandler;setupOutboundProtocol(Lnet/minecraft/network/ProtocolInfo;)Lnet/minecraft/network/UnconfiguredPipelineHandler$OutboundConfigurationTask;"))
+	private UnconfiguredPipelineHandler.OutboundConfigurationTask injectFabricPacketSlitterHandlerOutbound(UnconfiguredPipelineHandler.OutboundConfigurationTask transitioner) {
+		transitioner = transitioner.andThen((context) -> {
+			if (context.pipeline().get(HandlerNames.ENCODER) instanceof PacketContextSetter setter) {
 				setter.fabric_setPacketContext(this.packetContext);
 			}
 		});
-
-		PayloadTypeRegistryImpl payloadTypeRegistry = PayloadTypeRegistryImpl.get(protocolInfo);
-
-		if (payloadTypeRegistry == null) {
-			return transitioner;
-		}
-
-		return ((UnconfiguredPipelineHandler.OutboundConfigurationTask) transitioner).andThen((context) -> {
-			FabricPacketSplitter splitter = new FabricPacketSplitter(context.pipeline().get(PacketEncoder.class), payloadTypeRegistry);
-			context.pipeline().addAfter("encoder", "fabric:splitter", splitter);
+		return transitioner.andThen((context) -> {
+			if (context.pipeline().get(ChannelEncoderContextProvider.ID) == null) {
+				context.pipeline().addAfter(HandlerNames.ENCODER, ChannelEncoderContextProvider.ID, new ChannelEncoderContextProvider());
+			}
 		});
 	}
 
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/CustomPayloadStreamCodecMixin.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/CustomPayloadStreamCodecMixin.java
deleted file mode 100644
index d3e299d2bf..0000000000
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/CustomPayloadStreamCodecMixin.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.mixin.networking;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Coerce;
-
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.Identifier;
-
-import net.fabricmc.fabric.impl.networking.CustomPayloadTypeProvider;
-import net.fabricmc.fabric.impl.networking.FabricCustomPayloadStreamCodec;
-
-@Mixin(targets = "net.minecraft.network.protocol.common.custom.CustomPacketPayload$1")
-public abstract class CustomPayloadStreamCodecMixin implements StreamCodec, FabricCustomPayloadStreamCodec {
-	@Unique
-	private CustomPayloadTypeProvider customPayloadTypeProvider;
-
-	@Override
-	public void fabric_setCustomPayloadTypeProvider(CustomPayloadTypeProvider customPayloadTypeProvider) {
-		if (this.customPayloadTypeProvider != null) {
-			throw new IllegalStateException("Custom payload type provider is already set!");
-		}
-
-		this.customPayloadTypeProvider = customPayloadTypeProvider;
-	}
-
-	@WrapOperation(method = {
-			"writeCap(Lnet/minecraft/network/FriendlyByteBuf;Lnet/minecraft/network/protocol/common/custom/CustomPacketPayload$Type;Lnet/minecraft/network/protocol/common/custom/CustomPacketPayload;)V",
-			"decode(Lnet/minecraft/network/FriendlyByteBuf;)Lnet/minecraft/network/protocol/common/custom/CustomPacketPayload;"
-	}, at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/common/custom/CustomPacketPayload$1;findCodec(Lnet/minecraft/resources/Identifier;)Lnet/minecraft/network/codec/StreamCodec;"))
-	private StreamCodec wrapGetCodec(@Coerce StreamCodec instance, Identifier identifier, Operation> original, B buf) {
-		if (customPayloadTypeProvider != null) {
-			CustomPacketPayload.TypeAndCodec payloadType = customPayloadTypeProvider.get(buf, identifier);
-
-			if (payloadType != null) {
-				return payloadType.codec();
-			}
-		}
-
-		return original.call(instance, identifier);
-	}
-}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/FakePlayerNetHandlerMixin.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/FakePlayerNetHandlerMixin.java
new file mode 100644
index 0000000000..c9e4f3b56d
--- /dev/null
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/FakePlayerNetHandlerMixin.java
@@ -0,0 +1,9 @@
+package net.fabricmc.fabric.mixin.networking;
+
+import net.fabricmc.fabric.impl.networking.UntrackedPacketListener;
+
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(targets = "net.neoforged.neoforge.common.util.FakePlayer$FakePlayerNetHandler")
+public class FakePlayerNetHandlerMixin implements UntrackedPacketListener {
+}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/NetworkRegistryMixin.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/NetworkRegistryMixin.java
new file mode 100644
index 0000000000..f33c682728
--- /dev/null
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/NetworkRegistryMixin.java
@@ -0,0 +1,95 @@
+package net.fabricmc.fabric.mixin.networking;
+
+import java.util.Set;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.sugar.Local;
+import io.netty.channel.ChannelHandlerContext;
+import net.neoforged.neoforge.network.registration.NetworkChannel;
+import net.neoforged.neoforge.network.registration.NetworkRegistry;
+import org.jspecify.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.network.ConnectionProtocol;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.PacketFlow;
+import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
+import net.minecraft.network.protocol.common.ServerCommonPacketListener;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload.Type;
+import net.minecraft.resources.Identifier;
+import net.minecraft.server.network.ServerConfigurationPacketListenerImpl;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+
+import net.fabricmc.fabric.api.networking.v1.ServerConfigurationNetworking;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.fabricmc.fabric.impl.networking.NetworkingImpl;
+
+@Mixin(NetworkRegistry.class)
+public class NetworkRegistryMixin {
+	@Unique
+	private static ChannelHandlerContext fabric_context;
+
+	@Inject(
+			method = "checkPacket(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/protocol/common/ServerCommonPacketListener;)V",
+			at = @At(
+					value = "INVOKE",
+					target = "Lnet/neoforged/neoforge/network/registration/NetworkRegistry;hasChannel(Lnet/neoforged/neoforge/common/extensions/ICommonPacketListener;Lnet/minecraft/resources/Identifier;)Z"
+			),
+			cancellable = true
+	)
+	private static void checkFabricPacket(Packet packet, ServerCommonPacketListener listener, CallbackInfo ci) {
+		ClientboundCustomPayloadPacket customPayloadPacket = (ClientboundCustomPayloadPacket) packet;
+		Type type = customPayloadPacket.payload().type();
+
+		if (listener instanceof ServerConfigurationPacketListenerImpl impl && ServerConfigurationNetworking.canSend(impl, type)) {
+			ci.cancel();
+		}
+
+		if (listener instanceof ServerGamePacketListenerImpl impl && ServerPlayNetworking.canSend(impl, type)) {
+			ci.cancel();
+		}
+
+		if (NetworkingImpl.getCodec(type.id(), listener.protocol(), listener.flow()) != null) {
+			ci.cancel();
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	@Inject(method = "getCodec", at = @At("HEAD"), cancellable = true)
+	private static void getFabricCodec(Identifier id, ConnectionProtocol protocol, PacketFlow flow, CallbackInfoReturnable> cir) {
+		CustomPacketPayload.@Nullable TypeAndCodec typeAndCodec = NetworkingImpl.getCodec(id, protocol, flow);
+		if (typeAndCodec != null) {
+			cir.setReturnValue((StreamCodec) typeAndCodec.codec());
+		}
+	}
+	
+	@Inject(method = "filterGameBundlePackets", at = @At("HEAD"))
+	private static void captureContext(ChannelHandlerContext context, Iterable> packets, CallbackInfoReturnable cir) {
+		fabric_context = context;
+	}
+
+	@ModifyExpressionValue(
+			method = "lambda$filterGameBundlePackets$0",
+			at = @At(
+					value = "INVOKE",
+					target = "Lnet/neoforged/neoforge/network/registration/NetworkPayloadSetup;getChannel(Lnet/minecraft/network/ConnectionProtocol;Lnet/minecraft/resources/Identifier;)Lnet/neoforged/neoforge/network/registration/NetworkChannel;"
+			)
+	)
+	private static NetworkChannel checkFabricChannels(NetworkChannel channel, @Local(name = "id") Identifier id) {
+		if (channel == null && fabric_context.channel().hasAttr(NetworkingImpl.SENDABLE_CHANNELS)) {
+			Set fabricChannels = fabric_context.channel().attr(NetworkingImpl.SENDABLE_CHANNELS).get();
+			if (fabricChannels.contains(id)) {
+				return new NetworkChannel(id, "1");
+			}
+		}
+		return channel;
+	}
+}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/PacketDecoderMixin.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/PacketDecoderMixin.java
index 594434bbb1..b3d07cad16 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/PacketDecoderMixin.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/PacketDecoderMixin.java
@@ -42,6 +42,11 @@ private void wrapWithContext(ChannelHandlerContext ctx, ByteBuf input, List original.call(ctx, input, out));
 	}
 
+	@Override
+	public PacketContext fabric_getPacketContext() {
+		return this.packetContext;
+	}
+
 	@Override
 	public void fabric_setPacketContext(PacketContext context) {
 		this.packetContext = context;
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/PacketEncoderMixin.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/PacketEncoderMixin.java
index a1f43a6613..b22c973e9f 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/PacketEncoderMixin.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/PacketEncoderMixin.java
@@ -16,23 +16,13 @@
 
 package net.fabricmc.fabric.mixin.networking;
 
-import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.network.PacketEncoder;
-import net.minecraft.network.protocol.Packet;
 
 import net.fabricmc.fabric.api.networking.v1.context.PacketContext;
-import net.fabricmc.fabric.impl.networking.context.PacketContextImpl;
 import net.fabricmc.fabric.impl.networking.context.PacketContextSetter;
-import net.fabricmc.fabric.impl.networking.splitter.PassthroughPacket;
 
 // Lowered the default priority, as this should happen before other mods.
 @Mixin(value = PacketEncoder.class, priority = 500)
@@ -40,21 +30,13 @@ public class PacketEncoderMixin implements PacketContextSetter {
 	@Unique
 	private PacketContext packetContext;
 
-	@Inject(method = "encode(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/protocol/Packet;Lio/netty/buffer/ByteBuf;)V", at = @At("HEAD"), cancellable = true)
-	private void handlePassthroughPacket(ChannelHandlerContext channelHandlerContext, Packet packet, ByteBuf byteBuf, CallbackInfo ci) {
-		if (packet instanceof PassthroughPacket passthroughPacket) {
-			byteBuf.writeBytes(passthroughPacket.buf());
-			ci.cancel();
-		}
+	@Override
+	public PacketContext fabric_getPacketContext() {
+		return this.packetContext;
 	}
 
 	@Override
 	public void fabric_setPacketContext(PacketContext context) {
 		this.packetContext = context;
 	}
-
-	@WrapMethod(method = "encode(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/protocol/Packet;Lio/netty/buffer/ByteBuf;)V")
-	private void wrapWithContext(ChannelHandlerContext ctx, Packet packet, ByteBuf output, Operation original) {
-		ScopedValue.where(PacketContextImpl.VALUE, this.packetContext).run(() -> original.call(ctx, packet, output));
-	}
 }
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerCommonPacketListenerImplMixin.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerCommonPacketListenerImplMixin.java
index 31f3249076..2e936f76fd 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerCommonPacketListenerImplMixin.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerCommonPacketListenerImplMixin.java
@@ -16,6 +16,8 @@
 
 package net.fabricmc.fabric.mixin.networking;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -25,8 +27,8 @@
 
 import net.minecraft.network.Connection;
 import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
-import net.minecraft.network.protocol.common.ServerboundPongPacket;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.RunningOnDifferentThreadException;
 import net.minecraft.server.network.ServerCommonPacketListenerImpl;
@@ -35,6 +37,7 @@
 import net.fabricmc.fabric.api.networking.v1.context.PacketContextProvider;
 import net.fabricmc.fabric.impl.networking.PacketListenerExtensions;
 import net.fabricmc.fabric.impl.networking.server.ServerConfigurationNetworkAddon;
+import net.fabricmc.fabric.impl.networking.server.ServerPlayNetworkAddon;
 
 @Mixin(ServerCommonPacketListenerImpl.class)
 public abstract class ServerCommonPacketListenerImplMixin implements PacketListenerExtensions, PacketContextProvider {
@@ -51,13 +54,14 @@ private void handleCustomPayloadReceivedAsync(ServerboundCustomPayloadPacket pac
 		final CustomPacketPayload payload = packet.payload();
 
 		try {
-			boolean handled;
+			boolean handled = false;
 
 			if (getAddon() instanceof ServerConfigurationNetworkAddon addon) {
 				handled = addon.handle(payload);
 			} else {
 				// Play should be handled in ServerGamePacketListenerImplMixin
-				throw new IllegalStateException("Unknown addon");
+				// Disabled: Neo will take care of this
+//				throw new IllegalStateException("Unknown addon");
 			}
 
 			if (handled) {
@@ -69,11 +73,16 @@ private void handleCustomPayloadReceivedAsync(ServerboundCustomPayloadPacket pac
 		}
 	}
 
-	@Inject(method = "handlePong", at = @At("HEAD"))
-	private void onPlayPong(ServerboundPongPacket packet, CallbackInfo ci) {
-		if (getAddon() instanceof ServerConfigurationNetworkAddon addon) {
-			addon.onPong(packet.getId());
+	@WrapOperation(method = "handleCustomPayload", at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/network/registration/NetworkRegistry;isModdedPayload(Lnet/minecraft/network/protocol/common/custom/CustomPacketPayload;)Z"))
+	private boolean cancelNeoHandling(CustomPacketPayload payload, Operation original) {
+		if (this.getAddon() instanceof ServerPlayNetworkAddon addon) {
+			final Identifier channelName = payload.type().id();
+
+			if (addon.getPayloadTypeRegistry().get(channelName) != null) {
+				return false;
+			}
 		}
+		return original.call(payload);
 	}
 
 	@Override
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerConfigurationPacketListenerImplMixin.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerConfigurationPacketListenerImplMixin.java
index 2f71b02342..cc426daf0a 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerConfigurationPacketListenerImplMixin.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerConfigurationPacketListenerImplMixin.java
@@ -16,14 +16,16 @@
 
 package net.fabricmc.fabric.mixin.networking;
 
+import java.util.HashSet;
 import java.util.Queue;
 import java.util.Set;
 import java.util.function.Function;
 
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import io.netty.buffer.ByteBuf;
-import org.jspecify.annotations.Nullable;
+import net.neoforged.neoforge.network.connection.ConnectionType;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -35,6 +37,7 @@
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.Connection;
 import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.CommonListenerCookie;
 import net.minecraft.server.network.ConfigurationTask;
@@ -49,10 +52,6 @@
 // We want to apply a bit earlier than other mods which may not use us in order to prevent refCount issues
 @Mixin(value = ServerConfigurationPacketListenerImpl.class, priority = 900)
 public abstract class ServerConfigurationPacketListenerImplMixin extends ServerCommonPacketListenerImpl implements PacketListenerExtensions, FabricServerConfigurationPacketListenerImpl {
-	@Shadow
-	@Nullable
-	private ConfigurationTask currentTask;
-
 	@Shadow
 	protected abstract void finishCurrentTask(ConfigurationTask.Type key);
 
@@ -60,21 +59,9 @@ public abstract class ServerConfigurationPacketListenerImplMixin extends ServerC
 	@Final
 	private Queue configurationTasks;
 
-	@Shadow
-	public abstract boolean isAcceptingMessages();
-
-	@Shadow
-	public abstract void startConfiguration();
-
 	@Unique
 	private ServerConfigurationNetworkAddon addon;
 
-	@Unique
-	private boolean sentConfiguration;
-
-	@Unique
-	private boolean earlyTaskExecution;
-
 	public ServerConfigurationPacketListenerImplMixin(MinecraftServer server, Connection connection, CommonListenerCookie arg) {
 		super(server, connection, arg);
 	}
@@ -85,68 +72,17 @@ private void initAddon(CallbackInfo ci) {
 		// A bit of a hack but it allows the field above to be set in case someone registers handlers during INIT event which refers to said field
 		this.addon.lateInit();
 	}
-
-	@Inject(method = "startConfiguration", at = @At("HEAD"), cancellable = true)
-	private void onClientReady(CallbackInfo ci) {
-		// Send the initial channel registration packet
-		if (this.addon.startConfiguration()) {
-			if (currentTask != null) {
-				throw new IllegalStateException("A task is already running: " + currentTask.type().id());
-			}
-
-			ci.cancel();
-			return;
-		}
-
-		// Ready to start sending packets
-		if (!sentConfiguration) {
-			this.addon.preConfiguration();
-			sentConfiguration = true;
-			earlyTaskExecution = true;
-		}
-
-		// Run the early tasks
-		if (earlyTaskExecution) {
-			if (pollEarlyTasks()) {
-				ci.cancel();
-				return;
-			} else {
-				earlyTaskExecution = false;
-			}
-		}
-
-		// All early tasks should have been completed
-		if (currentTask != null || !configurationTasks.isEmpty()) {
-			throw new IllegalStateException("All early tasks should have been completed, current: " + currentTask + ", queued: " + configurationTasks.size());
-		}
-
-		// Run the vanilla tasks.
-		this.addon.configuration();
+	
+	@ModifyExpressionValue(method = "startConfiguration", at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/network/registration/NetworkRegistry;getInitialListeningChannels(Lnet/minecraft/network/protocol/PacketFlow;)Ljava/util/Set;"))
+	private Set addInitialReceivableChannels(Set original) {
+		Set union = new HashSet<>(original);
+		union.addAll(this.addon.getReceivableChannels());
+		return union;
 	}
 
-	@Unique
-	private boolean pollEarlyTasks() {
-		if (!earlyTaskExecution) {
-			throw new IllegalStateException("Early task execution has finished");
-		}
-
-		if (this.currentTask != null) {
-			throw new IllegalStateException("Task " + this.currentTask.type().id() + " has not finished yet");
-		}
-
-		if (!this.isAcceptingMessages()) {
-			return false;
-		}
-
-		final ConfigurationTask task = this.configurationTasks.poll();
-
-		if (task != null) {
-			this.currentTask = task;
-			task.start(this::send);
-			return true;
-		}
-
-		return false;
+	@Inject(method = "runConfiguration", at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/network/ConfigurationInitialization;configureEarlyTasks(Lnet/minecraft/network/protocol/configuration/ServerConfigurationPacketListener;Ljava/util/function/Consumer;)V"))
+	private void beforeConfigureEarlyTasks(CallbackInfo ci) {
+		this.addon.preConfiguration();
 	}
 
 	@Override
@@ -161,24 +97,12 @@ public void addTask(ConfigurationTask task) {
 
 	@Override
 	public void completeTask(ConfigurationTask.Type key) {
-		if (!earlyTaskExecution) {
-			finishCurrentTask(key);
-			return;
-		}
-
-		final ConfigurationTask.Type currentKey = this.currentTask != null ? this.currentTask.type() : null;
-
-		if (!key.equals(currentKey)) {
-			throw new IllegalStateException("Unexpected request for task finish, current task: " + currentKey + ", requested: " + key);
-		}
-
-		this.currentTask = null;
-		startConfiguration();
+		finishCurrentTask(key);
 	}
 
-	@WrapOperation(method = "handleConfigurationFinished", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/RegistryFriendlyByteBuf;decorator(Lnet/minecraft/core/RegistryAccess;)Ljava/util/function/Function;"))
-	private Function bindChannelInfo(RegistryAccess registryManager, Operation> original) {
-		return original.call(registryManager).andThen(registryByteBuf -> {
+	@WrapOperation(method = "handleConfigurationFinished", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/RegistryFriendlyByteBuf;decorator(Lnet/minecraft/core/RegistryAccess;Lnet/neoforged/neoforge/network/connection/ConnectionType;)Ljava/util/function/Function;"))
+	private Function bindChannelInfo(RegistryAccess registryManager, ConnectionType connectionType, Operation> original) {
+		return original.call(registryManager, connectionType).andThen(registryByteBuf -> {
 			FabricRegistryFriendlyByteBuf fabricRegistryFriendlyByteBuf = (FabricRegistryFriendlyByteBuf) registryByteBuf;
 			fabricRegistryFriendlyByteBuf.fabric_setSendableConfigurationChannels(Set.copyOf(addon.getSendableChannels()));
 			return registryByteBuf;
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerEntityMixin.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerEntityMixin.java
deleted file mode 100644
index ae45047dc1..0000000000
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerEntityMixin.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.mixin.networking;
-
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.server.level.ServerEntity;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.Entity;
-
-import net.fabricmc.fabric.api.networking.v1.EntityTrackingEvents;
-
-@Mixin(ServerEntity.class)
-abstract class ServerEntityMixin {
-	@Shadow
-	@Final
-	private Entity entity;
-
-	@Inject(method = "addPairing", at = @At("TAIL"))
-	private void onStartTracking(ServerPlayer player, CallbackInfo ci) {
-		EntityTrackingEvents.START_TRACKING.invoker().onStartTracking(this.entity, player);
-	}
-
-	@Inject(method = "removePairing", at = @At("HEAD"))
-	private void onStopTracking(ServerPlayer player, CallbackInfo ci) {
-		EntityTrackingEvents.STOP_TRACKING.invoker().onStopTracking(this.entity, player);
-	}
-}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerboundCustomPayloadPacketMixin.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerboundCustomPayloadPacketMixin.java
deleted file mode 100644
index 279b0b1eb0..0000000000
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerboundCustomPayloadPacketMixin.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.mixin.networking;
-
-import java.util.List;
-import java.util.function.Consumer;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import io.netty.channel.ChannelHandlerContext;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.PacketEncoder;
-import net.minecraft.network.RegistryFriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-
-import net.fabricmc.fabric.impl.networking.FabricCustomPayloadStreamCodec;
-import net.fabricmc.fabric.impl.networking.GenericPayloadAccessor;
-import net.fabricmc.fabric.impl.networking.PayloadTypeRegistryImpl;
-import net.fabricmc.fabric.impl.networking.splitter.FabricPacketSplitter;
-import net.fabricmc.fabric.impl.networking.splitter.SplittablePacket;
-
-@Mixin(ServerboundCustomPayloadPacket.class)
-public class ServerboundCustomPayloadPacketMixin implements SplittablePacket, GenericPayloadAccessor {
-	@Shadow
-	@Final
-	private CustomPacketPayload payload;
-
-	@WrapOperation(
-			method = "",
-			at = @At(
-					value = "INVOKE",
-					target = "Lnet/minecraft/network/protocol/common/custom/CustomPacketPayload;codec(Lnet/minecraft/network/protocol/common/custom/CustomPacketPayload$FallbackProvider;Ljava/util/List;)Lnet/minecraft/network/codec/StreamCodec;"
-			)
-	)
-	private static StreamCodec wrapCodec(CustomPacketPayload.FallbackProvider unknownCodecFactory, List> types, Operation> original) {
-		StreamCodec codec = original.call(unknownCodecFactory, types);
-		FabricCustomPayloadStreamCodec fabricCodec = (FabricCustomPayloadStreamCodec) codec;
-		fabricCodec.fabric_setCustomPayloadTypeProvider((friendlyByteBuf, identifier) -> {
-			// ServerboundCustomPayloadPacket does not have a separate codec for play/configuration. We know if the friendlyByteBuf is a FriendlyByteBuf we are in the play phase.
-			if (friendlyByteBuf instanceof RegistryFriendlyByteBuf) {
-				return (CustomPacketPayload.TypeAndCodec) (Object) PayloadTypeRegistryImpl.SERVERBOUND_PLAY.get(identifier);
-			}
-
-			return PayloadTypeRegistryImpl.SERVERBOUND_CONFIGURATION.get(identifier);
-		});
-		return codec;
-	}
-
-	@Override
-	public void fabric_split(PayloadTypeRegistryImpl payloadTypeRegistry, ChannelHandlerContext channelHandlerContext, PacketEncoder encoder, Packet packet, Consumer> consumer) throws Exception {
-		int size = payloadTypeRegistry.getMaxPacketSizeForSplitting(this.payload.type().id());
-
-		if (size == -1) {
-			consumer.accept((Packet) this);
-			return;
-		}
-
-		FabricPacketSplitter.genericPacketSplitter(this.payload.type().id(), channelHandlerContext, encoder, packet, ServerboundCustomPayloadPacket::new, consumer, FabricPacketSplitter.SAFE_C2S_SPLIT_SIZE, size);
-	}
-
-	@Override
-	public CustomPacketPayload fabric_payload() {
-		return this.payload;
-	}
-}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/accessor/PacketDecoderAccessor.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/accessor/PacketDecoderAccessor.java
deleted file mode 100644
index e32bc838a8..0000000000
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/accessor/PacketDecoderAccessor.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.mixin.networking.accessor;
-
-import java.util.List;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-import net.minecraft.network.PacketDecoder;
-
-@Mixin(PacketDecoder.class)
-public interface PacketDecoderAccessor {
-	@Invoker("decode")
-	void fabric_decode(ChannelHandlerContext var1, ByteBuf var2, List var3) throws Exception;
-}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/accessor/PacketEncoderAccessor.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/accessor/PacketEncoderAccessor.java
deleted file mode 100644
index 5d7aadd23d..0000000000
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/accessor/PacketEncoderAccessor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.mixin.networking.accessor;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-import net.minecraft.network.PacketEncoder;
-import net.minecraft.network.protocol.Packet;
-
-@Mixin(PacketEncoder.class)
-public interface PacketEncoderAccessor {
-	@Invoker("encode")
-	void fabric_encode(ChannelHandlerContext channelHandlerContext, Packet packet, ByteBuf byteBuf) throws Exception;
-}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/accessor/ServerCommonPacketListenerImplAccessor.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/accessor/ServerCommonPacketListenerImplAccessor.java
index 44ddd2fd31..7ac35d3cbd 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/accessor/ServerCommonPacketListenerImplAccessor.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/accessor/ServerCommonPacketListenerImplAccessor.java
@@ -19,15 +19,11 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-import net.minecraft.network.Connection;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerCommonPacketListenerImpl;
 
 @Mixin(ServerCommonPacketListenerImpl.class)
 public interface ServerCommonPacketListenerImplAccessor {
-	@Accessor
-	Connection getConnection();
-
 	@Accessor
 	MinecraftServer getServer();
 }
diff --git a/fabric-networking-api-v1/src/main/resources/fabric-networking-api-v1.mixins.json b/fabric-networking-api-v1/src/main/resources/fabric-networking-api-v1.mixins.json
index 266a0fe6b8..d26b9d4313 100644
--- a/fabric-networking-api-v1/src/main/resources/fabric-networking-api-v1.mixins.json
+++ b/fabric-networking-api-v1/src/main/resources/fabric-networking-api-v1.mixins.json
@@ -3,33 +3,29 @@
   "package": "net.fabricmc.fabric.mixin.networking",
   "compatibilityLevel": "JAVA_25",
   "mixins": [
-    "BundlePacketMixin",
-    "ClientboundCustomPayloadPacketMixin",
     "ClientboundCustomQueryPacketMixin",
     "CommandsMixin",
     "ConnectionMixin",
-    "CustomPayloadStreamCodecMixin",
     "DebugConfigCommandMixin",
     "IdDispatchCodecMixin",
     "PacketDecoderMixin",
     "PacketEncoderMixin",
     "PlayerListMixin",
     "RegistryFriendlyByteBufMixin",
-    "ServerboundCustomPayloadPacketMixin",
     "ServerboundCustomQueryAnswerPacketMixin",
     "ServerCommonPacketListenerImplMixin",
     "ServerConfigurationPacketListenerImplMixin",
-    "ServerEntityMixin",
     "ServerGamePacketListenerImplMixin",
     "ServerHandshakePacketListenerImplMixin",
     "ServerLoginPacketListenerImplMixin",
     "ServerPlayerMixin",
     "accessor.ChunkMapAccessor",
     "accessor.EntityTrackerAccessor",
-    "accessor.PacketDecoderAccessor",
-    "accessor.PacketEncoderAccessor",
     "accessor.ServerCommonPacketListenerImplAccessor",
-    "accessor.ServerLoginPacketListenerImplAccessor"
+    "accessor.ServerLoginPacketListenerImplAccessor",
+    "NetworkRegistryMixin",
+    "CommonRegisterTaskMixin",
+    "FakePlayerNetHandlerMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-networking-api-v1/src/main/resources/fabric.mod.json b/fabric-networking-api-v1/src/main/resources/fabric.mod.json
index 32de6e07da..353205a31d 100644
--- a/fabric-networking-api-v1/src/main/resources/fabric.mod.json
+++ b/fabric-networking-api-v1/src/main/resources/fabric.mod.json
@@ -16,10 +16,6 @@
     "FabricMC"
   ],
   "entrypoints": {
-    "main": [
-      "net.fabricmc.fabric.impl.networking.CommonPacketsImpl::init",
-      "net.fabricmc.fabric.impl.networking.NetworkingImpl::init"
-    ],
     "client": [
       "net.fabricmc.fabric.impl.networking.client.ClientNetworkingImpl::clientInit"
     ]
diff --git a/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/NetworkingChannelClientTest.java b/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/NetworkingChannelClientTest.java
index 4d56d6f2b9..f1a0899448 100644
--- a/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/NetworkingChannelClientTest.java
+++ b/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/NetworkingChannelClientTest.java
@@ -42,7 +42,7 @@ public void onInitializeClient() {
 		ClientTickEvents.END_CLIENT_TICK.register(client -> {
 			if (client.player != null) {
 				if (OPEN.consumeClick()) {
-					client.setScreen(new ChannelScreen(this));
+					client.gui.setScreen(new ChannelScreen(this));
 				}
 			}
 		});
@@ -50,16 +50,16 @@ public void onInitializeClient() {
 		ServerboundPlayChannelEvents.REGISTER.register((listener, sender, client, channels) -> {
 			SUPPORTED_SERVERBOUND_CHANNELS.addAll(channels);
 
-			if (Minecraft.getInstance().screen instanceof ChannelScreen) {
-				((ChannelScreen) Minecraft.getInstance().screen).refresh();
+			if (Minecraft.getInstance().gui.screen() instanceof ChannelScreen) {
+				((ChannelScreen) Minecraft.getInstance().gui.screen()).refresh();
 			}
 		});
 
 		ServerboundPlayChannelEvents.UNREGISTER.register((listener, sender, client, channels) -> {
 			SUPPORTED_SERVERBOUND_CHANNELS.removeAll(channels);
 
-			if (Minecraft.getInstance().screen instanceof ChannelScreen) {
-				((ChannelScreen) Minecraft.getInstance().screen).refresh();
+			if (Minecraft.getInstance().gui.screen() instanceof ChannelScreen) {
+				((ChannelScreen) Minecraft.getInstance().gui.screen()).refresh();
 			}
 		});
 
diff --git a/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/play/NetworkingPlayPacketClientTest.java b/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/play/NetworkingPlayPacketClientTest.java
index e5cb74ac8c..5339237dad 100644
--- a/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/play/NetworkingPlayPacketClientTest.java
+++ b/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/play/NetworkingPlayPacketClientTest.java
@@ -45,7 +45,7 @@ public void onInitializeClient() {
 			Objects.requireNonNull(context.client());
 			Objects.requireNonNull(context.player());
 
-			context.client().gui.setOverlayMessage(payload.message(), true);
+			context.client().gui.hud.setOverlayMessage(payload.message(), true);
 		}));
 
 		ClientCommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> dispatcher.register(
diff --git a/fabric-object-builder-api-v1/build.gradle b/fabric-object-builder-api-v1/build.gradle
index 8c4fde6e55..4f78cc3d94 100644
--- a/fabric-object-builder-api-v1/build.gradle
+++ b/fabric-object-builder-api-v1/build.gradle
@@ -9,7 +9,7 @@ moduleDependencies(project, [
 testDependencies(project, [
 	':fabric-command-api-v2',
 	':fabric-lifecycle-events-v1',
-	':fabric-rendering-v1'
+//	':fabric-rendering-v1'
 ])
 
 loom {
diff --git a/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/impl/object/builder/client/SignTypeTextureHelper.java b/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/impl/object/builder/client/SignTypeTextureHelper.java
deleted file mode 100644
index f06bb19001..0000000000
--- a/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/impl/object/builder/client/SignTypeTextureHelper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.impl.object.builder.client;
-
-import net.minecraft.client.renderer.Sheets;
-import net.minecraft.world.level.block.state.properties.WoodType;
-
-public final class SignTypeTextureHelper {
-	/**
-	 * Set to true after {@link Sheets} has been classloaded. If any new {@link WoodType}s are registered
-	 * after this point, they need to be added to the texture maps manually. Always adding textures manually classloads
-	 * {@link Sheets} too early, which causes issues such as decorated pot pattern textures not being
-	 * initialized correctly.
-	 */
-	public static boolean shouldAddTextures = false;
-}
diff --git a/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/mixin/object/builder/client/HangingSignEditScreenMixin.java b/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/mixin/object/builder/client/HangingSignEditScreenMixin.java
deleted file mode 100644
index 2bc57ac409..0000000000
--- a/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/mixin/object/builder/client/HangingSignEditScreenMixin.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.mixin.object.builder.client;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen;
-import net.minecraft.client.gui.screens.inventory.HangingSignEditScreen;
-import net.minecraft.resources.Identifier;
-import net.minecraft.world.level.block.entity.SignBlockEntity;
-
-@Mixin(HangingSignEditScreen.class)
-public abstract class HangingSignEditScreenMixin extends AbstractSignEditScreen {
-	private HangingSignEditScreenMixin(SignBlockEntity blockEntity, boolean filtered, boolean bl) {
-		super(blockEntity, filtered, bl);
-	}
-
-	@WrapOperation(method = "", at = @At(value = "INVOKE", target = "Lnet/minecraft/resources/Identifier;withDefaultNamespace(Ljava/lang/String;)Lnet/minecraft/resources/Identifier;"))
-	private Identifier init(String id, Operation original) {
-		if (woodType.name().indexOf(Identifier.NAMESPACE_SEPARATOR) != -1) {
-			Identifier identifier = Identifier.parse(woodType.name());
-			return identifier.withPath(path -> "textures/gui/hanging_signs/" + path + ".png");
-		}
-
-		return original.call(id);
-	}
-}
diff --git a/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/mixin/object/builder/client/ModelLayersMixin.java b/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/mixin/object/builder/client/ModelLayersMixin.java
deleted file mode 100644
index 149fe6e133..0000000000
--- a/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/mixin/object/builder/client/ModelLayersMixin.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.mixin.object.builder.client;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.client.model.geom.ModelLayerLocation;
-import net.minecraft.client.model.geom.ModelLayers;
-import net.minecraft.resources.Identifier;
-import net.minecraft.world.level.block.HangingSignBlock;
-import net.minecraft.world.level.block.state.properties.WoodType;
-
-@Mixin(ModelLayers.class)
-public class ModelLayersMixin {
-	@Inject(method = "createStandingSignModelName", at = @At("HEAD"), cancellable = true)
-	private static void createStandingSign(WoodType type, CallbackInfoReturnable cir) {
-		if (type.name().indexOf(Identifier.NAMESPACE_SEPARATOR) != -1) {
-			Identifier identifier = Identifier.parse(type.name());
-			cir.setReturnValue(new ModelLayerLocation(identifier.withPrefix("sign/standing/"), "main"));
-		}
-	}
-
-	@Inject(method = "createWallSignModelName", at = @At("HEAD"), cancellable = true)
-	private static void createWallSign(WoodType type, CallbackInfoReturnable cir) {
-		if (type.name().indexOf(Identifier.NAMESPACE_SEPARATOR) != -1) {
-			Identifier identifier = Identifier.parse(type.name());
-			cir.setReturnValue(new ModelLayerLocation(identifier.withPrefix("sign/wall/"), "main"));
-		}
-	}
-
-	@Inject(method = "createHangingSignModelName", at = @At("HEAD"), cancellable = true)
-	private static void createHangingSign(WoodType type, HangingSignBlock.Attachment attachmentType, CallbackInfoReturnable cir) {
-		if (type.name().indexOf(Identifier.NAMESPACE_SEPARATOR) != -1) {
-			Identifier identifier = Identifier.parse(type.name());
-			cir.setReturnValue(new ModelLayerLocation(identifier.withPath(path -> {
-				return "hanging_sign/" + path + "/" + attachmentType.getSerializedName();
-			}), "main"));
-		}
-	}
-}
diff --git a/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/mixin/object/builder/client/SheetsMixin.java b/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/mixin/object/builder/client/SheetsMixin.java
deleted file mode 100644
index 7dd6e45855..0000000000
--- a/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/mixin/object/builder/client/SheetsMixin.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.mixin.object.builder.client;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.client.renderer.Sheets;
-import net.minecraft.client.renderer.SpriteMapper;
-import net.minecraft.client.resources.model.sprite.SpriteId;
-import net.minecraft.resources.Identifier;
-
-import net.fabricmc.fabric.impl.object.builder.client.SignTypeTextureHelper;
-
-@Mixin(Sheets.class)
-abstract class SheetsMixin {
-	@Inject(method = "*", at = @At("RETURN"))
-	private static void onReturnClinit(CallbackInfo ci) {
-		SignTypeTextureHelper.shouldAddTextures = true;
-	}
-
-	@Redirect(method = "createSignSprite", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/SpriteMapper;defaultNamespaceApply(Ljava/lang/String;)Lnet/minecraft/client/resources/model/sprite/SpriteId;"))
-	private static SpriteId redirectSignVanillaId(SpriteMapper instance, String name) {
-		return instance.apply(Identifier.parse(name));
-	}
-
-	@Redirect(method = "createHangingSignSprite", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/SpriteMapper;defaultNamespaceApply(Ljava/lang/String;)Lnet/minecraft/client/resources/model/sprite/SpriteId;"))
-	private static SpriteId redirectHangingVanillaId(SpriteMapper instance, String name) {
-		return instance.apply(Identifier.parse(name));
-	}
-}
diff --git a/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/mixin/object/builder/client/WoodTypeMixin.java b/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/mixin/object/builder/client/WoodTypeMixin.java
deleted file mode 100644
index 38642aa8e0..0000000000
--- a/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/mixin/object/builder/client/WoodTypeMixin.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.mixin.object.builder.client;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.client.renderer.Sheets;
-import net.minecraft.resources.Identifier;
-import net.minecraft.world.level.block.state.properties.WoodType;
-
-import net.fabricmc.fabric.impl.object.builder.client.SignTypeTextureHelper;
-
-@Mixin(WoodType.class)
-abstract class WoodTypeMixin {
-	@Inject(method = "register", at = @At("RETURN"))
-	private static void onReturnRegister(WoodType type, CallbackInfoReturnable cir) {
-		if (SignTypeTextureHelper.shouldAddTextures) {
-			final Identifier identifier = Identifier.parse(type.name());
-			Sheets.SIGN_SPRITES.put(type, Sheets.SIGN_MAPPER.apply(identifier));
-			Sheets.HANGING_SIGN_SPRITES.put(type, Sheets.HANGING_SIGN_MAPPER.apply(identifier));
-		}
-	}
-}
diff --git a/fabric-object-builder-api-v1/src/client/resources/fabric-object-builder-v1.client.mixins.json b/fabric-object-builder-api-v1/src/client/resources/fabric-object-builder-v1.client.mixins.json
index 9f30f5ce5e..abd658a31b 100644
--- a/fabric-object-builder-api-v1/src/client/resources/fabric-object-builder-v1.client.mixins.json
+++ b/fabric-object-builder-api-v1/src/client/resources/fabric-object-builder-v1.client.mixins.json
@@ -3,10 +3,6 @@
   "package": "net.fabricmc.fabric.mixin.object.builder.client",
   "compatibilityLevel": "JAVA_25",
   "client": [
-    "ModelLayersMixin",
-    "HangingSignEditScreenMixin",
-    "SheetsMixin",
-    "WoodTypeMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/FabricDefaultAttributeRegistry.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/FabricDefaultAttributeRegistry.java
index f19c5e81b5..2bce6ded4b 100644
--- a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/FabricDefaultAttributeRegistry.java
+++ b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/FabricDefaultAttributeRegistry.java
@@ -16,8 +16,11 @@
 
 package net.fabricmc.fabric.api.object.builder.v1.entity;
 
+import java.util.Collection;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 
+import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,6 +29,8 @@
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
 import net.fabricmc.fabric.mixin.object.builder.DefaultAttributesAccessor;
 
 /**
@@ -45,6 +50,21 @@ public final class FabricDefaultAttributeRegistry {
 	 */
 	private static final Logger LOGGER = LoggerFactory.getLogger(FabricDefaultAttributeRegistry.class);
 
+	/// Bulk modifies the default attributes for entity types. Fires just before registries are frozen to
+	/// ensure all entity types are present before modification.
+	///
+	/// This event only affects entity types which have already had an [AttributeSupplier]
+	/// registered to them via a method such as [#register(EntityType, AttributeSupplier)] or
+	/// [FabricEntityType.Builder.Living#defaultAttributes(Supplier)].
+	///
+	/// The event is invoked after all builtin registration is complete to ensure that all entity
+	/// types have been registered.
+	public static final Event MODIFY = EventFactory.createArrayBacked(ModifyDefaultAttribute.class, listeners -> context -> {
+		for (ModifyDefaultAttribute listener : listeners) {
+			listener.modify(context);
+		}
+	});
+
 	private FabricDefaultAttributeRegistry() {
 	}
 
@@ -53,7 +73,7 @@ private FabricDefaultAttributeRegistry() {
 	 *
 	 * @param type    the entity type
 	 * @param builder the builder that creates the default attribute
-	 * @see	FabricDefaultAttributeRegistry#register(EntityType, AttributeSupplier)
+	 * @see FabricDefaultAttributeRegistry#register(EntityType, AttributeSupplier)
 	 */
 	public static void register(EntityType type, AttributeSupplier.Builder builder) {
 		register(type, builder.build());
@@ -74,11 +94,61 @@ public static void register(EntityType type, AttributeSu
 	 *
 	 * @param type      the entity type
 	 * @param container the container for the default attribute
-	 * @see	FabricEntityType.Builder.Living#defaultAttributes(Supplier)
+	 * @see FabricEntityType.Builder.Living#defaultAttributes(Supplier)
 	 */
 	public static void register(EntityType type, AttributeSupplier container) {
 		if (DefaultAttributesAccessor.getRegistry().put(type, container) != null) {
 			LOGGER.debug("Overriding existing registration for entity type {}", BuiltInRegistries.ENTITY_TYPE.getKey(type));
 		}
 	}
+
+	@ApiStatus.NonExtendable
+	public interface ModifyContext {
+		/// Modify the default attributes of a specified entity type.
+		///
+		/// @param entityTypePredicate A predicate to match entity types.
+		/// @param consumer            A consumer that provides a [AttributeSupplier.Builder] to apply the modification.
+		void modify(Predicate> entityTypePredicate, ModifyConsumer consumer);
+
+		/// Modify the default attributes of a specified entity type.
+		///
+		/// @param entityType The entity type to modify.
+		/// @param consumer   A consumer that provides a [AttributeSupplier.Builder] to apply the modification.
+		default void modify(EntityType entityType, ModifyConsumer consumer) {
+			modify(Predicate.isEqual(entityType), consumer);
+		}
+
+		/// Modify the default attributes of a specified entity type.
+		///
+		/// @param entityTypes The entity types to modify.
+		/// @param consumer    A consumer that provides a [AttributeSupplier.Builder] to apply the modification.
+		default void modify(Collection> entityTypes, ModifyConsumer consumer) {
+			modify(entityTypes::contains, consumer);
+		}
+
+		/// Modify the default attributes of all entity types with attributes.
+		///
+		/// @param consumer A consumer that provides a [AttributeSupplier.Builder] to apply the modification.
+		default void modifyAll(ModifyConsumer consumer) {
+			modify(_ -> true, consumer);
+		}
+	}
+
+	@FunctionalInterface
+	public interface ModifyDefaultAttribute {
+		/// Use the provided [ModifyContext] to modify the default attributes of entity types.
+		///
+		/// @param context The context to modify default attributes.
+		void modify(ModifyContext context);
+	}
+
+	@FunctionalInterface
+	public interface ModifyConsumer {
+		/// A consumer used for modifying the base attribute values of an [EntityType].
+		///
+		/// @param type    The entity type for which default attributes are being modified.
+		/// @param builder The default attribute builder. The builder will contain all the existing
+		///                                                                                                                         attributes for the entity type.
+		void accept(EntityType type, AttributeSupplier.Builder builder);
+	}
 }
diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/FabricEntityTypeBuilder.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/FabricEntityTypeBuilder.java
deleted file mode 100644
index 29fa6b0345..0000000000
--- a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/FabricEntityTypeBuilder.java
+++ /dev/null
@@ -1,630 +0,0 @@
-/*
- * 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.api.object.builder.v1.entity;
-
-import java.util.Objects;
-import java.util.function.Supplier;
-import java.util.function.UnaryOperator;
-
-import com.google.common.collect.ImmutableSet;
-import org.jspecify.annotations.Nullable;
-
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityDimensions;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.entity.SpawnPlacementType;
-import net.minecraft.world.entity.SpawnPlacements;
-import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
-import net.minecraft.world.flag.FeatureFlag;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.levelgen.Heightmap;
-
-/**
- * @deprecated replace with {@link EntityType.Builder}
- */
-@Deprecated
-public class FabricEntityTypeBuilder {
-	private MobCategory mobCategory;
-	private EntityType.EntityFactory factory;
-	private boolean saveable = true;
-	private boolean summonable = true;
-	private int trackRange = 5;
-	private int trackedUpdateRate = 3;
-	private Boolean forceTrackedVelocityUpdates;
-	private boolean fireImmune = false;
-	private boolean spawnableFarFromPlayer;
-	private EntityDimensions dimensions = EntityDimensions.scalable(-1.0f, -1.0f);
-	private ImmutableSet specificSpawnBlocks = ImmutableSet.of();
-
-	@Nullable
-	private FeatureFlag[] requiredFeatures = null;
-
-	protected FabricEntityTypeBuilder(MobCategory mobCategory, EntityType.EntityFactory factory) {
-		this.mobCategory = mobCategory;
-		this.factory = factory;
-		this.spawnableFarFromPlayer = mobCategory == MobCategory.CREATURE || mobCategory == MobCategory.MISC;
-	}
-
-	/**
-	 * Creates an entity type builder.
-	 *
-	 * 
    This entity's spawn group will automatically be set to {@link MobCategory#MISC}.
-	 *
-	 * @param  the type of entity
-	 *
-	 * @return a new entity type builder
-	 * @deprecated use {@link EntityType.Builder#createNothing(MobCategory)}
-	 */
-	@Deprecated
-	public static  FabricEntityTypeBuilder create() {
-		return create(MobCategory.MISC);
-	}
-
-	/**
-	 * Creates an entity type builder.
-	 *
-	 * @param mobCategory the entity mob category
-	 * @param  the type of entity
-	 *
-	 * @return a new entity type builder
-	 * @deprecated use {@link EntityType.Builder#createNothing(MobCategory)}
-	 */
-	@Deprecated
-	public static  FabricEntityTypeBuilder create(MobCategory mobCategory) {
-		return create(mobCategory, FabricEntityTypeBuilder::emptyFactory);
-	}
-
-	/**
-	 * Creates an entity type builder.
-	 *
-	 * @param mobCategory the entity mob category
-	 * @param factory the entity factory used to create this entity
-	 * @param  the type of entity
-	 *
-	 * @return a new entity type builder
-	 * @deprecated use {@link EntityType.Builder#of(EntityType.EntityFactory, MobCategory)}
-	 */
-	@Deprecated
-	public static  FabricEntityTypeBuilder create(MobCategory mobCategory, EntityType.EntityFactory factory) {
-		return new FabricEntityTypeBuilder<>(mobCategory, factory);
-	}
-
-	/**
-	 * Creates an entity type builder for a living entity.
-	 *
-	 * 
    This entity's spawn group will automatically be set to {@link MobCategory#MISC}.
-	 *
-	 * @param  the type of entity
-	 *
-	 * @return a new living entity type builder
-	 * @deprecated use {@link FabricEntityType.Builder#createLiving(EntityType.EntityFactory, MobCategory, UnaryOperator)}
-	 */
-	@Deprecated
-	public static  FabricEntityTypeBuilder.Living createLiving() {
-		return new FabricEntityTypeBuilder.Living<>(MobCategory.MISC, FabricEntityTypeBuilder::emptyFactory);
-	}
-
-	/**
-	 * Creates an entity type builder for a mob entity.
-	 *
-	 * @param  the type of entity
-	 *
-	 * @return a new mob entity type builder
-	 * @deprecated use {@link FabricEntityType.Builder#createMob(EntityType.EntityFactory, MobCategory, UnaryOperator)}
-	 */
-	public static  FabricEntityTypeBuilder.Mob createMob() {
-		return new FabricEntityTypeBuilder.Mob<>(MobCategory.MISC, FabricEntityTypeBuilder::emptyFactory);
-	}
-
-	private static  T emptyFactory(EntityType type, Level level) {
-		return null;
-	}
-
-	@Deprecated
-	public FabricEntityTypeBuilder mobCategory(MobCategory category) {
-		Objects.requireNonNull(category, "Category cannot be null");
-		this.mobCategory = category;
-		return this;
-	}
-
-	@Deprecated
-	public  FabricEntityTypeBuilder entityFactory(EntityType.EntityFactory factory) {
-		Objects.requireNonNull(factory, "Entity Factory cannot be null");
-		this.factory = (EntityType.EntityFactory) factory;
-		return (FabricEntityTypeBuilder) this;
-	}
-
-	/**
-	 * Whether this entity type is summonable using the {@code /summon} command.
-	 *
-	 * @return this builder for chaining
-	 * @deprecated use {@link EntityType.Builder#noSummon()}
-	 */
-	@Deprecated
-	public FabricEntityTypeBuilder disableSummon() {
-		this.summonable = false;
-		return this;
-	}
-
-	/**
-	 * @deprecated use {@link EntityType.Builder#noSave()}
-	 */
-	@Deprecated
-	public FabricEntityTypeBuilder disableSaving() {
-		this.saveable = false;
-		return this;
-	}
-
-	/**
-	 * Sets this entity type to be fire immune.
-	 *
-	 * @return this builder for chaining
-	 * @deprecated use {@link EntityType.Builder#fireImmune()}
-	 */
-	@Deprecated
-	public FabricEntityTypeBuilder fireImmune() {
-		this.fireImmune = true;
-		return this;
-	}
-
-	/**
-	 * Sets whether this entity type can be spawned far away from a player.
-	 *
-	 * @return this builder for chaining
-	 * @deprecated use {@link EntityType.Builder#canSpawnFarFromPlayer()}
-	 */
-	@Deprecated
-	public FabricEntityTypeBuilder spawnableFarFromPlayer() {
-		this.spawnableFarFromPlayer = true;
-		return this;
-	}
-
-	/**
-	 * Sets the dimensions of this entity type.
-	 *
-	 * @param dimensions the dimensions representing the entity's size
-	 *
-	 * @return this builder for chaining
-	 * @deprecated use {@link EntityType.Builder#sized(float, float)}
-	 */
-	@Deprecated
-	public FabricEntityTypeBuilder dimensions(EntityDimensions dimensions) {
-		Objects.requireNonNull(dimensions, "Cannot set null dimensions");
-		this.dimensions = dimensions;
-		return this;
-	}
-
-	/**
-	 * @deprecated use {@link FabricEntityTypeBuilder#trackRangeBlocks(int)}, {@link FabricEntityTypeBuilder#trackedUpdateRate(int)} and {@link FabricEntityTypeBuilder#forceTrackedVelocityUpdates(boolean)}
-	 */
-	@Deprecated
-	public FabricEntityTypeBuilder trackable(int trackRangeBlocks, int trackedUpdateRate) {
-		return trackable(trackRangeBlocks, trackedUpdateRate, true);
-	}
-
-	/**
-	 * @deprecated use {@link FabricEntityTypeBuilder#trackRangeBlocks(int)}, {@link FabricEntityTypeBuilder#trackedUpdateRate(int)} and {@link FabricEntityTypeBuilder#forceTrackedVelocityUpdates(boolean)}
-	 */
-	@Deprecated
-	public FabricEntityTypeBuilder trackable(int trackRangeBlocks, int trackedUpdateRate, boolean forceTrackedVelocityUpdates) {
-		this.trackRangeBlocks(trackRangeBlocks);
-		this.trackedUpdateRate(trackedUpdateRate);
-		this.forceTrackedVelocityUpdates(forceTrackedVelocityUpdates);
-		return this;
-	}
-
-	/**
-	 * Sets the maximum chunk tracking range of this entity type.
-	 *
-	 * @param range the tracking range in chunks
-	 *
-	 * @return this builder for chaining
-	 * @deprecated use {@link FabricEntityTypeBuilder#trackRangeBlocks(int)}
-	 */
-	@Deprecated
-	public FabricEntityTypeBuilder trackRangeChunks(int range) {
-		this.trackRange = range;
-		return this;
-	}
-
-	/**
-	 * Sets the maximum block range at which players can see this entity type.
-	 *
-	 * @param range the tracking range in blocks
-	 *
-	 * @return this builder for chaining
-	 * @deprecated use {@link FabricEntityTypeBuilder#trackRangeChunks(int)}
-	 */
-	@Deprecated
-	public FabricEntityTypeBuilder trackRangeBlocks(int range) {
-		return trackRangeChunks((range + 15) / 16);
-	}
-
-	/**
-	 * @deprecated use {@link FabricEntityTypeBuilder#trackRangeBlocks(int)}
-	 */
-	@Deprecated
-	public FabricEntityTypeBuilder trackedUpdateRate(int rate) {
-		this.trackedUpdateRate = rate;
-		return this;
-	}
-
-	/**
-	 * @deprecated use {@link FabricEntityTypeBuilder#trackRangeBlocks(int)}
-	 */
-	@Deprecated
-	public FabricEntityTypeBuilder forceTrackedVelocityUpdates(boolean forceTrackedVelocityUpdates) {
-		this.forceTrackedVelocityUpdates = forceTrackedVelocityUpdates;
-		return this;
-	}
-
-	/**
-	 * Sets the {@link ImmutableSet} of blocks this entity can spawn on.
-	 *
-	 * @param blocks the blocks the entity can spawn on
-	 * @return this builder for chaining
-	 * @deprecated use {@link EntityType.Builder#immuneTo(Block...)}
-	 */
-	@Deprecated
-	public FabricEntityTypeBuilder specificSpawnBlocks(Block... blocks) {
-		this.specificSpawnBlocks = ImmutableSet.copyOf(blocks);
-		return this;
-	}
-
-	/**
-	 * Sets the features this entity requires. If a feature is not enabled,
-	 * the entity cannot be spawned, and existing ones will despawn immediately.
-	 * @param requiredFeatures the features
-	 * @return this builder for chaining
-	 * @deprecated use {@link EntityType.Builder#requiredFeatures(FeatureFlag...)}
-	 */
-	@Deprecated
-	public FabricEntityTypeBuilder requires(FeatureFlag... requiredFeatures) {
-		this.requiredFeatures = requiredFeatures;
-		return this;
-	}
-
-	/**
-	 * Creates the entity type.
-	 *
-	 * @return a new {@link EntityType}
-	 * @deprecated use {@link EntityType.Builder#build(net.minecraft.resources.ResourceKey)}
-	 */
-	@Deprecated
-	public EntityType build(ResourceKey> key) {
-		EntityType.Builder builder = EntityType.Builder.of(this.factory, this.mobCategory)
-				.immuneTo(specificSpawnBlocks.toArray(Block[]::new))
-				.clientTrackingRange(this.trackRange)
-				.updateInterval(this.trackedUpdateRate)
-				.sized(this.dimensions.width(), this.dimensions.height());
-
-		if (!this.saveable) {
-			builder = builder.noSave();
-		}
-
-		if (!this.summonable) {
-			builder = builder.noSummon();
-		}
-
-		if (this.fireImmune) {
-			builder = builder.fireImmune();
-		}
-
-		if (this.spawnableFarFromPlayer) {
-			builder = builder.canSpawnFarFromPlayer();
-		}
-
-		if (this.requiredFeatures != null) {
-			builder = builder.requiredFeatures(this.requiredFeatures);
-		}
-
-		if (this.forceTrackedVelocityUpdates != null) {
-			builder = builder.alwaysUpdateVelocity(this.forceTrackedVelocityUpdates);
-		}
-
-		return builder.build(key);
-	}
-
-	/**
-	 * An extended version of {@link FabricEntityTypeBuilder} with support for features on present on {@link LivingEntity living entities}, such as default attributes.
-	 *
-	 * @param  Entity class.
-	 * @deprecated use {@link EntityType.Builder#createLiving(EntityType.EntityFactory, MobCategory, UnaryOperator)}
-	 */
-	@Deprecated
-	public static class Living extends FabricEntityTypeBuilder {
-		@Nullable
-		private Supplier defaultAttributeBuilder;
-
-		protected Living(MobCategory mobCategory, EntityType.EntityFactory function) {
-			super(mobCategory, function);
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Living mobCategory(MobCategory category) {
-			super.mobCategory(category);
-			return this;
-		}
-
-		@Override
-		public  FabricEntityTypeBuilder.Living entityFactory(EntityType.EntityFactory factory) {
-			super.entityFactory(factory);
-			return (Living) this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Living disableSummon() {
-			super.disableSummon();
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Living disableSaving() {
-			super.disableSaving();
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Living fireImmune() {
-			super.fireImmune();
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Living spawnableFarFromPlayer() {
-			super.spawnableFarFromPlayer();
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Living dimensions(EntityDimensions dimensions) {
-			super.dimensions(dimensions);
-			return this;
-		}
-
-		/**
-		 * @deprecated use {@link FabricEntityTypeBuilder.Living#trackRangeBlocks(int)}, {@link FabricEntityTypeBuilder.Living#trackedUpdateRate(int)} and {@link FabricEntityTypeBuilder.Living#forceTrackedVelocityUpdates(boolean)}
-		 */
-		@Override
-		@Deprecated
-		public FabricEntityTypeBuilder.Living trackable(int trackRangeBlocks, int trackedUpdateRate) {
-			super.trackable(trackRangeBlocks, trackedUpdateRate);
-			return this;
-		}
-
-		/**
-		 * @deprecated use {@link FabricEntityTypeBuilder.Living#trackRangeBlocks(int)}, {@link FabricEntityTypeBuilder.Living#trackedUpdateRate(int)} and {@link FabricEntityTypeBuilder.Living#forceTrackedVelocityUpdates(boolean)}
-		 */
-		@Override
-		@Deprecated
-		public FabricEntityTypeBuilder.Living trackable(int trackRangeBlocks, int trackedUpdateRate, boolean forceTrackedVelocityUpdates) {
-			super.trackable(trackRangeBlocks, trackedUpdateRate, forceTrackedVelocityUpdates);
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Living trackRangeChunks(int range) {
-			super.trackRangeChunks(range);
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Living trackRangeBlocks(int range) {
-			super.trackRangeBlocks(range);
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Living trackedUpdateRate(int rate) {
-			super.trackedUpdateRate(rate);
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Living forceTrackedVelocityUpdates(boolean forceTrackedVelocityUpdates) {
-			super.forceTrackedVelocityUpdates(forceTrackedVelocityUpdates);
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Living specificSpawnBlocks(Block... blocks) {
-			super.specificSpawnBlocks(blocks);
-			return this;
-		}
-
-		/**
-		 * Sets the default attributes for a type of living entity.
-		 *
-		 * 
    This can be used in a fashion similar to this:
-		 * 
    -		 * FabricEntityTypeBuilder.createLiving()
-		 * 	.mobCategory(MobCategory.CREATURE)
-		 * 	.entityFactory(MyCreature::new)
-		 * 	.defaultAttributes(LivingEntity::createLivingAttributes)
-		 * 	...
-		 * 	.build();
-		 * 
    
-		 *
-		 * @param defaultAttributeBuilder a function to generate the default attribute builder from the entity type
-		 * @return this builder for chaining
-		 * @deprecated use {@link FabricEntityType.Builder.Living#defaultAttributes(Supplier)}
-		 */
-		@Deprecated
-		public FabricEntityTypeBuilder.Living defaultAttributes(Supplier defaultAttributeBuilder) {
-			Objects.requireNonNull(defaultAttributeBuilder, "Cannot set null attribute builder");
-			this.defaultAttributeBuilder = defaultAttributeBuilder;
-			return this;
-		}
-
-		@Deprecated
-		@Override
-		public EntityType build(ResourceKey> key) {
-			final EntityType type = super.build(key);
-
-			if (this.defaultAttributeBuilder != null) {
-				FabricDefaultAttributeRegistry.register(type, this.defaultAttributeBuilder.get());
-			}
-
-			return type;
-		}
-	}
-
-	/**
-	 * An extended version of {@link FabricEntityTypeBuilder} with support for features on present on {@link Mob mob entities}, such as spawn placements.
-	 *
-	 * @param  Entity class.
-	 */
-	@Deprecated
-	public static class Mob extends FabricEntityTypeBuilder.Living {
-		private SpawnPlacementType spawnPlacementType;
-		private Heightmap.Types placementHeightmap;
-		private SpawnPlacements.SpawnPredicate spawnPredicate;
-
-		protected Mob(MobCategory mobCategory, EntityType.EntityFactory function) {
-			super(mobCategory, function);
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Mob mobCategory(MobCategory category) {
-			super.mobCategory(category);
-			return this;
-		}
-
-		@Override
-		public  FabricEntityTypeBuilder.Mob entityFactory(EntityType.EntityFactory factory) {
-			super.entityFactory(factory);
-			return (Mob) this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Mob disableSummon() {
-			super.disableSummon();
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Mob disableSaving() {
-			super.disableSaving();
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Mob fireImmune() {
-			super.fireImmune();
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Mob spawnableFarFromPlayer() {
-			super.spawnableFarFromPlayer();
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Mob dimensions(EntityDimensions dimensions) {
-			super.dimensions(dimensions);
-			return this;
-		}
-
-		/**
-		 * @deprecated use {@link FabricEntityTypeBuilder.Mob#trackRangeBlocks(int)}, {@link FabricEntityTypeBuilder.Mob#trackedUpdateRate(int)} and {@link FabricEntityTypeBuilder.Mob#forceTrackedVelocityUpdates(boolean)}
-		 */
-		@Override
-		@Deprecated
-		public FabricEntityTypeBuilder.Mob trackable(int trackRangeBlocks, int trackedUpdateRate) {
-			super.trackable(trackRangeBlocks, trackedUpdateRate);
-			return this;
-		}
-
-		/**
-		 * @deprecated use {@link FabricEntityTypeBuilder.Mob#trackRangeBlocks(int)}, {@link FabricEntityTypeBuilder.Mob#trackedUpdateRate(int)} and {@link FabricEntityTypeBuilder.Mob#forceTrackedVelocityUpdates(boolean)}
-		 */
-		@Override
-		@Deprecated
-		public FabricEntityTypeBuilder.Mob trackable(int trackRangeBlocks, int trackedUpdateRate, boolean forceTrackedVelocityUpdates) {
-			super.trackable(trackRangeBlocks, trackedUpdateRate, forceTrackedVelocityUpdates);
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Mob trackRangeChunks(int range) {
-			super.trackRangeChunks(range);
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Mob trackRangeBlocks(int range) {
-			super.trackRangeBlocks(range);
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Mob trackedUpdateRate(int rate) {
-			super.trackedUpdateRate(rate);
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Mob forceTrackedVelocityUpdates(boolean forceTrackedVelocityUpdates) {
-			super.forceTrackedVelocityUpdates(forceTrackedVelocityUpdates);
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Mob specificSpawnBlocks(Block... blocks) {
-			super.specificSpawnBlocks(blocks);
-			return this;
-		}
-
-		@Override
-		public FabricEntityTypeBuilder.Mob defaultAttributes(Supplier defaultAttributeBuilder) {
-			super.defaultAttributes(defaultAttributeBuilder);
-			return this;
-		}
-
-		/**
-		 * Registers a spawn placement for this entity.
-		 *
-		 * 
    This is used by mobs to determine whether Minecraft should spawn an entity within a certain context.
-		 *
-		 * @return this builder for chaining.
-		 * @deprecated use {@link FabricEntityType.Builder.Mob#spawnPlacement(SpawnPlacementType, Heightmap.Types, SpawnPlacements.SpawnPredicate)}
-		 */
-		@Deprecated
-		public FabricEntityTypeBuilder.Mob spawnPlacement(SpawnPlacementType spawnPlacementType, Heightmap.Types heightmap, SpawnPlacements.SpawnPredicate spawnPredicate) {
-			this.spawnPlacementType = Objects.requireNonNull(spawnPlacementType, "Spawn placement type cannot be null.");
-			this.placementHeightmap = Objects.requireNonNull(heightmap, "Heightmap type cannot be null.");
-			this.spawnPredicate = Objects.requireNonNull(spawnPredicate, "Spawn predicate cannot be null.");
-			return this;
-		}
-
-		@Override
-		public EntityType build(ResourceKey> key) {
-			EntityType type = super.build(key);
-
-			if (this.spawnPredicate != null) {
-				SpawnPlacements.register(type, this.spawnPlacementType, this.placementHeightmap, this.spawnPredicate);
-			}
-
-			return type;
-		}
-	}
-}
diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricBlockEntityTypeImpl.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricBlockEntityTypeImpl.java
new file mode 100644
index 0000000000..f5dc6157c2
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricBlockEntityTypeImpl.java
@@ -0,0 +1,5 @@
+package net.fabricmc.fabric.impl.object.builder;
+
+public interface FabricBlockEntityTypeImpl {
+	void modifyValidBlocks();
+}
diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricDefaultAttributeRegistryImpl.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricDefaultAttributeRegistryImpl.java
new file mode 100644
index 0000000000..da1a4e1c7c
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricDefaultAttributeRegistryImpl.java
@@ -0,0 +1,50 @@
+/*
+ * 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.impl.object.builder;
+
+import java.util.function.Predicate;
+
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
+
+import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
+import net.fabricmc.fabric.mixin.object.builder.DefaultAttributesAccessor;
+
+public final class FabricDefaultAttributeRegistryImpl {
+	// a single bulk modification is applied when the registries are frozen since at that point
+	// everything should be registered
+	public static void invokeModify() {
+		FabricDefaultAttributeRegistry.MODIFY.invoker().modify(new ModifyContextImpl());
+	}
+
+	static class ModifyContextImpl implements FabricDefaultAttributeRegistry.ModifyContext {
+		@Override
+		public void modify(Predicate> entityTypePredicate, FabricDefaultAttributeRegistry.ModifyConsumer consumer) {
+			DefaultAttributesAccessor.getRegistry().forEach((type, supplier) -> {
+				if (entityTypePredicate.test(type)) {
+					AttributeSupplier.Builder builder = new AttributeSupplier.Builder(supplier);
+					consumer.accept(type, builder);
+					DefaultAttributesAccessor.getRegistry().put(type, builder.build());
+				}
+			});
+		}
+	}
+
+	private FabricDefaultAttributeRegistryImpl() {
+	}
+}
diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricObjectBuilderImpl.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricObjectBuilderImpl.java
new file mode 100644
index 0000000000..5e35f11d74
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricObjectBuilderImpl.java
@@ -0,0 +1,29 @@
+package net.fabricmc.fabric.impl.object.builder;
+
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.neoforged.neoforge.event.entity.EntityAttributeModificationEvent;
+import org.sinytra.fabric.object_builder_api.generated.GeneratedEntryPoint;
+
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+
+@Mod(GeneratedEntryPoint.MOD_ID)
+public class FabricObjectBuilderImpl {
+
+	public FabricObjectBuilderImpl(IEventBus bus) {
+		bus.addListener(FabricObjectBuilderImpl::onCommonSetup);
+		bus.addListener(FabricObjectBuilderImpl::onModifyEntityAttributes);
+	}
+
+	private static void onCommonSetup(FMLCommonSetupEvent event) {
+		for (BlockEntityType type : BuiltInRegistries.BLOCK_ENTITY_TYPE) {
+			((FabricBlockEntityTypeImpl) type).modifyValidBlocks();
+		}
+	}
+
+	private static void onModifyEntityAttributes(EntityAttributeModificationEvent event) {
+		FabricDefaultAttributeRegistryImpl.invokeModify();
+	}
+}
diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/BlockEntityTypeMixin.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/BlockEntityTypeMixin.java
index f22242eafc..e64f8cc408 100644
--- a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/BlockEntityTypeMixin.java
+++ b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/BlockEntityTypeMixin.java
@@ -24,33 +24,40 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.Unique;
 
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityType;
+import net.fabricmc.fabric.impl.object.builder.FabricBlockEntityTypeImpl;
 
 @Mixin(BlockEntityType.class)
-public class BlockEntityTypeMixin implements FabricBlockEntityType {
+public class BlockEntityTypeMixin implements FabricBlockEntityType, FabricBlockEntityTypeImpl {
 	@Mutable
 	@Shadow
 	@Final
 	private Set validBlocks;
 
-	@Inject(method = "", at = @At("RETURN"))
-	private void mutableBlocks(BlockEntityType.BlockEntitySupplier factory, Set blocks, CallbackInfo ci) {
-		if (!(this.validBlocks instanceof HashSet)) {
-			this.validBlocks = new HashSet<>(this.validBlocks);
-		}
-	}
+	@Unique
+	private Set fabric$validBlocks;
 
 	@Override
 	public void addValidBlock(Block block) {
 		Objects.requireNonNull(block, "block");
-		validBlocks.add(block);
+		if (this.fabric$validBlocks == null) {
+			this.fabric$validBlocks = new HashSet<>();
+		}
+		this.fabric$validBlocks.add(block);
+	}
+
+	@Override
+	public void modifyValidBlocks() {
+		if (this.fabric$validBlocks != null) {
+			this.validBlocks = new HashSet<>(this.validBlocks);
+			this.validBlocks.addAll(this.fabric$validBlocks);
+			this.fabric$validBlocks = null;
+		}
 	}
 }
diff --git a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/EntityDataAccessorTest.java b/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/EntityDataAccessorTest.java
index 15f8b074d5..a84b8a645c 100644
--- a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/EntityDataAccessorTest.java
+++ b/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/EntityDataAccessorTest.java
@@ -17,10 +17,14 @@
 package net.fabricmc.fabric.test.object.builder;
 
 import java.util.Optional;
+import java.util.function.Supplier;
+
+import com.google.common.base.Suppliers;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.neoforge.registries.RegisterEvent;
 
 import net.minecraft.core.GlobalPos;
-import net.minecraft.core.Registry;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.syncher.EntityDataSerializer;
@@ -49,10 +53,10 @@ public class EntityDataAccessorTest implements ModInitializer {
 	static EntityDataSerializer> OPTIONAL_DYE_COLOR = EntityDataSerializer.forValueType(DyeColor.STREAM_CODEC.apply(ByteBufCodecs::optional));
 
 	private static final ResourceKey> TRACK_STACK_KEY = ResourceKey.create(Registries.ENTITY_TYPE, ObjectBuilderTestConstants.id("track_stack"));
-	public static EntityType TRACK_STACK_ENTITY = FabricEntityType.Builder.createMob(TrackStackEntity::new, MobCategory.MISC, builder -> builder.defaultAttributes(Mob::createMobAttributes))
+	public static Supplier> TRACK_STACK_ENTITY = Suppliers.memoize(() -> FabricEntityType.Builder.createMob(TrackStackEntity::new, MobCategory.MISC, builder -> builder.defaultAttributes(Mob::createMobAttributes))
 			.sized(0.4f, 2.8f)
 			.clientTrackingRange(10)
-			.build(TRACK_STACK_KEY);
+			.build(TRACK_STACK_KEY));
 
 	@Override
 	public void onInitialize() {
@@ -67,6 +71,9 @@ public void onInitialize() {
 			FabricEntityDataRegistry.register(GLOBAL_POS_ID, GLOBAL_POS);
 		}
 
-		Registry.register(BuiltInRegistries.ENTITY_TYPE, TRACK_STACK_KEY, TRACK_STACK_ENTITY);
+		IEventBus bus = ModLoadingContext.get().getActiveContainer().getEventBus();
+		bus.addListener(RegisterEvent.class, e -> {
+			e.register(Registries.ENTITY_TYPE, TRACK_STACK_KEY.identifier(), (Supplier) TRACK_STACK_ENTITY);
+		});
 	}
 }
diff --git a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/EntityTypeBuilderGenericsTest.java b/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/EntityTypeBuilderGenericsTest.java
deleted file mode 100644
index 6d3ba0ab87..0000000000
--- a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/EntityTypeBuilderGenericsTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.object.builder;
-
-import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.Identifier;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.entity.HumanoidArm;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.Mob;
-import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
-
-import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
-
-// This test is intentionally not an entrypoint to verify the generics of the entity type builder propagate properly
-final class EntityTypeBuilderGenericsTest {
-	static ResourceKey> DUMMY = ResourceKey.create(Registries.ENTITY_TYPE, Identifier.fromNamespaceAndPath("test", "dummy"));
-	static EntityType ENTITY_1 = FabricEntityTypeBuilder.create().build(DUMMY);
-	static EntityType LIVING_ENTITY_1 = FabricEntityTypeBuilder.createLiving().build(DUMMY);
-	static EntityType TEST_ENTITY_1 = FabricEntityTypeBuilder.createLiving()
-			.entityFactory(TestEntity::new)
-			.mobCategory(MobCategory.CREATURE)
-			.build(DUMMY);
-	static EntityType OLD_TEST = FabricEntityTypeBuilder.createLiving()
-			.entityFactory(TestEntity::new)
-			.mobCategory(MobCategory.CREATURE)
-			.build(DUMMY);
-	static EntityType OLD_MOB = FabricEntityTypeBuilder.createMob()
-			.disableSaving()
-			.entityFactory(TestMob::new)
-			.build(DUMMY);
-	static EntityType MOB_TEST = FabricEntityTypeBuilder.createMob()
-			.disableSaving()
-			.entityFactory(TestMob::new)
-			.build(DUMMY);
-
-	private static class TestEntity extends LivingEntity {
-		protected TestEntity(EntityType entityType, Level level) {
-			super(entityType, level);
-		}
-
-		@Override
-		public ItemStack getItemBySlot(EquipmentSlot slot) {
-			return ItemStack.EMPTY;
-		}
-
-		@Override
-		public void setItemSlot(EquipmentSlot slot, ItemStack stack) {
-		}
-
-		@Override
-		public HumanoidArm getMainArm() {
-			return HumanoidArm.RIGHT;
-		}
-	}
-
-	private static class TestMob extends Mob {
-		protected TestMob(EntityType entityType, Level level) {
-			super(entityType, level);
-		}
-	}
-}
diff --git a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/FabricDefaultAttributeRegistryGameTest.java b/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/FabricDefaultAttributeRegistryGameTest.java
new file mode 100644
index 0000000000..bbbaee0491
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/FabricDefaultAttributeRegistryGameTest.java
@@ -0,0 +1,95 @@
+/*
+ * 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.object.builder;
+
+import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraft.world.entity.EntityTypes;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.animal.chicken.Chicken;
+import net.minecraft.world.entity.animal.cow.Cow;
+import net.minecraft.world.entity.animal.pig.Pig;
+
+import net.fabricmc.fabric.api.gametest.v1.GameTest;
+
+public class FabricDefaultAttributeRegistryGameTest {
+	@GameTest
+	public void pigHasTestAttribute(GameTestHelper helper) {
+		Pig pig = helper.spawn(EntityTypes.PIG, 0, 0, 0);
+
+		helper.assertTrue(pig.getAttributes().hasAttribute(FabricDefaultAttributeRegistryTest.TEST_ATTRIBUTE), "Pig does not have test attribute");
+
+		double testAttributeBaseValue = pig.getAttributeBaseValue(FabricDefaultAttributeRegistryTest.TEST_ATTRIBUTE);
+		helper.assertValueEqual(testAttributeBaseValue, FabricDefaultAttributeRegistryTest.PIG_TEST_ATTRIBUTE_BASE_VALUE, "Pig test attribute base value");
+
+		double testAttributeValue = pig.getAttributeValue(FabricDefaultAttributeRegistryTest.TEST_ATTRIBUTE);
+		helper.assertValueEqual(testAttributeValue, FabricDefaultAttributeRegistryTest.PIG_TEST_ATTRIBUTE_BASE_VALUE, "Pig test attribute final value");
+
+		helper.succeed();
+	}
+
+	@GameTest
+	public void cowHasTestAttribute(GameTestHelper helper) {
+		Cow cow = helper.spawn(EntityTypes.COW, 0, 0, 0);
+
+		helper.assertTrue(cow.getAttributes().hasAttribute(FabricDefaultAttributeRegistryTest.TEST_ATTRIBUTE), "Cow does not have test attribute");
+
+		double testAttributeBaseValue = cow.getAttributeBaseValue(FabricDefaultAttributeRegistryTest.TEST_ATTRIBUTE);
+		helper.assertValueEqual(testAttributeBaseValue, 0.0, "Cow test attribute base value");
+
+		double testAttributeValue = cow.getAttributeValue(FabricDefaultAttributeRegistryTest.TEST_ATTRIBUTE);
+		helper.assertValueEqual(testAttributeValue, 0.0, "Cow test attribute final value");
+
+		helper.succeed();
+	}
+
+	@GameTest
+	public void pigDoesNotHavePlayerTestAttribute(GameTestHelper helper) {
+		Pig pig = helper.spawn(EntityTypes.PIG, 0, 0, 0);
+
+		helper.assertFalse(pig.getAttributes().hasAttribute(FabricDefaultAttributeRegistryTest.TEST_CHICKEN_ONLY_ATTRIBUTE), "Pig has the chicken-only test attribute");
+
+		helper.succeed();
+	}
+
+	@GameTest
+	public void chickenHasChickenOnlyTestAttribute(GameTestHelper helper) {
+		Chicken chicken = helper.spawn(EntityTypes.CHICKEN, 0, 0, 0);
+
+		helper.assertTrue(chicken.getAttributes().hasAttribute(FabricDefaultAttributeRegistryTest.TEST_CHICKEN_ONLY_ATTRIBUTE), "Chicken does not have the chicken-only test attribute");
+
+		double testAttributeBaseValue = chicken.getAttributeBaseValue(FabricDefaultAttributeRegistryTest.TEST_CHICKEN_ONLY_ATTRIBUTE);
+		helper.assertValueEqual(testAttributeBaseValue, 0.0, "Chicken-only test attribute base value");
+
+		double testAttributeValue = chicken.getAttributeValue(FabricDefaultAttributeRegistryTest.TEST_CHICKEN_ONLY_ATTRIBUTE);
+		helper.assertValueEqual(testAttributeValue, 0.0, "Chicken-only test attribute final value");
+
+		helper.succeed();
+	}
+
+	@GameTest
+	public void pigStillHasItsVanillaAttributes(GameTestHelper helper) {
+		Pig pig = helper.spawn(EntityTypes.PIG, 0, 0, 0);
+
+		helper.assertTrue(pig.getAttributes().hasAttribute(Attributes.MAX_HEALTH), "Pig does not have max health attribute");
+		helper.assertTrue(pig.getAttributes().hasAttribute(Attributes.FOLLOW_RANGE), "Pig does not have follow range attribute");
+		helper.assertTrue(pig.getAttributes().hasAttribute(Attributes.TEMPT_RANGE), "Pig does not have tempt range attribute");
+		helper.assertTrue(pig.getAttributes().hasAttribute(Attributes.MOVEMENT_SPEED), "Pig does not have movement speed attribute");
+		helper.assertValueEqual(pig.getAttributeBaseValue(Attributes.MAX_HEALTH), 10.0, "Pig max health attribute base value");
+
+		helper.succeed();
+	}
+}
diff --git a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/FabricDefaultAttributeRegistryTest.java b/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/FabricDefaultAttributeRegistryTest.java
new file mode 100644
index 0000000000..d266bbe69c
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/FabricDefaultAttributeRegistryTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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.object.builder;
+
+import net.minecraft.core.Holder;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.world.entity.EntityTypes;
+import net.minecraft.world.entity.ai.attributes.Attribute;
+import net.minecraft.world.entity.ai.attributes.RangedAttribute;
+
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
+
+public class FabricDefaultAttributeRegistryTest implements ModInitializer {
+	public static final Holder TEST_ATTRIBUTE = Registry.registerForHolder(BuiltInRegistries.ATTRIBUTE, ObjectBuilderTestConstants.id("test_attribute"), new RangedAttribute("attribute.name.%s.test_attribute".formatted(ObjectBuilderTestConstants.MOD_ID), 0.0, 0.0, 100.0));
+	public static final Holder TEST_CHICKEN_ONLY_ATTRIBUTE = Registry.registerForHolder(BuiltInRegistries.ATTRIBUTE, ObjectBuilderTestConstants.id("test_chicken_only_attribute"), new RangedAttribute("attribute.name.%s.test_chicken_only_attribute".formatted(ObjectBuilderTestConstants.MOD_ID), 0.0, 0.0, 100.0));
+	public static final double PIG_TEST_ATTRIBUTE_BASE_VALUE = 10.0;
+
+	@Override
+	public void onInitialize() {
+		FabricDefaultAttributeRegistry.MODIFY.register(context -> {
+			context.modifyAll((_, builder) -> {
+				builder.add(TEST_ATTRIBUTE);
+			});
+			context.modify(EntityTypes.PIG, (_, builder) -> {
+				builder.add(TEST_ATTRIBUTE, PIG_TEST_ATTRIBUTE_BASE_VALUE);
+			});
+			context.modify(EntityTypes.CHICKEN, (_, builder) -> {
+				builder.add(TEST_CHICKEN_ONLY_ATTRIBUTE);
+			});
+		});
+	}
+}
diff --git a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/TealSignTest.java b/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/TealSignTest.java
index ce729f406b..952ab9168d 100644
--- a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/TealSignTest.java
+++ b/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/TealSignTest.java
@@ -30,7 +30,7 @@
 import net.minecraft.world.level.block.StandingSignBlock;
 import net.minecraft.world.level.block.WallHangingSignBlock;
 import net.minecraft.world.level.block.WallSignBlock;
-import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.entity.BlockEntityTypes;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BlockSetType;
 import net.minecraft.world.level.block.state.properties.WoodType;
@@ -42,7 +42,7 @@
 public class TealSignTest implements ModInitializer {
 	public static final Identifier TEAL_TYPE_ID = ObjectBuilderTestConstants.id("teal");
 	public static final BlockSetType TEAL_BLOCK_SET_TYPE = BlockSetTypeBuilder.copyOf(BlockSetType.OAK).build(TEAL_TYPE_ID);
-	public static final WoodType TEAL_WOOD_TYPE = WoodTypeBuilder.copyOf(WoodType.OAK).build(TEAL_TYPE_ID, TEAL_BLOCK_SET_TYPE);
+	public static final WoodType TEAL_WOOD_TYPE = WoodTypeBuilder.copyOf(WoodType.OAK).register(TEAL_TYPE_ID, TEAL_BLOCK_SET_TYPE);
 	public static final ResourceKey TEAL_SIGN_KEY = ObjectBuilderTestConstants.block("teal_sign");
 	public static final StandingSignBlock TEAL_SIGN = new StandingSignBlock(TEAL_WOOD_TYPE, BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_SIGN).setId(TEAL_SIGN_KEY));
 	public static final ResourceKey TEAL_WALL_SIGN_KEY = ObjectBuilderTestConstants.block("teal_wall_sign");
@@ -56,8 +56,6 @@ public class TealSignTest implements ModInitializer {
 
 	@Override
 	public void onInitialize() {
-		WoodType.register(TEAL_WOOD_TYPE);
-
 		Registry.register(BuiltInRegistries.BLOCK, TEAL_SIGN_KEY, TEAL_SIGN);
 		Registry.register(BuiltInRegistries.BLOCK, TEAL_WALL_SIGN_KEY, TEAL_WALL_SIGN);
 		Registry.register(BuiltInRegistries.BLOCK, TEAL_HANGING_SIGN_KEY, TEAL_HANGING_SIGN);
@@ -66,9 +64,9 @@ public void onInitialize() {
 		Registry.register(BuiltInRegistries.ITEM, TEAL_SIGN_KEY.identifier(), TEAL_SIGN_ITEM);
 		Registry.register(BuiltInRegistries.ITEM, TEAL_HANGING_SIGN_KEY.identifier(), TEAL_HANGING_SIGN_ITEM);
 
-		BlockEntityType.SIGN.addValidBlock(TEAL_SIGN);
-		BlockEntityType.SIGN.addValidBlock(TEAL_WALL_SIGN);
-		BlockEntityType.HANGING_SIGN.addValidBlock(TEAL_HANGING_SIGN);
-		BlockEntityType.HANGING_SIGN.addValidBlock(TEAL_WALL_HANGING_SIGN);
+		BlockEntityTypes.SIGN.addValidBlock(TEAL_SIGN);
+		BlockEntityTypes.SIGN.addValidBlock(TEAL_WALL_SIGN);
+		BlockEntityTypes.HANGING_SIGN.addValidBlock(TEAL_HANGING_SIGN);
+		BlockEntityTypes.HANGING_SIGN.addValidBlock(TEAL_WALL_HANGING_SIGN);
 	}
 }
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/blockstates/teal_hanging_sign.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/blockstates/teal_hanging_sign.json
index 7db5073260..ccfb9c246b 100644
--- a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/blockstates/teal_hanging_sign.json
+++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/blockstates/teal_hanging_sign.json
@@ -1,7 +1,124 @@
 {
   "variants": {
-    "": {
-      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign"
+    "attached=false,rotation=0": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_rot_0"
+    },
+    "attached=false,rotation=1": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_rot_1"
+    },
+    "attached=false,rotation=10": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_rot_2",
+      "y": 180
+    },
+    "attached=false,rotation=11": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_rot_3",
+      "y": 180
+    },
+    "attached=false,rotation=12": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_rot_0",
+      "y": 270
+    },
+    "attached=false,rotation=13": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_rot_1",
+      "y": 270
+    },
+    "attached=false,rotation=14": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_rot_2",
+      "y": 270
+    },
+    "attached=false,rotation=15": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_rot_3",
+      "y": 270
+    },
+    "attached=false,rotation=2": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_rot_2"
+    },
+    "attached=false,rotation=3": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_rot_3"
+    },
+    "attached=false,rotation=4": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_rot_0",
+      "y": 90
+    },
+    "attached=false,rotation=5": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_rot_1",
+      "y": 90
+    },
+    "attached=false,rotation=6": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_rot_2",
+      "y": 90
+    },
+    "attached=false,rotation=7": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_rot_3",
+      "y": 90
+    },
+    "attached=false,rotation=8": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_rot_0",
+      "y": 180
+    },
+    "attached=false,rotation=9": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_rot_1",
+      "y": 180
+    },
+    "attached=true,rotation=0": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_attached_rot_0"
+    },
+    "attached=true,rotation=1": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_attached_rot_1"
+    },
+    "attached=true,rotation=10": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_attached_rot_2",
+      "y": 180
+    },
+    "attached=true,rotation=11": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_attached_rot_3",
+      "y": 180
+    },
+    "attached=true,rotation=12": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_attached_rot_0",
+      "y": 270
+    },
+    "attached=true,rotation=13": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_attached_rot_1",
+      "y": 270
+    },
+    "attached=true,rotation=14": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_attached_rot_2",
+      "y": 270
+    },
+    "attached=true,rotation=15": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_attached_rot_3",
+      "y": 270
+    },
+    "attached=true,rotation=2": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_attached_rot_2"
+    },
+    "attached=true,rotation=3": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_attached_rot_3"
+    },
+    "attached=true,rotation=4": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_attached_rot_0",
+      "y": 90
+    },
+    "attached=true,rotation=5": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_attached_rot_1",
+      "y": 90
+    },
+    "attached=true,rotation=6": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_attached_rot_2",
+      "y": 90
+    },
+    "attached=true,rotation=7": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_attached_rot_3",
+      "y": 90
+    },
+    "attached=true,rotation=8": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_attached_rot_0",
+      "y": 180
+    },
+    "attached=true,rotation=9": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign_attached_rot_1",
+      "y": 180
     }
   }
 }
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/blockstates/teal_sign.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/blockstates/teal_sign.json
index 7db5073260..aa9e8cedba 100644
--- a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/blockstates/teal_sign.json
+++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/blockstates/teal_sign.json
@@ -1,7 +1,64 @@
 {
   "variants": {
-    "": {
-      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign"
+    "rotation=0": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign_rot_0"
+    },
+    "rotation=1": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign_rot_1"
+    },
+    "rotation=10": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign_rot_2",
+      "y": 180
+    },
+    "rotation=11": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign_rot_3",
+      "y": 180
+    },
+    "rotation=12": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign_rot_0",
+      "y": 270
+    },
+    "rotation=13": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign_rot_1",
+      "y": 270
+    },
+    "rotation=14": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign_rot_2",
+      "y": 270
+    },
+    "rotation=15": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign_rot_3",
+      "y": 270
+    },
+    "rotation=2": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign_rot_2"
+    },
+    "rotation=3": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign_rot_3"
+    },
+    "rotation=4": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign_rot_0",
+      "y": 90
+    },
+    "rotation=5": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign_rot_1",
+      "y": 90
+    },
+    "rotation=6": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign_rot_2",
+      "y": 90
+    },
+    "rotation=7": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign_rot_3",
+      "y": 90
+    },
+    "rotation=8": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign_rot_0",
+      "y": 180
+    },
+    "rotation=9": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign_rot_1",
+      "y": 180
     }
   }
 }
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/blockstates/teal_wall_hanging_sign.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/blockstates/teal_wall_hanging_sign.json
index 7db5073260..3442d44bbc 100644
--- a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/blockstates/teal_wall_hanging_sign.json
+++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/blockstates/teal_wall_hanging_sign.json
@@ -1,7 +1,19 @@
 {
   "variants": {
-    "": {
-      "model": "fabric-object-builder-api-v1-testmod:block/teal_sign"
+    "facing=east": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_wall_hanging_sign",
+      "y": 270
+    },
+    "facing=north": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_wall_hanging_sign",
+      "y": 180
+    },
+    "facing=south": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_wall_hanging_sign"
+    },
+    "facing=west": {
+      "model": "fabric-object-builder-api-v1-testmod:block/teal_wall_hanging_sign",
+      "y": 90
     }
   }
 }
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_attached_rot_0.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_attached_rot_0.json
new file mode 100644
index 0000000000..4fc6a6b516
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_attached_rot_0.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/attached_hanging_sign_rot_0",
+  "textures": {
+    "all": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign",
+    "particle": "minecraft:block/stripped_acacia_log"
+  }
+}
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_attached_rot_1.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_attached_rot_1.json
new file mode 100644
index 0000000000..b6ce8c6c1f
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_attached_rot_1.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/attached_hanging_sign_rot_1",
+  "textures": {
+    "all": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign",
+    "particle": "minecraft:block/stripped_acacia_log"
+  }
+}
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_attached_rot_2.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_attached_rot_2.json
new file mode 100644
index 0000000000..2545a64739
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_attached_rot_2.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/attached_hanging_sign_rot_2",
+  "textures": {
+    "all": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign",
+    "particle": "minecraft:block/stripped_acacia_log"
+  }
+}
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_attached_rot_3.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_attached_rot_3.json
new file mode 100644
index 0000000000..b9de3e86d9
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_attached_rot_3.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/attached_hanging_sign_rot_3",
+  "textures": {
+    "all": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign",
+    "particle": "minecraft:block/stripped_acacia_log"
+  }
+}
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_rot_0.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_rot_0.json
new file mode 100644
index 0000000000..0985cae642
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_rot_0.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/hanging_sign_rot_0",
+  "textures": {
+    "all": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign",
+    "particle": "minecraft:block/stripped_acacia_log"
+  }
+}
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_rot_1.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_rot_1.json
new file mode 100644
index 0000000000..8a1d9d5261
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_rot_1.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/hanging_sign_rot_1",
+  "textures": {
+    "all": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign",
+    "particle": "minecraft:block/stripped_acacia_log"
+  }
+}
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_rot_2.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_rot_2.json
new file mode 100644
index 0000000000..3d98aec311
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_rot_2.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/hanging_sign_rot_2",
+  "textures": {
+    "all": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign",
+    "particle": "minecraft:block/stripped_acacia_log"
+  }
+}
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_rot_3.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_rot_3.json
new file mode 100644
index 0000000000..1c51636cb0
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_hanging_sign_rot_3.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/hanging_sign_rot_3",
+  "textures": {
+    "all": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign",
+    "particle": "minecraft:block/stripped_acacia_log"
+  }
+}
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_sign.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_sign.json
deleted file mode 100644
index ca1fbd87f1..0000000000
--- a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_sign.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "textures": {
-    "particle": "fabric-object-builder-api-v1-testmod:entity/signs/teal"
-  }
-}
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_sign_rot_0.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_sign_rot_0.json
new file mode 100644
index 0000000000..0b24e33675
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_sign_rot_0.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/sign_rot_0",
+  "textures": {
+    "all": "fabric-object-builder-api-v1-testmod:block/teal_sign",
+    "particle": "minecraft:block/acacia_planks"
+  }
+}
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_sign_rot_1.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_sign_rot_1.json
new file mode 100644
index 0000000000..09a088fdc5
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_sign_rot_1.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/sign_rot_1",
+  "textures": {
+    "all": "fabric-object-builder-api-v1-testmod:block/teal_sign",
+    "particle": "minecraft:block/acacia_planks"
+  }
+}
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_sign_rot_2.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_sign_rot_2.json
new file mode 100644
index 0000000000..327bc729cf
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_sign_rot_2.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/sign_rot_2",
+  "textures": {
+    "all": "fabric-object-builder-api-v1-testmod:block/teal_sign",
+    "particle": "minecraft:block/acacia_planks"
+  }
+}
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_sign_rot_3.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_sign_rot_3.json
new file mode 100644
index 0000000000..b10907f164
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_sign_rot_3.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/sign_rot_3",
+  "textures": {
+    "all": "fabric-object-builder-api-v1-testmod:block/teal_sign",
+    "particle": "minecraft:block/acacia_planks"
+  }
+}
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_wall_hanging_sign.json b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_wall_hanging_sign.json
new file mode 100644
index 0000000000..526c95648f
--- /dev/null
+++ b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/models/block/teal_wall_hanging_sign.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/wall_hanging_sign",
+  "textures": {
+    "all": "fabric-object-builder-api-v1-testmod:block/teal_hanging_sign",
+    "particle": "minecraft:block/stripped_acacia_log"
+  }
+}
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/textures/block/teal_hanging_sign.png b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/textures/block/teal_hanging_sign.png
new file mode 100644
index 0000000000..1650435457
Binary files /dev/null and b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/textures/block/teal_hanging_sign.png differ
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/textures/block/teal_sign.png b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/textures/block/teal_sign.png
new file mode 100644
index 0000000000..5bfc7f22a4
Binary files /dev/null and b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/textures/block/teal_sign.png differ
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/textures/entity/signs/hanging/teal.png b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/textures/entity/signs/hanging/teal.png
deleted file mode 100644
index 7fa9ee67f0..0000000000
Binary files a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/textures/entity/signs/hanging/teal.png and /dev/null differ
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/textures/entity/signs/teal.png b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/textures/entity/signs/teal.png
deleted file mode 100644
index 0c800312ec..0000000000
Binary files a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/textures/entity/signs/teal.png and /dev/null differ
diff --git a/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/textures/gui/signs/teal.png b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/textures/gui/signs/teal.png
new file mode 100644
index 0000000000..d45b6f5379
Binary files /dev/null and b/fabric-object-builder-api-v1/src/testmod/resources/assets/fabric-object-builder-api-v1-testmod/textures/gui/signs/teal.png differ
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 b15e3788a5..44b30ede4b 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
@@ -25,13 +25,15 @@
       "net.fabricmc.fabric.test.object.builder.BlockEntityTypeBuilderTest",
       "net.fabricmc.fabric.test.object.builder.TealSignTest",
       "net.fabricmc.fabric.test.object.builder.DimensionDataStorageTest",
-      "net.fabricmc.fabric.test.object.builder.EntityDataAccessorTest"
+      "net.fabricmc.fabric.test.object.builder.EntityDataAccessorTest",
+      "net.fabricmc.fabric.test.object.builder.FabricDefaultAttributeRegistryTest"
     ],
     "client": [
       "net.fabricmc.fabric.test.object.builder.client.EntityDataAccessorClientTest"
     ],
     "fabric-gametest": [
-      "net.fabricmc.fabric.test.object.builder.ObjectBuilderGameTest"
+      "net.fabricmc.fabric.test.object.builder.ObjectBuilderGameTest",
+      "net.fabricmc.fabric.test.object.builder.FabricDefaultAttributeRegistryGameTest"
     ]
   }
 }
diff --git a/fabric-object-builder-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/object/builder/client/EntityDataAccessorClientTest.java b/fabric-object-builder-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/object/builder/client/EntityDataAccessorClientTest.java
index ee9224c25f..103c7db2e2 100644
--- a/fabric-object-builder-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/object/builder/client/EntityDataAccessorClientTest.java
+++ b/fabric-object-builder-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/object/builder/client/EntityDataAccessorClientTest.java
@@ -16,13 +16,19 @@
 
 package net.fabricmc.fabric.test.object.builder.client;
 
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.neoforge.client.event.EntityRenderersEvent;
+
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
 import net.fabricmc.fabric.test.object.builder.EntityDataAccessorTest;
 
 public class EntityDataAccessorClientTest implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {
-		EntityRendererRegistry.register(EntityDataAccessorTest.TRACK_STACK_ENTITY, TrackStackEntityRenderer::new);
+		IEventBus bus = ModLoadingContext.get().getActiveContainer().getEventBus();
+		bus.addListener(EntityRenderersEvent.RegisterRenderers.class, event -> {
+			event.registerEntityRenderer(EntityDataAccessorTest.TRACK_STACK_ENTITY.get(), TrackStackEntityRenderer::new);
+		});
 	}
 }
diff --git a/fabric-object-builder-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/object/builder/client/TrackStackEntityRenderer.java b/fabric-object-builder-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/object/builder/client/TrackStackEntityRenderer.java
index 9d722fb6d9..c970e3af58 100644
--- a/fabric-object-builder-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/object/builder/client/TrackStackEntityRenderer.java
+++ b/fabric-object-builder-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/object/builder/client/TrackStackEntityRenderer.java
@@ -52,7 +52,7 @@ public void submit(RenderState renderState, PoseStack poseStack, SubmitNodeColle
 		poseStack.translate(0, -2, 0);
 
 		for (Component line : labelLines) {
-			submitNodeCollector.order(0).submitNameTag(poseStack, renderState.nameTagAttachment, 0, line, !renderState.isDiscrete, renderState.lightCoords, renderState.distanceToCameraSq, cameraState);
+			submitNodeCollector.order(0).submitNameTag(poseStack, renderState.nameTagAttachment, 0, line, !renderState.isDiscrete, renderState.lightCoords, cameraState);
 			poseStack.translate(0, 0.25875f, 0);
 		}
 
diff --git a/fabric-particles-v1/build.gradle b/fabric-particles-v1/build.gradle
index 70fafde28b..fbc7d9cfbd 100644
--- a/fabric-particles-v1/build.gradle
+++ b/fabric-particles-v1/build.gradle
@@ -15,7 +15,7 @@ testDependencies(project, [
 		':fabric-resource-loader-v1'
 ])
 
-validateMixinNames {
-	// Loom needs to handle inner mixins better
-	exclude "**/ParticleManagerAccessor\$SimpleSpriteProviderAccessor.class"
-}
+//validateMixinNames {
+//	// Loom needs to handle inner mixins better
+//	exclude "**/ParticleManagerAccessor\$SimpleSpriteProviderAccessor.class"
+//}
diff --git a/fabric-particles-v1/src/client/java/net/fabricmc/fabric/impl/client/particle/ParticleProviderRegistryImpl.java b/fabric-particles-v1/src/client/java/net/fabricmc/fabric/impl/client/particle/ParticleProviderRegistryImpl.java
index a056e4bb75..e53cf8c204 100644
--- a/fabric-particles-v1/src/client/java/net/fabricmc/fabric/impl/client/particle/ParticleProviderRegistryImpl.java
+++ b/fabric-particles-v1/src/client/java/net/fabricmc/fabric/impl/client/particle/ParticleProviderRegistryImpl.java
@@ -63,7 +63,7 @@ void applyTo(ParticleProviderRegistry registry) {
 	record DirectParticleProviderRegistry(ParticleResources particleResources) implements ParticleProviderRegistry {
 		@Override
 		public  void register(ParticleType type, ParticleProvider provider) {
-			particleResources.providers.put(BuiltInRegistries.PARTICLE_TYPE.getId(type), provider);
+			particleResources.providers.put(BuiltInRegistries.PARTICLE_TYPE.getKey(type), provider);
 		}
 
 		@Override
diff --git a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/impl/particle/BlockParticleOptionFactoryImpl.java b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/impl/particle/BlockParticleOptionFactoryImpl.java
index 99cc072bbf..82d5e7ea48 100644
--- a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/impl/particle/BlockParticleOptionFactoryImpl.java
+++ b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/impl/particle/BlockParticleOptionFactoryImpl.java
@@ -28,8 +28,6 @@ private BlockParticleOptionFactoryImpl() {
 	}
 
 	public static BlockParticleOption create(ParticleType type, BlockState blockState, @Nullable BlockPos blockPos) {
-		BlockParticleOption effect = new BlockParticleOption(type, blockState);
-		((BlockParticleOptionExtension) effect).fabric_setBlockPos(blockPos);
-		return effect;
+		return new BlockParticleOption(type, blockState, blockPos);
 	}
 }
diff --git a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/impl/particle/ExtendedBlockParticleOptionStreamCodec.java b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/impl/particle/ExtendedBlockParticleOptionStreamCodec.java
deleted file mode 100644
index ae1428be6f..0000000000
--- a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/impl/particle/ExtendedBlockParticleOptionStreamCodec.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.impl.particle;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.particles.BlockParticleOption;
-import net.minecraft.network.RegistryFriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
-
-public class ExtendedBlockParticleOptionStreamCodec implements StreamCodec {
-	private static final int PACKET_MARKER = -1;
-	private final StreamCodec fallback;
-
-	public ExtendedBlockParticleOptionStreamCodec(StreamCodec fallback) {
-		this.fallback = fallback;
-	}
-
-	@Override
-	public BlockParticleOption decode(RegistryFriendlyByteBuf buf) {
-		int index = buf.readerIndex();
-
-		if (buf.readVarInt() != PACKET_MARKER) {
-			// Reset index for vanilla's normal deserialization logic.
-			buf.readerIndex(index);
-			return fallback.decode(buf);
-		}
-
-		BlockParticleOption value = fallback.decode(buf);
-		BlockPos pos = BlockPos.STREAM_CODEC.decode(buf);
-		((BlockParticleOptionExtension) value).fabric_setBlockPos(pos);
-		return value;
-	}
-
-	@Override
-	public void encode(RegistryFriendlyByteBuf buf, BlockParticleOption value) {
-		BlockPos pos = value.getBlockPos();
-
-		if (pos == null || ExtendedBlockParticleOptionSync.shouldEncodeFallback()) {
-			fallback.encode(buf, value);
-			return;
-		}
-
-		buf.writeVarInt(PACKET_MARKER);
-		fallback.encode(buf, value);
-		BlockPos.STREAM_CODEC.encode(buf, pos);
-	}
-}
diff --git a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/impl/particle/ExtendedBlockParticleOptionSync.java b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/impl/particle/ExtendedBlockParticleOptionSync.java
deleted file mode 100644
index 8ac2b96227..0000000000
--- a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/impl/particle/ExtendedBlockParticleOptionSync.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.impl.particle;
-
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.Identifier;
-
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
-import net.fabricmc.fabric.api.networking.v1.ServerConfigurationConnectionEvents;
-import net.fabricmc.fabric.api.networking.v1.ServerConfigurationNetworking;
-import net.fabricmc.fabric.api.networking.v1.context.PacketContext;
-
-public class ExtendedBlockParticleOptionSync implements ModInitializer {
-	private static final PacketContext.Key ENCODE_FALLBACK = PacketContext.key(Identifier.fromNamespaceAndPath("fabric", "extended_block_particle_fallback"));
-	private static final Identifier PACKET_ID = Identifier.fromNamespaceAndPath("fabric", "extended_block_particle_option_sync");
-
-	@Override
-	public void onInitialize() {
-		PayloadTypeRegistry.clientboundConfiguration().register(DummyPayload.ID, DummyPayload.CODEC);
-		ServerConfigurationConnectionEvents.CONFIGURE.register((listener, _) -> {
-			listener.getPacketContext().set(ENCODE_FALLBACK, !ServerConfigurationNetworking.canSend(listener, PACKET_ID));
-		});
-	}
-
-	public static boolean shouldEncodeFallback() {
-		PacketContext context = PacketContext.get();
-
-		if (context == null) {
-			return true;
-		}
-
-		return context.orElse(ENCODE_FALLBACK, true);
-	}
-
-	public record DummyPayload() implements CustomPacketPayload {
-		public static final DummyPayload INSTANCE = new DummyPayload();
-		public static final StreamCodec CODEC = StreamCodec.unit(INSTANCE);
-		public static final CustomPacketPayload.Type ID = new Type<>(PACKET_ID);
-
-		@Override
-		public Type type() {
-			return ID;
-		}
-	}
-}
diff --git a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/BlockParticleOptionMixin.java b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/BlockParticleOptionMixin.java
index dca498b618..6bf541a19a 100644
--- a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/BlockParticleOptionMixin.java
+++ b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/BlockParticleOptionMixin.java
@@ -16,40 +16,19 @@
 
 package net.fabricmc.fabric.mixin.particle;
 
-import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.particles.BlockParticleOption;
-import net.minecraft.network.RegistryFriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
 
 import net.fabricmc.fabric.api.particle.v1.FabricBlockParticleOption;
-import net.fabricmc.fabric.impl.particle.BlockParticleOptionExtension;
-import net.fabricmc.fabric.impl.particle.ExtendedBlockParticleOptionStreamCodec;
 
 @Mixin(BlockParticleOption.class)
-abstract class BlockParticleOptionMixin implements FabricBlockParticleOption, BlockParticleOptionExtension {
-	@Nullable
-	@Unique
-	private BlockPos blockPos;
-
+abstract class BlockParticleOptionMixin implements FabricBlockParticleOption {
 	@Override
 	@Nullable
 	public BlockPos getBlockPos() {
-		return blockPos;
-	}
-
-	@Override
-	public void fabric_setBlockPos(@Nullable BlockPos pos) {
-		blockPos = pos;
-	}
-
-	@ModifyReturnValue(method = "streamCodec", at = @At("RETURN"))
-	private static StreamCodec modifyStreamCodec(StreamCodec codec) {
-		return new ExtendedBlockParticleOptionStreamCodec(codec);
+		return ((BlockParticleOption) (Object) this).getPos();
 	}
 }
diff --git a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/BreezeMixin.java b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/BreezeMixin.java
index c82cfc796d..2bd0278200 100644
--- a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/BreezeMixin.java
+++ b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/BreezeMixin.java
@@ -27,8 +27,6 @@
 import net.minecraft.world.entity.monster.breeze.Breeze;
 import net.minecraft.world.level.Level;
 
-import net.fabricmc.fabric.impl.particle.BlockParticleOptionExtension;
-
 @Mixin(Breeze.class)
 abstract class BreezeMixin extends Monster {
 	private BreezeMixin(EntityType entityType, Level level) {
@@ -38,7 +36,6 @@ private BreezeMixin(EntityType entityType, Level level) {
 	@ModifyExpressionValue(method = {"emitJumpTrailParticles", "emitGroundParticles"}, at = @At(value = "NEW", target = "(Lnet/minecraft/core/particles/ParticleType;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/core/particles/BlockParticleOption;"))
 	private BlockParticleOption modifyBlockStateParticleOption(BlockParticleOption original) {
 		BlockPos blockPos = !getInBlockState().isAir() ? blockPosition() : getOnPos();
-		((BlockParticleOptionExtension) original).fabric_setBlockPos(blockPos);
-		return original;
+		return new BlockParticleOption(original.getType(), original.getState(), blockPos);
 	}
 }
diff --git a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/BrushItemMixin.java b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/BrushItemMixin.java
index 90e06f81b2..fbde6cbfe7 100644
--- a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/BrushItemMixin.java
+++ b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/BrushItemMixin.java
@@ -28,13 +28,10 @@
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
 
-import net.fabricmc.fabric.impl.particle.BlockParticleOptionExtension;
-
 @Mixin(BrushItem.class)
 abstract class BrushItemMixin {
 	@ModifyExpressionValue(method = "spawnDustParticles", at = @At(value = "NEW", target = "(Lnet/minecraft/core/particles/ParticleType;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/core/particles/BlockParticleOption;"))
 	private BlockParticleOption modifyBlockStateParticleOption(BlockParticleOption original, Level level, BlockHitResult hitResult, BlockState state, Vec3 userRotation, HumanoidArm arm) {
-		((BlockParticleOptionExtension) original).fabric_setBlockPos(hitResult.getBlockPos());
-		return original;
+		return new BlockParticleOption(original.getType(), original.getState(), hitResult.getBlockPos());
 	}
 }
diff --git a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/EntityMixin.java b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/EntityMixin.java
deleted file mode 100644
index cd04893756..0000000000
--- a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/EntityMixin.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.mixin.particle;
-
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import com.llamalad7.mixinextras.sugar.Local;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.particles.BlockParticleOption;
-import net.minecraft.world.entity.Entity;
-
-import net.fabricmc.fabric.impl.particle.BlockParticleOptionExtension;
-
-@Mixin(Entity.class)
-abstract class EntityMixin {
-	@ModifyExpressionValue(method = "spawnSprintParticle", at = @At(value = "NEW", target = "(Lnet/minecraft/core/particles/ParticleType;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/core/particles/BlockParticleOption;"))
-	private BlockParticleOption modifyBlockStateParticleOption(BlockParticleOption original, @Local(name = "pos") BlockPos pos) {
-		((BlockParticleOptionExtension) original).fabric_setBlockPos(pos);
-		return original;
-	}
-}
diff --git a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/LivingEntityMixin.java b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/LivingEntityMixin.java
deleted file mode 100644
index 4092a6a716..0000000000
--- a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/LivingEntityMixin.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.mixin.particle;
-
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.particles.BlockParticleOption;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.level.block.state.BlockState;
-
-import net.fabricmc.fabric.impl.particle.BlockParticleOptionExtension;
-
-@Mixin(LivingEntity.class)
-abstract class LivingEntityMixin {
-	@ModifyExpressionValue(method = "checkFallDamage", at = @At(value = "NEW", target = "(Lnet/minecraft/core/particles/ParticleType;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/core/particles/BlockParticleOption;"))
-	private BlockParticleOption modifyBlockStateParticleOption(BlockParticleOption original, double heightDifference, boolean onGround, BlockState state, BlockPos landedPosition) {
-		((BlockParticleOptionExtension) original).fabric_setBlockPos(landedPosition);
-		return original;
-	}
-}
diff --git a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/ParticleUtilsMixin.java b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/ParticleUtilsMixin.java
index fcb2b6600f..e125843b29 100644
--- a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/ParticleUtilsMixin.java
+++ b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/ParticleUtilsMixin.java
@@ -25,13 +25,10 @@
 import net.minecraft.util.ParticleUtils;
 import net.minecraft.world.level.LevelAccessor;
 
-import net.fabricmc.fabric.impl.particle.BlockParticleOptionExtension;
-
 @Mixin(ParticleUtils.class)
 abstract class ParticleUtilsMixin {
 	@ModifyExpressionValue(method = "spawnSmashAttackParticles", at = @At(value = "NEW", target = "(Lnet/minecraft/core/particles/ParticleType;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/core/particles/BlockParticleOption;"))
 	private static BlockParticleOption modifyBlockStateParticleOption(BlockParticleOption original, LevelAccessor level, BlockPos pos, int count) {
-		((BlockParticleOptionExtension) original).fabric_setBlockPos(pos);
-		return original;
+		return new BlockParticleOption(original.getType(), original.getState(), pos);
 	}
 }
diff --git a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/ServerPlayerMixin.java b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/ServerPlayerMixin.java
index be25509efe..206ae8f785 100644
--- a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/ServerPlayerMixin.java
+++ b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/ServerPlayerMixin.java
@@ -25,13 +25,10 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.block.state.BlockState;
 
-import net.fabricmc.fabric.impl.particle.BlockParticleOptionExtension;
-
 @Mixin(ServerPlayer.class)
 abstract class ServerPlayerMixin {
 	@ModifyExpressionValue(method = "checkFallDamage", at = @At(value = "NEW", target = "(Lnet/minecraft/core/particles/ParticleType;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/core/particles/BlockParticleOption;"))
 	private BlockParticleOption modifyBlockStateParticleOption(BlockParticleOption original, double heightDifference, boolean onGround, BlockState state, BlockPos landedPosition) {
-		((BlockParticleOptionExtension) original).fabric_setBlockPos(landedPosition);
-		return original;
+		return new BlockParticleOption(original.getType(), original.getState(), landedPosition);
 	}
 }
diff --git a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/WardenMixin.java b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/WardenMixin.java
index 5696eb1416..4103f583a6 100644
--- a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/WardenMixin.java
+++ b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/WardenMixin.java
@@ -27,8 +27,6 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.gameevent.vibrations.VibrationSystem;
 
-import net.fabricmc.fabric.impl.particle.BlockParticleOptionExtension;
-
 @Mixin(Warden.class)
 abstract class WardenMixin extends Monster implements VibrationSystem {
 	private WardenMixin(EntityType entityType, Level level) {
@@ -37,7 +35,6 @@ private WardenMixin(EntityType entityType, Level level) {
 
 	@ModifyExpressionValue(method = "clientDiggingParticles", at = @At(value = "NEW", target = "(Lnet/minecraft/core/particles/ParticleType;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/core/particles/BlockParticleOption;"))
 	private BlockParticleOption modifyBlockStateParticleOption(BlockParticleOption original) {
-		((BlockParticleOptionExtension) original).fabric_setBlockPos(getOnPos());
-		return original;
+		return new BlockParticleOption(original.getType(), original.getState(), getOnPos());
 	}
 }
diff --git a/fabric-particles-v1/src/main/resources/fabric-particles-v1.classtweaker b/fabric-particles-v1/src/main/resources/fabric-particles-v1.classtweaker
index 163ae570e6..54641eca35 100644
--- a/fabric-particles-v1/src/main/resources/fabric-particles-v1.classtweaker
+++ b/fabric-particles-v1/src/main/resources/fabric-particles-v1.classtweaker
@@ -2,6 +2,7 @@ classTweaker	v1	official
 accessible	field	net/minecraft/client/particle/ParticleEngine	resourceManager	Lnet/minecraft/client/particle/ParticleResources;
 accessible	field	net/minecraft/client/particle/ParticleResources	providers	Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
 accessible	field	net/minecraft/client/particle/ParticleResources	spriteSets	Ljava/util/Map;
+accessible	class	net/minecraft/client/particle/ParticleResources$MutableSpriteSet
 accessible	method	net/minecraft/client/particle/ParticleResources$MutableSpriteSet		()V
 accessible	field	net/minecraft/client/particle/ParticleResources$MutableSpriteSet	sprites	Ljava/util/List;
 transitive-inject-interface	net/minecraft/core/particles/BlockParticleOption	net/fabricmc/fabric/api/particle/v1/FabricBlockParticleOption
diff --git a/fabric-particles-v1/src/main/resources/fabric-particles-v1.mixins.json b/fabric-particles-v1/src/main/resources/fabric-particles-v1.mixins.json
index f1ad3ec3ca..8385610b18 100644
--- a/fabric-particles-v1/src/main/resources/fabric-particles-v1.mixins.json
+++ b/fabric-particles-v1/src/main/resources/fabric-particles-v1.mixins.json
@@ -6,8 +6,6 @@
     "BlockParticleOptionMixin",
     "BreezeMixin",
     "BrushItemMixin",
-    "EntityMixin",
-    "LivingEntityMixin",
     "ParticleUtilsMixin",
     "ServerPlayerMixin",
     "WardenMixin"
diff --git a/fabric-particles-v1/src/main/resources/fabric.mod.json b/fabric-particles-v1/src/main/resources/fabric.mod.json
index c0fdb4a698..0da9d4e3bd 100644
--- a/fabric-particles-v1/src/main/resources/fabric.mod.json
+++ b/fabric-particles-v1/src/main/resources/fabric.mod.json
@@ -21,10 +21,8 @@
   },
   "entrypoints": {
     "main": [
-	    "net.fabricmc.fabric.impl.particle.ExtendedBlockParticleOptionSync"
     ],
     "client": [
-	    "net.fabricmc.fabric.impl.client.particle.ExtendedBlockParticleOptionSyncClient"
     ]
   },
   "description": "Hooks for registering custom particles.",
diff --git a/fabric-particles-v1/src/test/java/net/fabricmc/fabric/impl/test/particle/ParticleGroupRegistryTest.java b/fabric-particles-v1/src/test/java/net/fabricmc/fabric/impl/test/particle/ParticleGroupRegistryTest.java
index f5710d2e50..d9cbeb8c53 100644
--- a/fabric-particles-v1/src/test/java/net/fabricmc/fabric/impl/test/particle/ParticleGroupRegistryTest.java
+++ b/fabric-particles-v1/src/test/java/net/fabricmc/fabric/impl/test/particle/ParticleGroupRegistryTest.java
@@ -51,7 +51,7 @@ void testInitialSorting() {
 	void insertBefore() {
 		var registry = new ParticleGroupRegistryImpl(sheets);
 
-		var customSheet = new ParticleRenderType("mymod:custom");
+		var customSheet = new ParticleRenderType("mymod:custom", "MC");
 		registry.register(customSheet, particleEngine -> null);
 		registry.registerOrdering(getId(customSheet), getId(ITEM_PICKUP));
 
@@ -67,7 +67,7 @@ void insertBefore() {
 	void insertAfter() {
 		var registry = new ParticleGroupRegistryImpl(sheets);
 
-		var customSheet = new ParticleRenderType("mymod:custom");
+		var customSheet = new ParticleRenderType("mymod:custom", "MC");
 		registry.register(customSheet, particleEngine -> null);
 		registry.registerOrdering(getId(ITEM_PICKUP), getId(customSheet));
 
diff --git a/fabric-particles-v1/src/testmodClient/java/net/fabricmc/fabric/test/particle/client/ParticleGroupRegistryTests.java b/fabric-particles-v1/src/testmodClient/java/net/fabricmc/fabric/test/particle/client/ParticleGroupRegistryTests.java
index 21d4b9e709..b686361ef7 100644
--- a/fabric-particles-v1/src/testmodClient/java/net/fabricmc/fabric/test/particle/client/ParticleGroupRegistryTests.java
+++ b/fabric-particles-v1/src/testmodClient/java/net/fabricmc/fabric/test/particle/client/ParticleGroupRegistryTests.java
@@ -48,7 +48,7 @@
 public class ParticleGroupRegistryTests implements ClientModInitializer {
 	private static final Identifier PARTICLE_ID = Identifier.fromNamespaceAndPath("fabric-particles-v1-testmod", "test");
 	private static final SimpleParticleType TEST_PARTICLE_TYPE = FabricParticleTypes.simple();
-	private static final ParticleRenderType TEST_PARTICLE_TEXTURE_SHEET = new ParticleRenderType(PARTICLE_ID.toString());
+	private static final ParticleRenderType TEST_PARTICLE_TEXTURE_SHEET = new ParticleRenderType(PARTICLE_ID.toString(), "FT");
 
 	@Override
 	public void onInitializeClient() {
diff --git a/fabric-particles-v1/src/testmodClient/java/net/fabricmc/fabric/test/particle/client/ParticleRenderEventTests.java b/fabric-particles-v1/src/testmodClient/java/net/fabricmc/fabric/test/particle/client/ParticleRenderEventTests.java
index 61fbf02632..87497a390f 100644
--- a/fabric-particles-v1/src/testmodClient/java/net/fabricmc/fabric/test/particle/client/ParticleRenderEventTests.java
+++ b/fabric-particles-v1/src/testmodClient/java/net/fabricmc/fabric/test/particle/client/ParticleRenderEventTests.java
@@ -18,6 +18,8 @@
 
 import java.util.List;
 
+import net.fabricmc.fabric.test.particle.ParticleTintTestBlock;
+
 import net.minecraft.client.color.block.BlockTintSource;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.block.state.BlockState;
@@ -33,7 +35,7 @@ public void onInitializeClient() {
 		BlockTintSource tintSource = new BlockTintSource() {
 			@Override
 			public int color(BlockState state) {
-				return -1;
+				return ((ParticleTintTestBlock) state.getBlock()).color;
 			}
 		};
 
diff --git a/fabric-permission-api-v1/build.gradle b/fabric-permission-api-v1/build.gradle
new file mode 100644
index 0000000000..80187b9a89
--- /dev/null
+++ b/fabric-permission-api-v1/build.gradle
@@ -0,0 +1,15 @@
+version = getSubprojectVersion(project)
+
+loom {
+	accessWidenerPath = file('src/main/resources/fabric-permission-api-v1.classtweaker')
+}
+
+moduleDependencies(project, [
+	":fabric-api-base"
+])
+
+testDependencies(project, [
+	":fabric-command-api-v2",
+	":fabric-lifecycle-events-v1",
+//	":fabric-networking-api-v1"
+])
diff --git a/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/MutablePermissionContext.java b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/MutablePermissionContext.java
new file mode 100644
index 0000000000..11d8013684
--- /dev/null
+++ b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/MutablePermissionContext.java
@@ -0,0 +1,26 @@
+/*
+ * 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.api.permission.v1;
+
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Mutable version of {@link PermissionContext}, intended for creation of custom context conditions.
+ */
+public interface MutablePermissionContext extends PermissionContext {
+	 MutablePermissionContext set(PermissionContext.Key key, @Nullable T value);
+}
diff --git a/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/PermissionContext.java b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/PermissionContext.java
new file mode 100644
index 0000000000..4ca3a72794
--- /dev/null
+++ b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/PermissionContext.java
@@ -0,0 +1,258 @@
+/*
+ * 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.api.permission.v1;
+
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.core.BlockPos;
+import net.minecraft.resources.Identifier;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.permissions.PermissionLevel;
+import net.minecraft.server.players.NameAndId;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
+
+import net.fabricmc.fabric.impl.permission.CustomPermissionContext;
+import net.fabricmc.fabric.impl.permission.OverriddenPermissionContext;
+import net.fabricmc.fabric.impl.permission.PermissionContextKey;
+
+/**
+ * Interface representing context object used for permission checks, providing both required
+ * and additional values.
+ *
+ * 
    Permission checks should be applied by calling methods defined in {@link PermissionContextOwner}
+ * For command checks, you can use {@link PermissionPredicates}.
+ */
+public interface PermissionContext extends PermissionContextOwner {
+	/**
+	 * Represents name attached to the permission context.
+	 * There is no requirement for it to be unique, as it might be changed by external factors.
+	 * Mainly used to help with identifying system-type contexts or context with shared/nil uuid.
+	 * For entities, it defaults to the plain name, based on either custom name or entity type name.
+	 */
+	Key NAME = PermissionContextKey.NAME;
+
+	/**
+	 * Represents position current position in which permission check is applied.
+	 */
+	Key POSITION = PermissionContextKey.POSITION;
+
+	/**
+	 * Represents position current block position in which permission check is applied.
+	 */
+	Key BLOCK_POSITION = PermissionContextKey.BLOCK_POSITION;
+
+	/**
+	 * Represents entity for which permission check is applied.
+	 */
+	Key ENTITY = PermissionContextKey.ENTITY;
+
+	/**
+	 * Represents command source stack for which permission check is applied.
+	 */
+	Key COMMAND_SOURCE_STACK = PermissionContextKey.COMMAND_SOURCE_STACK;
+
+	/**
+	 * Represents level for which permission check is applied.
+	 */
+	Key LEVEL = PermissionContextKey.LEVEL;
+
+	/**
+	 * Represents the server to which this context is attached to.
+	 */
+	Key SERVER = PermissionContextKey.SERVER;
+
+	/**
+	 * Creates a custom context, without any optional values.
+	 *
+	 * @param uuid the uuid connected to this context
+	 * @param type type of the context
+	 * @param permissionLevel base permission level
+	 * @return mutable permission context
+	 */
+	static MutablePermissionContext create(UUID uuid, Type type, PermissionLevel permissionLevel) {
+		Objects.requireNonNull(uuid, "uuid cannot be null");
+		Objects.requireNonNull(type, "type cannot be null");
+		Objects.requireNonNull(permissionLevel, "permissionLevel cannot be null");
+
+		return new CustomPermissionContext(uuid, type, permissionLevel);
+	}
+
+	/**
+	 * Creates a context of offline player.
+	 * Do note that depending on the backing implementation, the check for offline players
+	 * might be noticeably slower, so using async check methods or checking them on non-main threads
+	 * is encouraged.
+	 *
+	 * @param uuid player's uuid
+	 * @param server the currently running server instance
+	 * @return mutable permission context
+	 */
+	static CompletableFuture offlinePlayer(UUID uuid, MinecraftServer server) {
+		Objects.requireNonNull(uuid, "uuid cannot be null");
+		Objects.requireNonNull(server, "server cannot be null");
+
+		PermissionLevel permissionLevel = server.getProfilePermissions(new NameAndId(uuid, "")).level();
+		var ctx = new CustomPermissionContext(uuid, Type.PLAYER, permissionLevel);
+		ctx.set(PermissionContext.SERVER, server);
+
+		return PermissionEvents.PREPARE_OFFLINE_PLAYER.invoker().prepareOfflinePlayer(ctx, server).thenApply(consumer -> {
+			if (consumer != null) {
+				consumer.accept(ctx);
+			}
+
+			return ctx;
+		});
+	}
+
+	/**
+	 * Creates a context of offline player.
+	 * Do note that depending on the backing implementation, the check for offline players
+	 * might be noticeably slower, so using async check methods or checking them on non-main threads
+	 * is encouraged.
+	 *
+	 * @param nameAndId player's name and uuid
+	 * @param server the currently running server instance
+	 * @return mutable permission context
+	 */
+	static CompletableFuture offlinePlayer(NameAndId nameAndId, MinecraftServer server) {
+		Objects.requireNonNull(nameAndId, "nameAndId cannot be null");
+		Objects.requireNonNull(server, "server cannot be null");
+
+		PermissionLevel permissionLevel = server.getProfilePermissions(nameAndId).level();
+		var ctx = new CustomPermissionContext(nameAndId.id(), Type.PLAYER, permissionLevel);
+		ctx.set(PermissionContext.NAME, nameAndId.name());
+		ctx.set(PermissionContext.SERVER, server);
+
+		return PermissionEvents.PREPARE_OFFLINE_PLAYER.invoker().prepareOfflinePlayer(ctx, server).thenApply(consumer -> {
+			if (consumer != null) {
+				consumer.accept(ctx);
+			}
+
+			return ctx;
+		});
+	}
+
+	/**
+	 * Creates a unique key, intended for attaching additional context data.
+	 * This key/value can't be serialized.
+	 *
+	 * @param identifier unique identifier
+	 * @param  type of attached
+	 * @return unique key
+	 */
+	static  Key key(Identifier identifier) {
+		Objects.requireNonNull(identifier, "identifier cannot be null");
+
+		return new PermissionContextKey<>(identifier);
+	}
+
+	/**
+	 * UUID connected to this context.
+	 */
+	UUID uuid();
+
+	/**
+	 * The type of the context.
+	 */
+	Type type();
+
+	/**
+	 * Returns optional value attached to this context.
+	 *
+	 * @param key unique key
+	 * @param  type of value
+	 * @return stored value if it's present, null otherwise
+	 */
+	@Nullable
+	 T get(Key key);
+
+	/**
+	 * Returns optional value attached to this context, with a fallback.
+	 *
+	 * @param key unique key
+	 * @param defaultValue fallback value, if it's not present or null
+	 * @param  type of value
+	 * @return stored value if it's present, otherwise defaultValue
+	 */
+	default  T orElse(Key key, T defaultValue) {
+		T value = get(key);
+
+		return value != null ? value : defaultValue;
+	}
+
+	/**
+	 * Creates a mutable copy of this context.
+	 *
+	 * @return a new mutable permission context.
+	 */
+	default MutablePermissionContext mutable() {
+		return new OverriddenPermissionContext(this);
+	}
+
+	/**
+	 * Provides the vanilla permission level of the context.
+	 *
+	 * @return permission level of the context.
+	 */
+	PermissionLevel permissionLevel();
+
+	/**
+	 * Provides a set of defined permission context keys.
+	 *
+	 * @return unmodifiable set of permission keys.
+	 */
+	Set> keys();
+
+	@Override
+	default PermissionContext getPermissionContext() {
+		return this;
+	}
+
+	/**
+	 * Identifies the owner type of the permission context.
+	 */
+	enum Type {
+		PLAYER,
+		ENTITY,
+		SYSTEM,
+		OTHER
+	}
+
+	/**
+	 * Key used to represent additional permission context.
+	 *
+	 * @param  type of the context
+	 */
+	@ApiStatus.NonExtendable
+	interface Key {
+		/**
+		 * Identifier representing this context.
+		 *
+		 * @return id of this key
+		 */
+		Identifier id();
+	}
+}
diff --git a/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/PermissionContextOwner.java b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/PermissionContextOwner.java
new file mode 100644
index 0000000000..f68a2a809c
--- /dev/null
+++ b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/PermissionContextOwner.java
@@ -0,0 +1,124 @@
+/*
+ * 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.api.permission.v1;
+
+import org.jetbrains.annotations.Contract;
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.resources.Identifier;
+import net.minecraft.server.permissions.PermissionLevel;
+import net.minecraft.world.entity.Entity;
+
+import net.fabricmc.fabric.api.util.TriState;
+
+/**
+ * Utility interface allowing quick access for permission checking methods.
+ * Implemented by default on {@link Entity}, {@link CommandSourceStack} and {@link PermissionContext}.
+ * Other mods are allowed to implement this on their own classes as well.
+ *
+ * 
    See {@link PermissionContext} for creation and modification of permission contexts.
+ *
+ * 
    Example usage:
+ * 
    {@code
+ * Identifier claimBypassPermission = Identifier.fromNamespaceAndPath("potatoclaims", "bypass_protection");
+ * ServerPlayer player = ...;
+ *
+ * AttackEntityCallback.EVENT.register((playerEntity, _, _, entity, _) -> {
+ *     if (ModChecks.isProtected(entity) && !player.checkPermission(claimBypassPermission, PermissionLevel.GAMEMASTERS)) {
+ *         return InteractionResult.FAIL;
+ *     }
+ *     return InteractionResult.PASS;
+ * });
+ * }
    
+ */
+public interface PermissionContextOwner {
+	/**
+	 * Provides the permission context.
+	 * In case of entities, this context will be dynamic.
+	 *
+	 * @return PermissionContext attached to this object
+	 */
+	default PermissionContext getPermissionContext() {
+		throw new IllegalStateException("Implemented via Mixin");
+	}
+
+	/**
+	 * Simple permission check. Should be used to check if something is allowed.
+	 *
+	 * @param permission a permission identifier to check against
+	 * @return TriState returning value of the permission (DEFAULT if not changed)
+	 */
+	default TriState checkPermission(Identifier permission) {
+		return TriState.of(this.checkPermission(PermissionNode.of(permission)));
+	}
+
+	/**
+	 * Simple permission check. Should be used to check if something is allowed.
+	 * Will default to {@param defaultValue} if permission value is not provided.
+	 *
+	 * @param permission a permission identifier to check against
+	 * @param defaultValue fallback value
+	 * @return a boolean representing state of the permission, returns defaultValue if not modified by other mods
+	 */
+	default boolean checkPermission(Identifier permission, boolean defaultValue) {
+		Boolean value = this.checkPermission(PermissionNode.of(permission));
+		return value != null ? value : defaultValue;
+	}
+
+	/**
+	 * Simple permission check. Should be used to check if something is allowed.
+	 * Will check for vanilla permission level, if permission value is not provided.
+	 *
+	 * @param permission a permission identifier to check against
+	 * @param defaultPermissionLevel a fallback permission level to check against
+	 * @return a boolean representing state of the permission
+	 */
+	default boolean checkPermission(Identifier permission, PermissionLevel defaultPermissionLevel) {
+		PermissionLevel permissionLevel = this.getPermissionContext().permissionLevel();
+		return this.checkPermission(PermissionNode.of(permission), permissionLevel.isEqualOrHigherThan(defaultPermissionLevel));
+	}
+
+	/**
+	 * A dynamic, typed permission check. Should be used to check for more complex permission values,
+	 * like allowed amount and alike.
+	 *
+	 * @param permission a permission node to check against
+	 * @param  type of the permission
+	 * @return value of the permission or null if not provided
+	 */
+	@Nullable
+	default  T checkPermission(PermissionNode permission) {
+		return this.checkPermission(permission, null);
+	}
+
+	/**
+	 * A dynamic, typed permission check. Should be used to check for more complex permission values,
+	 * like allowed amount and alike.
+	 *
+	 * @param permission a permission node to check against
+	 * @param defaultValue fallback value, if not provided
+	 * @param  type of the permission
+	 * @return  value of the permission or {@param defaultValue} if not provided
+	 */
+	@Contract("_, null -> _; _, !null -> !null")
+	default  @Nullable T checkPermission(PermissionNode permission, @Nullable T defaultValue) {
+		T value = PermissionEvents.ON_REQUEST.invoker().handlePermissionRequest(this.getPermissionContext(), permission);
+
+		return value != null ? value : defaultValue;
+	}
+}
diff --git a/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/PermissionEvents.java b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/PermissionEvents.java
new file mode 100644
index 0000000000..981121d420
--- /dev/null
+++ b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/PermissionEvents.java
@@ -0,0 +1,117 @@
+/*
+ * 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.api.permission.v1;
+
+import java.util.ArrayList;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.server.MinecraftServer;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+
+/**
+ * These events used for handling permission resolution within PermissionContext system.
+ * Implemented callbacks for these event should be thread safe, as permission methods can be called from any active thread.
+ * Additionally, the execution should be reasonably fast for non-player and online player cases.
+ * Offline player checks are allowed to be slower.
+ *
+ * 
    When implementing a permission handler, only {@link PermissionEvents#ON_REQUEST} needs to be implemented.
+ *
+ * 
    To check for permissions, you should use dedicated methods from {@link PermissionContextOwner} interface
+ * and it's implementations over invoking this event.
+ */
+public final class PermissionEvents {
+	private PermissionEvents() {
+	}
+
+	/**
+	 * Event used for handling permission resolution.
+	 *
+	 * 
    This event is invoked by methods provided by {@link PermissionContextOwner}.
+	 */
+	public static final Event ON_REQUEST = EventFactory.createArrayBacked(OnRequest.class, arr -> new OnRequest() {
+		@Override
+		public @Nullable  T handlePermissionRequest(PermissionContext context, PermissionNode permission) {
+			for (OnRequest callback : arr) {
+				T out = callback.handlePermissionRequest(context, permission);
+
+				if (out != null) {
+					return out;
+				}
+			}
+
+			return null;
+		}
+	});
+
+	/**
+	 * Event for preparing for offline player checks.
+	 *
+	 * 
    This event is invoked by {@link PermissionContext#offlinePlayer}.
+	 */
+	public static final Event PREPARE_OFFLINE_PLAYER = EventFactory.createArrayBacked(PrepareOfflinePlayer.class,
+			(_, _) -> CompletableFuture.completedFuture(null), arr -> (context, server) -> {
+				var list = new ArrayList>>();
+
+				for (PrepareOfflinePlayer callback : arr) {
+					list.add(callback.prepareOfflinePlayer(context, server));
+				}
+
+				return CompletableFuture.allOf(list.toArray(CompletableFuture[]::new)).thenApply(_ -> {
+					return mutableContext -> {
+						for (CompletableFuture<@Nullable Consumer> future : list) {
+							Consumer consumer = future.getNow(null);
+
+							if (consumer != null) {
+								consumer.accept(mutableContext);
+							}
+						}
+					};
+				});
+			});
+
+	@FunctionalInterface
+	public interface OnRequest {
+		/**
+		 * Main permission checking, it can execute on any thread.
+		 *
+		 * @param context        context to check for.
+		 * @param permission     a permission node representing a permission.
+		 * @param             type of permission.
+		 * @return value of type T if present, null to pass to the next handler.
+		 */
+		@Nullable
+		 T handlePermissionRequest(PermissionContext context, PermissionNode permission);
+	}
+
+	@FunctionalInterface
+	public interface PrepareOfflinePlayer {
+		/**
+		 * A callback run before providing a {@link PermissionContext} for offline player checks.
+		 * Should be used to preload the relevant permission data if needed.
+		 *
+		 * @param context context to load.
+		 * @param server server for which this player is resolved against.
+		 * @return a completable future indicating that permission context is ready to be checked against, with optional callback to modify the context.
+		 */
+		CompletableFuture<@Nullable Consumer> prepareOfflinePlayer(PermissionContext context, MinecraftServer server);
+	}
+}
diff --git a/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/PermissionNode.java b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/PermissionNode.java
new file mode 100644
index 0000000000..b4fd2c3602
--- /dev/null
+++ b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/PermissionNode.java
@@ -0,0 +1,218 @@
+/*
+ * 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.api.permission.v1;
+
+import java.util.Objects;
+import java.util.function.Predicate;
+
+import com.mojang.serialization.Codec;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.resources.Identifier;
+
+import net.fabricmc.fabric.impl.permission.PermissionNodeImpl;
+
+/**
+ * This class represents a permission, which consist of identifier as the key and a codec to dictate
+ * its type. This class can be instantiated dynamically (just before permission request) or statically
+ * on mod initialization.
+ *
+ * 
    PermissionNode objects are considered to be equal objects (but not the same instances)
+ * as long as they were created with the same key and codec pair.
+ *
+ * @param  type of the permission
+ */
+@ApiStatus.NonExtendable
+public interface PermissionNode {
+	/**
+	 * Creates a permission node of boolean type.
+	 * Primarily used for simple permission checks (if owner can/can't do something).
+	 *
+	 * @param key a key identifying this permission
+	 * @return permission node for boolean type
+	 */
+	static PermissionNode of(Identifier key) {
+		Objects.requireNonNull(key, "key can't be null!");
+
+		return new PermissionNodeImpl<>(key, Codec.BOOL, PermissionNodeImpl.BOOLEAN);
+	}
+
+	/**
+	 * Creates a permission node of boolean type.
+	 * Primarily used for simple permission checks (if owner can/can't do something).
+	 *
+	 * @param namespace namespace of the key identifying this permission node
+	 * @param path path of the key identifying this permission node
+	 * @return permission node for boolean type
+	 */
+	static PermissionNode of(String namespace, String path) {
+		Objects.requireNonNull(namespace, "namespace can't be null!");
+		Objects.requireNonNull(path, "path can't be null!");
+
+		return of(Identifier.fromNamespaceAndPath(namespace, path));
+	}
+
+	/**
+	 * Creates a permission node of integer type.
+	 * Primarily used for limiting permission checks (if player can do/have X of something).
+	 *
+	 * @param key a key identifying this permission
+	 * @return permission node for integer type
+	 */
+	static PermissionNode ofInteger(Identifier key) {
+		Objects.requireNonNull(key, "key can't be null!");
+
+		return new PermissionNodeImpl<>(key, Codec.INT, PermissionNodeImpl.INTEGER);
+	}
+
+	/**
+	 * Creates a permission node of integer type.
+	 * Primarily used for limiting permission checks (if player can do/have X of something).
+	 *
+	 * @param namespace namespace of the key identifying this permission node
+	 * @param path path of the key identifying this permission node
+	 * @return permission node for integer type
+	 */
+	static PermissionNode ofInteger(String namespace, String path) {
+		Objects.requireNonNull(namespace, "namespace can't be null!");
+		Objects.requireNonNull(path, "path can't be null!");
+
+		return ofInteger(Identifier.fromNamespaceAndPath(namespace, path));
+	}
+
+	/**
+	 * Creates a permission node of string type.
+	 * Primarily used for information/logical checks.
+	 *
+	 * @param key a key identifying this permission
+	 * @return permission node for string type
+	 */
+	static PermissionNode ofString(Identifier key) {
+		Objects.requireNonNull(key, "key can't be null!");
+
+		return new PermissionNodeImpl<>(key, Codec.STRING, PermissionNodeImpl.STRING);
+	}
+
+	/**
+	 * Creates a permission node of string type.
+	 * Primarily used for information/logical checks.
+	 *
+	 * @param namespace namespace of the key identifying this permission node
+	 * @param path path of the key identifying this permission node
+	 * @return permission node for string type
+	 */
+	static PermissionNode ofString(String namespace, String path) {
+		Objects.requireNonNull(namespace, "namespace can't be null!");
+		Objects.requireNonNull(path, "path can't be null!");
+
+		return ofString(Identifier.fromNamespaceAndPath(namespace, path));
+	}
+
+	/**
+	 * Creates a permission node of custom, codec defined type.
+	 *
+	 * @param key a key identifying this permission
+	 * @param codec a codec used to read the permission value
+	 * @param checkedClass the class representing the custom value, used for cast validation
+	 * @param  the type of permission
+	 * @return permission node for codec-defined type
+	 */
+	static  PermissionNode ofCustom(Identifier key, Codec codec, Class checkedClass) {
+		Objects.requireNonNull(key, "key can't be null!");
+
+		return new PermissionNodeImpl<>(key, codec, i -> checkedClass.isAssignableFrom(i.getClass()));
+	}
+
+	/**
+	 * Creates a permission node of custom, codec defined type.
+	 *
+	 * @param namespace namespace of the key identifying this permission node
+	 * @param path path of the key identifying this permission node
+	 * @param codec a codec used to read the permission value
+	 * @param checkedClass the class representing the custom value, used for cast validation
+	 * @param  the type of permission
+	 * @return permission node for codec-defined type
+	 */
+	static  PermissionNode ofCustom(String namespace, String path, Codec codec, Class checkedClass) {
+		Objects.requireNonNull(namespace, "namespace can't be null!");
+		Objects.requireNonNull(path, "path can't be null!");
+		Objects.requireNonNull(codec, "codec can't be null!");
+		Objects.requireNonNull(checkedClass, "checkedClass can't be null!");
+
+		return ofCustom(Identifier.fromNamespaceAndPath(namespace, path), codec, checkedClass);
+	}
+
+	/**
+	 * Creates a permission node of custom, codec defined type.
+	 *
+	 * @param key a key identifying this permission
+	 * @param codec a codec used to read the permission value
+	 * @param castValidator a predicate used for validating if provided value can be cast to type of this node
+	 * @param  the type of permission
+	 * @return permission node for codec-defined type
+	 */
+	static  PermissionNode ofCustom(Identifier key, Codec codec, Predicate castValidator) {
+		Objects.requireNonNull(key, "key can't be null!");
+		Objects.requireNonNull(codec, "codec can't be null!");
+		Objects.requireNonNull(castValidator, "castValidator can't be null!");
+
+		return new PermissionNodeImpl<>(key, codec, castValidator);
+	}
+
+	/**
+	 * Creates a permission node of custom, codec defined type.
+	 *
+	 * @param namespace namespace of the key identifying this permission node
+	 * @param path path of the key identifying this permission node
+	 * @param codec a codec used to read the permission value
+	 * @param castValidator a predicate used for validating if provided value can be cast to type of this node
+	 * @param  the type of permission
+	 * @return permission node for codec-defined type
+	 */
+	static  PermissionNode ofCustom(String namespace, String path, Codec codec, Predicate castValidator) {
+		Objects.requireNonNull(namespace, "namespace can't be null!");
+		Objects.requireNonNull(path, "path can't be null!");
+
+		return ofCustom(Identifier.fromNamespaceAndPath(namespace, path), codec, castValidator);
+	}
+
+	/**
+	 * Validates and cast a value to the type of permission nodes.
+	 * Should be used when not handling permission resolution with the provided codec.
+	 *
+	 * @param value value to cast, should be compatible with T
+	 * @return The same value as input
+	 * @throws IllegalArgumentException if the provided object isn't valid!
+	 */
+	@Nullable
+	T cast(@Nullable Object value);
+
+	/**
+	 * Returns a key that represents this permission.
+	 *
+	 * @return key identifying this permission.
+	 */
+	Identifier key();
+
+	/**
+	 * Returns a codec, which defined type of this permission.
+	 *
+	 * @return codec representing the type of this permission.
+	 */
+	Codec codec();
+}
diff --git a/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/PermissionPredicates.java b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/PermissionPredicates.java
new file mode 100644
index 0000000000..56b888dc19
--- /dev/null
+++ b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/PermissionPredicates.java
@@ -0,0 +1,115 @@
+/*
+ * 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.api.permission.v1;
+
+import java.util.function.Predicate;
+
+import net.minecraft.resources.Identifier;
+import net.minecraft.server.permissions.PermissionLevel;
+
+/**
+ * Utility methods for creating permission predicates, mainly to be used for commands,
+ * but will work in any context that needs a predicate.
+ *
+ * 
    Example usage:
+ * 
    {@code
+ * CommandRegistrationCallback.EVENT.register((dispatcher, _, _) -> {
+ *     dispatcher.register(literal("modcommand")
+ *     	   // By using direct Identitier
+ *         .requires(PermissionPredicates.require(Identifier.fromNamespaceAndPath("mymod", "command/main"), true))
+ *         .executes(ModCommands::executeMainCommand)
+ *         .then(literal("admin")
+ *             // By using boolean permission node
+ *             .requires(PermissionPredicates.require(PermissionNode.of(Identifier.fromNamespaceAndPath("mymod", "command/admin")), PermissionLevel.ADMINS))
+ *             .executes(ModCommands::executeMainCommand)
+ *         )
+ * });
+ * }
    
+ */
+public final class PermissionPredicates {
+	private PermissionPredicates() { }
+
+	/**
+	 * Predicate checking if context has a permission, defaults to false.
+	 *
+	 * @param permission permission to check
+	 * @param  type of the owner
+	 * @return predicate checking context's permission
+	 */
+	public static  Predicate require(Identifier permission) {
+		return x -> x.checkPermission(permission, false);
+	}
+
+	/**
+	 * Predicate checking if context has a permission.
+	 *
+	 * @param permission permission to check
+	 * @param defaultValue default result of permission check
+	 * @param  type of the owner
+	 * @return predicate checking context's permission
+	 */
+	public static  Predicate require(Identifier permission, boolean defaultValue) {
+		return x -> x.checkPermission(permission, defaultValue);
+	}
+
+	/**
+	 * Predicate checking if context has a permission.
+	 *
+	 * @param permission permission to check
+	 * @param permissionLevel fallback permission level check
+	 * @param  type of the owner
+	 * @return predicate checking context's permission
+	 */
+	public static  Predicate require(Identifier permission, PermissionLevel permissionLevel) {
+		return x -> x.checkPermission(permission, permissionLevel);
+	}
+
+	/**
+	 * Predicate checking if context has a permission, defaults to false.
+	 *
+	 * @param permission permission to check
+	 * @param  type of the owner
+	 * @return predicate checking context's permission
+	 */
+	public static  Predicate require(PermissionNode permission) {
+		return x -> x.checkPermission(permission, false);
+	}
+
+	/**
+	 * Predicate checking if context has a permission.
+	 *
+	 * @param permission permission to check
+	 * @param defaultValue default result of permission check
+	 * @param  type of the owner
+	 * @return predicate checking context's permission
+	 */
+	public static  Predicate require(PermissionNode permission, boolean defaultValue) {
+		return x -> x.checkPermission(permission, defaultValue);
+	}
+
+	/**
+	 * Predicate checking if context has a permission.
+	 *
+	 * @param permission permission to check
+	 * @param permissionLevel fallback permission level check
+	 * @param  type of the owner
+	 * @return predicate checking context's permission
+	 */
+	public static  Predicate require(PermissionNode permission, PermissionLevel permissionLevel) {
+		return x -> x.checkPermission(permission, x.getPermissionContext().permissionLevel().isEqualOrHigherThan(permissionLevel));
+	}
+}
diff --git a/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/package-info.java b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/package-info.java
new file mode 100644
index 0000000000..0a01b12f21
--- /dev/null
+++ b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/api/permission/v1/package-info.java
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+
+/**
+ * Permission API is an api allowing mods to easily interact with each
+ * other in order to know what is and isn't allowed (aka the titular permissions).
+ * This applies to actions done by players, entities and anything else that
+ * might do actions you would want other mods to easily prevent.
+ *
+ * 
    By default, this api provides direct support for checking permissions
+ * for {@link net.minecraft.world.entity.player.Player}, {@link net.minecraft.world.entity.Entity}
+ * and {@link net.minecraft.commands.CommandSourceStack}, but also creation of custom contexts.
+ * To simplify access, these classes now extend the {@link net.fabricmc.fabric.api.permission.v1.PermissionContextOwner}
+ * interface allowing for access to the attached {@link net.fabricmc.fabric.api.permission.v1.PermissionContext} (which also extends that interface)
+ * as well as providing additional methods for sync and async permission checks.
+ * Custom implementations of {@link net.fabricmc.fabric.api.permission.v1.PermissionContextOwner}
+ * and {@link net.fabricmc.fabric.api.permission.v1.PermissionContext} are encouraged in places that require
+ * more flexibility or lazy evaluation.
+ *
+ * 
    Permission themselves are typed, which allows to support more types (aside of most common boolean permissions)
+ * allowing for more flexibility of the interactions.
+ * To create a typed permission node you can use one of the provided static factory methods from
+ * the {@link net.fabricmc.fabric.api.permission.v1.PermissionNode} interface. Permission nodes can be
+ * created at any point in time, either dynamically or statically. You can then use this object
+ * directly as an argument of {@link net.fabricmc.fabric.api.permission.v1.PermissionContextOwner} permission
+ * checking methods.
+ * Boolean permissions can also use {@link net.minecraft.resources.Identifier} directly,
+ * with addition for some extra utility methods on the owner object.
+ *
+ * 
    To define a provider, you need to register callbacks for events defined in {@link net.fabricmc.fabric.api.permission.v1.PermissionEvents}.
+ * By default, you only need to implement the
+ * {@link net.fabricmc.fabric.api.permission.v1.PermissionEvents#ON_REQUEST} event, but other ones might still be good to look into to allow better handling of them.
+ *
+ * 
    Example cases where you might want to use this api:
+ * - Commands that might not make sense to give to all players, but might be required for helpers/moderators/admins,
+ * - Dynamic limits for things based on external factors (for example warps, max protected area size),
+ * - Checking if non-regular in world interaction is allowed within protected area (for example transmuting blocks with a special items, summoning mounts),
+ *
+ * 
    Example code - Checking for command permission:
+ * 
    {@code
+ * CommandRegistrationCallback.EVENT.register((dispatcher, _, _) -> {
+ *     dispatcher.register(literal("modcommand")
+ *     	   // By using direct Identitier
+ *         .requires(PermissionPredicates.require(Identifier.fromNamespaceAndPath("mymod", "command/main"), true))
+ *         .executes(ModCommands::executeMainCommand)
+ *         .then(literal("admin")
+ *             // By using boolean permission node
+ *             .requires(PermissionPredicates.require(PermissionNode.of("mymod", "command/admin"), PermissionLevel.ADMINS))
+ *             .executes(ModCommands::executeMainCommand)
+ *         )
+ * });
+ * }
    
+ *
+ * 
    Example code - Validating if special interaction works in claim at select position.
+ * 
    {@code
+ * // Check side (...)
+ * var canSummonMountPermission = PermissionNode.of("mymod", "can_summon_mount");
+ * public boolean trySummoningMount(Player player, Vec3 pos) {
+ *     var context = player.getPermissionContext().mutable()
+ *     				.set(PermissionContext.BLOCK_POSITION, BlockPos.containing(pos))
+ *     				.set(PermissionContext.POSITION, pos);
+ *
+ *     	if (!context.checkPermission(canSummonMountPermission, true)) {
+ *     	    player.sendSystemMessage(Component.literal("You can't summon your mount here!"));
+ *     	    return false;
+ *     	}
+ *
+ *     	// Mount summoning logic goes here (...)
+ *     	return true;
+ * }
+ *
+ * // Protection mod / validation side (...)
+ * var checkedPermissions = Set.of(Identifier.fromNamespaceAndPath("mymod", "can_summon_mount"), ...);
+ *
+ * PermissionEvents.register((context, permission) -> {
+ * 		if (context.type() != PermissionContext.Type.PLAYER && context.type() != PermissionContext.Type.ENTITY) return null;
+ *
+ * 		var pos = context.get(PermissionContext.BLOCK_POSITION);
+ * 		if (pos == null) return null;
+ *
+ * 		var claim = ClaimMod.getClaimAt(pos);
+ * 		if (claim == null) return null;
+ *
+ *      if (checkedPermissions.contains(permission.key()) && permission.codec() == Codec.BOOL) {
+ *          return (T) Boolean.valueOf(claim.canModifyClaim(context.uuid()));
+ *      }
+ *      // Any other logic...
+ *      return null;
+ * });
+ * }
    
+ */
+@NullMarked
+package net.fabricmc.fabric.api.permission.v1;
+
+import org.jspecify.annotations.NullMarked;
diff --git a/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/CommandPermissionContext.java b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/CommandPermissionContext.java
new file mode 100644
index 0000000000..a14d099b88
--- /dev/null
+++ b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/CommandPermissionContext.java
@@ -0,0 +1,125 @@
+/*
+ * 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.impl.permission;
+
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+import com.mojang.datafixers.util.Pair;
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.permissions.LevelBasedPermissionSet;
+import net.minecraft.server.permissions.Permission;
+import net.minecraft.server.permissions.PermissionLevel;
+import net.minecraft.server.permissions.PermissionSet;
+import net.minecraft.server.permissions.Permissions;
+
+import net.fabricmc.fabric.api.permission.v1.PermissionContext;
+
+public class CommandPermissionContext implements PermissionContext {
+	private static final List> PERMISSION_LEVEL_CHECKS = List.of(
+			Pair.of(PermissionLevel.MODERATORS, Permissions.COMMANDS_MODERATOR),
+			Pair.of(PermissionLevel.GAMEMASTERS, Permissions.COMMANDS_GAMEMASTER),
+			Pair.of(PermissionLevel.ADMINS, Permissions.COMMANDS_ADMIN),
+			Pair.of(PermissionLevel.OWNERS, Permissions.COMMANDS_OWNER)
+	);
+
+	private final CommandSourceStack source;
+	private @Nullable PermissionLevel permissionLevel;
+
+	public CommandPermissionContext(CommandSourceStack source) {
+		this.source = source;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public @Nullable  T get(Key key) {
+		if (key == PermissionContext.NAME) {
+			return (T) this.source.getTextName();
+		} else if (key == PermissionContext.POSITION) {
+			return (T) this.source.getPosition();
+		} else if (key == PermissionContext.BLOCK_POSITION) {
+			return (T) BlockPos.containing(this.source.getPosition());
+		} else if (key == PermissionContext.LEVEL) {
+			return (T) this.source.getLevel();
+		} else if (key == PermissionContext.ENTITY) {
+			return (T) this.source.getEntity();
+		} else if (key == PermissionContext.COMMAND_SOURCE_STACK) {
+			return (T) this.source;
+		} else if (key == PermissionContext.SERVER) {
+			return (T) this.source.getServer();
+		}
+
+		return null;
+	}
+
+	@Override
+	public PermissionLevel permissionLevel() {
+		if (this.permissionLevel == null) {
+			this.permissionLevel = extractPermissionLevel(this.source.permissions());
+		}
+
+		return this.permissionLevel;
+	}
+
+	public static PermissionLevel extractPermissionLevel(PermissionSet permissions) {
+		if (permissions instanceof LevelBasedPermissionSet levelBasedPermissionSet) {
+			return levelBasedPermissionSet.level();
+		} else if (permissions == PermissionSet.ALL_PERMISSIONS) {
+			return PermissionLevel.OWNERS;
+		} else if (permissions == PermissionSet.NO_PERMISSIONS) {
+			return PermissionLevel.ALL;
+		}
+
+		PermissionLevel level = PermissionLevel.ALL;
+
+		// Search for closest permission level, starting from the lowest to highest.
+		// Not the ideal solution, but should handle any custom PermissionSet implementation.
+		for (Pair pair : PERMISSION_LEVEL_CHECKS) {
+			if (!permissions.hasPermission(pair.getSecond())) {
+				break;
+			}
+
+			level = pair.getFirst();
+		}
+
+		return level;
+	}
+
+	@Override
+	public Set> keys() {
+		return this.source.getEntity() != null ? PermissionContextKey.DEFAULT_COMMAND_ENTITY_KEYS : PermissionContextKey.DEFAULT_COMMAND_KEYS;
+	}
+
+	@Override
+	public Type type() {
+		return ((Extension) this.source).fabric_getType();
+	}
+
+	@Override
+	public UUID uuid() {
+		return ((Extension) this.source).fabric_getUuid();
+	}
+
+	public interface Extension {
+		Type fabric_getType();
+		UUID fabric_getUuid();
+	}
+}
diff --git a/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/CustomPermissionContext.java b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/CustomPermissionContext.java
new file mode 100644
index 0000000000..08c917f9c0
--- /dev/null
+++ b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/CustomPermissionContext.java
@@ -0,0 +1,57 @@
+/*
+ * 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.impl.permission;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.server.permissions.PermissionLevel;
+
+import net.fabricmc.fabric.api.permission.v1.MutablePermissionContext;
+
+public record CustomPermissionContext(UUID uuid, Type type, PermissionLevel permissionLevel, Map, Object> overrides) implements MutablePermissionContext {
+	public CustomPermissionContext(UUID uuid, Type type, PermissionLevel permissionLevel) {
+		this(uuid, type, permissionLevel, new HashMap<>());
+	}
+
+	@Override
+	public  MutablePermissionContext set(Key key, @Nullable T value) {
+		if (value != null) {
+			this.overrides.put(key, value);
+		} else {
+			this.overrides.remove(key);
+		}
+
+		return this;
+	}
+
+	@Override
+	public @Nullable  T get(Key key) {
+		//noinspection unchecked
+		return (T) this.overrides.get(key);
+	}
+
+	@Override
+	public Set> keys() {
+		return Collections.unmodifiableSet(this.overrides.keySet());
+	}
+}
diff --git a/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/EntityPermissionContext.java b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/EntityPermissionContext.java
new file mode 100644
index 0000000000..bfd0d6ced0
--- /dev/null
+++ b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/EntityPermissionContext.java
@@ -0,0 +1,93 @@
+/*
+ * 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.impl.permission;
+
+import java.util.Set;
+import java.util.UUID;
+
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.permissions.PermissionLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
+
+import net.fabricmc.fabric.api.permission.v1.PermissionContext;
+
+public class EntityPermissionContext implements PermissionContext {
+	private final Entity entity;
+	private final Type type;
+	private final Set> keys;
+	private final @Nullable MinecraftServer server;
+
+	public EntityPermissionContext(Entity entity) {
+		this.entity = entity;
+		this.type = entity instanceof Player ? Type.PLAYER : Type.ENTITY;
+		this.server = entity.level().getServer() != null ? entity.level().getServer() : null;
+
+		if (this.entity instanceof ServerPlayer) {
+			this.keys = PermissionContextKey.DEFAULT_COMMAND_ENTITY_KEYS;
+		} else if (this.server != null) {
+			this.keys = PermissionContextKey.DEFAULT_SERVER_ENTITY_KEYS;
+		} else {
+			this.keys = PermissionContextKey.DEFAULT_ENTITY_KEYS;
+		}
+	}
+
+	@Override
+	public UUID uuid() {
+		return this.entity.getUUID();
+	}
+
+	@SuppressWarnings({"unchecked", "resource"})
+	@Override
+	public @Nullable  T get(Key key) {
+		if (key == PermissionContext.NAME) {
+			return (T) this.entity.getPlainTextName();
+		} else if (key == PermissionContext.POSITION) {
+			return (T) this.entity.position();
+		} else if (key == PermissionContext.BLOCK_POSITION) {
+			return (T) this.entity.blockPosition();
+		} else if (key == PermissionContext.LEVEL) {
+			return (T) this.entity.level();
+		} else if (key == PermissionContext.ENTITY) {
+			return (T) this.entity;
+		} else if (key == PermissionContext.COMMAND_SOURCE_STACK) {
+			return (T) this.entity instanceof ServerPlayer player ? (T) player.commandSource() : null;
+		} else if (key == PermissionContext.SERVER) {
+			return (T) this.server;
+		}
+
+		return null;
+	}
+
+	@Override
+	public PermissionLevel permissionLevel() {
+		return this.entity instanceof Player player ? CommandPermissionContext.extractPermissionLevel(player.permissions()) : PermissionLevel.ALL;
+	}
+
+	@Override
+	public Set> keys() {
+		return this.keys;
+	}
+
+	@Override
+	public Type type() {
+		return type;
+	}
+}
diff --git a/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/OverriddenPermissionContext.java b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/OverriddenPermissionContext.java
new file mode 100644
index 0000000000..015210a512
--- /dev/null
+++ b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/OverriddenPermissionContext.java
@@ -0,0 +1,77 @@
+/*
+ * 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.impl.permission;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import com.google.common.collect.Sets;
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.server.permissions.PermissionLevel;
+
+import net.fabricmc.fabric.api.permission.v1.MutablePermissionContext;
+import net.fabricmc.fabric.api.permission.v1.PermissionContext;
+
+public record OverriddenPermissionContext(PermissionContext context, Map, Object> overrides) implements MutablePermissionContext {
+	public OverriddenPermissionContext(PermissionContext context) {
+		this(context, new HashMap<>());
+	}
+
+	@Override
+	public  MutablePermissionContext set(Key key, @Nullable T value) {
+		if (value != null) {
+			this.overrides.put(key, value);
+		} else {
+			this.overrides.remove(key);
+		}
+
+		return this;
+	}
+
+	@Override
+	public UUID uuid() {
+		return this.context.uuid();
+	}
+
+	@Override
+	public Type type() {
+		return this.context.type();
+	}
+
+	@Override
+	public @Nullable  T get(Key key) {
+		if (this.overrides.containsKey(key)) {
+			//noinspection unchecked
+			return (T) this.overrides.get(key);
+		}
+
+		return this.context.get(key);
+	}
+
+	@Override
+	public PermissionLevel permissionLevel() {
+		return this.context.permissionLevel();
+	}
+
+	@Override
+	public Set> keys() {
+		return Sets.union(this.overrides.keySet(), this.context.keys());
+	}
+}
diff --git a/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/PermissionContextKey.java b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/PermissionContextKey.java
new file mode 100644
index 0000000000..e41fda37cf
--- /dev/null
+++ b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/PermissionContextKey.java
@@ -0,0 +1,56 @@
+/*
+ * 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.impl.permission;
+
+import java.util.Set;
+
+import com.google.common.collect.Sets;
+
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.core.BlockPos;
+import net.minecraft.resources.Identifier;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
+
+import net.fabricmc.fabric.api.permission.v1.PermissionContext;
+
+public record PermissionContextKey(Identifier id) implements PermissionContext.Key {
+	public static final PermissionContext.Key NAME = fabricKey("name");
+	public static final PermissionContext.Key POSITION = fabricKey("position");
+	public static final PermissionContext.Key BLOCK_POSITION = fabricKey("block_position");
+	public static final PermissionContext.Key ENTITY = fabricKey("entity");
+	public static final PermissionContext.Key COMMAND_SOURCE_STACK = fabricKey("command_source_stack");
+	public static final PermissionContext.Key LEVEL = fabricKey("level");
+	public static final PermissionContext.Key SERVER = fabricKey("server");
+
+	public static final Set> DEFAULT_COMMON_KEYS = Set.of(POSITION, BLOCK_POSITION, LEVEL, NAME);
+	public static final Set> DEFAULT_ENTITY_KEYS = Sets.union(DEFAULT_COMMON_KEYS, Set.of(ENTITY));
+	public static final Set> DEFAULT_SERVER_ENTITY_KEYS = Sets.union(DEFAULT_COMMON_KEYS, Set.of(ENTITY, SERVER));
+	public static final Set> DEFAULT_COMMAND_KEYS = Sets.union(DEFAULT_COMMON_KEYS, Set.of(COMMAND_SOURCE_STACK, SERVER));
+	public static final Set> DEFAULT_COMMAND_ENTITY_KEYS = Sets.union(DEFAULT_COMMON_KEYS, Set.of(ENTITY, COMMAND_SOURCE_STACK, SERVER));
+
+	private static  PermissionContext.Key fabricKey(String path) {
+		return new PermissionContextKey<>(Identifier.fromNamespaceAndPath("fabric", path));
+	}
+
+	@Override
+	public String toString() {
+		return "PermissionContext.Key[" + id + "]";
+	}
+}
diff --git a/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/PermissionNodeImpl.java b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/PermissionNodeImpl.java
new file mode 100644
index 0000000000..e06de25d3e
--- /dev/null
+++ b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/impl/permission/PermissionNodeImpl.java
@@ -0,0 +1,45 @@
+/*
+ * 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.impl.permission;
+
+import java.util.function.Predicate;
+
+import com.mojang.serialization.Codec;
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.resources.Identifier;
+
+import net.fabricmc.fabric.api.permission.v1.PermissionNode;
+
+public record PermissionNodeImpl(Identifier key, Codec codec, Predicate castPredicate) implements PermissionNode {
+	public static final Predicate BOOLEAN = o -> o.getClass() == Boolean.class;
+	public static final Predicate INTEGER = o -> o.getClass() == Integer.class;
+	public static final Predicate STRING = o -> o.getClass() == String.class;
+
+	@Override
+	@Nullable
+	public T cast(@Nullable Object value) {
+		if (value == null) {
+			return null;
+		} else if (castPredicate.test(value)) {
+			//noinspection unchecked
+			return (T) value;
+		}
+
+		throw new IllegalArgumentException("The provided value is not compatible with this node's type!");
+	}
+}
diff --git a/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/mixin/permission/CommandSourceStackMixin.java b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/mixin/permission/CommandSourceStackMixin.java
new file mode 100644
index 0000000000..2571b60c09
--- /dev/null
+++ b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/mixin/permission/CommandSourceStackMixin.java
@@ -0,0 +1,88 @@
+/*
+ * 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.mixin.permission;
+
+import java.util.UUID;
+
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.commands.CommandSource;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.permissions.PermissionSet;
+import net.minecraft.util.Util;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.phys.Vec2;
+import net.minecraft.world.phys.Vec3;
+
+import net.fabricmc.fabric.api.permission.v1.PermissionContext;
+import net.fabricmc.fabric.api.permission.v1.PermissionContextOwner;
+import net.fabricmc.fabric.impl.permission.CommandPermissionContext;
+
+@Mixin(CommandSourceStack.class)
+public abstract class CommandSourceStackMixin implements PermissionContextOwner, CommandPermissionContext.Extension {
+	@Unique
+	private final PermissionContext context = new CommandPermissionContext((CommandSourceStack) ((Object) this));
+	@Unique
+	private PermissionContext.Type sourceType = PermissionContext.Type.SYSTEM;
+	@Unique
+	private UUID sourceUuid = Util.NIL_UUID;
+
+	@Inject(method = "(Lnet/minecraft/commands/CommandSource;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec2;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/server/permissions/PermissionSet;Ljava/lang/String;Lnet/minecraft/network/chat/Component;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/world/entity/Entity;)V", at = @At("TAIL"))
+	private void storeOriginalSource(CommandSource source, Vec3 position, Vec2 rotation, ServerLevel level, PermissionSet permissions, String textName, Component displayName, MinecraftServer server, Entity entity, CallbackInfo ci) {
+		this.sourceType = switch (entity) {
+		case Player _ -> PermissionContext.Type.PLAYER;
+		case Entity _ -> PermissionContext.Type.ENTITY;
+		case null -> PermissionContext.Type.SYSTEM;
+		};
+		this.sourceUuid = switch (entity) {
+		case Entity _ -> entity.getUUID();
+		case null -> Util.NIL_UUID;
+		};
+	}
+
+	@SuppressWarnings("DataFlowIssue")
+	@ModifyReturnValue(method = "/^with/ desc=/CommandSourceStack;$/", at = @At("RETURN"))
+	private CommandSourceStack copyOriginalOwner(CommandSourceStack result) {
+		((CommandSourceStackMixin) (Object) result).sourceUuid = this.sourceUuid;
+		((CommandSourceStackMixin) (Object) result).sourceType = this.sourceType;
+		return result;
+	}
+
+	@Override
+	public PermissionContext.Type fabric_getType() {
+		return this.sourceType;
+	}
+
+	@Override
+	public UUID fabric_getUuid() {
+		return this.sourceUuid;
+	}
+
+	@Override
+	public PermissionContext getPermissionContext() {
+		return this.context;
+	}
+}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BuiltInRegistriesMixin.java b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/mixin/permission/EntityMixin.java
similarity index 52%
rename from fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BuiltInRegistriesMixin.java
rename to fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/mixin/permission/EntityMixin.java
index 570a917ebf..6d12ef42a6 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BuiltInRegistriesMixin.java
+++ b/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/mixin/permission/EntityMixin.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.registry.sync;
+package net.fabricmc.fabric.mixin.permission;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
@@ -22,19 +22,26 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.Level;
 
-@Mixin(BuiltInRegistries.class)
-public class BuiltInRegistriesMixin {
+import net.fabricmc.fabric.api.permission.v1.PermissionContext;
+import net.fabricmc.fabric.api.permission.v1.PermissionContextOwner;
+import net.fabricmc.fabric.impl.permission.EntityPermissionContext;
+
+@Mixin(Entity.class)
+public abstract class EntityMixin implements PermissionContextOwner {
 	@Unique
-	private static boolean hasInitialised = false;
+	private PermissionContext context;
 
-	@Inject(method = "createContents", at = @At("HEAD"), cancellable = true)
-	private static void init(CallbackInfo ci) {
-		if (hasInitialised) {
-			ci.cancel();
-		}
+	@Inject(method = "", at = @At("TAIL"))
+	private void createPermissionContext(EntityType type, Level level, CallbackInfo ci) {
+		this.context = new EntityPermissionContext((Entity) ((Object) this));
+	}
 
-		hasInitialised = true;
+	@Override
+	public PermissionContext getPermissionContext() {
+		return this.context;
 	}
 }
diff --git a/fabric-crash-report-info-v1/src/main/resources/assets/fabric-crash-report-info-v1/icon.png b/fabric-permission-api-v1/src/main/resources/assets/fabric-permission-api-v1/icon.png
similarity index 100%
rename from fabric-crash-report-info-v1/src/main/resources/assets/fabric-crash-report-info-v1/icon.png
rename to fabric-permission-api-v1/src/main/resources/assets/fabric-permission-api-v1/icon.png
diff --git a/fabric-permission-api-v1/src/main/resources/fabric-permission-api-v1.classtweaker b/fabric-permission-api-v1/src/main/resources/fabric-permission-api-v1.classtweaker
new file mode 100644
index 0000000000..f2f7960245
--- /dev/null
+++ b/fabric-permission-api-v1/src/main/resources/fabric-permission-api-v1.classtweaker
@@ -0,0 +1,4 @@
+classTweaker	v1	official
+
+transitive-inject-interface	net/minecraft/commands/CommandSourceStack	net/fabricmc/fabric/api/permission/v1/PermissionContextOwner
+transitive-inject-interface	net/minecraft/world/entity/Entity	net/fabricmc/fabric/api/permission/v1/PermissionContextOwner
diff --git a/fabric-permission-api-v1/src/main/resources/fabric-permission-api-v1.mixins.json b/fabric-permission-api-v1/src/main/resources/fabric-permission-api-v1.mixins.json
new file mode 100644
index 0000000000..14b25e44a1
--- /dev/null
+++ b/fabric-permission-api-v1/src/main/resources/fabric-permission-api-v1.mixins.json
@@ -0,0 +1,15 @@
+{
+  "required": true,
+  "package": "net.fabricmc.fabric.mixin.permission",
+  "compatibilityLevel": "JAVA_25",
+  "mixins": [
+    "CommandSourceStackMixin",
+    "EntityMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "overwrites": {
+    "requireAnnotations": true
+  }
+}
diff --git a/fabric-crash-report-info-v1/src/main/resources/fabric.mod.json b/fabric-permission-api-v1/src/main/resources/fabric.mod.json
similarity index 61%
rename from fabric-crash-report-info-v1/src/main/resources/fabric.mod.json
rename to fabric-permission-api-v1/src/main/resources/fabric.mod.json
index e3db50e15d..4ae1258d82 100644
--- a/fabric-crash-report-info-v1/src/main/resources/fabric.mod.json
+++ b/fabric-permission-api-v1/src/main/resources/fabric.mod.json
@@ -1,11 +1,11 @@
 {
   "schemaVersion": 1,
-  "id": "fabric-crash-report-info-v1",
-  "name": "Fabric Crash Report Info (v1)",
+  "id": "fabric-permission-api-v1",
+  "name": "Fabric Permission API (v1)",
   "version": "${version}",
   "environment": "*",
   "license": "Apache-2.0",
-  "icon": "assets/fabric-crash-report-info-v1/icon.png",
+  "icon": "assets/fabric-permission-api-v1/icon.png",
   "contact": {
     "homepage": "https://fabricmc.net",
     "irc": "irc://irc.esper.net:6667/fabric",
@@ -18,10 +18,13 @@
   "depends": {
     "fabricloader": ">=0.18.4"
   },
-  "description": "Adds Fabric-related debug info to crash reports.",
+  "entrypoints": {
+  },
+  "description": "General-use permission api",
   "mixins": [
-    "fabric-crash-report-info-v1.mixins.json"
+    "fabric-permission-api-v1.mixins.json"
   ],
+  "accessWidener": "fabric-permission-api-v1.classtweaker",
   "custom": {
     "fabric-api:module-lifecycle": "stable"
   }
diff --git a/fabric-permission-api-v1/src/test/java/net/fabricmc/fabric/test/permission/unit/PermissionContextTests.java b/fabric-permission-api-v1/src/test/java/net/fabricmc/fabric/test/permission/unit/PermissionContextTests.java
new file mode 100644
index 0000000000..dadd28198b
--- /dev/null
+++ b/fabric-permission-api-v1/src/test/java/net/fabricmc/fabric/test/permission/unit/PermissionContextTests.java
@@ -0,0 +1,116 @@
+/*
+ * 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.permission.unit;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import com.mojang.serialization.MapCodec;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import net.minecraft.resources.Identifier;
+import net.minecraft.server.permissions.PermissionLevel;
+import net.minecraft.util.Util;
+
+import net.fabricmc.fabric.api.permission.v1.MutablePermissionContext;
+import net.fabricmc.fabric.api.permission.v1.PermissionContext;
+import net.fabricmc.fabric.api.permission.v1.PermissionNode;
+
+public class PermissionContextTests {
+	private static final PermissionContext.Key OBJECT_KEY = PermissionContext.key(Identifier.fromNamespaceAndPath("test", "object"));
+	private MutablePermissionContext context;
+
+	@BeforeEach
+	void setUp() {
+		context = PermissionContext.create(Util.NIL_UUID, PermissionContext.Type.OTHER, PermissionLevel.ALL);
+	}
+
+	// Test storing and retrieving values.
+	@Test
+	void storeAndRetrieve() {
+		var object = new Object();
+
+		assertNull(context.get(OBJECT_KEY));
+
+		context.set(OBJECT_KEY, object);
+		assertEquals(context.get(OBJECT_KEY), object);
+
+		context.set(OBJECT_KEY, null);
+		assertNull(context.get(OBJECT_KEY));
+
+		assertNull(context.get(PermissionContext.ENTITY));
+	}
+
+	// Test orElse fallback methods.
+	@Test
+	void orElse() {
+		var a = new Object();
+		var b = new Object();
+
+		assertEquals(context.orElse(OBJECT_KEY, b), b);
+
+		context.set(OBJECT_KEY, a);
+		assertEquals(context.orElse(OBJECT_KEY, b), a);
+	}
+
+	// Test casting and it's object validation.
+	@Test
+	void testCasts() {
+		interface BaseType { }
+
+		record ImplementedType() implements BaseType { }
+
+		record Implemented2Type() implements BaseType { }
+
+		var typed = new ImplementedType();
+		var typed2 = new Implemented2Type();
+		var object = new Object();
+
+		PermissionNode booleanPermission = PermissionNode.of("test", "boolean");
+		assertDoesNotThrow(() -> assertNull(booleanPermission.cast(null)));
+		assertDoesNotThrow(() -> assertNotNull(booleanPermission.cast(true)));
+		assertDoesNotThrow(() -> assertNotNull(booleanPermission.cast(Boolean.FALSE)));
+		assertThrows(IllegalArgumentException.class, () -> booleanPermission.cast(typed));
+
+		PermissionNode stringPermission = PermissionNode.ofString("test", "string");
+		assertDoesNotThrow(() -> assertNull(stringPermission.cast(null)));
+		assertDoesNotThrow(() -> assertNotNull(stringPermission.cast("Right type")));
+		assertThrows(IllegalArgumentException.class, () -> stringPermission.cast(typed));
+
+		PermissionNode intPermission = PermissionNode.ofInteger("test", "int");
+		assertDoesNotThrow(() -> assertNull(intPermission.cast(null)));
+		assertDoesNotThrow(() -> assertNotNull(intPermission.cast(1234)));
+		assertDoesNotThrow(() -> assertNotNull(intPermission.cast(Integer.valueOf(5))));
+		assertThrows(IllegalArgumentException.class, () -> intPermission.cast(typed));
+
+		PermissionNode customGenericPermission = PermissionNode.ofCustom("test", "custom_generic", MapCodec.unitCodec(object), Object.class);
+		assertDoesNotThrow(() -> assertNull(customGenericPermission.cast(null)));
+		assertDoesNotThrow(() -> assertNotNull(customGenericPermission.cast(1234)));
+		assertDoesNotThrow(() -> assertNotNull(customGenericPermission.cast(object)));
+		assertDoesNotThrow(() -> assertNotNull(customGenericPermission.cast(typed)));
+
+		PermissionNode customSpecificPermission = PermissionNode.ofCustom("test", "custom_specific", MapCodec.unitCodec(typed), BaseType.class);
+		assertDoesNotThrow(() -> assertNull(customSpecificPermission.cast(null)));
+		assertDoesNotThrow(() -> assertNotNull(customSpecificPermission.cast(typed)));
+		assertDoesNotThrow(() -> assertNotNull(customSpecificPermission.cast(typed2)));
+		assertThrows(IllegalArgumentException.class, () -> customSpecificPermission.cast(object));
+	}
+}
diff --git a/fabric-permission-api-v1/src/testmod/java/net/fabricmc/fabric/test/permission/PermissionTestMod.java b/fabric-permission-api-v1/src/testmod/java/net/fabricmc/fabric/test/permission/PermissionTestMod.java
new file mode 100644
index 0000000000..47fd7e1f3d
--- /dev/null
+++ b/fabric-permission-api-v1/src/testmod/java/net/fabricmc/fabric/test/permission/PermissionTestMod.java
@@ -0,0 +1,218 @@
+/*
+ * 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.permission;
+
+import static net.minecraft.commands.Commands.argument;
+import static net.minecraft.commands.Commands.literal;
+
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.logging.LogUtils;
+import com.mojang.serialization.Codec;
+import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.entity.EntityJoinLevelEvent;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+import org.slf4j.Logger;
+
+import net.minecraft.commands.CommandBuildContext;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.commands.arguments.IdentifierArgument;
+import net.minecraft.commands.arguments.NbtTagArgument;
+import net.minecraft.core.BlockPos;
+import net.minecraft.nbt.Tag;
+import net.minecraft.nbt.TextComponentTagVisitor;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import net.minecraft.server.permissions.PermissionLevel;
+import net.minecraft.server.players.NameAndId;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Blocks;
+
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
+import net.fabricmc.fabric.api.permission.v1.MutablePermissionContext;
+import net.fabricmc.fabric.api.permission.v1.PermissionContext;
+import net.fabricmc.fabric.api.permission.v1.PermissionEvents;
+import net.fabricmc.fabric.api.permission.v1.PermissionNode;
+import net.fabricmc.fabric.api.permission.v1.PermissionPredicates;
+import net.fabricmc.fabric.test.permission.example.PermissionMap;
+
+public class PermissionTestMod implements ModInitializer, PermissionEvents.OnRequest, PermissionEvents.PrepareOfflinePlayer {
+	private static final Logger LOGGER = LogUtils.getLogger();
+
+	private static final PermissionContext.Key OBJECT_KEY = PermissionContext.key(Identifier.fromNamespaceAndPath("test", "object_key"));
+
+	private static final PermissionNode ON_STONE = PermissionNode.of(Identifier.fromNamespaceAndPath("test", "on_stone"));
+	private static final PermissionNode IS_ENTITY = PermissionNode.of(Identifier.fromNamespaceAndPath("test", "is_entity"));
+	private static final PermissionNode ABOVE_SEA = PermissionNode.of(Identifier.fromNamespaceAndPath("test", "above_sea"));
+	private static final PermissionNode MAGIC = PermissionNode.ofInteger(Identifier.fromNamespaceAndPath("test", "magic"));
+
+	private final PermissionMap globalPermissionMap = new PermissionMap();
+
+	@Override
+	public void onInitialize() {
+		CommandRegistrationCallback.EVENT.register(this::registerCommands);
+		PermissionEvents.ON_REQUEST.register(this);
+		PermissionEvents.PREPARE_OFFLINE_PLAYER.register(this);
+
+		this.runBasicTest();
+		ServerLifecycleEvents.SERVER_STARTED.register(this::runServerTest);
+
+		NeoForge.EVENT_BUS.addListener(EntityJoinLevelEvent.class, e -> {
+			if (e.getEntity() instanceof ServerPlayer serverPlayer) {
+				runPlayerTest(serverPlayer.connection);
+			}
+		});
+	}
+
+	private void runBasicTest() {
+		int value = RandomSource.createThreadLocalInstance().nextInt();
+
+		this.globalPermissionMap.set(MAGIC.key(), value);
+
+		PermissionContext context = PermissionContext.create(UUID.randomUUID(), PermissionContext.Type.OTHER, PermissionLevel.ADMINS);
+
+		int valueMainCheck = context.checkPermission(MAGIC, value + 1);
+
+		if (valueMainCheck != value) {
+			throw new IllegalStateException("Permission check failed! valueMainCheck != value, d=" + (valueMainCheck - value));
+		}
+	}
+
+	private void runServerTest(MinecraftServer server) {
+		PermissionContext.offlinePlayer(NameAndId.createOffline("TinyPotato"), server).thenAcceptAsync(context -> {
+			if (context.get(OBJECT_KEY) == null) {
+				throw new IllegalStateException("Context wasn't modified correctly!");
+			}
+
+			int value = RandomSource.createThreadLocalInstance().nextInt();
+			this.globalPermissionMap.set(MAGIC.key(), value);
+
+			int valueMainCheck = context.checkPermission(MAGIC, value + 1);
+
+			if (valueMainCheck != value) {
+				throw new IllegalStateException("Permission check failed! valueMainCheck != value, d=" + (valueMainCheck - value));
+			}
+		}, server);
+	}
+
+	@SuppressWarnings("ConstantValue")
+	private void runPlayerTest(ServerGamePacketListenerImpl listener) {
+		if (listener.player.getPermissionContext().permissionLevel() == null) {
+			throw new IllegalStateException("Player entity permission level is null!");
+		}
+
+		if (listener.player.createCommandSourceStack().getPermissionContext().permissionLevel() == null) {
+			throw new IllegalStateException("Player command source permission level is null!");
+		}
+	}
+
+	private void registerCommands(CommandDispatcher dispatcher, CommandBuildContext context, Commands.CommandSelection selection) {
+		dispatcher.register(literal("permissions")
+				.then(
+						literal("set").then(argument("permission", IdentifierArgument.id()).then(argument("value", NbtTagArgument.nbtTag()).executes(this::setPermissionValue)))
+				)
+				.then(
+						literal("get").then(argument("permission", IdentifierArgument.id()).executes(this::getPermissionValue))
+				)
+				.then(
+						literal("check_bool").then(argument("permission", IdentifierArgument.id()).executes(this::checkPermissionValue))
+				)
+				.then(
+						literal("on_stone_command").requires(PermissionPredicates.require(ON_STONE, false)).executes(this::onStoneCommand)
+				)
+		);
+	}
+
+	private int setPermissionValue(CommandContext context) {
+		Identifier id = IdentifierArgument.getId(context, "permission");
+		Tag value = NbtTagArgument.getNbtTag(context, "value");
+
+		if (context.getSource().getPlayer() instanceof ServerPlayer player) {
+			context.getSource().getServer().getPlayerList().sendPlayerPermissionLevel(player);
+		}
+
+		this.globalPermissionMap.set(id, value);
+		return 1;
+	}
+
+	private int getPermissionValue(CommandContext context) {
+		Identifier id = IdentifierArgument.getId(context, "permission");
+		Tag value = this.globalPermissionMap.getRaw(id);
+
+		context.getSource().sendSystemMessage(value != null ? new TextComponentTagVisitor("", TextComponentTagVisitor.RichStyling.INSTANCE).visit(value) : Component.literal(""));
+		return 1;
+	}
+
+	private int checkPermissionValue(CommandContext context) {
+		Identifier id = IdentifierArgument.getId(context, "permission");
+
+		context.getSource().sendSystemMessage(Component.literal(context.getSource().checkPermission(id).getSerializedName()));
+		return 1;
+	}
+
+	private int onStoneCommand(CommandContext context) {
+		context.getSource().sendSystemMessage(Component.literal("You got the stone permission"));
+		return 1;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public @Nullable  T handlePermissionRequest(PermissionContext context, PermissionNode permission) {
+		Level level = context.get(PermissionContext.LEVEL);
+		BlockPos blockPos = context.get(PermissionContext.BLOCK_POSITION);
+		Entity entity = context.get(PermissionContext.ENTITY);
+
+		if (permission.codec() == Codec.BOOL) {
+			if (permission.equals(ON_STONE) && level != null && blockPos != null) {
+				return permission.cast(level.getBlockState(blockPos.below()).is(Blocks.STONE));
+			}
+
+			if (permission.equals(IS_ENTITY)) {
+				return permission.cast(entity != null);
+			}
+
+			if (permission.equals(ABOVE_SEA) && blockPos != null && level != null) {
+				return permission.cast(level.getSeaLevel() < blockPos.getY());
+			}
+		}
+
+		// This isn't needed since PermissionMap uses codec, but it's done to make sure it works™
+		return permission.cast(this.globalPermissionMap.get(permission.key(), permission.codec()));
+	}
+
+	@Override
+	public @NonNull CompletableFuture<@Nullable Consumer> prepareOfflinePlayer(PermissionContext context, MinecraftServer server) {
+		LOGGER.info("Preparing for offline player check for {} (also known as {})!", context.uuid(), context.get(PermissionContext.NAME));
+		return CompletableFuture.completedFuture(mutCtx -> {
+			mutCtx.set(OBJECT_KEY, new Object());
+			LOGGER.info("Modified context for {}!", mutCtx.uuid());
+		});
+	}
+}
diff --git a/fabric-permission-api-v1/src/testmod/java/net/fabricmc/fabric/test/permission/example/PermissionMap.java b/fabric-permission-api-v1/src/testmod/java/net/fabricmc/fabric/test/permission/example/PermissionMap.java
new file mode 100644
index 0000000000..49b0dadc91
--- /dev/null
+++ b/fabric-permission-api-v1/src/testmod/java/net/fabricmc/fabric/test/permission/example/PermissionMap.java
@@ -0,0 +1,87 @@
+/*
+ * 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.permission.example;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import com.mojang.serialization.Codec;
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.nbt.ByteTag;
+import net.minecraft.nbt.IntTag;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.nbt.StringTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.resources.Identifier;
+
+public record PermissionMap(Map permissions) {
+	public PermissionMap() {
+		this(new HashMap<>());
+	}
+
+	public void set(Identifier identifier, Tag tag) {
+		this.permissions.put(identifier, new PermissionValue(tag));
+	}
+
+	public void set(Identifier identifier, boolean val) {
+		this.permissions.put(identifier, new PermissionValue(ByteTag.valueOf(val)));
+	}
+
+	public void set(Identifier identifier, int val) {
+		this.permissions.put(identifier, new PermissionValue(IntTag.valueOf(val)));
+	}
+
+	public void set(Identifier identifier, String val) {
+		this.permissions.put(identifier, new PermissionValue(StringTag.valueOf(val)));
+	}
+
+	@Nullable
+	public  T get(Identifier identifier, Codec codec) {
+		PermissionValue value = this.permissions.get(identifier);
+		return value != null ? value.get(codec) : null;
+	}
+
+	public Tag getRaw(Identifier identifier) {
+		PermissionValue value = this.permissions.get(identifier);
+		return value != null ? value.tag() : null;
+	}
+
+	public record PermissionValue(Tag tag, Map, Optional> map) {
+		public PermissionValue(Tag tag) {
+			this(tag, Collections.synchronizedMap(new IdentityHashMap<>()));
+		}
+
+		@SuppressWarnings("unchecked")
+		@Nullable
+		public  T get(Codec codec) {
+			Optional val = (Optional) this.map.get(codec);
+
+			//noinspection OptionalAssignedToNull
+			if (val != null) {
+				return val.orElse(null);
+			}
+
+			Optional parse = codec.parse(NbtOps.INSTANCE, tag).result();
+			this.map.put(codec, (Optional) parse);
+			return parse.orElse(null);
+		}
+	}
+}
diff --git a/fabric-permission-api-v1/src/testmod/resources/fabric.mod.json b/fabric-permission-api-v1/src/testmod/resources/fabric.mod.json
new file mode 100644
index 0000000000..157248335d
--- /dev/null
+++ b/fabric-permission-api-v1/src/testmod/resources/fabric.mod.json
@@ -0,0 +1,19 @@
+{
+  "schemaVersion": 1,
+  "id": "fabric-permission-api-v1-testmod",
+  "name": "Fabric Permission API (v1) Test Mod",
+  "version": "1.0.0",
+  "environment": "*",
+  "license": "Apache-2.0",
+  "depends": {
+    "fabric-permission-api-v1": "*"
+  },
+  "entrypoints": {
+    "main": [
+      "net.fabricmc.fabric.test.permission.PermissionTestMod"
+    ]
+  },
+  "custom": {
+    "fabric-api:module-lifecycle": "experimental"
+  }
+}
diff --git a/fabric-recipe-api-v1/build.gradle b/fabric-recipe-api-v1/build.gradle
index c00c3fd0a6..993c6a8d3d 100644
--- a/fabric-recipe-api-v1/build.gradle
+++ b/fabric-recipe-api-v1/build.gradle
@@ -6,7 +6,7 @@ loom {
 
 moduleDependencies(project, [
 	':fabric-lifecycle-events-v1',
-	'fabric-networking-api-v1',
+//	'fabric-networking-api-v1',
 ])
 
 testDependencies(project, [
diff --git a/fabric-recipe-api-v1/src/client/java/net/fabricmc/fabric/impl/recipe/sync/client/RecipeSyncImplClient.java b/fabric-recipe-api-v1/src/client/java/net/fabricmc/fabric/impl/recipe/sync/client/RecipeSyncImplClient.java
index 0ac592d7c0..96ea9bfb2d 100644
--- a/fabric-recipe-api-v1/src/client/java/net/fabricmc/fabric/impl/recipe/sync/client/RecipeSyncImplClient.java
+++ b/fabric-recipe-api-v1/src/client/java/net/fabricmc/fabric/impl/recipe/sync/client/RecipeSyncImplClient.java
@@ -17,33 +17,35 @@
 package net.fabricmc.fabric.impl.recipe.sync.client;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Comparator;
 
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.client.event.RecipesReceivedEvent;
+import net.neoforged.neoforge.common.NeoForge;
+import org.sinytra.fabric.recipe_api.generated.GeneratedEntryPoint;
+
+import net.minecraft.client.Minecraft;
 import net.minecraft.world.item.crafting.RecipeHolder;
 
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.client.recipe.v1.sync.ClientRecipeSynchronizedEvent;
 import net.fabricmc.fabric.api.recipe.v1.sync.SynchronizedRecipes;
-import net.fabricmc.fabric.impl.recipe.sync.ClientboundRecipeSyncPayload;
 import net.fabricmc.fabric.impl.recipe.sync.SynchronizedRecipesImpl;
 
-public class RecipeSyncImplClient implements ClientModInitializer {
-	@Override
-	public void onInitializeClient() {
-		ClientPlayNetworking.registerGlobalReceiver(ClientboundRecipeSyncPayload.TYPE, RecipeSyncImplClient::onRecipeSyncPacket);
+@Mod(GeneratedEntryPoint.MOD_ID)
+public class RecipeSyncImplClient {
+
+	public RecipeSyncImplClient(IEventBus bus) {
+		NeoForge.EVENT_BUS.addListener(RecipesReceivedEvent.class, RecipeSyncImplClient::onNeoRecipesReceives);
 	}
 
-	private static void onRecipeSyncPacket(ClientboundRecipeSyncPayload payload, ClientPlayNetworking.Context context) {
+	private static void onNeoRecipesReceives(RecipesReceivedEvent event) {
 		SynchronizedRecipes recipes;
+		Collection> received = event.getRecipeMap().values();
 
-		if (!payload.entries().isEmpty()) {
-			var collectedRecipes = new ArrayList>();
-
-			for (ClientboundRecipeSyncPayload.Entry entry : payload.entries()) {
-				collectedRecipes.addAll(entry.recipes());
-			}
-
+		if (!received.isEmpty()) {
+			var collectedRecipes = new ArrayList<>(received);
 			// Sort values by id to match ordering with server ones.
 			collectedRecipes.sort(Comparator.comparing(entry -> entry.id().identifier()));
 			recipes = SynchronizedRecipesImpl.of(collectedRecipes);
@@ -51,7 +53,7 @@ private static void onRecipeSyncPacket(ClientboundRecipeSyncPayload payload, Cli
 			recipes = SynchronizedRecipesImpl.EMPTY;
 		}
 
-		((SynchronizedClientRecipesSetter) context.player().connection.recipes()).fabric_setSynchronizedClientRecipes(recipes);
-		ClientRecipeSynchronizedEvent.EVENT.invoker().onRecipesSynchronized(context.client(), recipes);
+		((SynchronizedClientRecipesSetter) Minecraft.getInstance().player.connection.recipes()).fabric_setSynchronizedClientRecipes(recipes);
+		ClientRecipeSynchronizedEvent.EVENT.invoker().onRecipesSynchronized(Minecraft.getInstance(), recipes);
 	}
 }
diff --git a/fabric-recipe-api-v1/src/client/java/net/fabricmc/fabric/mixin/recipe/client/sync/ClientConfigurationPacketListenerImplMixin.java b/fabric-recipe-api-v1/src/client/java/net/fabricmc/fabric/mixin/recipe/client/sync/ClientConfigurationPacketListenerImplMixin.java
index e62b4c4da8..d279316d46 100644
--- a/fabric-recipe-api-v1/src/client/java/net/fabricmc/fabric/mixin/recipe/client/sync/ClientConfigurationPacketListenerImplMixin.java
+++ b/fabric-recipe-api-v1/src/client/java/net/fabricmc/fabric/mixin/recipe/client/sync/ClientConfigurationPacketListenerImplMixin.java
@@ -23,13 +23,13 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl;
 import net.minecraft.client.multiplayer.ClientConfigurationPacketListenerImpl;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.protocol.configuration.ClientboundSelectKnownPacks;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 
-import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationNetworking;
 import net.fabricmc.fabric.impl.recipe.sync.RecipeSyncImpl;
 import net.fabricmc.fabric.impl.recipe.sync.ServerboundSupportedRecipeSerializersPayload;
 
@@ -37,10 +37,6 @@
 public class ClientConfigurationPacketListenerImplMixin {
 	@Inject(method = "handleSelectKnownPacks", at = @At("TAIL"))
 	private void sendSupportedRecipeSerializers(ClientboundSelectKnownPacks packet, CallbackInfo ci) {
-		if (!ClientConfigurationNetworking.canSend(ServerboundSupportedRecipeSerializersPayload.TYPE)) {
-			return;
-		}
-
 		var ids = new HashSet();
 
 		for (RecipeSerializer serializer : RecipeSyncImpl.getSyncedSerializers()) {
@@ -52,6 +48,6 @@ private void sendSupportedRecipeSerializers(ClientboundSelectKnownPacks packet,
 			return;
 		}
 
-		ClientConfigurationNetworking.send(new ServerboundSupportedRecipeSerializersPayload(ids));
+		((ClientCommonPacketListenerImpl) (Object) this).send(new ServerboundSupportedRecipeSerializersPayload(ids));
 	}
 }
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/CustomIngredient.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/CustomIngredient.java
index de9f45a6aa..d2b009b578 100644
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/CustomIngredient.java
+++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/CustomIngredient.java
@@ -26,7 +26,7 @@
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.display.SlotDisplay;
 
-import net.fabricmc.fabric.impl.recipe.ingredient.CustomIngredientImpl;
+import net.fabricmc.fabric.impl.recipe.ingredient.compat.NeoCustomIngredientWrapper;
 
 /**
  * Interface that modders can implement to create new behaviors for {@link Ingredient}s.
@@ -107,6 +107,6 @@ default SlotDisplay display() {
 	 */
 	@ApiStatus.NonExtendable
 	default Ingredient toVanilla() {
-		return new CustomIngredientImpl(this);
+		return new NeoCustomIngredientWrapper(this).toVanilla();
 	}
 }
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/sync/RecipeSynchronization.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/sync/RecipeSynchronization.java
index f4e0e2a107..661fd3f769 100644
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/sync/RecipeSynchronization.java
+++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/sync/RecipeSynchronization.java
@@ -38,7 +38,7 @@ public final class RecipeSynchronization {
 	 * Event phase used for sending recipes to the client. It runs after the default event phase {@link Event#DEFAULT_PHASE}.
 	 * It's defined for {@link ServerLifecycleEvents#SYNC_DATA_PACK_CONTENTS} event.
 	 */
-	public static final Identifier RECIPE_SYNC_EVENT_PHASE = RecipeSyncImpl.RECIPE_SYNC_EVENT_PHASE;
+	public static final Identifier RECIPE_SYNC_EVENT_PHASE = Identifier.fromNamespaceAndPath("fabric", "recipe_sync");
 
 	private RecipeSynchronization() {
 	}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/ClientboundCustomIngredientPayload.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/ClientboundCustomIngredientPayload.java
deleted file mode 100644
index b2ea6b4d7d..0000000000
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/ClientboundCustomIngredientPayload.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.impl.recipe.ingredient;
-
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.codec.ByteBufCodecs;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-
-public record ClientboundCustomIngredientPayload(int protocolVersion) implements CustomPacketPayload {
-	public static final StreamCodec CODEC = StreamCodec.composite(
-			ByteBufCodecs.VAR_INT, ClientboundCustomIngredientPayload::protocolVersion,
-			ClientboundCustomIngredientPayload::new
-	);
-	public static final CustomPacketPayload.Type TYPE = new Type<>(CustomIngredientSync.PACKET_ID);
-
-	@Override
-	public Type type() {
-		return TYPE;
-	}
-}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientImpl.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientImpl.java
index 60a86ce17e..8a81a83d07 100644
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientImpl.java
+++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientImpl.java
@@ -16,34 +16,24 @@
 
 package net.fabricmc.fabric.impl.recipe.ingredient;
 
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Stream;
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DataResult;
 import org.jspecify.annotations.Nullable;
 
-import net.minecraft.core.Holder;
-import net.minecraft.core.HolderSet;
 import net.minecraft.resources.Identifier;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraft.world.item.crafting.display.SlotDisplay;
 
-import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredient;
 import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredientSerializer;
 
 /**
  * To test this API beyond the unit tests, please refer to the recipe provider in the datagen API testmod.
  * It contains various interesting recipes to test, and explains how to package them in a datapack.
  */
-public class CustomIngredientImpl extends Ingredient {
+public class CustomIngredientImpl {
 	// Static helpers used by the API
 
 	public static final String TYPE_KEY = "fabric:type";
@@ -71,72 +61,4 @@ public static CustomIngredientSerializer getSerializer(Identifier identifier)
 
 		return REGISTERED_SERIALIZERS.get(identifier);
 	}
-
-	// Actual custom ingredient logic
-
-	private final CustomIngredient customIngredient;
-	@Nullable
-	private List> customMatchingItems;
-
-	public CustomIngredientImpl(CustomIngredient customIngredient) {
-		// We must pass a holder list that contains something that isn't air. It doesn't actually get used.
-		super(HolderSet.direct(Items.STONE.builtInRegistryHolder()));
-
-		this.customIngredient = customIngredient;
-	}
-
-	public List> getCustomMatchingItems() {
-		if (customMatchingItems == null) {
-			customMatchingItems = customIngredient.items().toList();
-		}
-
-		return customMatchingItems;
-	}
-
-	@Override
-	public CustomIngredient getCustomIngredient() {
-		return customIngredient;
-	}
-
-	@Override
-	public boolean requiresTesting() {
-		return customIngredient.requiresTesting();
-	}
-
-	@Override
-	public Stream> items() {
-		return getCustomMatchingItems().stream();
-	}
-
-	@Override
-	public boolean isEmpty() {
-		return getCustomMatchingItems().isEmpty();
-	}
-
-	@Override
-	public boolean test(ItemStack stack) {
-		return customIngredient.test(stack);
-	}
-
-	@Override
-	public boolean acceptsItem(Holder holder) {
-		return getCustomMatchingItems().contains(holder);
-	}
-
-	@Override
-	public SlotDisplay display() {
-		return customIngredient.display();
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (!(o instanceof CustomIngredientImpl that)) return false;
-		return customIngredient.equals(that.customIngredient);
-	}
-
-	@Override
-	public int hashCode() {
-		return customIngredient.hashCode();
-	}
 }
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientStreamCodec.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientStreamCodec.java
deleted file mode 100644
index 988ce30052..0000000000
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientStreamCodec.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 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.impl.recipe.ingredient;
-
-import java.util.Set;
-
-import org.jspecify.annotations.Nullable;
-
-import net.minecraft.network.RegistryFriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.resources.Identifier;
-import net.minecraft.world.item.crafting.Ingredient;
-
-import net.fabricmc.fabric.api.networking.v1.context.PacketContext;
-import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredient;
-import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredientSerializer;
-
-public class CustomIngredientStreamCodec implements StreamCodec {
-	static final int PACKET_MARKER = -1;
-	private final StreamCodec fallback;
-
-	public CustomIngredientStreamCodec(StreamCodec fallback) {
-		this.fallback = fallback;
-	}
-
-	@Override
-	public Ingredient decode(RegistryFriendlyByteBuf buf) {
-		int index = buf.readerIndex();
-
-		if (buf.readVarInt() != PACKET_MARKER) {
-			// Reset index for vanilla's normal deserialization logic.
-			buf.readerIndex(index);
-			return this.fallback.decode(buf);
-		}
-
-		Identifier type = buf.readIdentifier();
-		CustomIngredientSerializer serializer = CustomIngredientSerializer.get(type);
-
-		if (serializer == null) {
-			throw new IllegalArgumentException("Cannot deserialize custom ingredient of unknown type " + type);
-		}
-
-		return serializer.getStreamCodec().decode(buf).toVanilla();
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void encode(RegistryFriendlyByteBuf buf, Ingredient value) {
-		CustomIngredient customIngredient = value.getCustomIngredient();
-
-		if (shouldEncodeFallback(customIngredient)) {
-			// The client doesn't support this custom ingredient, so we send the matching stacks as a regular ingredient.
-			this.fallback.encode(buf, value);
-			return;
-		}
-
-		// The client supports this custom ingredient, so we send it as a custom ingredient.
-		buf.writeVarInt(PACKET_MARKER);
-		buf.writeIdentifier(customIngredient.getSerializer().getIdentifier());
-		StreamCodec streamCodec = (StreamCodec) customIngredient.getSerializer().getStreamCodec();
-		streamCodec.encode(buf, customIngredient);
-	}
-
-	static boolean shouldEncodeFallback(@Nullable CustomIngredient customIngredient) {
-		if (customIngredient == null) {
-			return true;
-		}
-
-		PacketContext context = PacketContext.get();
-
-		// Can be null if we're not writing a packet from the StreamEncoder; in that case, always write the full ingredient.
-		// Chances are this is a mod's doing and the client has the Ingredient API with the relevant ingredients.
-		if (context == null) {
-			return false;
-		}
-
-		Set supportedIngredients = context.orElse(CustomIngredientSync.SUPPORTED_CUSTOM_INGREDIENTS, Set.of());
-		return !supportedIngredients.contains(customIngredient.getSerializer().getIdentifier());
-	}
-}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientSync.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientSync.java
deleted file mode 100644
index 40ef790d14..0000000000
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientSync.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * 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.impl.recipe.ingredient;
-
-import java.util.Set;
-import java.util.function.Consumer;
-
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.resources.Identifier;
-import net.minecraft.server.network.ConfigurationTask;
-
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
-import net.fabricmc.fabric.api.networking.v1.ServerConfigurationConnectionEvents;
-import net.fabricmc.fabric.api.networking.v1.ServerConfigurationNetworking;
-import net.fabricmc.fabric.api.networking.v1.context.PacketContext;
-
-/**
- * To reasonably support server-side only custom ingredients, we only send custom ingredients to clients that support them.
- * If a specific client doesn't support a custom ingredient, we send the matching stacks as a regular ingredient.
- * This is fine since all recipe computation happens server-side anyway.
- *
- * 
      
- *     
    • Each client sends a packet with the set of custom ingredients it supports.
      • 
- *     
    • We store that set inside the {@link PacketContext} using {@link CustomIngredientSync#SUPPORTED_CUSTOM_INGREDIENTS}.
      • 
- *     
    • When serializing a custom ingredient, we get access to {@link PacketContext},
- *     and based on that we decide whether to send the custom ingredient, or a vanilla ingredient with the matching stacks.
      • 
- * 
    
- */
-public class CustomIngredientSync implements ModInitializer {
-	public static final Identifier PACKET_ID = Identifier.fromNamespaceAndPath("fabric", "custom_ingredient_sync");
-	public static final int PROTOCOL_VERSION_1 = 1;
-	public static final PacketContext.Key> SUPPORTED_CUSTOM_INGREDIENTS = PacketContext.key(Identifier.fromNamespaceAndPath("fabric", "supported_custom_ingredients"));
-
-	public static ServerboundCustomIngredientPayload createResponsePayload(int serverProtocolVersion) {
-		if (serverProtocolVersion < PROTOCOL_VERSION_1) {
-			// Not supposed to happen - notify the server that we didn't understand the query.
-			return null;
-		}
-
-		// Always send protocol 1 - the server should support it even if it supports more recent protocols.
-		return new ServerboundCustomIngredientPayload(PROTOCOL_VERSION_1, CustomIngredientImpl.REGISTERED_SERIALIZERS.keySet());
-	}
-
-	public static Set decodeResponsePayload(ServerboundCustomIngredientPayload payload) {
-		int protocolVersion = payload.protocolVersion();
-		switch (protocolVersion) {
-		case PROTOCOL_VERSION_1 -> {
-			Set serializers = payload.registeredSerializers();
-			// Remove unknown keys to save memory
-			serializers.removeIf(id -> !CustomIngredientImpl.REGISTERED_SERIALIZERS.containsKey(id));
-			return serializers;
-		}
-		default -> {
-			throw new IllegalArgumentException("Unknown ingredient sync protocol version: " + protocolVersion);
-		}
-		}
-	}
-
-	@Override
-	public void onInitialize() {
-		PayloadTypeRegistry.serverboundConfiguration()
-				.register(ServerboundCustomIngredientPayload.TYPE, ServerboundCustomIngredientPayload.CODEC);
-		PayloadTypeRegistry.clientboundConfiguration()
-				.register(ClientboundCustomIngredientPayload.TYPE, ClientboundCustomIngredientPayload.CODEC);
-
-		ServerConfigurationConnectionEvents.CONFIGURE.register((handler, server) -> {
-			if (ServerConfigurationNetworking.canSend(handler, PACKET_ID)) {
-				handler.addTask(new IngredientSyncTask());
-			}
-		});
-
-		ServerConfigurationNetworking.registerGlobalReceiver(ServerboundCustomIngredientPayload.TYPE, (payload, context) -> {
-			Set supportedCustomIngredients = decodeResponsePayload(payload);
-			context.packetListener().getPacketContext().set(SUPPORTED_CUSTOM_INGREDIENTS, supportedCustomIngredients);
-			context.packetListener().completeTask(IngredientSyncTask.KEY);
-		});
-	}
-
-	private record IngredientSyncTask() implements ConfigurationTask {
-		public static final Type KEY = new Type(PACKET_ID.toString());
-
-		@Override
-		public void start(Consumer> sender) {
-			// Send packet with 1 so the client can send us back the list of supported tags.
-			// 1 is sent in case we need a different protocol later for some reason.
-			sender.accept(ServerConfigurationNetworking.createClientboundPacket(new ClientboundCustomIngredientPayload(PROTOCOL_VERSION_1)));
-		}
-
-		@Override
-		public Type type() {
-			return KEY;
-		}
-	}
-}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/FabricRecipeApiV1.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/FabricRecipeApiV1.java
new file mode 100644
index 0000000000..29f17a0c39
--- /dev/null
+++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/FabricRecipeApiV1.java
@@ -0,0 +1,61 @@
+package net.fabricmc.fabric.impl.recipe.ingredient;
+
+import java.util.function.Function;
+
+import com.mojang.datafixers.util.Either;
+import com.mojang.serialization.Codec;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.common.crafting.IngredientType;
+import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
+import net.neoforged.neoforge.network.registration.PayloadRegistrar;
+import net.neoforged.neoforge.registries.DeferredHolder;
+import net.neoforged.neoforge.registries.DeferredRegister;
+import net.neoforged.neoforge.registries.NeoForgeRegistries;
+import org.sinytra.fabric.recipe_api.generated.GeneratedEntryPoint;
+
+import net.minecraft.world.item.crafting.Ingredient;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
+import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredient;
+import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredientSerializer;
+import net.fabricmc.fabric.api.recipe.v1.sync.RecipeSynchronization;
+import net.fabricmc.fabric.impl.recipe.ingredient.compat.NeoCustomIngredientWrapper;
+import net.fabricmc.fabric.impl.recipe.sync.RecipeSyncImpl;
+import net.fabricmc.fabric.impl.recipe.sync.ServerboundSupportedRecipeSerializersPayload;
+
+@Mod(GeneratedEntryPoint.MOD_ID)
+public class FabricRecipeApiV1 {
+	private static final DeferredRegister> INGREDIENT_TYPES = DeferredRegister.create(NeoForgeRegistries.Keys.INGREDIENT_TYPES, GeneratedEntryPoint.MOD_ID);
+
+	public static final DeferredHolder, IngredientType> FABRIC_INGREDIENT_WRAPPER = INGREDIENT_TYPES.register("fabric_wrapper", () -> new IngredientType<>(NeoCustomIngredientWrapper.CODEC, NeoCustomIngredientWrapper.STREAM_CODEC));
+
+	public FabricRecipeApiV1(IEventBus bus) {
+		INGREDIENT_TYPES.register(bus);
+		
+		bus.addListener(RegisterPayloadHandlersEvent.class, event -> {
+			PayloadRegistrar registrar = event.registrar("1").optional();
+
+			registrar.configurationToServer(
+					ServerboundSupportedRecipeSerializersPayload.TYPE,
+					ServerboundSupportedRecipeSerializersPayload.CODEC,
+					RecipeSyncImpl::onRecipeSyncRequest
+			);
+		});
+	}
+
+	public static Codec makeIngredientMapCodec(Codec original) {
+		var customIngredientCodec = CustomIngredientImpl.CODEC.dispatch(
+				CustomIngredientImpl.TYPE_KEY, CustomIngredient::getSerializer, CustomIngredientSerializer::getCodec);
+		return Codec.xor(customIngredientCodec, original)
+				.xmap(
+						e -> e.map(c -> new NeoCustomIngredientWrapper(c).toVanilla(), Function.identity()),
+						s -> s.getCustomIngredient() instanceof NeoCustomIngredientWrapper wrapper ? Either.left(wrapper.ingredient()) : Either.right(s)
+				);
+	}
+	
+	static {
+		ServerLifecycleEvents.SYNC_DATA_PACK_CONTENTS.addPhaseOrdering(Event.DEFAULT_PHASE, RecipeSynchronization.RECIPE_SYNC_EVENT_PHASE);
+	}
+}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/OptionalCustomIngredientStreamCodec.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/OptionalCustomIngredientStreamCodec.java
deleted file mode 100644
index f3e310de6d..0000000000
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/OptionalCustomIngredientStreamCodec.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.impl.recipe.ingredient;
-
-import java.util.Optional;
-
-import net.minecraft.network.RegistryFriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.resources.Identifier;
-import net.minecraft.world.item.crafting.Ingredient;
-
-import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredient;
-import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredientSerializer;
-
-public class OptionalCustomIngredientStreamCodec implements StreamCodec> {
-	private final StreamCodec> fallback;
-
-	public OptionalCustomIngredientStreamCodec(StreamCodec> fallback) {
-		this.fallback = fallback;
-	}
-
-	@Override
-	public Optional decode(RegistryFriendlyByteBuf buf) {
-		int index = buf.readerIndex();
-
-		if (buf.readVarInt() != CustomIngredientStreamCodec.PACKET_MARKER) {
-			// Reset index for vanilla's normal deserialization logic.
-			buf.readerIndex(index);
-			return this.fallback.decode(buf);
-		}
-
-		Identifier type = buf.readIdentifier();
-		CustomIngredientSerializer serializer = CustomIngredientSerializer.get(type);
-
-		if (serializer == null) {
-			throw new IllegalArgumentException("Cannot deserialize custom ingredient of unknown type " + type);
-		}
-
-		return Optional.of(serializer.getStreamCodec().decode(buf).toVanilla());
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void encode(RegistryFriendlyByteBuf buf, Optional value) {
-		if (value.isEmpty()) {
-			this.fallback.encode(buf, value);
-			return;
-		}
-
-		CustomIngredient customIngredient = value.get().getCustomIngredient();
-
-		if (CustomIngredientStreamCodec.shouldEncodeFallback(customIngredient)) {
-			// The client doesn't support this custom ingredient, so we send the matching stacks as a regular ingredient.
-			this.fallback.encode(buf, value);
-			return;
-		}
-
-		// The client supports this custom ingredient, so we send it as a custom ingredient.
-		buf.writeVarInt(CustomIngredientStreamCodec.PACKET_MARKER);
-		buf.writeIdentifier(customIngredient.getSerializer().getIdentifier());
-		StreamCodec streamCodec = (StreamCodec) customIngredient.getSerializer().getStreamCodec();
-		streamCodec.encode(buf, customIngredient);
-	}
-}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/ServerboundCustomIngredientPayload.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/ServerboundCustomIngredientPayload.java
deleted file mode 100644
index 81e7dad8d4..0000000000
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/ServerboundCustomIngredientPayload.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.impl.recipe.ingredient;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.codec.ByteBufCodecs;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.Identifier;
-
-public record ServerboundCustomIngredientPayload(int protocolVersion, Set registeredSerializers) implements CustomPacketPayload {
-	public static final StreamCodec CODEC = StreamCodec.composite(
-			ByteBufCodecs.VAR_INT, ServerboundCustomIngredientPayload::protocolVersion,
-			ByteBufCodecs.collection(HashSet::new, Identifier.STREAM_CODEC), ServerboundCustomIngredientPayload::registeredSerializers,
-			ServerboundCustomIngredientPayload::new
-	);
-	public static final CustomPacketPayload.Type TYPE = new Type<>(CustomIngredientSync.PACKET_ID);
-
-	@Override
-	public Type type() {
-		return TYPE;
-	}
-}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/ShapelessMatch.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/ShapelessMatch.java
deleted file mode 100644
index b9f54ed887..0000000000
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/ShapelessMatch.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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.impl.recipe.ingredient;
-
-import java.util.Arrays;
-import java.util.BitSet;
-import java.util.List;
-
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.Ingredient;
-
-/**
- * Helper class to perform a shapeless recipe match when ingredients that require testing are involved.
- *
- * 
    The problem to solve is a maximum cardinality bipartite matching, for which this implementation uses the augmenting path algorithm.
- * This has good performance in simple cases, and sufficient O(N^3) asymptotic complexity in the worst case.
- */
-public class ShapelessMatch {
-	private final int[] match;
-	/**
-	 * The first {@code size} bits are for the visited array (on the left partition).
-	 * The remaining {@code size * size} bits are for the adjacency matrix.
-	 */
-	private final BitSet bitSet;
-
-	private ShapelessMatch(int size) {
-		match = new int[size];
-		bitSet = new BitSet(size * (size+1));
-	}
-
-	private boolean augment(int l) {
-		if (bitSet.get(l)) return false;
-		bitSet.set(l);
-
-		for (int r = 0; r < match.length; ++r) {
-			if (bitSet.get(match.length + l * match.length + r)) {
-				if (match[r] == -1 || augment(match[r])) {
-					match[r] = l;
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	public static boolean isMatch(List stacks, List ingredients) {
-		if (stacks.size() != ingredients.size()) {
-			return false;
-		}
-
-		ShapelessMatch m = new ShapelessMatch(ingredients.size());
-
-		// Build stack -> ingredient bipartite graph
-		for (int i = 0; i < stacks.size(); ++i) {
-			ItemStack stack = stacks.get(i);
-
-			for (int j = 0; j < ingredients.size(); ++j) {
-				if (ingredients.get(j).test(stack)) {
-					m.bitSet.set((i + 1) * m.match.length + j);
-				}
-			}
-		}
-
-		// Init matches to -1 (no match)
-		Arrays.fill(m.match, -1);
-
-		// Try to find an augmenting path for each stack
-		for (int i = 0; i < ingredients.size(); ++i) {
-			if (!m.augment(i)) {
-				return false;
-			}
-
-			m.bitSet.set(0, m.match.length, false);
-		}
-
-		return true;
-	}
-}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/compat/FabricICustomIngredientWrapper.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/compat/FabricICustomIngredientWrapper.java
new file mode 100644
index 0000000000..c8db1655fc
--- /dev/null
+++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/compat/FabricICustomIngredientWrapper.java
@@ -0,0 +1,52 @@
+package net.fabricmc.fabric.impl.recipe.ingredient.compat;
+
+import java.util.stream.Stream;
+
+import net.neoforged.neoforge.common.crafting.ICustomIngredient;
+
+import net.minecraft.core.Holder;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.item.crafting.display.SlotDisplay;
+
+import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredient;
+import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredientSerializer;
+
+public class FabricICustomIngredientWrapper implements CustomIngredient {
+    private final ICustomIngredient ingredient;
+
+    public FabricICustomIngredientWrapper(ICustomIngredient ingredient) {
+        this.ingredient = ingredient;
+    }
+
+    @Override
+    public boolean test(ItemStack stack) {
+        return this.ingredient.test(stack);
+    }
+
+	@Override
+	public Stream> items() {
+		return this.ingredient.items();
+	}
+
+    @Override
+    public boolean requiresTesting() {
+        return !this.ingredient.isSimple();
+    }
+
+    @Override
+    public CustomIngredientSerializer getSerializer() {
+        throw new UnsupportedOperationException();
+    }
+
+	@Override
+	public SlotDisplay display() {
+		return this.ingredient.display();
+	}
+
+	@Override
+	public Ingredient toVanilla() {
+		return this.ingredient.toVanilla();
+	}
+}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/compat/NeoCustomIngredientWrapper.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/compat/NeoCustomIngredientWrapper.java
new file mode 100644
index 0000000000..e1b9c982b4
--- /dev/null
+++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/compat/NeoCustomIngredientWrapper.java
@@ -0,0 +1,57 @@
+package net.fabricmc.fabric.impl.recipe.ingredient.compat;
+
+import java.util.Objects;
+import java.util.stream.Stream;
+
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.neoforged.neoforge.common.crafting.ICustomIngredient;
+import net.neoforged.neoforge.common.crafting.IngredientType;
+
+import net.minecraft.core.Holder;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.resources.Identifier;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+
+import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredient;
+import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredientSerializer;
+import net.fabricmc.fabric.impl.recipe.ingredient.CustomIngredientImpl;
+import net.fabricmc.fabric.impl.recipe.ingredient.FabricRecipeApiV1;
+
+public record NeoCustomIngredientWrapper(CustomIngredient ingredient) implements ICustomIngredient {
+    public static final StreamCodec CUSTOM_INGREDIENT_SERIALIZER_STREAM_CODEC = Identifier.STREAM_CODEC
+        .cast()
+        .dispatch(i -> i.getSerializer().getIdentifier(), l -> Objects.requireNonNull(CustomIngredientSerializer.get(l)).getStreamCodec());
+    public static final StreamCodec STREAM_CODEC = StreamCodec.composite(
+        CUSTOM_INGREDIENT_SERIALIZER_STREAM_CODEC,
+        w -> w.ingredient,
+        NeoCustomIngredientWrapper::new
+    );
+    public static final Codec CUSTOM_INGREDIENT_CODEC = CustomIngredientImpl.CODEC.dispatch(CustomIngredient::getSerializer, CustomIngredientSerializer::getCodec);
+    public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
+        CUSTOM_INGREDIENT_CODEC.fieldOf("ingredient").forGetter(w -> w.ingredient)
+    ).apply(instance, NeoCustomIngredientWrapper::new));
+
+    @Override
+    public boolean test(ItemStack arg) {
+        return this.ingredient.test(arg);
+    }
+
+    @Override
+    public boolean isSimple() {
+        return !this.ingredient.requiresTesting();
+    }
+
+	@Override
+	public Stream> items() {
+		return this.ingredient.items();
+	}
+
+	@Override
+    public IngredientType getType() {
+        return FabricRecipeApiV1.FABRIC_INGREDIENT_WRAPPER.get();
+    }
+}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/sync/ClientboundRecipeSyncPayload.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/sync/ClientboundRecipeSyncPayload.java
deleted file mode 100644
index 084f7e6039..0000000000
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/sync/ClientboundRecipeSyncPayload.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.impl.recipe.sync;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.network.RegistryFriendlyByteBuf;
-import net.minecraft.network.SkipPacketDecoderException;
-import net.minecraft.network.codec.ByteBufCodecs;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.Identifier;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.item.crafting.Recipe;
-import net.minecraft.world.item.crafting.RecipeHolder;
-import net.minecraft.world.item.crafting.RecipeSerializer;
-
-/**
- * Main packet used to send recipes to the client.
- */
-public record ClientboundRecipeSyncPayload(List entries) implements CustomPacketPayload {
-	public static final StreamCodec CODEC = Entry.CODEC.apply(ByteBufCodecs.list()).map(ClientboundRecipeSyncPayload::new, ClientboundRecipeSyncPayload::entries);
-
-	public static final Type TYPE = new Type<>(Identifier.fromNamespaceAndPath("fabric", "recipe_sync"));
-
-	@Override
-	public Type type() {
-		return TYPE;
-	}
-
-	public record Entry(RecipeSerializer serializer, List> recipes) {
-		public static final StreamCodec CODEC = StreamCodec.ofMember(
-				Entry::write,
-				Entry::read
-		);
-
-		private static Entry read(RegistryFriendlyByteBuf buf) {
-			Identifier recipeSerializerId = buf.readIdentifier();
-			RecipeSerializer recipeSerializer = BuiltInRegistries.RECIPE_SERIALIZER.getValue(recipeSerializerId);
-
-			if (recipeSerializer == null || !RecipeSyncImpl.isSynced(recipeSerializer)) {
-				throw new SkipPacketDecoderException("Tried syncing unsupported packet serializer '" + recipeSerializerId + "'!");
-			}
-
-			int count = buf.readVarInt();
-			var list = new ArrayList>();
-
-			for (int i = 0; i < count; i++) {
-				ResourceKey> id = buf.readResourceKey(Registries.RECIPE);
-				//noinspection deprecation
-				Recipe recipe = recipeSerializer.streamCodec().decode(buf);
-				list.add(new RecipeHolder<>(id, recipe));
-			}
-
-			return new Entry(recipeSerializer, list);
-		}
-
-		private void write(RegistryFriendlyByteBuf buf) {
-			buf.writeIdentifier(BuiltInRegistries.RECIPE_SERIALIZER.getKey(this.serializer));
-
-			buf.writeVarInt(this.recipes.size());
-
-			//noinspection unchecked,deprecation
-			StreamCodec> serializer = ((StreamCodec>) this.serializer.streamCodec());
-
-			for (RecipeHolder recipe : this.recipes) {
-				buf.writeResourceKey(recipe.id());
-				serializer.encode(buf, recipe.value());
-			}
-		}
-	}
-}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/sync/RecipeSyncImpl.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/sync/RecipeSyncImpl.java
index 51023df0b5..7f6f6e3d93 100644
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/sync/RecipeSyncImpl.java
+++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/sync/RecipeSyncImpl.java
@@ -17,80 +17,82 @@
 package net.fabricmc.fabric.impl.recipe.sync;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
+import net.neoforged.neoforge.network.handling.IPayloadContext;
+import net.neoforged.neoforge.network.payload.RecipeContentPayload;
 
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
-import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
-import net.fabricmc.fabric.api.networking.v1.ServerConfigurationNetworking;
-import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.fabricmc.fabric.mixin.recipe.sync.RecipeManagerAccessor;
-import net.fabricmc.fabric.mixin.recipe.sync.ServerCommonPacketListenerImplAccessor;
 
 public class RecipeSyncImpl implements ModInitializer {
-	// Recipe packet might contain a lot of data depending on mods, so it's best to increase it's max size to 64 MB.
-	private static final int RECIPE_PAYLOAD_MAX_SIZE = 64 * 1024 * 1024;
 	private static final Set> SYNCED_SERIALIZERS = new ReferenceOpenHashSet<>();
 
 	public static final Identifier RECIPE_SYNC_EVENT_PHASE = Identifier.fromNamespaceAndPath("fabric", "recipe_sync");
 
 	@Override
 	public void onInitialize() {
-		PayloadTypeRegistry.serverboundConfiguration().register(ServerboundSupportedRecipeSerializersPayload.TYPE, ServerboundSupportedRecipeSerializersPayload.CODEC);
-		PayloadTypeRegistry.clientboundPlay().registerLarge(ClientboundRecipeSyncPayload.TYPE, ClientboundRecipeSyncPayload.CODEC, RECIPE_PAYLOAD_MAX_SIZE);
-
-		ServerConfigurationNetworking.registerGlobalReceiver(ServerboundSupportedRecipeSerializersPayload.TYPE, RecipeSyncImpl::onRecipeSyncRequest);
-
 		ServerLifecycleEvents.SYNC_DATA_PACK_CONTENTS.addPhaseOrdering(Event.DEFAULT_PHASE, RECIPE_SYNC_EVENT_PHASE);
-		ServerLifecycleEvents.SYNC_DATA_PACK_CONTENTS.register(RECIPE_SYNC_EVENT_PHASE, RecipeSyncImpl::sendRecipes);
 	}
 
-	private static void onRecipeSyncRequest(ServerboundSupportedRecipeSerializersPayload payload, ServerConfigurationNetworking.Context context) {
+	public static void onRecipeSyncRequest(ServerboundSupportedRecipeSerializersPayload payload, IPayloadContext context) {
 		var set = new ReferenceOpenHashSet>();
 
 		for (Identifier identifier : payload.synchronizedSerializers()) {
 			BuiltInRegistries.RECIPE_SERIALIZER.getOptional(identifier).ifPresent(set::add);
 		}
 
-		((SyncedSerializerAwareConnection) ((ServerCommonPacketListenerImplAccessor) context.packetListener()).getConnection())
+		((SyncedSerializerAwareConnection) context.listener().getConnection())
 				.fabric_setSyncedRecipeSerializers(set);
 	}
 
-	private static void sendRecipes(ServerPlayer player, boolean exist) {
-		if (!ServerPlayNetworking.canSend(player, ClientboundRecipeSyncPayload.TYPE)) {
-			return;
+	public static RecipeContentPayload appendSyncedRecipes(RecipeContentPayload payload, ServerPlayer player) {
+		List> combined = new ArrayList<>(payload.recipes());
+		Collection>> keys = combined.stream()
+			.map(RecipeHolder::id)
+			.collect(Collectors.toUnmodifiableSet());
+
+		List> recipes = getRecipesToSend(player);
+		for (RecipeHolder recipe : recipes) {
+			if (!keys.contains(recipe.id())) {
+				combined.add(recipe);
+			}
 		}
 
-		Set> serializers = ((SyncedSerializerAwareConnection) ((ServerCommonPacketListenerImplAccessor) player.connection).getConnection()).fabric_getSyncedRecipeSerializers();
+		return new RecipeContentPayload(payload.recipeTypes(), combined);
+	}
+
+	private static List> getRecipesToSend(ServerPlayer player) {
+		Set> serializers = ((SyncedSerializerAwareConnection) player.connection.getConnection()).fabric_getSyncedRecipeSerializers();
 
 		SyncedSerializerAwarePreparedRecipe accessor = (SyncedSerializerAwarePreparedRecipe) ((RecipeManagerAccessor) player.level().recipeAccess()).getRecipes();
 
-		var list = new ArrayList();
+		List> list = new ArrayList<>();
 
 		for (RecipeSerializer serializer : serializers) {
 			List> recipes = accessor.fabric_getRecipesBySyncedSerializer(serializer);
 
 			if (recipes != null && !recipes.isEmpty()) {
-				list.add(new ClientboundRecipeSyncPayload.Entry(serializer, recipes));
+				list.addAll(recipes);
 			}
 		}
 
-		if (list.isEmpty()) {
-			return;
-		}
-
-		ServerPlayNetworking.send(player, new ClientboundRecipeSyncPayload(list));
+		return list;
 	}
 
 	public static void addSynchronizedSerializer(RecipeSerializer serializer) {
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/IngredientCodecsMixin.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/IngredientCodecsMixin.java
new file mode 100644
index 0000000000..b9ada63e01
--- /dev/null
+++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/IngredientCodecsMixin.java
@@ -0,0 +1,20 @@
+package net.fabricmc.fabric.mixin.recipe.ingredient;
+
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import com.mojang.serialization.Codec;
+import net.neoforged.neoforge.common.crafting.IngredientCodecs;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import net.minecraft.world.item.crafting.Ingredient;
+
+import net.fabricmc.fabric.impl.recipe.ingredient.FabricRecipeApiV1;
+
+@Mixin(IngredientCodecs.class)
+public class IngredientCodecsMixin {
+
+    @ModifyReturnValue(method = "codec", at = @At("RETURN"))
+    private static Codec modifyIngredientCodec(Codec original) {
+        return FabricRecipeApiV1.makeIngredientMapCodec(original);
+    }
+}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/IngredientMixin.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/IngredientMixin.java
index c95c68bf7b..5f568401e6 100644
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/IngredientMixin.java
+++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/IngredientMixin.java
@@ -16,105 +16,30 @@
 
 package net.fabricmc.fabric.mixin.recipe.ingredient;
 
-import java.util.Optional;
-
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import com.mojang.datafixers.util.Either;
-import com.mojang.serialization.Codec;
-import org.spongepowered.asm.mixin.Final;
+import net.neoforged.neoforge.common.crafting.ICustomIngredient;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import net.minecraft.core.HolderSet;
-import net.minecraft.network.RegistryFriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.crafting.Ingredient;
 
 import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredient;
-import net.fabricmc.fabric.api.recipe.v1.ingredient.CustomIngredientSerializer;
 import net.fabricmc.fabric.api.recipe.v1.ingredient.FabricIngredient;
-import net.fabricmc.fabric.impl.recipe.ingredient.CustomIngredientImpl;
-import net.fabricmc.fabric.impl.recipe.ingredient.CustomIngredientStreamCodec;
-import net.fabricmc.fabric.impl.recipe.ingredient.OptionalCustomIngredientStreamCodec;
+import net.fabricmc.fabric.impl.recipe.ingredient.compat.FabricICustomIngredientWrapper;
+import net.fabricmc.fabric.impl.recipe.ingredient.compat.NeoCustomIngredientWrapper;
 
 @Mixin(Ingredient.class)
 public class IngredientMixin implements FabricIngredient {
-	@Mutable
-	@Shadow
-	@Final
-	public static Codec CODEC;
-
+	@Nullable
 	@Shadow
-	@Final
-	private HolderSet values;
-
-	@ModifyExpressionValue(
-			method = "",
-			at = @At(
-					value = "INVOKE",
-					target = "Lnet/minecraft/network/codec/StreamCodec;map(Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/network/codec/StreamCodec;",
-					ordinal = 0
-			)
-	)
-	private static StreamCodec useCustomIngredientStreamCodec(StreamCodec original) {
-		return new CustomIngredientStreamCodec(original);
-	}
-
-	@ModifyExpressionValue(
-			method = "",
-			at = @At(
-					value = "INVOKE",
-					target = "Lnet/minecraft/network/codec/StreamCodec;map(Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/network/codec/StreamCodec;",
-					ordinal = 1
-			)
-	)
-	private static StreamCodec> useOptionalCustomIngredientStreamCodec(StreamCodec> original) {
-		return new OptionalCustomIngredientStreamCodec(original);
-	}
-
-	@Inject(method = "", at = @At("TAIL"))
-	private static void injectCodec(CallbackInfo ci) {
-		Codec customIngredientCodec = CustomIngredientImpl.CODEC.dispatch(
-				CustomIngredientImpl.TYPE_KEY,
-				CustomIngredient::getSerializer,
-				CustomIngredientSerializer::getCodec);
-
-		CODEC = Codec.either(customIngredientCodec, CODEC).xmap(
-				either -> either.map(CustomIngredient::toVanilla, ingredient -> ingredient),
-				ingredient -> {
-					CustomIngredient customIngredient = ingredient.getCustomIngredient();
-					return customIngredient == null ? Either.right(ingredient) : Either.left(customIngredient);
-				}
-		);
-	}
-
-	// Targets the lambdas in the codecs which extract the entries from an ingredient.
-	// For custom ingredients, these lambdas will only be invoked when the client does not support this ingredient.
-	// In this case, use CustomIngredientImpl#getCustomMatchingItems, which as close as we can get.
-	@Inject(method = {"lambda$static$4", "lambda$static$2", "lambda$static$0"}, at = @At("HEAD"), cancellable = true)
-	private static void onGetEntries(Ingredient ingredient, CallbackInfoReturnable> cir) {
-		if (ingredient instanceof CustomIngredientImpl customIngredient) {
-			cir.setReturnValue(HolderSet.direct(customIngredient.getCustomMatchingItems()));
-		}
-	}
-
-	@Inject(method = "equals(Ljava/lang/Object;)Z", at = @At("HEAD"), cancellable = true)
-	private void onHeadEquals(Object obj, CallbackInfoReturnable cir) {
-		if (obj instanceof CustomIngredientImpl) {
-			// This will only get called when this isn't custom and other is custom, in which case the
-			// ingredients can never be equal.
-			cir.setReturnValue(false);
-		}
-	}
+	private ICustomIngredient customIngredient;
 
 	@Override
-	public int hashCode() {
-		return values.hashCode();
+	public @Nullable CustomIngredient getCustomIngredient() {
+		return customIngredient != null
+				? customIngredient instanceof NeoCustomIngredientWrapper(
+				CustomIngredient ingredient
+		) ? ingredient : new FabricICustomIngredientWrapper(customIngredient)
+				: null;
 	}
 }
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/ShapelessRecipeMixin.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/ShapelessRecipeMixin.java
deleted file mode 100644
index 2b4701916a..0000000000
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/ShapelessRecipeMixin.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.mixin.recipe.ingredient;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.ItemStackTemplate;
-import net.minecraft.world.item.crafting.CraftingInput;
-import net.minecraft.world.item.crafting.CraftingRecipe;
-import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraft.world.item.crafting.Recipe;
-import net.minecraft.world.item.crafting.ShapelessRecipe;
-import net.minecraft.world.level.Level;
-
-import net.fabricmc.fabric.impl.recipe.ingredient.ShapelessMatch;
-
-@Mixin(ShapelessRecipe.class)
-public class ShapelessRecipeMixin {
-	@Final
-	@Shadow
-	private List ingredients;
-	@Unique
-	private boolean fabric_requiresTesting = false;
-
-	@Inject(at = @At("RETURN"), method = "")
-	private void cacheRequiresTesting(Recipe.CommonInfo commonInfo, CraftingRecipe.CraftingBookInfo bookInfo, ItemStackTemplate result, List ingredients, CallbackInfo ci) {
-		for (Ingredient ingredient : ingredients) {
-			if (ingredient.requiresTesting()) {
-				fabric_requiresTesting = true;
-				break;
-			}
-		}
-	}
-
-	@Inject(at = @At("HEAD"), method = "matches(Lnet/minecraft/world/item/crafting/CraftingInput;Lnet/minecraft/world/level/Level;)Z", cancellable = true)
-	public void customIngredientMatch(CraftingInput recipeInput, Level level, CallbackInfoReturnable cir) {
-		if (fabric_requiresTesting) {
-			List nonEmptyStacks = new ArrayList<>(recipeInput.ingredientCount());
-
-			for (int i = 0; i < recipeInput.size(); ++i) {
-				ItemStack stack = recipeInput.getItem(i);
-
-				if (!stack.isEmpty()) {
-					nonEmptyStacks.add(stack);
-				}
-			}
-
-			cir.setReturnValue(ShapelessMatch.isMatch(nonEmptyStacks, ingredients));
-		}
-	}
-}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/sync/CommonHooksMixin.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/sync/CommonHooksMixin.java
new file mode 100644
index 0000000000..f03824ccb0
--- /dev/null
+++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/sync/CommonHooksMixin.java
@@ -0,0 +1,19 @@
+package net.fabricmc.fabric.mixin.recipe.sync;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import net.neoforged.neoforge.common.CommonHooks;
+import net.neoforged.neoforge.network.payload.RecipeContentPayload;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import net.minecraft.server.level.ServerPlayer;
+
+import net.fabricmc.fabric.impl.recipe.sync.RecipeSyncImpl;
+
+@Mixin(CommonHooks.class)
+public class CommonHooksMixin {
+	@ModifyExpressionValue(method = "sendRecipes", at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/network/payload/RecipeContentPayload;create(Ljava/util/Collection;Lnet/minecraft/world/item/crafting/RecipeMap;)Lnet/neoforged/neoforge/network/payload/RecipeContentPayload;"))
+	private static RecipeContentPayload sendRecipes(RecipeContentPayload payload, ServerPlayer player) {
+		return RecipeSyncImpl.appendSyncedRecipes(payload, player);
+	}
+}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/sync/ServerCommonPacketListenerImplAccessor.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/sync/ServerCommonPacketListenerImplAccessor.java
deleted file mode 100644
index 00f3c40f7d..0000000000
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/sync/ServerCommonPacketListenerImplAccessor.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.mixin.recipe.sync;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import net.minecraft.network.Connection;
-import net.minecraft.server.network.ServerCommonPacketListenerImpl;
-
-@Mixin(ServerCommonPacketListenerImpl.class)
-public interface ServerCommonPacketListenerImplAccessor {
-	@Accessor
-	Connection getConnection();
-}
diff --git a/fabric-recipe-api-v1/src/main/resources/fabric-recipe-api-v1.mixins.json b/fabric-recipe-api-v1/src/main/resources/fabric-recipe-api-v1.mixins.json
index def7676442..40acd9d79f 100644
--- a/fabric-recipe-api-v1/src/main/resources/fabric-recipe-api-v1.mixins.json
+++ b/fabric-recipe-api-v1/src/main/resources/fabric-recipe-api-v1.mixins.json
@@ -5,12 +5,12 @@
   "mixins": [
     "RecipeAccessMixin",
     "RecipeManagerMixin",
+    "ingredient.IngredientCodecsMixin",
     "ingredient.IngredientMixin",
-    "ingredient.ShapelessRecipeMixin",
+    "sync.CommonHooksMixin",
     "sync.ConnectionMixin",
-    "sync.RecipeMapMixin",
-    "sync.ServerCommonPacketListenerImplAccessor",
-    "sync.RecipeManagerAccessor"
+    "sync.RecipeManagerAccessor",
+    "sync.RecipeMapMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-recipe-api-v1/src/main/resources/fabric.mod.json b/fabric-recipe-api-v1/src/main/resources/fabric.mod.json
index 98ccd1aaf3..6b5ed0a2b6 100644
--- a/fabric-recipe-api-v1/src/main/resources/fabric.mod.json
+++ b/fabric-recipe-api-v1/src/main/resources/fabric.mod.json
@@ -25,18 +25,14 @@
   "accessWidener": "fabric-recipe-api-v1.classtweaker",
   "depends": {
     "fabricloader": ">=0.18.4",
-    "fabric-networking-api-v1": "*",
     "fabric-lifecycle-events-v1": "*"
   },
   "entrypoints": {
     "main": [
       "net.fabricmc.fabric.impl.recipe.ingredient.CustomIngredientInit",
-      "net.fabricmc.fabric.impl.recipe.ingredient.CustomIngredientSync",
       "net.fabricmc.fabric.impl.recipe.sync.RecipeSyncImpl"
     ],
     "client": [
-      "net.fabricmc.fabric.impl.recipe.ingredient.client.CustomIngredientSyncClient",
-      "net.fabricmc.fabric.impl.recipe.sync.client.RecipeSyncImplClient"
     ]
   },
   "description": "Recipe extensions such as creation of new types of recipe ingredients and recipe synchronization.",
diff --git a/fabric-recipe-api-v1/src/test/java/net/fabricmc/fabric/test/recipe/ingredient/SerializationTests.java b/fabric-recipe-api-v1/src/test/java/net/fabricmc/fabric/test/recipe/ingredient/SerializationTests.java
index 7fb3816780..c59592fb23 100644
--- a/fabric-recipe-api-v1/src/test/java/net/fabricmc/fabric/test/recipe/ingredient/SerializationTests.java
+++ b/fabric-recipe-api-v1/src/test/java/net/fabricmc/fabric/test/recipe/ingredient/SerializationTests.java
@@ -26,6 +26,9 @@
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
 import com.mojang.serialization.JsonOps;
+
+import net.fabricmc.fabric.api.recipe.v1.ingredient.FabricIngredient;
+
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -94,6 +97,6 @@ public void testCustomIngredientSerialization() {
 		// Make sure that we can deserialize it
 		Ingredient deserialized = Ingredient.CODEC.parse(registryOps, json).getOrThrow(JsonParseException::new);
 		assertNotNull(deserialized.getCustomIngredient(), "Custom ingredient was not deserialized");
-		assertSame(deserialized.getCustomIngredient().getSerializer(), ingredient.getCustomIngredient().getSerializer(), "Serializer did not match");
+		assertSame(((FabricIngredient) deserialized).getCustomIngredient().getSerializer(), ((FabricIngredient) ingredient).getCustomIngredient().getSerializer(), "Serializer did not match");
 	}
 }
diff --git a/fabric-registry-sync-v0/build.gradle b/fabric-registry-sync-v0/build.gradle
index a1ee9ba16a..b29d77d279 100644
--- a/fabric-registry-sync-v0/build.gradle
+++ b/fabric-registry-sync-v0/build.gradle
@@ -5,11 +5,11 @@ loom {
 }
 
 moduleDependencies(project, [
-	'fabric-api-base',
-	'fabric-networking-api-v1'
+	'fabric-api-base'
 ])
 
 testDependencies(project, [
 	':fabric-lifecycle-events-v1',
 	':fabric-command-api-v2',
+	'fabric-networking-api-v1'
 ])
diff --git a/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/impl/client/registry/sync/ClientRegistrySyncHandler.java b/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/impl/client/registry/sync/ClientRegistrySyncHandler.java
deleted file mode 100644
index d317f1ef22..0000000000
--- a/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/impl/client/registry/sync/ClientRegistrySyncHandler.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * 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.impl.client.registry.sync;
-
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletionException;
-
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
-import org.jetbrains.annotations.VisibleForTesting;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.minecraft.ChatFormatting;
-import net.minecraft.core.Registry;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.resources.Identifier;
-
-import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationNetworking;
-import net.fabricmc.fabric.api.event.registry.RegistryAttribute;
-import net.fabricmc.fabric.impl.registry.sync.RegistrySyncManager;
-import net.fabricmc.fabric.impl.registry.sync.RemapException;
-import net.fabricmc.fabric.impl.registry.sync.RemappableRegistry;
-import net.fabricmc.fabric.impl.registry.sync.SyncCompletePayload;
-import net.fabricmc.fabric.impl.registry.sync.packet.RegistrySyncPayload;
-
-public final class ClientRegistrySyncHandler {
-	private static final Logger LOGGER = LoggerFactory.getLogger(ClientRegistrySyncHandler.class);
-
-	private ClientRegistrySyncHandler() {
-	}
-
-	public static void receivePacket(RegistrySyncPayload payload, ClientConfigurationNetworking.Context context) {
-		if (!RegistrySyncManager.DEBUG && context.client().isLocalServer()) {
-			context.responseSender().sendPacket(SyncCompletePayload.INSTANCE);
-			return;
-		}
-
-		context.client().execute(() -> {
-			try {
-				apply(payload);
-				context.responseSender().sendPacket(SyncCompletePayload.INSTANCE);
-			} catch (Throwable e) {
-				LOGGER.error("Registry remapping failed!", e);
-				context.responseSender().disconnect(getComponent(e));
-				return;
-			}
-		});
-	}
-
-	@VisibleForTesting
-	public static void apply(RegistrySyncPayload data) throws RemapException {
-		// First check that all of the data provided is valid before making any changes
-		checkRemoteRemap(data);
-
-		for (Map.Entry> entry : data.registryMap().entrySet()) {
-			final Identifier registryId = entry.getKey();
-
-			Registry registry = BuiltInRegistries.REGISTRY.getValue(registryId);
-
-			// Registry was not found on the client, is it optional?
-			// If so we can just ignore it.
-			// Otherwise we throw an exception and disconnect.
-			if (registry == null) {
-				if (isRegistryOptional(registryId, data)) {
-					LOGGER.info("Received registry data for unknown optional registry: {}", registryId);
-					continue;
-				}
-			}
-
-			if (!(registry instanceof RemappableRegistry remappableRegistry)) {
-				throw new RemapException("Registry " + registryId + " is not remappable");
-			}
-
-			remappableRegistry.remap(entry.getValue(), RemappableRegistry.RemapMode.REMOTE);
-		}
-	}
-
-	@VisibleForTesting
-	public static void checkRemoteRemap(RegistrySyncPayload data) throws RemapException {
-		Map> map = data.registryMap();
-		ArrayList missingRegistries = new ArrayList<>();
-		Map> missingEntries = new HashMap<>();
-
-		for (Identifier registryId : map.keySet()) {
-			final Object2IntMap remoteRegistry = map.get(registryId);
-			Registry registry = BuiltInRegistries.REGISTRY.getValue(registryId);
-
-			if (registry == null) {
-				if (!isRegistryOptional(registryId, data)) {
-					// Registry was not found on the client, and is not optional.
-					missingRegistries.add(registryId);
-				}
-
-				continue;
-			}
-
-			for (Identifier remoteId : remoteRegistry.keySet()) {
-				if (!registry.containsKey(remoteId)) {
-					// Found a holder from the server that is missing on the client
-					missingEntries.computeIfAbsent(registryId, i -> new ArrayList<>()).add(remoteId);
-				}
-			}
-		}
-
-		if (missingRegistries.isEmpty() && missingEntries.isEmpty()) {
-			// All good :)
-			return;
-		}
-
-		// Print out details to the log
-		if (!missingRegistries.isEmpty()) {
-			LOGGER.error("Received unknown remote registries from server");
-
-			for (Identifier registryId : missingRegistries) {
-				LOGGER.error("Received unknown remote registry ({}) from server", registryId);
-			}
-		}
-
-		if (!missingEntries.isEmpty()) {
-			LOGGER.error("Received unknown remote registry entries from server");
-
-			for (Map.Entry> entry : missingEntries.entrySet()) {
-				for (Identifier identifier : entry.getValue()) {
-					LOGGER.error("Registry entry ({}) is missing from local registry ({})", identifier, entry.getKey());
-				}
-			}
-		}
-
-		if (!missingRegistries.isEmpty()) {
-			throw new RemapException(missingRegistriesError(missingRegistries));
-		}
-
-		throw new RemapException(missingEntriesError(missingEntries));
-	}
-
-	private static Component missingRegistriesError(List missingRegistries) {
-		MutableComponent component = Component.empty();
-
-		final int count = missingRegistries.size();
-
-		if (count == 1) {
-			component = component.append(Component.translatable("fabric-registry-sync-v0.unknown-registry.title.singular"));
-		} else {
-			component = component.append(Component.translatable("fabric-registry-sync-v0.unknown-registry.title.plural", count));
-		}
-
-		component = component.append(Component.translatable("fabric-registry-sync-v0.unknown-registry.subtitle.1").withStyle(ChatFormatting.GREEN));
-		component = component.append(Component.translatable("fabric-registry-sync-v0.unknown-registry.subtitle.2"));
-
-		final int toDisplay = 4;
-
-		for (int i = 0; i < Math.min(missingRegistries.size(), toDisplay); i++) {
-			component = component.append(Component.literal(missingRegistries.get(i).toString()).withStyle(ChatFormatting.YELLOW));
-			component = component.append(CommonComponents.NEW_LINE);
-		}
-
-		if (missingRegistries.size() > toDisplay) {
-			component = component.append(Component.translatable("fabric-registry-sync-v0.unknown-registry.footer", missingRegistries.size() - toDisplay));
-		}
-
-		return component;
-	}
-
-	private static Component missingEntriesError(Map> missingEntries) {
-		MutableComponent component = Component.empty();
-
-		final int count = missingEntries.values().stream().mapToInt(List::size).sum();
-
-		if (count == 1) {
-			component = component.append(Component.translatable("fabric-registry-sync-v0.unknown-remote.title.singular"));
-		} else {
-			component = component.append(Component.translatable("fabric-registry-sync-v0.unknown-remote.title.plural", count));
-		}
-
-		component = component.append(Component.translatable("fabric-registry-sync-v0.unknown-remote.subtitle.1").withStyle(ChatFormatting.GREEN));
-		component = component.append(Component.translatable("fabric-registry-sync-v0.unknown-remote.subtitle.2"));
-
-		final int toDisplay = 4;
-		// Get the distinct missing namespaces
-		final List namespaces = missingEntries.values().stream()
-				.flatMap(List::stream)
-				.map(Identifier::getNamespace)
-				.distinct()
-				.sorted()
-				.toList();
-
-		for (int i = 0; i < Math.min(namespaces.size(), toDisplay); i++) {
-			component = component.append(Component.literal(namespaces.get(i)).withStyle(ChatFormatting.YELLOW));
-			component = component.append(CommonComponents.NEW_LINE);
-		}
-
-		if (namespaces.size() > toDisplay) {
-			component = component.append(Component.translatable("fabric-registry-sync-v0.unknown-remote.footer", namespaces.size() - toDisplay));
-		}
-
-		return component;
-	}
-
-	private static boolean isRegistryOptional(Identifier registryId, RegistrySyncPayload data) {
-		EnumSet registryAttributes = data.registryAttributes().get(registryId);
-		return registryAttributes.contains(RegistryAttribute.OPTIONAL);
-	}
-
-	private static Component getComponent(Throwable e) {
-		if (e instanceof RemapException remapException) {
-			final Component component = remapException.getComponent();
-
-			if (component != null) {
-				return component;
-			}
-		} else if (e instanceof CompletionException completionException) {
-			return getComponent(completionException.getCause());
-		}
-
-		return Component.literal("Registry remapping failed: " + e.getMessage());
-	}
-}
diff --git a/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/impl/client/registry/sync/FabricRegistryClientInit.java b/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/impl/client/registry/sync/FabricRegistryClientInit.java
deleted file mode 100644
index 4263b097a6..0000000000
--- a/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/impl/client/registry/sync/FabricRegistryClientInit.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.impl.client.registry.sync;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationNetworking;
-import net.fabricmc.fabric.impl.registry.sync.packet.RegistrySyncPayload;
-
-public class FabricRegistryClientInit implements ClientModInitializer {
-	private static final Logger LOGGER = LoggerFactory.getLogger(FabricRegistryClientInit.class);
-
-	@Override
-	public void onInitializeClient() {
-		ClientConfigurationNetworking.registerGlobalReceiver(RegistrySyncPayload.ID, ClientRegistrySyncHandler::receivePacket);
-	}
-}
diff --git a/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/MinecraftMixin.java b/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/MinecraftMixin.java
deleted file mode 100644
index f9c0c14e2b..0000000000
--- a/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/MinecraftMixin.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.mixin.registry.sync.client;
-
-import org.slf4j.Logger;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.core.Registry;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.Identifier;
-import net.minecraft.world.item.CreativeModeTabs;
-
-import net.fabricmc.fabric.impl.registry.sync.RemapException;
-import net.fabricmc.fabric.impl.registry.sync.RemappableRegistry;
-import net.fabricmc.fabric.impl.registry.sync.trackers.vanilla.BlockInitTracker;
-
-@Mixin(Minecraft.class)
-public class MinecraftMixin {
-	@Shadow
-	@Final
-	private static Logger LOGGER;
-
-	// Unmap the registry before loading a new SP/MP setup.
-	@Inject(at = @At("RETURN"), method = "disconnect(Lnet/minecraft/client/gui/screens/Screen;ZZ)V")
-	public void disconnectAfter(Screen disconnectionScreen, boolean bl, boolean bl2, CallbackInfo ci) {
-		try {
-			unmap();
-		} catch (RemapException e) {
-			LOGGER.warn("Failed to unmap Fabric registries!", e);
-		}
-	}
-
-	@Inject(method = "", at = @At(value = "INVOKE", target = "Ljava/lang/Thread;currentThread()Ljava/lang/Thread;"))
-	private void afterModInit(CallbackInfo ci) {
-		// Freeze the registries on the client
-		LOGGER.debug("Freezing registries");
-		BuiltInRegistries.bootStrap();
-		BlockInitTracker.postFreeze();
-		CreativeModeTabs.validate();
-	}
-
-	@Unique
-	private static void unmap() throws RemapException {
-		for (Identifier registryId : BuiltInRegistries.REGISTRY.keySet()) {
-			Registry registry = BuiltInRegistries.REGISTRY.getValue(registryId);
-
-			if (registry instanceof RemappableRegistry) {
-				((RemappableRegistry) registry).unmap();
-			}
-		}
-	}
-}
diff --git a/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/ParticleResourcesMixin.java b/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/ParticleResourcesMixin.java
deleted file mode 100644
index 7ec7390b75..0000000000
--- a/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/ParticleResourcesMixin.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.mixin.registry.sync.client;
-
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.client.particle.ParticleProvider;
-import net.minecraft.client.particle.ParticleResources;
-import net.minecraft.core.registries.BuiltInRegistries;
-
-import net.fabricmc.fabric.impl.registry.sync.trackers.Int2ObjectMapTracker;
-
-@Mixin(ParticleResources.class)
-public class ParticleResourcesMixin {
-	@Final
-	@Shadow
-	private Int2ObjectMap> providers;
-
-	@Inject(method = "", at = @At("RETURN"))
-	public void onInit(CallbackInfo info) {
-		Int2ObjectMapTracker.register(BuiltInRegistries.PARTICLE_TYPE, "ParticleEngine.providers", providers);
-	}
-}
diff --git a/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/RegistryDataCollectorContentsCollectorAccessor.java b/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/RegistryDataCollectorContentsCollectorAccessor.java
deleted file mode 100644
index 996ece6144..0000000000
--- a/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/RegistryDataCollectorContentsCollectorAccessor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.mixin.registry.sync.client;
-
-import java.util.List;
-import java.util.Map;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistrySynchronization;
-import net.minecraft.resources.ResourceKey;
-
-@Mixin(targets = "net.minecraft.client.multiplayer.RegistryDataCollector$ContentsCollector")
-public interface RegistryDataCollectorContentsCollectorAccessor {
-	@Accessor
-	Map>, List> getElements();
-}
diff --git a/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/RegistryDataCollectorMixin.java b/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/RegistryDataCollectorMixin.java
deleted file mode 100644
index 42c3953123..0000000000
--- a/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/RegistryDataCollectorMixin.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.mixin.registry.sync.client;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import org.objectweb.asm.Opcodes;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Coerce;
-
-import net.minecraft.client.multiplayer.RegistryDataCollector;
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistrySynchronization;
-import net.minecraft.resources.RegistryDataLoader;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.server.packs.resources.ResourceProvider;
-
-import net.fabricmc.fabric.impl.registry.sync.DynamicRegistriesImpl;
-
-@Mixin(RegistryDataCollector.class)
-public class RegistryDataCollectorMixin {
-	/**
-	 * Keep the pre-24w04a behavior of removing empty registries, even if the client knows that registry.
-	 */
-	@WrapOperation(method = "loadNewElementsAndTags", at = @At(value = "FIELD", target = "Lnet/minecraft/resources/RegistryDataLoader;SYNCHRONIZED_REGISTRIES:Ljava/util/List;", opcode = Opcodes.GETSTATIC))
-	private List> skipEmptyRegistries(Operation>> operation, ResourceProvider resourceFactory, @Coerce RegistryDataCollectorContentsCollectorAccessor storage, boolean bl) {
-		Map>, List> dynamicRegistries = storage.getElements();
-
-		List> result = new ArrayList<>(operation.call());
-		result.removeIf(entry -> DynamicRegistriesImpl.SKIP_EMPTY_SYNC_REGISTRIES.contains(entry.key()) && !dynamicRegistries.containsKey(entry.key()));
-		return result;
-	}
-}
diff --git a/fabric-registry-sync-v0/src/client/resources/fabric-registry-sync-v0.client.mixins.json b/fabric-registry-sync-v0/src/client/resources/fabric-registry-sync-v0.client.mixins.json
deleted file mode 100644
index 0b93548d8b..0000000000
--- a/fabric-registry-sync-v0/src/client/resources/fabric-registry-sync-v0.client.mixins.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "required": true,
-  "package": "net.fabricmc.fabric.mixin.registry.sync.client",
-  "compatibilityLevel": "JAVA_25",
-  "client": [
-    "RegistryDataCollectorMixin",
-    "RegistryDataCollectorContentsCollectorAccessor",
-    "MinecraftMixin",
-    "ParticleResourcesMixin"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  },
-  "overwrites": {
-    "requireAnnotations": true
-  }
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/DynamicRegistries.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/DynamicRegistries.java
index 7ddc8c72fa..564c332a77 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/DynamicRegistries.java
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/DynamicRegistries.java
@@ -19,6 +19,7 @@
 import java.util.List;
 
 import com.mojang.serialization.Codec;
+import net.neoforged.neoforge.registries.DataPackRegistriesHooks;
 import org.jetbrains.annotations.Unmodifiable;
 
 import net.minecraft.core.Registry;
@@ -34,8 +35,11 @@
  * Custom dynamic registries can be registered with {@link #register(ResourceKey, Codec)}. These registries will not be
  * synced to the client.
  *
- * 
    The list of all dynamic registries, whether from vanilla or mods, can be accessed using
- * {@link #getDynamicRegistries()}.
+ * 
    The list of all world registries, whether from vanilla or mods, can be accessed using
+ * {@link #getWorldRegistries()}.
+ *
+ * 
    The list of all bootstrapping registries, whether from vanilla or mods, can be accessed using
+ *  * {@link #getBootstrappingRegistries()}.
  *
  * 
    Tags for the entries of a custom registry must be placed in
  * {@code /tags///}. For example, the tags for the example
@@ -79,14 +83,41 @@ private DynamicRegistries() {
 	}
 
 	/**
-	 * Returns an unmodifiable list of all dynamic registries, including modded ones.
+	 * Returns an unmodifiable list of all world registries, including modded ones.
 	 *
 	 * 
    The list will not reflect any changes caused by later registrations.
 	 *
 	 * @return an unmodifiable list of all dynamic registries
+	 *
+	 * @apiNote A world registry is defined as a registry which is loaded from datapacks.
+	 * 
    Those registries are loaded by the game at different times, and some are not patched.
+	 */
+	public static @Unmodifiable List> getWorldRegistries() {
+		return DataPackRegistriesHooks.getDataPackRegistriesWithDimensions().toList();
+	}
+
+	/**
+	 * Returns an unmodifiable list of all bootstrapping dynamic registries, including modded ones.
+	 *
+	 * 
    The list will not reflect any changes caused by later registrations.
+	 *
+	 * @return an unmodifiable list of all bootstrapping registries
+	 *
+	 * @apiNote A bootstrapping registry is defined as a registry with entries being data generated in vanilla from its own registry builder.
+	 * 
    Those registries are the ones that should be built for data generation backends.
+	 * 
    For example, it does not include the minecraft:dimension registry.
+	 */
+	public static @Unmodifiable List> getBootstrappingRegistries() {
+		return DataPackRegistriesHooks.getDataPackRegistries();
+	}
+
+	/**
+	 * @deprecated Either use {@link #getWorldRegistries()} if you wish to get all world registries, including minecraft:dimension,
+	 * or use {@link #getBootstrappingRegistries()} if you wish to avoid the latter.
 	 */
+	@Deprecated
 	public static @Unmodifiable List> getDynamicRegistries() {
-		return DynamicRegistriesImpl.getDynamicRegistries();
+		return DataPackRegistriesHooks.getDataPackRegistries();
 	}
 
 	/**
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/FabricRegistryBuilder.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/FabricRegistryBuilder.java
index 2ea4cc6d93..15785bc138 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/FabricRegistryBuilder.java
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/FabricRegistryBuilder.java
@@ -23,13 +23,13 @@
 import net.minecraft.core.DefaultedMappedRegistry;
 import net.minecraft.core.DefaultedRegistry;
 import net.minecraft.core.MappedRegistry;
-import net.minecraft.core.RegistrationInfo;
 import net.minecraft.core.Registry;
 import net.minecraft.core.WritableRegistry;
 import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
 
-import net.fabricmc.fabric.mixin.registry.sync.BuiltInRegistriesAccessor;
+import net.fabricmc.fabric.impl.registry.sync.FabricRegistryInit;
+import net.fabricmc.fabric.mixin.registry.sync.BaseMappedRegistryAccessor;
 
 /**
  * Used to create custom registries, with specified registry attributes.
@@ -141,12 +141,11 @@ public FabricRegistryBuilder attribute(RegistryAttribute attribute) {
 	public R buildAndRegister() {
 		final ResourceKey key = registry.key();
 
-		for (RegistryAttribute attribute : attributes) {
-			RegistryAttributeHolder.get(key).addAttribute(attribute);
+		if (attributes.contains(RegistryAttribute.SYNCED)) {
+			((BaseMappedRegistryAccessor) registry).invokeSetSync(true);
 		}
-
-		//noinspection unchecked
-		BuiltInRegistriesAccessor.getWRITABLE_REGISTRY().register((ResourceKey>) key, registry, RegistrationInfo.BUILT_IN);
+		
+		FabricRegistryInit.addRegistry(registry);
 
 		return registry;
 	}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryEntryAddedCallback.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryEntryAddedCallback.java
index e54d63fddc..65b030f8e7 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryEntryAddedCallback.java
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryEntryAddedCallback.java
@@ -23,7 +23,7 @@
 import net.minecraft.resources.Identifier;
 
 import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.impl.registry.sync.ListenableRegistry;
+import net.fabricmc.fabric.impl.registry.sync.FabricRegistryInit;
 
 /**
  * An event for when an entry is added to a registry.
@@ -48,7 +48,7 @@ public interface RegistryEntryAddedCallback {
 	 * @return the event
 	 */
 	static  Event> event(Registry registry) {
-		return ListenableRegistry.get(registry).fabric_getAddObjectEvent();
+		return FabricRegistryInit.objectAddedEvent(registry);
 	}
 
 	/**
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryIdRemapCallback.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryIdRemapCallback.java
index bc68c9f8a0..7af129889c 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryIdRemapCallback.java
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryIdRemapCallback.java
@@ -22,7 +22,7 @@
 import net.minecraft.resources.Identifier;
 
 import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.impl.registry.sync.ListenableRegistry;
+import net.fabricmc.fabric.impl.registry.sync.FabricRegistryInit;
 
 /**
  * The remapping process functions as follows:
@@ -49,6 +49,6 @@ interface RemapState {
 	}
 
 	static  Event> event(Registry registry) {
-		return ListenableRegistry.get(registry).fabric_getRemapEvent();
+		return FabricRegistryInit.getRemapCallbackEvent(registry);
 	}
 }
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/DynamicRegistriesImpl.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/DynamicRegistriesImpl.java
index fc68f92978..82e06a8516 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/DynamicRegistriesImpl.java
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/DynamicRegistriesImpl.java
@@ -17,16 +17,18 @@
 package net.fabricmc.fabric.impl.registry.sync;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
 import com.mojang.serialization.Codec;
-import org.jetbrains.annotations.Unmodifiable;
+import net.neoforged.neoforge.registries.DataPackRegistryEvent;
 
 import net.minecraft.core.Registry;
-import net.minecraft.core.RegistrySynchronization;
 import net.minecraft.resources.RegistryDataLoader;
 import net.minecraft.resources.RegistryValidator;
 import net.minecraft.resources.ResourceKey;
@@ -34,59 +36,70 @@
 import net.fabricmc.fabric.api.event.registry.DynamicRegistries;
 
 public final class DynamicRegistriesImpl {
-	private static final List> DYNAMIC_REGISTRIES = new ArrayList<>(RegistryDataLoader.WORLDGEN_REGISTRIES);
-	public static final Set> FABRIC_DYNAMIC_REGISTRY_KEYS = new HashSet<>();
-	public static final Set>> DYNAMIC_REGISTRY_KEYS = new HashSet<>();
-	public static final Set>> SKIP_EMPTY_SYNC_REGISTRIES = new HashSet<>();
+	private static final List> WORLD_REGISTRIES = new ArrayList<>();
+	private static final List> BOOTSTRAPPING_REGISTRIES = new ArrayList<>();
+	private static final Set>> VANILLA_DYNAMIC_REGISTRY_KEYS;
+	public static final Set>> FABRIC_DYNAMIC_REGISTRY_KEYS = new HashSet<>();
+	public static final Map>, Codec> NETWORK_CODECS = new HashMap<>();
+
 
 	static {
-		for (RegistryDataLoader.RegistryData vanillaEntry : RegistryDataLoader.WORLDGEN_REGISTRIES) {
-			DYNAMIC_REGISTRY_KEYS.add(vanillaEntry.key());
+		Set>> vanillaDynamicRegistryKeys = new HashSet<>();
+
+		for (RegistryDataLoader.RegistryData worldgenEntry : RegistryDataLoader.WORLDGEN_REGISTRIES) {
+			vanillaDynamicRegistryKeys.add(worldgenEntry.key());
+		}
+
+		for (RegistryDataLoader.RegistryData dimensionEntry : RegistryDataLoader.DIMENSION_REGISTRIES) {
+			vanillaDynamicRegistryKeys.add(dimensionEntry.key());
 		}
+
+		VANILLA_DYNAMIC_REGISTRY_KEYS = Collections.unmodifiableSet(vanillaDynamicRegistryKeys);
 	}
 
 	private DynamicRegistriesImpl() {
 	}
 
-	public static @Unmodifiable List> getDynamicRegistries() {
-		return List.copyOf(DYNAMIC_REGISTRIES);
+	private static void addDynamicRegistryData(ResourceKey> key, RegistryDataLoader.RegistryData data) {
+		FABRIC_DYNAMIC_REGISTRY_KEYS.add(key);
+		BOOTSTRAPPING_REGISTRIES.add(data);
+		WORLD_REGISTRIES.add(data);
 	}
 
 	public static  RegistryDataLoader.RegistryData register(ResourceKey> key, Codec serverCodec) {
 		Objects.requireNonNull(key, "Registry key cannot be null");
 		Objects.requireNonNull(serverCodec, "Server codec cannot be null");
 
-		if (!DYNAMIC_REGISTRY_KEYS.add(key)) {
+		if (VANILLA_DYNAMIC_REGISTRY_KEYS.contains(key) || FABRIC_DYNAMIC_REGISTRY_KEYS.contains(key)) {
 			throw new IllegalArgumentException("Dynamic registry " + key + " has already been registered!");
 		}
 
 		var entry = new RegistryDataLoader.RegistryData<>(key, serverCodec, RegistryValidator.none());
-		DYNAMIC_REGISTRIES.add(entry);
-		FABRIC_DYNAMIC_REGISTRY_KEYS.add(key);
+		addDynamicRegistryData(key, entry);
 		return entry;
 	}
 
-	public static  void addSyncedRegistry(ResourceKey> key, Codec clientCodec, DynamicRegistries.SyncOption... options) {
+	public static  void addSyncedRegistry(ResourceKey> key, Codec networkCodec, DynamicRegistries.SyncOption... options) {
 		Objects.requireNonNull(key, "Registry key cannot be null");
-		Objects.requireNonNull(clientCodec, "Client codec cannot be null");
+		Objects.requireNonNull(networkCodec, "Network codec cannot be null");
 		Objects.requireNonNull(options, "Options cannot be null");
 
-		if (!(RegistryDataLoader.SYNCHRONIZED_REGISTRIES instanceof ArrayList>)) {
-			RegistryDataLoader.SYNCHRONIZED_REGISTRIES = new ArrayList<>(RegistryDataLoader.SYNCHRONIZED_REGISTRIES);
-		}
-
-		RegistryDataLoader.SYNCHRONIZED_REGISTRIES.add(new RegistryDataLoader.RegistryData<>(key, clientCodec, RegistryValidator.none()));
-
-		if (!(RegistrySynchronization.NETWORKABLE_REGISTRIES instanceof HashSet>>)) {
-			RegistrySynchronization.NETWORKABLE_REGISTRIES = new HashSet<>(RegistrySynchronization.NETWORKABLE_REGISTRIES);
-		}
+        NETWORK_CODECS.put(key, networkCodec);
+		FABRIC_DYNAMIC_REGISTRY_KEYS.add(key);
+	}
 
-		RegistrySynchronization.NETWORKABLE_REGISTRIES.add(key);
+	@SuppressWarnings({"rawtypes", "unchecked"})
+    static void onNewDatapackRegistries(DataPackRegistryEvent.NewRegistry event) {
+        for (RegistryDataLoader.RegistryData dynamicRegistry : WORLD_REGISTRIES) {
+            Codec networkCodec = NETWORK_CODECS.get(dynamicRegistry.key());
+            event.dataPackRegistry(dynamicRegistry.key(), dynamicRegistry.elementCodec(), networkCodec);
+        }
 
-		for (DynamicRegistries.SyncOption option : options) {
-			if (option == DynamicRegistries.SyncOption.SKIP_WHEN_EMPTY) {
-				SKIP_EMPTY_SYNC_REGISTRIES.add(key);
-			}
+		for (RegistryDataLoader.RegistryData dynamicRegistry : BOOTSTRAPPING_REGISTRIES) {
+			Codec networkCodec = NETWORK_CODECS.get(dynamicRegistry.key());
+			event.dataPackRegistry(dynamicRegistry.key(), dynamicRegistry.elementCodec(), networkCodec);
 		}
+		WORLD_REGISTRIES.clear();
+		BOOTSTRAPPING_REGISTRIES.clear();
 	}
 }
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/FabricRegistryInit.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/FabricRegistryInit.java
index 449fef64f6..5479b5fe60 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/FabricRegistryInit.java
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/FabricRegistryInit.java
@@ -16,207 +16,85 @@
 
 package net.fabricmc.fabric.impl.registry.sync;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.neoforge.registries.DataPackRegistryEvent;
+import net.neoforged.neoforge.registries.ModifyRegistriesEvent;
+import net.neoforged.neoforge.registries.callback.AddCallback;
+
+import net.minecraft.core.RegistrationInfo;
+import net.minecraft.core.Registry;
+import net.minecraft.core.WritableRegistry;
 import net.minecraft.core.registries.BuiltInRegistries;
 
 import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.event.registry.RegistryAttribute;
-import net.fabricmc.fabric.api.event.registry.RegistryAttributeHolder;
-import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
-import net.fabricmc.fabric.api.networking.v1.ServerConfigurationConnectionEvents;
-import net.fabricmc.fabric.api.networking.v1.ServerConfigurationNetworking;
-import net.fabricmc.fabric.impl.registry.sync.packet.RegistrySyncPayload;
-
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
+import net.fabricmc.fabric.api.event.registry.RegistryIdRemapCallback;
+import net.fabricmc.fabric.mixin.registry.sync.BaseMappedRegistryAccessor;
+import net.fabricmc.fabric.mixin.registry.sync.MappedRegistryAccessor;
+import net.fabricmc.fabric.mixin.registry.sync.RegistryManagerAccessor;
+
+@SuppressWarnings({"unchecked", "rawtypes"})
 public class FabricRegistryInit implements ModInitializer {
-	private static final int MAX_PACKET_SIZE = Integer.getInteger("fabric.registry.sync.max_packet_size", 128 * 1024 * 1024);
+	private static final Map, Event> REGISTRY_ENTRY_ADDED_CALLBACKS = new ConcurrentHashMap<>();
+	private static final Map, Event>> REMAP_CALLBACKS = new HashMap<>();
 
 	@Override
 	public void onInitialize() {
-		PayloadTypeRegistry.serverboundConfiguration().register(SyncCompletePayload.ID, SyncCompletePayload.CODEC);
-		PayloadTypeRegistry.clientboundConfiguration().registerLarge(RegistrySyncPayload.ID, RegistrySyncPayload.CODEC, MAX_PACKET_SIZE);
+		IEventBus bus = ModLoadingContext.get().getActiveContainer().getEventBus();
+		bus.addListener(DataPackRegistryEvent.NewRegistry.class, DynamicRegistriesImpl::onNewDatapackRegistries);
+		bus.addListener(ModifyRegistriesEvent.class, FabricRegistryInit::injectCallbacks);
+	}
 
-		ServerConfigurationConnectionEvents.BEFORE_CONFIGURE.register(RegistrySyncManager::configureClient);
-		ServerConfigurationNetworking.registerGlobalReceiver(SyncCompletePayload.ID, (payload, context) -> {
-			context.packetListener().completeTask(RegistrySyncManager.SyncConfigurationTask.KEY);
+	public static void injectCallbacks(ModifyRegistriesEvent event) {
+		event.getRegistries().forEach(registry -> {
+			getRemapCallbackEvent(registry);
+			registry.addCallback(new FapiRemapBridge<>());
 		});
+	}
 
-		// Synced in ClientboundSoundPacket.
-		RegistryAttributeHolder.get(BuiltInRegistries.SOUND_EVENT)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Synced with RegistryTagContainer from RegistryTagManager.
-		RegistryAttributeHolder.get(BuiltInRegistries.FLUID)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// MobEffectInstance serialises with raw id.
-		RegistryAttributeHolder.get(BuiltInRegistries.MOB_EFFECT)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Synced in ClientboundSectionBlocksUpdatePacket among other places, a pallet is used when saving.
-		RegistryAttributeHolder.get(BuiltInRegistries.BLOCK)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Synced in ClientboundAddEntityPacket and RegistryTagManager
-		RegistryAttributeHolder.get(BuiltInRegistries.ENTITY_TYPE)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Synced in RegistryTagManager
-		RegistryAttributeHolder.get(BuiltInRegistries.ITEM)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Synced via ByteBufCodecs.registry
-		RegistryAttributeHolder.get(BuiltInRegistries.POTION)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Doesnt seem to be accessed apart from registering?
-		RegistryAttributeHolder.get(BuiltInRegistries.CARVER);
-
-		// Serialised by string, doesnt seem to be synced
-		RegistryAttributeHolder.get(BuiltInRegistries.FEATURE);
-
-		// Serialised by string, doesnt seem to be synced
-		RegistryAttributeHolder.get(BuiltInRegistries.BLOCKSTATE_PROVIDER_TYPE);
-
-		// Serialised by string, doesnt seem to be synced
-		RegistryAttributeHolder.get(BuiltInRegistries.FOLIAGE_PLACER_TYPE);
-
-		// Serialised by string, doesnt seem to be synced
-		RegistryAttributeHolder.get(BuiltInRegistries.TRUNK_PLACER_TYPE);
-
-		// Serialised by string, doesnt seem to be synced
-		RegistryAttributeHolder.get(BuiltInRegistries.TREE_DECORATOR_TYPE);
-
-		// Serialised by string, doesnt seem to be synced
-		RegistryAttributeHolder.get(BuiltInRegistries.FEATURE_SIZE_TYPE);
-
-		// Synced in ClientboundLevelParticlesPacket
-		RegistryAttributeHolder.get(BuiltInRegistries.PARTICLE_TYPE)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Serialised by string, doesnt seem to be synced
-		RegistryAttributeHolder.get(BuiltInRegistries.BIOME_SOURCE);
-
-		// Synced. Vanilla uses raw ids in ClientboundBlockEntityDataPacket, and mods use the Vanilla syncing since 1.18
-		RegistryAttributeHolder.get(BuiltInRegistries.BLOCK_ENTITY_TYPE)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Synced via ByteBufCodecs.registry
-		RegistryAttributeHolder.get(BuiltInRegistries.CUSTOM_STAT)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Serialised by string, doesnt seem to be synced
-		RegistryAttributeHolder.get(BuiltInRegistries.CHUNK_STATUS);
-
-		// Serialised by string, doesnt seem to be synced
-		RegistryAttributeHolder.get(BuiltInRegistries.STRUCTURE_TYPE);
-
-		// Serialised by string, doesnt seem to be synced
-		RegistryAttributeHolder.get(BuiltInRegistries.STRUCTURE_PIECE);
-
-		// Serialised by string, doesnt seem to be synced
-		RegistryAttributeHolder.get(BuiltInRegistries.RULE_TEST);
-
-		// Serialised by string, doesnt seem to be synced
-		RegistryAttributeHolder.get(BuiltInRegistries.POS_RULE_TEST);
-
-		RegistryAttributeHolder.get(BuiltInRegistries.STRUCTURE_PROCESSOR);
-
-		// Serialised by string, doesnt seem to be synced
-		RegistryAttributeHolder.get(BuiltInRegistries.STRUCTURE_POOL_ELEMENT);
-
-		//  Uses the raw ID when syncing the command tree to the client
-		RegistryAttributeHolder.get(BuiltInRegistries.COMMAND_ARGUMENT_TYPE)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Synced in ClientboundOpenScreenPacket
-		RegistryAttributeHolder.get(BuiltInRegistries.MENU)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Does not seem to be serialised, only queried by id. Not synced
-		RegistryAttributeHolder.get(BuiltInRegistries.RECIPE_TYPE);
-
-		// Synced by rawID in 24w03a+
-		RegistryAttributeHolder.get(BuiltInRegistries.ATTRIBUTE)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Synced in ClientboundAwardStatsPacket
-		RegistryAttributeHolder.get(BuiltInRegistries.STAT_TYPE)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Synced by rawID in EntityDataSerializers.VILLAGER_DATA
-		RegistryAttributeHolder.get(BuiltInRegistries.VILLAGER_TYPE)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Synced by rawID in EntityDataSerializers.VILLAGER_DATA
-		RegistryAttributeHolder.get(BuiltInRegistries.VILLAGER_PROFESSION)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Serialised by string, doesnt seem to be synced
-		RegistryAttributeHolder.get(BuiltInRegistries.POINT_OF_INTEREST_TYPE);
-
-		// Serialised by string, doesnt seem to be synced
-		RegistryAttributeHolder.get(BuiltInRegistries.MEMORY_MODULE_TYPE);
-
-		// Doesnt seem to be serialised or synced.
-		RegistryAttributeHolder.get(BuiltInRegistries.SENSOR_TYPE);
-
-		// Doesnt seem to be serialised or synced.
-		RegistryAttributeHolder.get(BuiltInRegistries.ACTIVITY);
-
-		// Doesnt seem to be serialised or synced.
-		RegistryAttributeHolder.get(BuiltInRegistries.LOOT_POOL_ENTRY_TYPE);
-
-		// Doesnt seem to be serialised or synced.
-		RegistryAttributeHolder.get(BuiltInRegistries.LOOT_FUNCTION_TYPE);
-
-		// Doesnt seem to be serialised or synced.
-		RegistryAttributeHolder.get(BuiltInRegistries.LOOT_CONDITION_TYPE);
-
-		// Synced in TagManager::toPacket/fromPacket -> TagGroup::serialize/deserialize
-		RegistryAttributeHolder.get(BuiltInRegistries.GAME_EVENT)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Synced by rawID in its serialization code.
-		RegistryAttributeHolder.get(BuiltInRegistries.NUMBER_FORMAT_TYPE)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Synced by rawID.
-		RegistryAttributeHolder.get(BuiltInRegistries.POSITION_SOURCE_TYPE)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Synced by rawID.
-		RegistryAttributeHolder.get(BuiltInRegistries.DATA_COMPONENT_TYPE)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Synced by rawID.
-		RegistryAttributeHolder.get(BuiltInRegistries.DATA_COMPONENT_PREDICATE_TYPE)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Synced by rawID.
-		RegistryAttributeHolder.get(BuiltInRegistries.MAP_DECORATION_TYPE)
-				.addAttribute(RegistryAttribute.SYNCED);
-
-		// Synced via ByteBufCodecs.registry
-		RegistryAttributeHolder.get(BuiltInRegistries.CONSUME_EFFECT_TYPE)
-				.addAttribute(RegistryAttribute.SYNCED);
+	public static  Event> getRemapCallbackEvent(Registry registry) {
+		return (Event) REMAP_CALLBACKS.computeIfAbsent(registry, r -> EventFactory.createArrayBacked(RegistryIdRemapCallback.class,
+				callbacks -> a -> {
+					for (RegistryIdRemapCallback callback : callbacks) {
+						callback.onRemap(a);
+					}
+				}
+		));
+	}
 
-		// Synced via ByteBufCodecs.registryValue
-		RegistryAttributeHolder.get(BuiltInRegistries.RECIPE_DISPLAY)
-				.addAttribute(RegistryAttribute.SYNCED);
+	public static  Event> objectAddedEvent(Registry registry) {
+		return (Event>) (Object) REGISTRY_ENTRY_ADDED_CALLBACKS.computeIfAbsent(registry, k -> {
+			Event event = EventFactory.createArrayBacked(RegistryEntryAddedCallback.class,
+					callbacks -> (rawId, id, object) -> {
+						for (RegistryEntryAddedCallback callback : callbacks) {
+							callback.onEntryAdded(rawId, id, object);
+						}
+					}
+			);
+			k.addCallback(AddCallback.class, (reg, id, key, val) -> event.invoker().onEntryAdded(id, key.identifier(), val));
+			return event;
+		});
+	}
 
-		// Synced via ByteBufCodecs.registryValue
-		RegistryAttributeHolder.get(BuiltInRegistries.SLOT_DISPLAY)
-				.addAttribute(RegistryAttribute.SYNCED);
+	public static void addRegistry(Registry registry) {
+		RegistryManagerAccessor.invokeTrackModdedRegistry(registry.key().identifier());
 
-		// Synced via ByteBufCodecs.registryValue
-		RegistryAttributeHolder.get(BuiltInRegistries.RECIPE_BOOK_CATEGORY)
-				.addAttribute(RegistryAttribute.SYNCED);
+		boolean frozen = ((MappedRegistryAccessor) BuiltInRegistries.REGISTRY).getFrozen();
+		if (frozen) {
+			((BaseMappedRegistryAccessor) BuiltInRegistries.REGISTRY).invokeUnfreeze(false);
+		}
 
-		// Synced via ByteBufCodecs.registryValue
-		RegistryAttributeHolder.get(BuiltInRegistries.POINT_OF_INTEREST_TYPE)
-				.addAttribute(RegistryAttribute.SYNCED);
+		((WritableRegistry) BuiltInRegistries.REGISTRY).register(registry.key(), registry, RegistrationInfo.BUILT_IN);
 
-		// Synced via ByteBufCodecs.registryValue
-		RegistryAttributeHolder.get(BuiltInRegistries.DEBUG_SUBSCRIPTION)
-				.addAttribute(RegistryAttribute.SYNCED);
+		if (frozen) {
+			((WritableRegistry) BuiltInRegistries.REGISTRY).freeze();
+		}
 	}
 }
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/FapiRemapBridge.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/FapiRemapBridge.java
new file mode 100644
index 0000000000..e621aedca3
--- /dev/null
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/FapiRemapBridge.java
@@ -0,0 +1,59 @@
+package net.fabricmc.fabric.impl.registry.sync;
+
+import it.unimi.dsi.fastutil.ints.Int2IntMap;
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import net.neoforged.neoforge.registries.callback.BakeCallback;
+import net.neoforged.neoforge.registries.callback.ClearCallback;
+import org.jetbrains.annotations.Nullable;
+
+import net.minecraft.core.Registry;
+import net.minecraft.resources.Identifier;
+
+import net.fabricmc.fabric.api.event.registry.RegistryIdRemapCallback;
+
+public final class FapiRemapBridge implements ClearCallback, BakeCallback {
+	@Nullable
+	private Int2ObjectMap oldIdMap;
+
+	@Override
+	public void onClear(Registry registry, boolean full) {
+		if (full) {
+			oldIdMap = null;
+			return;
+		}
+		oldIdMap = new Int2ObjectOpenHashMap<>();
+		for (T value : registry) {
+			oldIdMap.put(registry.getId(value), registry.getKey(value));
+		}
+	}
+
+	@Override
+	public void onBake(Registry registry) {
+		if (oldIdMap == null) {
+			return;
+		}
+		Int2ObjectMap old = oldIdMap;
+		oldIdMap = null;
+
+		Object2IntMap newByKey = new Object2IntOpenHashMap<>();
+		newByKey.defaultReturnValue(Integer.MIN_VALUE);
+		for (T value : registry) {
+			newByKey.put(registry.getKey(value), registry.getId(value));
+		}
+
+		Int2IntMap rawIdChangeMap = new Int2IntOpenHashMap();
+		for (var e : old.int2ObjectEntrySet()) {
+			int newId = newByKey.getInt(e.getValue());
+			if (newId != Integer.MIN_VALUE) {
+				rawIdChangeMap.put(e.getIntKey(), newId);
+			}
+		}
+
+		RegistryIdRemapCallback.RemapState state = new RemapStateImpl<>(registry, old, rawIdChangeMap);
+		RegistryIdRemapCallback.event(registry).invoker().onRemap(state);
+	}
+}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/ListenableRegistry.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/ListenableRegistry.java
deleted file mode 100644
index 2c7a3a20fb..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/ListenableRegistry.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.impl.registry.sync;
-
-import net.minecraft.core.Registry;
-
-import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
-import net.fabricmc.fabric.api.event.registry.RegistryIdRemapCallback;
-
-public interface ListenableRegistry {
-	Event> fabric_getAddObjectEvent();
-	Event> fabric_getRemapEvent();
-	@SuppressWarnings("unchecked")
-	static  ListenableRegistry get(Registry registry) {
-		if (!(registry instanceof ListenableRegistry)) {
-			throw new IllegalArgumentException("Unsupported registry: " + registry.key().identifier());
-		}
-
-		// Safe cast: this is implemented via Mixin and T will always match the T in Registry
-		return (ListenableRegistry) registry;
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RegistryAttributeImpl.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RegistryAttributeImpl.java
index 72702acc42..9e3b3e4498 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RegistryAttributeImpl.java
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RegistryAttributeImpl.java
@@ -16,51 +16,44 @@
 
 package net.fabricmc.fabric.impl.registry.sync;
 
-import java.util.EnumSet;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.jetbrains.annotations.VisibleForTesting;
-
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceKey;
 
 import net.fabricmc.fabric.api.event.registry.RegistryAttribute;
 import net.fabricmc.fabric.api.event.registry.RegistryAttributeHolder;
-import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.fabric.mixin.registry.sync.BaseMappedRegistryAccessor;
 
 public final class RegistryAttributeImpl implements RegistryAttributeHolder {
 	private static final Map, RegistryAttributeHolder> HOLDER_MAP = new ConcurrentHashMap<>();
 
-	public static RegistryAttributeHolder getHolder(ResourceKey resourceKey) {
-		return HOLDER_MAP.computeIfAbsent(resourceKey, key -> new RegistryAttributeImpl());
+	public static RegistryAttributeHolder getHolder(ResourceKey registryKey) {
+		return HOLDER_MAP.computeIfAbsent(registryKey, RegistryAttributeImpl::new);
 	}
 
-	private final EnumSet attributes = EnumSet.noneOf(RegistryAttribute.class);
+	private final ResourceKey key;
 
-	private RegistryAttributeImpl() {
+	private RegistryAttributeImpl(ResourceKey key) {
+		this.key = key;
 	}
 
 	@Override
 	public RegistryAttributeHolder addAttribute(RegistryAttribute attribute) {
-		attributes.add(attribute);
-		return this;
-	}
-
-	@VisibleForTesting
-	public void removeAttribute(RegistryAttribute attribute) {
-		if (!FabricLoader.getInstance().isDevelopmentEnvironment()) {
-			throw new AssertionError();
+		if (attribute == RegistryAttribute.SYNCED) {
+			Registry registry = BuiltInRegistries.REGISTRY.getValue((ResourceKey) this.key);
+			((BaseMappedRegistryAccessor) registry).invokeSetSync(true);
 		}
-
-		attributes.remove(attribute);
+		return this;
 	}
 
 	@Override
 	public boolean hasAttribute(RegistryAttribute attribute) {
-		return attributes.contains(attribute);
-	}
-
-	public EnumSet getAttributes() {
-		return attributes;
+		if (attribute == RegistryAttribute.SYNCED) {
+			return BuiltInRegistries.REGISTRY.getValue((ResourceKey) this.key).doesSync();
+		}
+		return attribute == RegistryAttribute.MODDED;
 	}
 }
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RegistryMapSerializer.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RegistryMapSerializer.java
deleted file mode 100644
index dedb908a91..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RegistryMapSerializer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.impl.registry.sync;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
-
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.resources.Identifier;
-
-public class RegistryMapSerializer {
-	public static final int VERSION = 1;
-
-	public static Map> fromNbt(CompoundTag nbt) {
-		CompoundTag mainNbt = nbt.getCompound("registries").orElseThrow();
-		Map> map = new LinkedHashMap<>();
-
-		for (String registryId : mainNbt.keySet()) {
-			Object2IntMap idMap = new Object2IntLinkedOpenHashMap<>();
-			CompoundTag idNbt = mainNbt.getCompound(registryId).orElseThrow();
-
-			for (String id : idNbt.keySet()) {
-				idMap.put(Identifier.parse(id), idNbt.getIntOr(id, 0));
-			}
-
-			map.put(Identifier.parse(registryId), idMap);
-		}
-
-		return map;
-	}
-
-	public static CompoundTag toNbt(Map> map) {
-		CompoundTag mainNbt = new CompoundTag();
-
-		map.forEach((registryId, idMap) -> {
-			CompoundTag registryNbt = new CompoundTag();
-
-			for (Object2IntMap.Entry idPair : idMap.object2IntEntrySet()) {
-				registryNbt.putInt(idPair.getKey().toString(), idPair.getIntValue());
-			}
-
-			mainNbt.put(registryId.toString(), registryNbt);
-		});
-
-		CompoundTag nbt = new CompoundTag();
-		nbt.putInt("version", VERSION);
-		nbt.put("registries", mainNbt);
-		return nbt;
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RegistrySyncManager.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RegistrySyncManager.java
deleted file mode 100644
index 583eab2860..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RegistrySyncManager.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * 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.impl.registry.sync;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.function.Consumer;
-
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSet;
-import it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
-import org.jspecify.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.minecraft.ChatFormatting;
-import net.minecraft.core.Registry;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.resources.Identifier;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.network.ConfigurationTask;
-import net.minecraft.server.network.ServerConfigurationPacketListenerImpl;
-import net.minecraft.server.players.NameAndId;
-
-import net.fabricmc.fabric.api.event.registry.RegistryAttribute;
-import net.fabricmc.fabric.api.event.registry.RegistryAttributeHolder;
-import net.fabricmc.fabric.api.networking.v1.ServerConfigurationNetworking;
-import net.fabricmc.fabric.impl.networking.server.ServerNetworkingImpl;
-import net.fabricmc.fabric.impl.registry.sync.packet.RegistrySyncPayload;
-
-public final class RegistrySyncManager {
-	public static final boolean DEBUG = Boolean.getBoolean("fabric.registry.debug");
-
-	private static final Logger LOGGER = LoggerFactory.getLogger("FabricRegistrySync");
-	private static final boolean DEBUG_WRITE_REGISTRY_DATA = Boolean.getBoolean("fabric.registry.debug.writeContentsAsCsv");
-
-	//Set to true after vanilla's bootstrap has completed
-	public static boolean postBootstrap = false;
-
-	private RegistrySyncManager() { }
-
-	public static void configureClient(ServerConfigurationPacketListenerImpl handler, MinecraftServer server) {
-		if (!DEBUG && server.isSingleplayerOwner(new NameAndId(handler.getOwner()))) {
-			// Dont send in singleplayer
-			return;
-		}
-
-		final Map> map = RegistrySyncManager.createAndPopulateRegistryMap();
-
-		if (map == null) {
-			// Don't send when there is nothing to map
-			return;
-		}
-
-		if (!ServerConfigurationNetworking.canSend(handler, RegistrySyncPayload.ID)) {
-			if (areAllRegistriesOptional(map)) {
-				// Allow the client to connect if all of the registries we want to sync are optional
-				return;
-			}
-
-			// Disconnect incompatible clients
-			Component message = getIncompatibleClientComponent(ServerNetworkingImpl.getAddon(handler).getClientBrand(), map);
-			handler.disconnect(message);
-			return;
-		}
-
-		handler.addTask(new SyncConfigurationTask(handler, map));
-	}
-
-	private static Component getIncompatibleClientComponent(@Nullable String brand, Map> map) {
-		String brandText = switch (brand) {
-		case "fabric" -> "Fabric API";
-		case null, default -> "Fabric Loader and Fabric API";
-		};
-
-		final int toDisplay = 4;
-
-		List namespaces = map.values().stream()
-				.map(Object2IntMap::keySet)
-				.flatMap(Set::stream)
-				.map(Identifier::getNamespace)
-				.filter(s -> !s.equals(Identifier.DEFAULT_NAMESPACE))
-				.distinct()
-				.sorted()
-				.toList();
-
-		MutableComponent component = Component.literal("The following registry entry namespaces may be related:\n\n");
-
-		for (int i = 0; i < Math.min(namespaces.size(), toDisplay); i++) {
-			component = component.append(Component.literal(namespaces.get(i)).withStyle(ChatFormatting.YELLOW));
-			component = component.append(CommonComponents.NEW_LINE);
-		}
-
-		if (namespaces.size() > toDisplay) {
-			component = component.append(Component.literal("And %d more...".formatted(namespaces.size() - toDisplay)));
-		}
-
-		return Component.literal("This server requires ").append(Component.literal(brandText).withStyle(ChatFormatting.GREEN)).append(" installed on your client!")
-				.append(CommonComponents.NEW_LINE).append(component)
-				.append(CommonComponents.NEW_LINE).append(CommonComponents.NEW_LINE).append(Component.literal("Contact the server's administrator for more information!").withStyle(ChatFormatting.GOLD));
-	}
-
-	private static boolean areAllRegistriesOptional(Map> map) {
-		return map.keySet().stream()
-				.map(BuiltInRegistries.REGISTRY::getValue)
-				.filter(Objects::nonNull)
-				.map(RegistryAttributeHolder::get)
-				.allMatch(attributes -> attributes.hasAttribute(RegistryAttribute.OPTIONAL));
-	}
-
-	public record SyncConfigurationTask(
-			ServerConfigurationPacketListenerImpl handler,
-			Map> map
-	) implements ConfigurationTask {
-		public static final Type KEY = new Type("fabric:registry/sync");
-
-		@Override
-		public void start(Consumer> sender) {
-			sender.accept(ServerConfigurationNetworking.createClientboundPacket(new RegistrySyncPayload(map)));
-		}
-
-		@Override
-		public Type type() {
-			return KEY;
-		}
-	}
-
-	/**
-	 * Creates a {@link Map} used to sync the registry ids.
-	 *
-	 * @return a {@link Map} to sync, null when empty
-	 */
-	@Nullable
-	public static Map> createAndPopulateRegistryMap() {
-		Map> map = new LinkedHashMap<>();
-
-		for (Identifier registryId : BuiltInRegistries.REGISTRY.keySet()) {
-			Registry registry = BuiltInRegistries.REGISTRY.getValue(registryId);
-
-			if (DEBUG_WRITE_REGISTRY_DATA) {
-				File location = new File(".fabric" + File.separatorChar + "debug" + File.separatorChar + "registry");
-				boolean c = true;
-
-				if (!location.exists()) {
-					if (!location.mkdirs()) {
-						LOGGER.warn("[fabric-registry-sync debug] Could not create " + location.getAbsolutePath() + " directory!");
-						c = false;
-					}
-				}
-
-				if (c && registry != null) {
-					File file = new File(location, registryId.toString().replace(':', '.').replace('/', '.') + ".csv");
-
-					try (FileOutputStream stream = new FileOutputStream(file)) {
-						StringBuilder builder = new StringBuilder("Raw ID,String ID,Class Type\n");
-
-						for (Object o : registry) {
-							String classType = (o == null) ? "null" : o.getClass().getName();
-							//noinspection unchecked
-							Identifier id = registry.getKey(o);
-							if (id == null) continue;
-
-							//noinspection unchecked
-							int rawId = registry.getId(o);
-							String stringId = id.toString();
-							builder.append("\"").append(rawId).append("\",\"").append(stringId).append("\",\"").append(classType).append("\"\n");
-						}
-
-						stream.write(builder.toString().getBytes(StandardCharsets.UTF_8));
-					} catch (IOException e) {
-						LOGGER.warn("[fabric-registry-sync debug] Could not write to " + file.getAbsolutePath() + "!", e);
-					}
-				}
-			}
-
-			RegistryAttributeHolder attributeHolder = RegistryAttributeHolder.get(registry.key());
-
-			if (!attributeHolder.hasAttribute(RegistryAttribute.SYNCED)) {
-				LOGGER.debug("Not syncing registry: {}", registryId);
-				continue;
-			}
-
-			/*
-			 * Dont do anything with vanilla registries on client sync.
-			 *
-			 * This will not sync IDs if a world has been previously modded, either from removed mods
-			 * or a previous version of fabric registry sync.
-			 */
-			if (!attributeHolder.hasAttribute(RegistryAttribute.MODDED)) {
-				LOGGER.debug("Skipping un-modded registry: " + registryId);
-				continue;
-			}
-
-			LOGGER.debug("Syncing registry: " + registryId);
-
-			if (registry instanceof RemappableRegistry) {
-				Object2IntMap idMap = new Object2IntLinkedOpenHashMap<>();
-				IntSet rawIdsFound = DEBUG ? new IntOpenHashSet() : null;
-
-				for (Object o : registry) {
-					//noinspection unchecked
-					Identifier id = registry.getKey(o);
-					if (id == null) continue;
-
-					//noinspection unchecked
-					int rawId = registry.getId(o);
-
-					if (DEBUG) {
-						if (registry.getValue(id) != o) {
-							LOGGER.error("[fabric-registry-sync] Inconsistency detected in " + registryId + ": object " + o + " -> string ID " + id + " -> object " + registry.getValue(id) + "!");
-						}
-
-						if (registry.byId(rawId) != o) {
-							LOGGER.error("[fabric-registry-sync] Inconsistency detected in " + registryId + ": object " + o + " -> integer ID " + rawId + " -> object " + registry.byId(rawId) + "!");
-						}
-
-						if (!rawIdsFound.add(rawId)) {
-							LOGGER.error("[fabric-registry-sync] Inconsistency detected in " + registryId + ": multiple objects hold the raw ID " + rawId + " (this one is " + id + ")");
-						}
-					}
-
-					idMap.put(id, rawId);
-				}
-
-				map.put(registryId, idMap);
-			}
-		}
-
-		if (map.isEmpty()) {
-			return null;
-		}
-
-		return map;
-	}
-
-	public static void bootstrapRegistries() {
-		postBootstrap = true;
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RemapException.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RemapException.java
deleted file mode 100644
index 4b71c3ced2..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RemapException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.impl.registry.sync;
-
-import org.jspecify.annotations.Nullable;
-
-import net.minecraft.network.chat.Component;
-
-public class RemapException extends Exception {
-	@Nullable
-	private final Component component;
-
-	public RemapException(String message) {
-		super(message);
-		this.component = null;
-	}
-
-	public RemapException(Component component) {
-		super(component.getString());
-		this.component = component;
-	}
-
-	@Nullable
-	public Component getComponent() {
-		return component;
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RemappableRegistry.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RemappableRegistry.java
deleted file mode 100644
index 47667e6a12..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RemappableRegistry.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.impl.registry.sync;
-
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
-
-import net.minecraft.resources.Identifier;
-
-public interface RemappableRegistry {
-	/**
-	 * The mode the remapping process should take.
-	 */
-	enum RemapMode {
-		/**
-		 * Any differences (local->remote, remote->local) are allowed. This should
-		 * be used when a side is authoritative (f.e. loading a world on the server).
-		 */
-		AUTHORITATIVE,
-		/**
-		 * Entries missing on the remote side are hidden on the local side, while
-		 * entries missing on the local side cause an exception. This should be
-		 * used when a side is remote (f.e. connecting to a remote server as a
-		 * client).
-		 */
-		REMOTE,
-	}
-
-	void remap(Object2IntMap remoteIndexedEntries, RemapMode mode) throws RemapException;
-
-	void unmap() throws RemapException;
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RemovableIdMapper.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RemovableIdMapper.java
deleted file mode 100644
index 68801833d1..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RemovableIdMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.impl.registry.sync;
-
-import it.unimi.dsi.fastutil.ints.Int2IntMap;
-
-public interface RemovableIdMapper {
-	void fabric_clear();
-	void fabric_remove(T o);
-	void fabric_removeId(int i);
-	void fabric_remapId(int from, int to);
-	void fabric_remapIds(Int2IntMap map);
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/packet/RegistrySyncPayload.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/packet/RegistrySyncPayload.java
deleted file mode 100644
index f10389cc74..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/packet/RegistrySyncPayload.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * 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.impl.registry.sync.packet;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
-
-import net.minecraft.core.Registry;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.resources.Identifier;
-import net.minecraft.resources.ResourceKey;
-
-import net.fabricmc.fabric.api.event.registry.RegistryAttribute;
-import net.fabricmc.fabric.api.event.registry.RegistryAttributeHolder;
-import net.fabricmc.fabric.impl.registry.sync.RegistryAttributeImpl;
-
-/**
- * A more optimized method to sync registry ids to client.
- * Produces smaller packets than the old nbt-based method.
- *
- * 
    This method optimizes the packet in multiple ways:
- * 
      
- *     
    • Directly writes into the buffer instead of using an nbt;
      • 
- *     
    • Groups all {@link Identifier}s with same namespace together and only sends those unique namespaces once for each group;
      • 
- *     
    • Groups consecutive rawIds together and only sends the difference of the first rawId and the last rawId of the bulk before.
- *     This is based on the assumption that mods generally register all of their objects at once,
- *     therefore making the rawIds somewhat densely packed.
      • 
- * 
    
- */
-public record RegistrySyncPayload(
-		Map> registryMap,
-		Map> registryAttributes
-) implements CustomPacketPayload {
-	public static final CustomPacketPayload.Type ID = new CustomPacketPayload.Type<>(Identifier.fromNamespaceAndPath("fabric", "registry/sync"));
-	public static final StreamCodec CODEC = CustomPacketPayload.codec(RegistrySyncPayload::write, RegistrySyncPayload::read);
-
-	public RegistrySyncPayload(Map> registryMap) {
-		this(registryMap, getRegistryAttributeMap(registryMap));
-	}
-
-	private static Map> getRegistryAttributeMap(Map> registryMap) {
-		Map> registryAttributes = new LinkedHashMap<>();
-		registryMap.forEach((regId, idMap) -> {
-			ResourceKey> registryKey = ResourceKey.createRegistryKey(regId);
-			RegistryAttributeImpl holder = (RegistryAttributeImpl) RegistryAttributeHolder.get(registryKey);
-			registryAttributes.put(regId, holder.getAttributes());
-		});
-		return registryAttributes;
-	}
-
-	private static RegistrySyncPayload read(FriendlyByteBuf combinedBuf) {
-		Map> syncedRegistryMap = new LinkedHashMap<>();
-		Map> syncedRegistryAttributes = new LinkedHashMap<>();
-		int regNamespaceGroupAmount = combinedBuf.readVarInt();
-
-		for (int i = 0; i < regNamespaceGroupAmount; i++) {
-			String regNamespace = unoptimizeNamespace(combinedBuf.readUtf());
-			int regNamespaceGroupLength = combinedBuf.readVarInt();
-
-			for (int j = 0; j < regNamespaceGroupLength; j++) {
-				String regPath = combinedBuf.readUtf();
-				EnumSet attributes = decodeRegistryAttributes(combinedBuf.readByte());
-				Object2IntMap idMap = new Object2IntLinkedOpenHashMap<>();
-				int idNamespaceGroupAmount = combinedBuf.readVarInt();
-
-				int lastBulkLastRawId = 0;
-
-				for (int k = 0; k < idNamespaceGroupAmount; k++) {
-					String idNamespace = unoptimizeNamespace(combinedBuf.readUtf());
-					int rawIdBulkAmount = combinedBuf.readVarInt();
-
-					for (int l = 0; l < rawIdBulkAmount; l++) {
-						int bulkRawIdStartDiff = combinedBuf.readVarInt();
-						int bulkSize = combinedBuf.readVarInt();
-
-						int currentRawId = (lastBulkLastRawId + bulkRawIdStartDiff) - 1;
-
-						for (int m = 0; m < bulkSize; m++) {
-							currentRawId++;
-							String idPath = combinedBuf.readUtf();
-							idMap.put(Identifier.fromNamespaceAndPath(idNamespace, idPath), currentRawId);
-						}
-
-						lastBulkLastRawId = currentRawId;
-					}
-				}
-
-				Identifier registryId = Identifier.fromNamespaceAndPath(regNamespace, regPath);
-				syncedRegistryMap.put(registryId, idMap);
-				syncedRegistryAttributes.put(registryId, attributes);
-			}
-		}
-
-		return new RegistrySyncPayload(syncedRegistryMap, syncedRegistryAttributes);
-	}
-
-	private void write(FriendlyByteBuf buf) {
-		// Group registry ids with same namespace.
-		Map> regNamespaceGroups = registryMap.keySet().stream()
-				.collect(Collectors.groupingBy(Identifier::getNamespace));
-
-		buf.writeVarInt(regNamespaceGroups.size());
-
-		regNamespaceGroups.forEach((regNamespace, regIds) -> {
-			buf.writeUtf(optimizeNamespace(regNamespace));
-			buf.writeVarInt(regIds.size());
-
-			for (Identifier regId : regIds) {
-				buf.writeUtf(regId.getPath());
-				buf.writeByte(encodeRegistryAttributes(registryAttributes.getOrDefault(regId, EnumSet.noneOf(RegistryAttribute.class))));
-
-				Object2IntMap idMap = registryMap.get(regId);
-
-				// Sort object ids by its namespace. We use linked map here to keep the original namespace ordering.
-				Map>> idNamespaceGroups = idMap.object2IntEntrySet().stream()
-						.collect(Collectors.groupingBy(e -> e.getKey().getNamespace(), LinkedHashMap::new, Collectors.toCollection(ArrayList::new)));
-
-				buf.writeVarInt(idNamespaceGroups.size());
-
-				int lastBulkLastRawId = 0;
-
-				for (Map.Entry>> idNamespaceEntry : idNamespaceGroups.entrySet()) {
-					// Make sure the ids are sorted by its raw id.
-					List> idPairs = idNamespaceEntry.getValue();
-					idPairs.sort(Comparator.comparingInt(Object2IntMap.Entry::getIntValue));
-
-					// Group consecutive raw ids together.
-					List>> bulks = new ArrayList<>();
-
-					Iterator> idPairIter = idPairs.iterator();
-					List> currentBulk = new ArrayList<>();
-					Object2IntMap.Entry currentPair = idPairIter.next();
-					currentBulk.add(currentPair);
-
-					while (idPairIter.hasNext()) {
-						currentPair = idPairIter.next();
-
-						if (currentBulk.get(currentBulk.size() - 1).getIntValue() + 1 != currentPair.getIntValue()) {
-							bulks.add(currentBulk);
-							currentBulk = new ArrayList<>();
-						}
-
-						currentBulk.add(currentPair);
-					}
-
-					bulks.add(currentBulk);
-
-					buf.writeUtf(optimizeNamespace(idNamespaceEntry.getKey()));
-					buf.writeVarInt(bulks.size());
-
-					for (List> bulk : bulks) {
-						int firstRawId = bulk.get(0).getIntValue();
-						int bulkRawIdStartDiff = firstRawId - lastBulkLastRawId;
-
-						buf.writeVarInt(bulkRawIdStartDiff);
-						buf.writeVarInt(bulk.size());
-
-						for (Object2IntMap.Entry idPair : bulk) {
-							buf.writeUtf(idPair.getKey().getPath());
-
-							lastBulkLastRawId = idPair.getIntValue();
-						}
-					}
-				}
-			}
-		});
-	}
-
-	private static byte encodeRegistryAttributes(EnumSet attributes) {
-		byte encoded = 0;
-
-		// Only send the optional marker.
-		if (attributes.contains(RegistryAttribute.OPTIONAL)) {
-			encoded |= 0x1;
-		}
-
-		return encoded;
-	}
-
-	private static EnumSet decodeRegistryAttributes(byte encoded) {
-		EnumSet attributes = EnumSet.noneOf(RegistryAttribute.class);
-
-		if ((encoded & 0x1) != 0) {
-			attributes.add(RegistryAttribute.OPTIONAL);
-		}
-
-		return attributes;
-	}
-
-	private static String optimizeNamespace(String namespace) {
-		return namespace.equals(Identifier.DEFAULT_NAMESPACE) ? "" : namespace;
-	}
-
-	private static String unoptimizeNamespace(String namespace) {
-		return namespace.isEmpty() ? Identifier.DEFAULT_NAMESPACE : namespace;
-	}
-
-	@Override
-	public Type type() {
-		return ID;
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/IdMapperTracker.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/IdMapperTracker.java
deleted file mode 100644
index 7e6feb32a1..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/IdMapperTracker.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.impl.registry.sync.trackers;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import net.minecraft.core.IdMapper;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.Identifier;
-
-import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
-import net.fabricmc.fabric.api.event.registry.RegistryIdRemapCallback;
-import net.fabricmc.fabric.impl.registry.sync.RemovableIdMapper;
-
-public class IdMapperTracker implements RegistryEntryAddedCallback, RegistryIdRemapCallback {
-	private final String name;
-	private final IdMapper mappers;
-	private Map removedMapperCache = new HashMap<>();
-
-	private IdMapperTracker(String name, IdMapper mappers) {
-		this.name = name;
-		this.mappers = mappers;
-	}
-
-	public static  void register(Registry registry, String name, IdMapper mappers) {
-		IdMapperTracker updater = new IdMapperTracker<>(name, mappers);
-		RegistryEntryAddedCallback.event(registry).register(updater);
-		RegistryIdRemapCallback.event(registry).register(updater);
-	}
-
-	@Override
-	public void onEntryAdded(int rawId, Identifier id, V object) {
-		if (removedMapperCache.containsKey(id)) {
-			mappers.addMapping(removedMapperCache.get(id), rawId);
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public void onRemap(RemapState state) {
-		((RemovableIdMapper) mappers).fabric_remapIds(state.getRawIdChangeMap());
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/Int2ObjectMapTracker.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/Int2ObjectMapTracker.java
deleted file mode 100644
index 690d2ebc65..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/Int2ObjectMapTracker.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.impl.registry.sync.trackers;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.base.Joiner;
-import it.unimi.dsi.fastutil.ints.Int2IntMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.minecraft.core.Registry;
-import net.minecraft.resources.Identifier;
-
-import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
-import net.fabricmc.fabric.api.event.registry.RegistryIdRemapCallback;
-
-public class Int2ObjectMapTracker implements RegistryEntryAddedCallback, RegistryIdRemapCallback {
-	private static final Logger LOGGER = LoggerFactory.getLogger(Int2ObjectMapTracker.class);
-	private final String name;
-	private final Int2ObjectMap mappers;
-	private Map removedMapperCache = new HashMap<>();
-
-	private Int2ObjectMapTracker(String name, Int2ObjectMap mappers) {
-		this.name = name;
-		this.mappers = mappers;
-	}
-
-	public static  void register(Registry registry, String name, Int2ObjectMap mappers) {
-		Int2ObjectMapTracker updater = new Int2ObjectMapTracker<>(name, mappers);
-		RegistryEntryAddedCallback.event(registry).register(updater);
-		RegistryIdRemapCallback.event(registry).register(updater);
-	}
-
-	@Override
-	public void onEntryAdded(int rawId, Identifier id, V object) {
-		if (removedMapperCache.containsKey(id)) {
-			mappers.put(rawId, removedMapperCache.get(id));
-		}
-	}
-
-	@Override
-	public void onRemap(RemapState state) {
-		Int2ObjectMap oldMappers = new Int2ObjectOpenHashMap<>(mappers);
-		Int2IntMap remapMap = state.getRawIdChangeMap();
-		List errors = null;
-
-		mappers.clear();
-
-		for (int i : oldMappers.keySet()) {
-			int newI = remapMap.getOrDefault(i, Integer.MIN_VALUE);
-
-			if (newI >= 0) {
-				if (mappers.containsKey(newI)) {
-					if (errors == null) {
-						errors = new ArrayList<>();
-					}
-
-					errors.add(" - Map contained two equal IDs " + newI + " (" + state.getIdFromOld(i) + "/" + i + " -> " + state.getIdFromNew(newI) + "/" + newI + ")!");
-				} else {
-					mappers.put(newI, oldMappers.get(i));
-				}
-			} else {
-				LOGGER.warn("[fabric-registry-sync] Int2ObjectMap " + name + " is dropping mapping for integer ID " + i + " (" + state.getIdFromOld(i) + ") - should not happen!");
-				removedMapperCache.put(state.getIdFromOld(i), oldMappers.get(i));
-			}
-		}
-
-		if (errors != null) {
-			throw new RuntimeException("Errors while remapping Int2ObjectMap " + name + " found:\n" + Joiner.on('\n').join(errors));
-		}
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/StateIdTracker.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/StateIdTracker.java
deleted file mode 100644
index 28569cbe8e..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/StateIdTracker.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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.impl.registry.sync.trackers;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Function;
-
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.minecraft.core.IdMapper;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.Identifier;
-
-import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
-import net.fabricmc.fabric.api.event.registry.RegistryIdRemapCallback;
-import net.fabricmc.fabric.impl.registry.sync.RemovableIdMapper;
-
-public final class StateIdTracker implements RegistryIdRemapCallback, RegistryEntryAddedCallback {
-	private static final Logger LOGGER = LoggerFactory.getLogger(StateIdTracker.class);
-	private static final Set TRACKED = new HashSet<>();
-
-	private final Registry registry;
-	private final IdMapper stateList;
-	private final Function> stateGetter;
-	private int currentHighestId = 0;
-
-	public static  void register(Registry registry, IdMapper stateList, Function> stateGetter) {
-		if (!TRACKED.add(registry.key().identifier())) {
-			throw new IllegalStateException("Trying to register a tracker for registry " + registry.key().identifier() + " more than once!");
-		}
-
-		StateIdTracker tracker = new StateIdTracker<>(registry, stateList, stateGetter);
-		RegistryEntryAddedCallback.event(registry).register(tracker);
-		RegistryIdRemapCallback.event(registry).register(tracker);
-	}
-
-	private StateIdTracker(Registry registry, IdMapper stateList, Function> stateGetter) {
-		this.registry = registry;
-		this.stateList = stateList;
-		this.stateGetter = stateGetter;
-
-		recalcHighestId();
-	}
-
-	@Override
-	public void onEntryAdded(int rawId, Identifier id, T object) {
-		if (rawId == currentHighestId + 1) {
-			stateGetter.apply(object).forEach(stateList::add);
-			currentHighestId = rawId;
-		} else {
-			LOGGER.debug("[fabric-registry-sync] Non-sequential RegistryEntryAddedCallback for " + object.getClass().getSimpleName() + " ID tracker (at " + id + "), forcing state map recalculation...");
-			recalcStateMap();
-		}
-	}
-
-	@Override
-	public void onRemap(RemapState state) {
-		recalcStateMap();
-	}
-
-	private void recalcStateMap() {
-		((RemovableIdMapper) stateList).fabric_clear();
-
-		Int2ObjectMap sortedBlocks = new Int2ObjectRBTreeMap<>();
-
-		currentHighestId = 0;
-		registry.forEach((t) -> {
-			int rawId = registry.getId(t);
-			currentHighestId = Math.max(currentHighestId, rawId);
-			sortedBlocks.put(rawId, t);
-		});
-
-		for (T b : sortedBlocks.values()) {
-			stateGetter.apply(b).forEach(stateList::add);
-		}
-	}
-
-	private void recalcHighestId() {
-		currentHighestId = 0;
-
-		for (T object : registry) {
-			currentHighestId = Math.max(currentHighestId, registry.getId(object));
-		}
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockInitTracker.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockInitTracker.java
deleted file mode 100644
index eb35594b34..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockInitTracker.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.impl.registry.sync.trackers.vanilla;
-
-import java.util.List;
-
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.util.Mth;
-import net.minecraft.world.level.block.state.BlockState;
-
-import net.fabricmc.fabric.mixin.registry.sync.DebugLevelSourceAccessor;
-
-public final class BlockInitTracker {
-	public static void postFreeze() {
-		final List blockStateList = BuiltInRegistries.BLOCK.stream()
-				.flatMap((block) -> block.getStateDefinition().getPossibleStates().stream())
-				.toList();
-
-		final int xLength = Mth.ceil(Mth.sqrt(blockStateList.size()));
-		final int zLength = Mth.ceil(blockStateList.size() / (float) xLength);
-
-		DebugLevelSourceAccessor.setALL_BLOCKS(blockStateList);
-		DebugLevelSourceAccessor.setGRID_WIDTH(xLength);
-		DebugLevelSourceAccessor.setGRID_HEIGHT(zLength);
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockItemTracker.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockItemTracker.java
deleted file mode 100644
index 2c52fdfb39..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockItemTracker.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.impl.registry.sync.trackers.vanilla;
-
-import net.minecraft.core.Registry;
-import net.minecraft.resources.Identifier;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.Item;
-
-import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
-
-public final class BlockItemTracker implements RegistryEntryAddedCallback {
-	private BlockItemTracker() { }
-
-	public static void register(Registry registry) {
-		BlockItemTracker tracker = new BlockItemTracker();
-		RegistryEntryAddedCallback.event(registry).register(tracker);
-	}
-
-	@Override
-	public void onEntryAdded(int rawId, Identifier id, Item object) {
-		if (object instanceof BlockItem) {
-			((BlockItem) object).registerBlocks(Item.BY_BLOCK, object);
-		}
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BaseMappedRegistryAccessor.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BaseMappedRegistryAccessor.java
new file mode 100644
index 0000000000..6ebff7f11c
--- /dev/null
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BaseMappedRegistryAccessor.java
@@ -0,0 +1,14 @@
+package net.fabricmc.fabric.mixin.registry.sync;
+
+import net.neoforged.neoforge.registries.BaseMappedRegistry;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(BaseMappedRegistry.class)
+public interface BaseMappedRegistryAccessor {
+    @Invoker
+    void invokeSetSync(boolean sync);
+
+    @Invoker
+    void invokeUnfreeze(boolean clearTags);
+}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BaseMappedRegistryMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BaseMappedRegistryMixin.java
new file mode 100644
index 0000000000..5285571a9a
--- /dev/null
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BaseMappedRegistryMixin.java
@@ -0,0 +1,10 @@
+package net.fabricmc.fabric.mixin.registry.sync;
+
+import net.neoforged.neoforge.registries.BaseMappedRegistry;
+import org.spongepowered.asm.mixin.Mixin;
+
+import net.fabricmc.fabric.api.event.registry.FabricRegistry;
+
+@Mixin(BaseMappedRegistry.class)
+public abstract class BaseMappedRegistryMixin implements FabricRegistry {
+}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BootstrapMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BootstrapMixin.java
deleted file mode 100644
index c63a09631b..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BootstrapMixin.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.mixin.registry.sync;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.server.Bootstrap;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.material.Fluid;
-import net.minecraft.world.level.material.Fluids;
-
-import net.fabricmc.fabric.impl.registry.sync.RegistrySyncManager;
-import net.fabricmc.fabric.impl.registry.sync.trackers.StateIdTracker;
-import net.fabricmc.fabric.impl.registry.sync.trackers.vanilla.BlockItemTracker;
-
-@Mixin(Bootstrap.class)
-public class BootstrapMixin {
-	@Inject(method = "bootStrap", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/Bootstrap;wrapStreams()V"))
-	private static void afterInitialize(CallbackInfo info) {
-		// These seemingly pointless accesses are done to make sure each
-		// static initializer is called, to register vanilla-provided blocks
-		// and items from the respective classes - otherwise, they would
-		// duplicate our calls from below.
-		Object oBlock = Blocks.AIR;
-		Object oFluid = Fluids.EMPTY;
-		Object oItem = Items.AIR;
-
-		// state ID tracking
-		StateIdTracker.register(BuiltInRegistries.BLOCK, Block.BLOCK_STATE_REGISTRY, (block) -> block.getStateDefinition().getPossibleStates());
-		StateIdTracker.register(BuiltInRegistries.FLUID, Fluid.FLUID_STATE_REGISTRY, (fluid) -> fluid.getStateDefinition().getPossibleStates());
-
-		// map tracking
-		BlockItemTracker.register(BuiltInRegistries.ITEM);
-
-		RegistrySyncManager.bootstrapRegistries();
-	}
-
-	@Redirect(method = "bootStrap", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/registries/BuiltInRegistries;bootStrap()V"))
-	private static void delayRegistryFreeze() {
-		BuiltInRegistries.createContents();
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BuiltInRegistriesAccessor.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BuiltInRegistriesAccessor.java
deleted file mode 100644
index a7a21a09bc..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BuiltInRegistriesAccessor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.mixin.registry.sync;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import net.minecraft.core.WritableRegistry;
-import net.minecraft.core.registries.BuiltInRegistries;
-
-@Mixin(BuiltInRegistries.class)
-public interface BuiltInRegistriesAccessor {
-	@Accessor()
-	static WritableRegistry> getWRITABLE_REGISTRY() {
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/DebugLevelSourceAccessor.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/DebugLevelSourceAccessor.java
deleted file mode 100644
index 0f7d27ec0c..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/DebugLevelSourceAccessor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.mixin.registry.sync;
-
-import java.util.List;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.levelgen.DebugLevelSource;
-
-@Mixin(DebugLevelSource.class)
-public interface DebugLevelSourceAccessor {
-	@Accessor
-	@Mutable
-	static void setALL_BLOCKS(List blockStates) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Accessor
-	@Mutable
-	static void setGRID_WIDTH(int length) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Accessor
-	@Mutable
-	static void setGRID_HEIGHT(int length) {
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/IdMapperMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/IdMapperMixin.java
deleted file mode 100644
index 66d14b1334..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/IdMapperMixin.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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.mixin.registry.sync;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import it.unimi.dsi.fastutil.ints.Int2IntMap;
-import it.unimi.dsi.fastutil.ints.Int2IntMaps;
-import it.unimi.dsi.fastutil.objects.Reference2IntMap;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-
-import net.minecraft.core.IdMapper;
-
-import net.fabricmc.fabric.impl.registry.sync.RemovableIdMapper;
-
-@Mixin(IdMapper.class)
-public class IdMapperMixin implements RemovableIdMapper {
-	@Shadow
-	private int nextId;
-	@Final
-	@Shadow
-	private Reference2IntMap tToId;
-	@Final
-	@Shadow
-	private List idToT;
-
-	@Override
-	public void fabric_clear() {
-		nextId = 0;
-		tToId.clear();
-		idToT.clear();
-	}
-
-	@Unique
-	private void fabric_removeInner(T o) {
-		int value = tToId.removeInt(o);
-		idToT.set(value, null);
-
-		while (nextId > 1 && idToT.get(nextId - 1) == null) {
-			nextId--;
-		}
-	}
-
-	@Override
-	public void fabric_remove(T o) {
-		if (tToId.containsKey(o)) {
-			fabric_removeInner(o);
-		}
-	}
-
-	@Override
-	public void fabric_removeId(int i) {
-		List removals = new ArrayList<>();
-
-		for (T o : tToId.keySet()) {
-			int j = tToId.getInt(o);
-
-			if (i == j) {
-				removals.add(o);
-			}
-		}
-
-		removals.forEach(this::fabric_removeInner);
-	}
-
-	@Override
-	public void fabric_remapId(int from, int to) {
-		fabric_remapIds(Int2IntMaps.singleton(from, to));
-	}
-
-	@Override
-	public void fabric_remapIds(Int2IntMap map) {
-		// remap idMap
-		tToId.replaceAll((a, b) -> map.get((int) b));
-
-		// remap list
-		nextId = 0;
-		List oldList = new ArrayList<>(idToT);
-		idToT.clear();
-
-		for (int k = 0; k < oldList.size(); k++) {
-			T o = oldList.get(k);
-
-			if (o != null) {
-				int i = map.getOrDefault(k, k);
-
-				while (idToT.size() <= i) {
-					idToT.add(null);
-				}
-
-				idToT.set(i, o);
-
-				if (nextId <= i) {
-					nextId = i + 1;
-				}
-			}
-		}
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MainMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MainMixin.java
deleted file mode 100644
index e21f8011ab..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MainMixin.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.mixin.registry.sync;
-
-import org.slf4j.Logger;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.server.Main;
-import net.minecraft.world.item.CreativeModeTabs;
-
-import net.fabricmc.api.EnvType;
-import net.fabricmc.fabric.impl.registry.sync.trackers.vanilla.BlockInitTracker;
-import net.fabricmc.loader.api.FabricLoader;
-
-@Mixin(Main.class)
-public class MainMixin {
-	@Shadow
-	@Final
-	private static Logger LOGGER;
-
-	@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;startTimerHackThread()V"), method = "main")
-	private static void afterModInit(CallbackInfo info) {
-		if (FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER) {
-			// Freeze the registries on the server
-			LOGGER.debug("Freezing registries");
-
-			BuiltInRegistries.bootStrap();
-			BlockInitTracker.postFreeze();
-			CreativeModeTabs.validate();
-		}
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MappedRegistryAccessor.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MappedRegistryAccessor.java
index 4cb5c12451..5a51ff51fd 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MappedRegistryAccessor.java
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MappedRegistryAccessor.java
@@ -1,19 +1,3 @@
-/*
- * 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.mixin.registry.sync;
 
 import org.spongepowered.asm.mixin.Mixin;
@@ -23,6 +7,6 @@
 
 @Mixin(MappedRegistry.class)
 public interface MappedRegistryAccessor {
-	@Accessor
-	boolean isFrozen();
+    @Accessor
+    boolean getFrozen();
 }
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MappedRegistryMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MappedRegistryMixin.java
deleted file mode 100644
index a4f2b06093..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MappedRegistryMixin.java
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- * 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.mixin.registry.sync;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import com.mojang.serialization.Lifecycle;
-import it.unimi.dsi.fastutil.ints.Int2IntMap;
-import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
-import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import it.unimi.dsi.fastutil.objects.ObjectList;
-import it.unimi.dsi.fastutil.objects.Reference2IntMap;
-import org.jspecify.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.core.Holder;
-import net.minecraft.core.MappedRegistry;
-import net.minecraft.core.RegistrationInfo;
-import net.minecraft.core.Registry;
-import net.minecraft.core.WritableRegistry;
-import net.minecraft.resources.Identifier;
-import net.minecraft.resources.ResourceKey;
-
-import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.api.event.EventFactory;
-import net.fabricmc.fabric.api.event.registry.FabricRegistry;
-import net.fabricmc.fabric.api.event.registry.RegistryAttribute;
-import net.fabricmc.fabric.api.event.registry.RegistryAttributeHolder;
-import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
-import net.fabricmc.fabric.api.event.registry.RegistryIdRemapCallback;
-import net.fabricmc.fabric.impl.registry.sync.ListenableRegistry;
-import net.fabricmc.fabric.impl.registry.sync.RegistrySyncManager;
-import net.fabricmc.fabric.impl.registry.sync.RemapException;
-import net.fabricmc.fabric.impl.registry.sync.RemapStateImpl;
-import net.fabricmc.fabric.impl.registry.sync.RemappableRegistry;
-
-@Mixin(MappedRegistry.class)
-public abstract class MappedRegistryMixin implements WritableRegistry, RemappableRegistry, ListenableRegistry, FabricRegistry {
-	// Namespaces used by the vanilla game. "brigadier" is used by command argument type registry.
-	// While Realms use "realms" namespace, it is irrelevant for Registry Sync.
-	@Unique
-	private static final Set VANILLA_NAMESPACES = Set.of("minecraft", "brigadier");
-
-	@Shadow
-	@Final
-	private ObjectList> byId;
-	@Shadow
-	@Final
-	private Reference2IntMap toId;
-	@Shadow
-	@Final
-	private Map> byLocation;
-	@Shadow
-	@Final
-	private Map, Holder.Reference> byKey;
-
-	@Shadow
-	public abstract Optional> getResourceKey(T entry);
-
-	@Shadow
-	public abstract @Nullable T getValue(@Nullable Identifier id);
-
-	@Shadow
-	public abstract ResourceKey> key();
-
-	@Unique
-	private static final Logger FABRIC_LOGGER = LoggerFactory.getLogger(MappedRegistryMixin.class);
-
-	@Unique
-	private Event> fabric_addObjectEvent;
-
-	@Unique
-	private Event> fabric_postRemapEvent;
-
-	@Unique
-	private Object2IntMap fabric_prevIndexedEntries;
-	@Unique
-	private BiMap> fabric_prevEntries;
-	@Unique
-	// invariant: the sets of keys and values are disjoint (every alias points to a 'deepest' non-alias ID)
-	private Map aliases = new HashMap<>();
-
-	@Shadow
-	public abstract boolean containsKey(Identifier id);
-
-	@Shadow
-	public abstract String toString();
-
-	@Shadow
-	@Final
-	private ResourceKey> key;
-
-	@Shadow
-	protected abstract void validateWrite();
-
-	@Override
-	public Event> fabric_getAddObjectEvent() {
-		return fabric_addObjectEvent;
-	}
-
-	@Override
-	public Event> fabric_getRemapEvent() {
-		return fabric_postRemapEvent;
-	}
-
-	@Inject(method = "(Lnet/minecraft/resources/ResourceKey;Lcom/mojang/serialization/Lifecycle;Z)V", at = @At("RETURN"))
-	private void init(ResourceKey key, Lifecycle lifecycle, boolean intrusive, CallbackInfo ci) {
-		fabric_addObjectEvent = EventFactory.createArrayBacked(RegistryEntryAddedCallback.class,
-			(callbacks) -> (rawId, id, object) -> {
-				for (RegistryEntryAddedCallback callback : callbacks) {
-					callback.onEntryAdded(rawId, id, object);
-				}
-			}
-		);
-		// aliasing: check that no new entries use the id of an alias
-		fabric_addObjectEvent.register((rawId, id, object) -> {
-			if (aliases.containsKey(id)) {
-				throw new IllegalArgumentException(
-						"Tried registering %s to registry %s, but it is already an alias (for %s)".formatted(
-								id,
-								this.key,
-								aliases.get(id)
-						)
-				);
-			}
-		});
-		fabric_postRemapEvent = EventFactory.createArrayBacked(RegistryIdRemapCallback.class,
-			(callbacks) -> (a) -> {
-				for (RegistryIdRemapCallback callback : callbacks) {
-					callback.onRemap(a);
-				}
-			}
-		);
-	}
-
-	@Unique
-	private void onChange(ResourceKey resourceKey) {
-		if (RegistrySyncManager.postBootstrap || !VANILLA_NAMESPACES.contains(resourceKey.identifier().getNamespace())) {
-			RegistryAttributeHolder holder = RegistryAttributeHolder.get(key());
-
-			if (!holder.hasAttribute(RegistryAttribute.MODDED)) {
-				Identifier id = key().identifier();
-				FABRIC_LOGGER.debug("Registry {} has been marked as modded, holder {} was changed", id, resourceKey.identifier());
-				RegistryAttributeHolder.get(key()).addAttribute(RegistryAttribute.MODDED);
-			}
-		}
-	}
-
-	@Inject(method = "register", at = @At("RETURN"))
-	private void set(ResourceKey key, T entry, RegistrationInfo arg, CallbackInfoReturnable> info) {
-		// We need to restore the 1.19 behavior of binding the value to references immediately.
-		// Unfrozen registries cannot be interacted with otherwise, because the references would throw when
-		// trying to access their values.
-		info.getReturnValue().bindValue(entry);
-
-		fabric_addObjectEvent.invoker().onEntryAdded(toId.getInt(entry), key.identifier(), entry);
-		onChange(key);
-	}
-
-	@Override
-	public void remap(Object2IntMap remoteIndexedEntries, RemapMode mode) throws RemapException {
-		// Throw on invalid conditions.
-		switch (mode) {
-		case AUTHORITATIVE:
-			break;
-		case REMOTE: {
-			List strings = null;
-
-			for (Identifier remoteId : remoteIndexedEntries.keySet()) {
-				if (this.containsKey(remoteId)) {
-					continue;
-				}
-
-				if (strings == null) {
-					strings = new ArrayList<>();
-				}
-
-				strings.add(" - " + remoteId);
-			}
-
-			if (strings != null) {
-				StringBuilder builder = new StringBuilder("Received ID map for " + key() + " contains IDs unknown to the receiver!");
-
-				for (String s : strings) {
-					builder.append('\n').append(s);
-				}
-
-				throw new RemapException(builder.toString());
-			}
-
-			break;
-		}
-		}
-
-		// Make a copy of the previous maps.
-		// For now, only one is necessary - on an integrated server scenario,
-		// AUTHORITATIVE == CLIENT, which is fine.
-		// The reason we preserve the first one is because it contains the
-		// vanilla order of IDs before mods, which is crucial for vanilla server
-		// compatibility.
-		if (fabric_prevIndexedEntries == null) {
-			fabric_prevIndexedEntries = new Object2IntOpenHashMap<>();
-			fabric_prevEntries = HashBiMap.create(byLocation);
-
-			for (T o : this) {
-				fabric_prevIndexedEntries.put(getKey(o), getId(o));
-			}
-		}
-
-		Int2ObjectMap oldIdMap = new Int2ObjectOpenHashMap<>();
-
-		for (T o : this) {
-			oldIdMap.put(getId(o), getKey(o));
-		}
-
-		// If we're AUTHORITATIVE, we append entries which only exist on the
-		// local side to the new entry list. For REMOTE, we instead drop them.
-		switch (mode) {
-		case AUTHORITATIVE: {
-			int maxValue = 0;
-
-			Object2IntMap oldRemoteIndexedEntries = remoteIndexedEntries;
-			remoteIndexedEntries = new Object2IntOpenHashMap<>();
-
-			for (Identifier id : oldRemoteIndexedEntries.keySet()) {
-				int v = oldRemoteIndexedEntries.getInt(id);
-				remoteIndexedEntries.put(id, v);
-				if (v > maxValue) maxValue = v;
-			}
-
-			for (Identifier id : keySet()) {
-				if (!remoteIndexedEntries.containsKey(id)) {
-					FABRIC_LOGGER.warn("Adding " + id + " to saved/remote registry.");
-					remoteIndexedEntries.put(id, ++maxValue);
-				}
-			}
-
-			break;
-		}
-		case REMOTE: {
-			int maxId = -1;
-
-			for (Identifier id : keySet()) {
-				if (remoteIndexedEntries.containsKey(id)) {
-					continue;
-				}
-
-				if (maxId < 0) {
-					maxId = remoteIndexedEntries.values()
-							.intStream()
-							.max()
-							.orElseThrow(() -> new RemapException("Failed to assign new id to client only registry entry"));
-				}
-
-				maxId++;
-
-				FABRIC_LOGGER.debug("An ID for {} was not sent by the server, assuming client only registry entry and assigning a new id ({}) in {}", id.toString(), maxId, key().identifier().toString());
-				remoteIndexedEntries.put(id, maxId);
-			}
-
-			break;
-		}
-		}
-
-		Int2IntMap idMap = new Int2IntOpenHashMap();
-
-		for (int i = 0; i < byId.size(); i++) {
-			Holder.Reference reference = byId.get(i);
-
-			// Unused id, can happen if there are holes in the registry.
-			if (reference == null) {
-				throw new RemapException("Unused id " + i + " in registry " + key().identifier());
-			}
-
-			Identifier id = reference.key().identifier();
-
-			// see above note
-			if (remoteIndexedEntries.containsKey(id)) {
-				idMap.put(i, remoteIndexedEntries.getInt(id));
-			}
-		}
-
-		// entries was handled above, if it was necessary.
-		byId.clear();
-		toId.clear();
-
-		List orderedRemoteEntries = new ArrayList<>(remoteIndexedEntries.keySet());
-		orderedRemoteEntries.sort(Comparator.comparingInt(remoteIndexedEntries::getInt));
-
-		for (Identifier identifier : orderedRemoteEntries) {
-			int id = remoteIndexedEntries.getInt(identifier);
-			Holder.Reference object = byLocation.get(identifier);
-
-			// Warn if an object is missing from the local registry.
-			// This should only happen in AUTHORITATIVE mode, and as such we
-			// throw an exception otherwise.
-			if (object == null) {
-				if (mode != RemapMode.AUTHORITATIVE) {
-					throw new RemapException(identifier + " missing from registry, but requested!");
-				} else {
-					FABRIC_LOGGER.warn(identifier + " missing from registry, but requested!");
-				}
-
-				continue;
-			}
-
-			// Add the new object
-			byId.size(Math.max(this.byId.size(), id + 1));
-
-			if (byId.get(id) != null) {
-				throw new IllegalStateException("Raw ID already populated");
-			}
-
-			byId.set(id, object);
-			toId.put(object.value(), id);
-		}
-
-		fabric_getRemapEvent().invoker().onRemap(new RemapStateImpl<>(this, oldIdMap, idMap));
-	}
-
-	@Override
-	public void unmap() throws RemapException {
-		if (fabric_prevIndexedEntries != null) {
-			List addedIds = new ArrayList<>();
-
-			// Emit AddObject events for previously culled objects.
-			for (Identifier id : fabric_prevEntries.keySet()) {
-				if (!byLocation.containsKey(id)) {
-					if (!fabric_prevIndexedEntries.containsKey(id)) {
-						throw new IllegalStateException("id missing from previous indexed entries");
-					}
-
-					addedIds.add(id);
-				}
-			}
-
-			byLocation.clear();
-			byKey.clear();
-
-			byLocation.putAll(fabric_prevEntries);
-
-			for (Map.Entry> entry : fabric_prevEntries.entrySet()) {
-				ResourceKey entryKey = ResourceKey.create(key(), entry.getKey());
-				byKey.put(entryKey, entry.getValue());
-			}
-
-			remap(fabric_prevIndexedEntries, RemapMode.AUTHORITATIVE);
-
-			for (Identifier id : addedIds) {
-				fabric_getAddObjectEvent().invoker().onEntryAdded(toId.getInt(byLocation.get(id)), id, getValue(id));
-			}
-
-			fabric_prevIndexedEntries = null;
-			fabric_prevEntries = null;
-		}
-	}
-
-	@Override
-	public void addAlias(Identifier old, Identifier newId) {
-		Objects.requireNonNull(old, "alias cannot be null");
-		Objects.requireNonNull(newId, "aliased id cannot be null");
-
-		if (aliases.containsKey(old)) {
-			throw new IllegalArgumentException(
-					"Tried adding %s as an alias for %s, but it is already an alias (for %s) in registry %s".formatted(
-							old,
-							newId,
-							aliases.get(old),
-							this.key
-					)
-			);
-		}
-
-		if (this.byLocation.containsKey(old)) {
-			throw new IllegalArgumentException(
-					"Tried adding %s as an alias, but it is already present in registry %s".formatted(
-							old,
-							this.key
-					)
-			);
-		}
-
-		if (old.equals(aliases.get(newId))) {
-			// since an alias corresponds to at most one identifier, this is the only way to create a cycle
-			// that doesn't already fall under the first condition
-			throw new IllegalArgumentException(
-					"Making %1$s an alias of %2$s would create a cycle, as %2$s is already an alias of %1$s (registry %3$s)".formatted(
-							old,
-							newId,
-							this.key
-					)
-			);
-		}
-
-		if (!this.byLocation.containsKey(newId)) {
-			FABRIC_LOGGER.warn(
-					"Adding {} as an alias for {}, but the latter doesn't exist in registry {}",
-					old,
-					newId,
-					this.key
-			);
-		}
-
-		validateWrite();
-
-		// recompute alias map to preserve invariant, i.e. make sure all keys point to a non-alias ID
-		Identifier deepest = aliases.getOrDefault(newId, newId);
-
-		for (Map.Entry entry : aliases.entrySet()) {
-			if (old.equals(entry.getValue())) {
-				entry.setValue(deepest);
-			}
-		}
-
-		aliases.put(old, deepest);
-		FABRIC_LOGGER.debug("Adding alias {} for {} in registry {}", old, newId, this.key);
-	}
-
-	@ModifyVariable(
-			method = {
-					"get(Lnet/minecraft/resources/Identifier;)Ljava/util/Optional;",
-					"getValue(Lnet/minecraft/resources/Identifier;)Ljava/lang/Object;",
-					"containsKey(Lnet/minecraft/resources/Identifier;)Z"
-			},
-			at = @At("HEAD"),
-			argsOnly = true
-	)
-	private Identifier aliasIdentifierParameter(Identifier original) {
-		return aliases.getOrDefault(original, original);
-	}
-
-	@ModifyVariable(
-			method = {
-					"getValue(Lnet/minecraft/resources/ResourceKey;)Ljava/lang/Object;",
-					"get(Lnet/minecraft/resources/ResourceKey;)Ljava/util/Optional;",
-					"getOrCreateHolderOrThrow",
-					"containsKey(Lnet/minecraft/resources/ResourceKey;)Z",
-					"registrationInfo"
-			},
-			at = @At("HEAD"),
-			argsOnly = true
-	)
-	private ResourceKey aliasResourceKeyParameter(ResourceKey original) {
-		if (original == null) {
-			return null;
-		}
-
-		Identifier aliased = aliases.get(original.identifier());
-		return aliased == null ? original : ResourceKey.create(original.registryKey(), aliased);
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistriesMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistriesMixin.java
deleted file mode 100644
index 9bc5bf5c40..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistriesMixin.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.mixin.registry.sync;
-
-import com.llamalad7.mixinextras.injector.ModifyReturnValue;
-import com.llamalad7.mixinextras.sugar.Local;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.core.Registry;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.Identifier;
-import net.minecraft.resources.ResourceKey;
-
-// Vanilla doesn't mark namespaces in the directories of tags and dynamic registry elements at all,
-// so we prepend the directories with the namespace if it's a modded registry id.
-@Mixin(Registries.class)
-public class RegistriesMixin {
-	@ModifyReturnValue(method = "elementsDirPath", at = @At("RETURN"))
-	private static String prependDirectoryWithNamespace(String original, @Local(argsOnly = true) ResourceKey> registryRef) {
-		Identifier id = registryRef.identifier();
-
-		if (!id.getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) {
-			return id.getNamespace() + "/" + id.getPath();
-		}
-
-		return original;
-	}
-
-	@ModifyReturnValue(method = "tagsDirPath", at = @At("RETURN"))
-	private static String prependTagDirectoryWithNamespace(String original, @Local(argsOnly = true) ResourceKey> registryRef) {
-		Identifier id = registryRef.identifier();
-
-		if (!id.getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) {
-			return "tags/" + id.getNamespace() + "/" + id.getPath();
-		}
-
-		return original;
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryDataLoaderMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryDataLoaderMixin.java
index ed914d0f44..0d0f1d5243 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryDataLoaderMixin.java
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryDataLoaderMixin.java
@@ -29,7 +29,6 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Coerce;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
 
 import net.minecraft.core.HolderLookup;
@@ -39,6 +38,7 @@
 import net.minecraft.resources.RegistryLoadTask;
 import net.minecraft.resources.RegistryOps;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.packs.resources.ResourceManager;
 
 import net.fabricmc.fabric.api.event.registry.DynamicRegistrySetupCallback;
 import net.fabricmc.fabric.impl.registry.sync.DynamicRegistryViewImpl;
@@ -48,12 +48,12 @@ public class RegistryDataLoaderMixin {
 	@Unique
 	private static final ScopedValue IS_SERVER = ScopedValue.newInstance();
 
-	@WrapOperation(method = "load(Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/List;Ljava/util/List;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;", at = @At(value = "INVOKE", target = "Lnet/minecraft/resources/RegistryDataLoader;load(Lnet/minecraft/resources/RegistryDataLoader$LoaderFactory;Ljava/util/List;Ljava/util/List;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"))
-	private static CompletableFuture wrapIsServerCall(@Coerce Object loaderFactory, List> contextRegistries, List> registriesToLoad, Executor executor, Operation> original) {
-		return ScopedValue.where(IS_SERVER, true).call(() -> original.call(loaderFactory, contextRegistries, registriesToLoad, executor));
+	@WrapOperation(method = "load(Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/List;Ljava/util/List;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;", at = @At(value = "INVOKE", target = "Lnet/minecraft/resources/RegistryDataLoader;load(Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/List;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture;"))
+	private static CompletableFuture wrapIsServerCall(ResourceManager resourceManager, List> contextRegistries, List> registriesToLoad, Executor executor, List> pendingTags, Operation> original) {
+		return ScopedValue.where(IS_SERVER, true).call(() -> original.call(resourceManager, contextRegistries, registriesToLoad, executor, pendingTags));
 	}
 
-	@ModifyArg(method = "load(Lnet/minecraft/resources/RegistryDataLoader$LoaderFactory;Ljava/util/List;Ljava/util/List;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;", at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;supplyAsync(Ljava/util/function/Supplier;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"))
+	@ModifyArg(method = "load(Lnet/minecraft/resources/RegistryDataLoader$LoaderFactory;Ljava/util/List;Ljava/util/List;Ljava/util/concurrent/Executor;Z)Ljava/util/concurrent/CompletableFuture;", at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;supplyAsync(Ljava/util/function/Supplier;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"))
 	private static Supplier> supplyAsync(Supplier> supplier) {
 		final boolean isServer = IS_SERVER.orElse(false);
 		return () -> ScopedValue.where(IS_SERVER, isServer).call(supplier::get);
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryManagerAccessor.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryManagerAccessor.java
new file mode 100644
index 0000000000..f939ecb91f
--- /dev/null
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryManagerAccessor.java
@@ -0,0 +1,15 @@
+package net.fabricmc.fabric.mixin.registry.sync;
+
+import net.neoforged.neoforge.registries.RegistryManager;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+import net.minecraft.resources.Identifier;
+
+@Mixin(RegistryManager.class)
+public interface RegistryManagerAccessor {
+    @Invoker
+    static void invokeTrackModdedRegistry(Identifier registry) {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryMixin.java
index ea6b256817..4b299182a3 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryMixin.java
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryMixin.java
@@ -1,26 +1,10 @@
-/*
- * 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.mixin.registry.sync;
 
-import org.spongepowered.asm.mixin.Mixin;
+import net.fabricmc.fabric.api.event.registry.FabricRegistry;
 
 import net.minecraft.core.Registry;
 
-import net.fabricmc.fabric.api.event.registry.FabricRegistry;
+import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(Registry.class)
 public interface RegistryMixin extends FabricRegistry {
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryPatchGeneratorMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryPatchGeneratorMixin.java
deleted file mode 100644
index b0cbe546bb..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryPatchGeneratorMixin.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.mixin.registry.sync;
-
-import java.util.List;
-
-import org.objectweb.asm.Opcodes;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import net.minecraft.data.registries.RegistryPatchGenerator;
-import net.minecraft.resources.RegistryDataLoader;
-
-import net.fabricmc.fabric.api.event.registry.DynamicRegistries;
-
-@Mixin(RegistryPatchGenerator.class)
-class RegistryPatchGeneratorMixin {
-	@Redirect(at = @At(value = "FIELD", target = "Lnet/minecraft/resources/RegistryDataLoader;WORLDGEN_REGISTRIES:Ljava/util/List;", opcode = Opcodes.GETSTATIC), method = "lambda$createLookup$0")
-	private static List> getDynamicRegistries() {
-		// Register cloners for all dynamic registries.
-		return DynamicRegistries.getDynamicRegistries();
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistrySynchronizationMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistrySynchronizationMixin.java
deleted file mode 100644
index 8f83752839..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistrySynchronizationMixin.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.mixin.registry.sync;
-
-import java.util.Set;
-import java.util.function.BiConsumer;
-
-import com.mojang.serialization.DynamicOps;
-import org.spongepowered.asm.mixin.Dynamic;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.core.RegistrySynchronization;
-import net.minecraft.resources.RegistryDataLoader;
-
-import net.fabricmc.fabric.impl.registry.sync.DynamicRegistriesImpl;
-
-// Implements skipping empty dynamic registries with the SKIP_WHEN_EMPTY sync option.
-@Mixin(RegistrySynchronization.class)
-abstract class RegistrySynchronizationMixin {
-	/**
-	 * Used for tag syncing.
-	 */
-	@Dynamic("lambda$ownedNetworkableRegistries$0: Stream.filter in ownedNetworkableRegistries")
-	@Inject(method = "lambda$ownedNetworkableRegistries$0", at = @At("HEAD"), cancellable = true)
-	private static void filterNonSyncedEntries(RegistryAccess.RegistryEntry entry, CallbackInfoReturnable cir) {
-		boolean canSkip = DynamicRegistriesImpl.SKIP_EMPTY_SYNC_REGISTRIES.contains(entry.key());
-
-		if (canSkip && entry.value().size() == 0) {
-			cir.setReturnValue(false);
-		}
-	}
-
-	/**
-	 * Used for registry serialization.
-	 */
-	@Dynamic("lambda$packRegistry$0: Optional.ifPresent in packRegistry")
-	@Inject(method = "lambda$packRegistry$0", at = @At("HEAD"), cancellable = true)
-	private static void filterNonSyncedEntriesAgain(Set set, RegistryDataLoader.RegistryData entry, DynamicOps dynamicOps, BiConsumer biConsumer, Registry registry, CallbackInfo ci) {
-		boolean canSkip = DynamicRegistriesImpl.SKIP_EMPTY_SYNC_REGISTRIES.contains(registry.key());
-
-		if (canSkip && registry.size() == 0) {
-			ci.cancel();
-		}
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/SerializableChunkDataMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/SerializableChunkDataMixin.java
deleted file mode 100644
index 23cd14a6b4..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/SerializableChunkDataMixin.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.mixin.registry.sync;
-
-import org.slf4j.Logger;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import net.minecraft.world.level.chunk.storage.SerializableChunkData;
-
-@Mixin(SerializableChunkData.class)
-public class SerializableChunkDataMixin {
-	@Redirect(method = "lambda$unpackStructureReferences$0", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V"))
-	private static void log(Logger logger, String msg, Object identifier, Object chunkPos) {
-		// Drop to debug log level.
-		logger.debug(msg, identifier, chunkPos);
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/WorldLoaderMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/WorldLoaderMixin.java
deleted file mode 100644
index f05cca355e..0000000000
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/WorldLoaderMixin.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.mixin.registry.sync;
-
-import java.util.List;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyArg;
-
-import net.minecraft.resources.RegistryDataLoader;
-import net.minecraft.server.WorldLoader;
-
-import net.fabricmc.fabric.api.event.registry.DynamicRegistries;
-
-// Implements dynamic registry loading.
-@Mixin(WorldLoader.class)
-abstract class WorldLoaderMixin {
-	@ModifyArg(method = "lambda$load$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/resources/RegistryDataLoader;load(Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/List;Ljava/util/List;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;", ordinal = 0), index = 2, allow = 1)
-	private static List> modifyLoadedEntries(List> entries) {
-		return DynamicRegistries.getDynamicRegistries();
-	}
-}
diff --git a/fabric-registry-sync-v0/src/main/resources/fabric-registry-sync-v0.classtweaker b/fabric-registry-sync-v0/src/main/resources/fabric-registry-sync-v0.classtweaker
index 8eaf1a32cf..c2f2bcf3cf 100644
--- a/fabric-registry-sync-v0/src/main/resources/fabric-registry-sync-v0.classtweaker
+++ b/fabric-registry-sync-v0/src/main/resources/fabric-registry-sync-v0.classtweaker
@@ -1,10 +1,3 @@
 classTweaker	v1	official
-accessible	field	net/minecraft/core/MappedRegistry	frozen	Z
-accessible	method	net/minecraft/core/Holder$Reference	bindValue	(Ljava/lang/Object;)V
-accessible	method	net/minecraft/core/registries/BuiltInRegistries	createContents	()V
-accessible	field	net/minecraft/resources/RegistryDataLoader	SYNCHRONIZED_REGISTRIES	Ljava/util/List;
-mutable	field	net/minecraft/resources/RegistryDataLoader	SYNCHRONIZED_REGISTRIES	Ljava/util/List;
-accessible	field	net/minecraft/core/RegistrySynchronization	NETWORKABLE_REGISTRIES	Ljava/util/Set;
-mutable	field	net/minecraft/core/RegistrySynchronization	NETWORKABLE_REGISTRIES	Ljava/util/Set;
 accessible field net/minecraft/resources/RegistryLoadTask registry Lnet/minecraft/core/WritableRegistry;
 transitive-inject-interface	net/minecraft/core/Registry	net/fabricmc/fabric/api/event/registry/FabricRegistry
diff --git a/fabric-registry-sync-v0/src/main/resources/fabric-registry-sync-v0.mixins.json b/fabric-registry-sync-v0/src/main/resources/fabric-registry-sync-v0.mixins.json
index 2e5919d7ab..6376aeaaf3 100644
--- a/fabric-registry-sync-v0/src/main/resources/fabric-registry-sync-v0.mixins.json
+++ b/fabric-registry-sync-v0/src/main/resources/fabric-registry-sync-v0.mixins.json
@@ -3,22 +3,12 @@
   "package": "net.fabricmc.fabric.mixin.registry.sync",
   "compatibilityLevel": "JAVA_25",
   "mixins": [
-    "BlocksMixin",
-    "BootstrapMixin",
-    "SerializableChunkDataMixin",
-    "DebugLevelSourceAccessor",
-    "RegistryPatchGeneratorMixin",
-    "IdMapperMixin",
-    "MainMixin",
-    "BuiltInRegistriesAccessor",
-    "BuiltInRegistriesMixin",
-    "RegistriesMixin",
-    "RegistryDataLoaderMixin",
-    "RegistryMixin",
-    "WorldLoaderMixin",
-    "RegistrySynchronizationMixin",
+    "BaseMappedRegistryAccessor",
+    "BaseMappedRegistryMixin",
     "MappedRegistryAccessor",
-    "MappedRegistryMixin"
+    "RegistryDataLoaderMixin",
+    "RegistryManagerAccessor",
+    "RegistryMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-registry-sync-v0/src/main/resources/fabric.mod.json b/fabric-registry-sync-v0/src/main/resources/fabric.mod.json
index 7cec2b2e5d..2e8ec796a2 100644
--- a/fabric-registry-sync-v0/src/main/resources/fabric.mod.json
+++ b/fabric-registry-sync-v0/src/main/resources/fabric.mod.json
@@ -17,23 +17,15 @@
   ],
   "depends": {
     "fabricloader": ">=0.18.4",
-    "fabric-api-base": "*",
-    "fabric-networking-api-v1": "*"
+    "fabric-api-base": "*"
   },
   "description": "Syncs registry mappings.",
   "mixins": [
-    "fabric-registry-sync-v0.mixins.json",
-    {
-      "config": "fabric-registry-sync-v0.client.mixins.json",
-      "environment": "client"
-    }
+    "fabric-registry-sync-v0.mixins.json"
   ],
   "entrypoints": {
     "main": [
       "net.fabricmc.fabric.impl.registry.sync.FabricRegistryInit"
-    ],
-    "client": [
-      "net.fabricmc.fabric.impl.client.registry.sync.FabricRegistryClientInit"
     ]
   },
   "accessWidener": "fabric-registry-sync-v0.classtweaker",
diff --git a/fabric-registry-sync-v0/src/test/java/net/fabricmc/fabric/test/registry/sync/RegistryRemapTest.java b/fabric-registry-sync-v0/src/test/java/net/fabricmc/fabric/test/registry/sync/RegistryRemapTest.java
deleted file mode 100644
index 45bbb1cbec..0000000000
--- a/fabric-registry-sync-v0/src/test/java/net/fabricmc/fabric/test/registry/sync/RegistryRemapTest.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * 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.registry.sync;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.util.EnumSet;
-import java.util.Map;
-import java.util.UUID;
-
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
-import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import net.minecraft.SharedConstants;
-import net.minecraft.core.MappedRegistry;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.Identifier;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.server.Bootstrap;
-import net.minecraft.util.thread.BlockableEventLoop;
-
-import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder;
-import net.fabricmc.fabric.api.event.registry.RegistryAttribute;
-import net.fabricmc.fabric.api.event.registry.RegistryAttributeHolder;
-import net.fabricmc.fabric.impl.client.registry.sync.ClientRegistrySyncHandler;
-import net.fabricmc.fabric.impl.registry.sync.RegistryAttributeImpl;
-import net.fabricmc.fabric.impl.registry.sync.RemapException;
-import net.fabricmc.fabric.impl.registry.sync.RemappableRegistry;
-import net.fabricmc.fabric.impl.registry.sync.packet.RegistrySyncPayload;
-
-public class RegistryRemapTest {
-	private ResourceKey> testRegistryKey;
-	private MappedRegistry testRegistry;
-
-	@BeforeAll
-	static void beforeAll() {
-		SharedConstants.tryDetectVersion();
-		Bootstrap.bootStrap();
-	}
-
-	@BeforeEach
-	void beforeEach() {
-		testRegistryKey = ResourceKey.createRegistryKey(id(UUID.randomUUID().toString()));
-		testRegistry = FabricRegistryBuilder.create(testRegistryKey)
-				.attribute(RegistryAttribute.SYNCED)
-				.buildAndRegister();
-
-		Registry.register(testRegistry, id("zero"), "zero");
-		Registry.register(testRegistry, id("one"), "one");
-		Registry.register(testRegistry, id("two"), "two");
-	}
-
-	@AfterEach
-	void afterEach() throws RemapException {
-		// If a test fails, make sure we unmap the registry to avoid affecting other tests
-		RemappableRegistry remappableRegistry = (RemappableRegistry) testRegistry;
-		remappableRegistry.unmap();
-	}
-
-	@Test
-	void remapRegistry() throws RemapException {
-		RemappableRegistry remappableRegistry = (RemappableRegistry) testRegistry;
-
-		assertEquals(0, testRegistry.getId("zero"));
-		assertEquals(1, testRegistry.getId("one"));
-		assertEquals(2, testRegistry.getId("two"));
-
-		Map idMap = Map.of(
-				id("zero"), 2,
-				id("one"), 1,
-				id("two"), 0
-		);
-		remappableRegistry.remap(asFastMap(idMap), RemappableRegistry.RemapMode.AUTHORITATIVE);
-
-		assertEquals(2, testRegistry.getId("zero"));
-		assertEquals(1, testRegistry.getId("one"));
-		assertEquals(0, testRegistry.getId("two"));
-
-		remappableRegistry.unmap();
-
-		assertEquals(0, testRegistry.getId("zero"));
-		assertEquals(1, testRegistry.getId("one"));
-		assertEquals(2, testRegistry.getId("two"));
-	}
-
-	@Test
-	void remapRegistryViaPacket() throws RemapException {
-		RemappableRegistry remappableRegistry = (RemappableRegistry) testRegistry;
-
-		assertEquals(0, testRegistry.getId("zero"));
-		assertEquals(1, testRegistry.getId("one"));
-		assertEquals(2, testRegistry.getId("two"));
-
-		Map idMap = Map.of(
-				id("two"), 0,
-				id("one"), 1,
-				id("zero"), 2
-		);
-
-		var payload = new RegistrySyncPayload(Map.of(testRegistryKey.identifier(), asFastMap(idMap)));
-
-		ClientRegistrySyncHandler.apply(payload);
-
-		assertEquals(2, testRegistry.getId("zero"));
-		assertEquals(1, testRegistry.getId("one"));
-		assertEquals(0, testRegistry.getId("two"));
-
-		remappableRegistry.unmap();
-
-		assertEquals(0, testRegistry.getId("zero"));
-		assertEquals(1, testRegistry.getId("one"));
-		assertEquals(2, testRegistry.getId("two"));
-	}
-
-	@Test
-	void unknownEntry() {
-		Map idMap = Map.of(
-				id("two"), 0,
-				id("one"), 1,
-				id("zero"), 2,
-				id("unknown"), 3
-		);
-
-		var payload = new RegistrySyncPayload(Map.of(testRegistryKey.identifier(), asFastMap(idMap)));
-
-		RemapException remapException = assertThrows(RemapException.class, () -> ClientRegistrySyncHandler.apply(payload));
-		assertTrue(remapException.getMessage().contains("unknown-remote"));
-	}
-
-	@Test
-	void unknownRegistry() {
-		Map idMap = Map.of(
-				id("two"), 0,
-				id("one"), 1,
-				id("zero"), 2
-		);
-
-		var payload = new RegistrySyncPayload(Map.of(id("unknown"), asFastMap(idMap)));
-
-		RemapException remapException = assertThrows(RemapException.class, () -> ClientRegistrySyncHandler.apply(payload));
-		assertTrue(remapException.getMessage().contains("unknown-registry"));
-	}
-
-	@Test
-	void unknownOptionalRegistry() throws RemapException {
-		Map idMap = Map.of(
-				id("two"), 0,
-				id("one"), 1,
-				id("zero"), 2
-		);
-
-		RegistryAttributeImpl holder = (RegistryAttributeImpl) RegistryAttributeHolder.get(testRegistryKey);
-		holder.addAttribute(RegistryAttribute.OPTIONAL);
-
-		var payload = new RegistrySyncPayload(Map.of(testRegistryKey.identifier(), asFastMap(idMap)));
-
-		// Packet should be handled without issue.
-		ClientRegistrySyncHandler.apply(payload);
-
-		holder.removeAttribute(RegistryAttribute.OPTIONAL);
-	}
-
-	@Test
-	void missingRemoteEntries() throws RemapException {
-		RemappableRegistry remappableRegistry = (RemappableRegistry) testRegistry;
-
-		assertEquals(0, testRegistry.getId("zero"));
-		assertEquals(1, testRegistry.getId("one"));
-		assertEquals(2, testRegistry.getId("two"));
-
-		Map idMap = Map.of(
-				id("two"), 0,
-				id("zero"), 1
-		);
-
-		var payload = new RegistrySyncPayload(Map.of(testRegistryKey.identifier(), asFastMap(idMap)));
-
-		ClientRegistrySyncHandler.apply(payload);
-
-		assertEquals(0, testRegistry.getId("two"));
-		assertEquals(1, testRegistry.getId("zero"));
-		// assigned an ID at the end of the registry
-		assertEquals(2, testRegistry.getId("one"));
-
-		remappableRegistry.unmap();
-
-		assertEquals(0, testRegistry.getId("zero"));
-		assertEquals(1, testRegistry.getId("one"));
-		assertEquals(2, testRegistry.getId("two"));
-	}
-
-	@Test
-	void remapRegistryFromPacketData() throws RemapException {
-		RemappableRegistry remappableRegistry = (RemappableRegistry) testRegistry;
-
-		assertEquals(0, testRegistry.getId("zero"));
-		assertEquals(1, testRegistry.getId("one"));
-		assertEquals(2, testRegistry.getId("two"));
-
-		ClientRegistrySyncHandler.apply(new RegistrySyncPayload(
-				Map.of(
-					testRegistryKey.identifier(), asFastMap(Map.of(
-						id("zero"), 2,
-						id("one"), 1,
-						id("two"), 0
-					))
-				),
-				Map.of()
-		));
-
-		assertEquals(2, testRegistry.getId("zero"));
-		assertEquals(1, testRegistry.getId("one"));
-		assertEquals(0, testRegistry.getId("two"));
-
-		remappableRegistry.unmap();
-
-		assertEquals(0, testRegistry.getId("zero"));
-		assertEquals(1, testRegistry.getId("one"));
-		assertEquals(2, testRegistry.getId("two"));
-	}
-
-	@Test
-	void remapRegistryFromPacketDataIgnoreOptional() throws RemapException {
-		RemappableRegistry remappableRegistry = (RemappableRegistry) testRegistry;
-
-		assertEquals(0, testRegistry.getId("zero"));
-		assertEquals(1, testRegistry.getId("one"));
-		assertEquals(2, testRegistry.getId("two"));
-
-		ClientRegistrySyncHandler.apply(new RegistrySyncPayload(
-				Map.of(
-					testRegistryKey.identifier(), asFastMap(Map.of(
-							id("zero"), 2,
-							id("one"), 1,
-							id("two"), 0
-					)),
-					Identifier.fromNamespaceAndPath("test", "optional"), asFastMap(Map.of(
-						id("test"), 0
-					))
-				),
-				Map.of(
-						Identifier.fromNamespaceAndPath("test", "optional"), EnumSet.of(RegistryAttribute.OPTIONAL)
-				)
-		));
-
-		assertEquals(2, testRegistry.getId("zero"));
-		assertEquals(1, testRegistry.getId("one"));
-		assertEquals(0, testRegistry.getId("two"));
-
-		remappableRegistry.unmap();
-
-		assertEquals(0, testRegistry.getId("zero"));
-		assertEquals(1, testRegistry.getId("one"));
-		assertEquals(2, testRegistry.getId("two"));
-	}
-
-	private static Object2IntMap asFastMap(Map map) {
-		var fastMap = new Object2IntOpenHashMap();
-		fastMap.putAll(map);
-		return fastMap;
-	}
-
-	private static Identifier id(String path) {
-		return Identifier.fromNamespaceAndPath("registry_sync_test", path);
-	}
-
-	// Run the task on the current thread instantly
-	private static class ThisThreadExecutor extends BlockableEventLoop {
-		public static final ThisThreadExecutor INSTANCE = new ThisThreadExecutor();
-
-		private ThisThreadExecutor() {
-			super("Test thread executor", true);
-		}
-
-		@Override
-		protected boolean shouldRun(Runnable task) {
-			return true;
-		}
-
-		@Override
-		protected Thread getRunningThread() {
-			return Thread.currentThread();
-		}
-
-		@Override
-		public Runnable wrapRunnable(Runnable runnable) {
-			return runnable;
-		}
-	}
-}
diff --git a/fabric-registry-sync-v0/src/testmod/java/net/fabricmc/fabric/test/registry/sync/RegistrySyncTest.java b/fabric-registry-sync-v0/src/testmod/java/net/fabricmc/fabric/test/registry/sync/RegistrySyncTest.java
index e2980d1271..c9c50863cb 100644
--- a/fabric-registry-sync-v0/src/testmod/java/net/fabricmc/fabric/test/registry/sync/RegistrySyncTest.java
+++ b/fabric-registry-sync-v0/src/testmod/java/net/fabricmc/fabric/test/registry/sync/RegistrySyncTest.java
@@ -55,6 +55,13 @@ public class RegistrySyncTest implements ModInitializer {
 	// We check them later as they may be used before the registry attributes are assigned.
 	private static boolean hasCheckedEarlyRegistries = false;
 	private static final List>> sycnedRegistriesToCheck = new ArrayList<>();
+	
+	private static final List UNSYNCED_REGS = List.of(
+			Registries.RECIPE_SERIALIZER.identifier(),
+			Registries.DATA_COMPONENT_PREDICATE_TYPE.identifier(),
+			Registries.POINT_OF_INTEREST_TYPE.identifier(),
+			Registries.GAME_EVENT.identifier()
+	);
 
 	@Override
 	public void onInitialize() {
@@ -116,7 +123,7 @@ public static void checkSyncedRegistry(ResourceKey> regist
 			return;
 		}
 
-		if (registry.identifier().equals(Identifier.parse("recipe_serializer"))) {
+		if (UNSYNCED_REGS.contains(registry.identifier())) {
 			// Recipe serializers are not synced, as there is an unused codec left over.
 			return;
 		}
diff --git a/fabric-registry-sync-v0/src/testmodClient/java/net/fabricmc/fabric/test/registry/sync/client/DynamicRegistryClientTest.java b/fabric-registry-sync-v0/src/testmodClient/java/net/fabricmc/fabric/test/registry/sync/client/DynamicRegistryClientTest.java
index c12369930f..92519de3f3 100644
--- a/fabric-registry-sync-v0/src/testmodClient/java/net/fabricmc/fabric/test/registry/sync/client/DynamicRegistryClientTest.java
+++ b/fabric-registry-sync-v0/src/testmodClient/java/net/fabricmc/fabric/test/registry/sync/client/DynamicRegistryClientTest.java
@@ -16,11 +16,6 @@
 
 package net.fabricmc.fabric.test.registry.sync.client;
 
-import static net.fabricmc.fabric.test.registry.sync.CustomDynamicRegistryTest.TEST_EMPTY_SYNCED_DYNAMIC_REGISTRY_KEY;
-import static net.fabricmc.fabric.test.registry.sync.CustomDynamicRegistryTest.TEST_NESTED_DYNAMIC_REGISTRY_KEY;
-import static net.fabricmc.fabric.test.registry.sync.CustomDynamicRegistryTest.TEST_SYNCED_1_DYNAMIC_REGISTRY_KEY;
-import static net.fabricmc.fabric.test.registry.sync.CustomDynamicRegistryTest.TEST_SYNCED_2_DYNAMIC_REGISTRY_KEY;
-
 import com.mojang.logging.LogUtils;
 import org.slf4j.Logger;
 
@@ -29,9 +24,8 @@
 import net.minecraft.resources.ResourceKey;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
-import net.fabricmc.fabric.test.registry.sync.TestDynamicObject;
-import net.fabricmc.fabric.test.registry.sync.TestNestedDynamicObject;
+
+//import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 
 public final class DynamicRegistryClientTest implements ClientModInitializer {
 	private static final Logger LOGGER = LogUtils.getLogger();
@@ -39,56 +33,56 @@ public final class DynamicRegistryClientTest implements ClientModInitializer {
 
 	@Override
 	public void onInitializeClient() {
-		ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
-			LOGGER.info("Starting dynamic registry sync tests...");
-
-			TestDynamicObject synced1 = handler.registryAccess()
-					.lookupOrThrow(TEST_SYNCED_1_DYNAMIC_REGISTRY_KEY)
-					.getValue(SYNCED_ID);
-			TestDynamicObject synced2 = handler.registryAccess()
-					.lookupOrThrow(TEST_SYNCED_2_DYNAMIC_REGISTRY_KEY)
-					.getValue(SYNCED_ID);
-			TestNestedDynamicObject simpleNested = handler.registryAccess()
-					.lookupOrThrow(TEST_NESTED_DYNAMIC_REGISTRY_KEY)
-					.getValue(SYNCED_ID);
-
-			LOGGER.info("Synced - simple: {}", synced1);
-			LOGGER.info("Synced - custom network codec: {}", synced2);
-			LOGGER.info("Synced - simple nested: {}", simpleNested);
-
-			if (synced1 == null) {
-				didNotReceive(TEST_SYNCED_1_DYNAMIC_REGISTRY_KEY, SYNCED_ID);
-			}
-
-			if (synced1.usesNetworkCodec()) {
-				throw new AssertionError("Entries in " + TEST_SYNCED_1_DYNAMIC_REGISTRY_KEY + " should not use network codec");
-			}
-
-			if (synced2 == null) {
-				didNotReceive(TEST_SYNCED_2_DYNAMIC_REGISTRY_KEY, SYNCED_ID);
-			}
-
-			// In 24w04a, dynamic registries are always serialized and sent even in singleplayer.
-			if (!synced2.usesNetworkCodec()) {
-				LOGGER.error("Entries in " + TEST_SYNCED_2_DYNAMIC_REGISTRY_KEY + " should use network codec");
-			}
-
-			// TODO 1.20.2
-			//if (simpleNested == null) {
-			//	didNotReceive(TEST_NESTED_DYNAMIC_REGISTRY_KEY, SYNCED_ID);
-			//}
-
-			//if (simpleNested.nested().value() != synced1) {
-			//	throw new AssertionError("Did not match up synced nested entry to the other synced value");
-			//}
-
-			// See ClientRegistriesDynamicBuiltInRegistriesMixin
-			if (handler.registryAccess().lookup(TEST_EMPTY_SYNCED_DYNAMIC_REGISTRY_KEY).isPresent()) {
-				throw new AssertionError("Received empty registry that should have been skipped");
-			}
-
-			LOGGER.info("Dynamic registry sync tests passed!");
-		});
+//		ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
+//			LOGGER.info("Starting dynamic registry sync tests...");
+//
+//			TestDynamicObject synced1 = handler.registryAccess()
+//					.lookupOrThrow(TEST_SYNCED_1_DYNAMIC_REGISTRY_KEY)
+//					.getValue(SYNCED_ID);
+//			TestDynamicObject synced2 = handler.registryAccess()
+//					.lookupOrThrow(TEST_SYNCED_2_DYNAMIC_REGISTRY_KEY)
+//					.getValue(SYNCED_ID);
+//			TestNestedDynamicObject simpleNested = handler.registryAccess()
+//					.lookupOrThrow(TEST_NESTED_DYNAMIC_REGISTRY_KEY)
+//					.getValue(SYNCED_ID);
+//
+//			LOGGER.info("Synced - simple: {}", synced1);
+//			LOGGER.info("Synced - custom network codec: {}", synced2);
+//			LOGGER.info("Synced - simple nested: {}", simpleNested);
+//
+//			if (synced1 == null) {
+//				didNotReceive(TEST_SYNCED_1_DYNAMIC_REGISTRY_KEY, SYNCED_ID);
+//			}
+//
+//			if (synced1.usesNetworkCodec()) {
+//				throw new AssertionError("Entries in " + TEST_SYNCED_1_DYNAMIC_REGISTRY_KEY + " should not use network codec");
+//			}
+//
+//			if (synced2 == null) {
+//				didNotReceive(TEST_SYNCED_2_DYNAMIC_REGISTRY_KEY, SYNCED_ID);
+//			}
+//
+//			// In 24w04a, dynamic registries are always serialized and sent even in singleplayer.
+//			if (!synced2.usesNetworkCodec()) {
+//				LOGGER.error("Entries in " + TEST_SYNCED_2_DYNAMIC_REGISTRY_KEY + " should use network codec");
+//			}
+//
+//			// TODO 1.20.2
+//			//if (simpleNested == null) {
+//			//	didNotReceive(TEST_NESTED_DYNAMIC_REGISTRY_KEY, SYNCED_ID);
+//			//}
+//
+//			//if (simpleNested.nested().value() != synced1) {
+//			//	throw new AssertionError("Did not match up synced nested entry to the other synced value");
+//			//}
+//
+//			// See ClientRegistriesDynamicBuiltInRegistriesMixin
+////			if (handler.registryAccess().lookup(TEST_EMPTY_SYNCED_DYNAMIC_REGISTRY_KEY).isPresent()) {
+////				throw new AssertionError("Received empty registry that should have been skipped");
+////			}
+//
+//			LOGGER.info("Dynamic registry sync tests passed!");
+//		});
 	}
 
 	private static void didNotReceive(ResourceKey> registryKey, Identifier entryId) {
diff --git a/fabric-registry-sync-v0/src/testmodClient/java/net/fabricmc/fabric/test/registry/sync/client/RegistrySyncClientTest.java b/fabric-registry-sync-v0/src/testmodClient/java/net/fabricmc/fabric/test/registry/sync/client/RegistrySyncClientTest.java
index 53e3335b5d..959ddfbc34 100644
--- a/fabric-registry-sync-v0/src/testmodClient/java/net/fabricmc/fabric/test/registry/sync/client/RegistrySyncClientTest.java
+++ b/fabric-registry-sync-v0/src/testmodClient/java/net/fabricmc/fabric/test/registry/sync/client/RegistrySyncClientTest.java
@@ -18,7 +18,6 @@
 
 import java.util.EnumSet;
 import java.util.Map;
-import java.util.Objects;
 
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
@@ -26,14 +25,13 @@
 import net.minecraft.commands.Commands;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.Identifier;
-import net.minecraft.server.level.ServerPlayer;
 
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.registry.RegistryAttribute;
-import net.fabricmc.fabric.impl.client.registry.sync.ClientRegistrySyncHandler;
-import net.fabricmc.fabric.impl.registry.sync.RemapException;
-import net.fabricmc.fabric.impl.registry.sync.packet.RegistrySyncPayload;
+//import net.fabricmc.fabric.impl.client.registry.sync.ClientRegistrySyncHandler;
+//import net.fabricmc.fabric.impl.registry.sync.RemapException;
+//import net.fabricmc.fabric.impl.registry.sync.packet.RegistrySyncPayload;
 
 public class RegistrySyncClientTest implements ClientModInitializer {
 	@Override
@@ -49,19 +47,19 @@ public void onInitializeClient() {
 							Registries.ITEM.identifier(), EnumSet.noneOf(RegistryAttribute.class)
 					);
 
-					try {
-						ClientRegistrySyncHandler.checkRemoteRemap(new RegistrySyncPayload(registryData, attributes));
-					} catch (RemapException e) {
-						final ServerPlayer player = context.getSource().getPlayer();
-
-						if (player != null) {
-							player.connection.disconnect(Objects.requireNonNull(e.getComponent()));
-						}
-
+//					try {
+//						ClientRegistrySyncHandler.checkRemoteRemap(new RegistrySyncPayload(registryData, attributes));
+//					} catch (RemapException e) {
+//						final ServerPlayer player = context.getSource().getPlayer();
+//
+//						if (player != null) {
+//							player.connection.disconnect(Objects.requireNonNull(e.getComponent()));
+//						}
+//
 						return 1;
-					}
-
-					throw new IllegalStateException();
+//					}
+//
+//					throw new IllegalStateException();
 				})));
 	}
 
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/Renderer.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/Renderer.java
index b48a26e2ec..7159a648da 100644
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/Renderer.java
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/Renderer.java
@@ -18,6 +18,7 @@
 
 import java.util.List;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import net.minecraft.client.color.block.BlockColors;
 import net.minecraft.client.renderer.block.BlockAndTintGetter;
@@ -25,8 +26,8 @@
 import net.minecraft.client.renderer.block.ModelBlockRenderer;
 import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
 import net.minecraft.client.renderer.chunk.SectionCompiler;
-import net.minecraft.client.renderer.feature.BlockFeatureRenderer;
-import net.minecraft.client.renderer.feature.ItemFeatureRenderer;
+import net.minecraft.client.renderer.feature.FeatureRenderer;
+import net.minecraft.client.renderer.feature.FeatureRendererType;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.level.block.state.BlockState;
@@ -36,7 +37,9 @@
 import net.fabricmc.fabric.api.client.renderer.v1.mesh.MutableQuadView;
 import net.fabricmc.fabric.api.client.renderer.v1.mesh.QuadEmitter;
 import net.fabricmc.fabric.api.client.renderer.v1.render.AltModelBlockRenderer;
-import net.fabricmc.fabric.api.client.renderer.v1.render.FabricSubmitNodeCollection;
+import net.fabricmc.fabric.api.client.renderer.v1.render.submit.ExtendedBlockModelSubmit;
+import net.fabricmc.fabric.api.client.renderer.v1.render.submit.ExtendedItemSubmit;
+import net.fabricmc.fabric.api.client.rendering.v1.FeatureRendererRegistry;
 import net.fabricmc.fabric.impl.client.renderer.RendererManager;
 
 /**
@@ -54,9 +57,9 @@
  * {@link AltModelBlockRenderer#tesselateBlock(QuadEmitter, float, float, float, BlockAndTintGetter, BlockPos, BlockState, BlockStateModel, long)},
  * respectively, instead.
  *
- * 
    Renderers must patch {@link ItemFeatureRenderer} to support
- * {@link FabricSubmitNodeCollection#getExtendedItemSubmits()}. {@link BlockFeatureRenderer} is automatically patched
- * to support {@link FabricSubmitNodeCollection#getExtendedBlockModelSubmits()} and {@link BlockStateModel#emitQuads}.
+ * 
    Renderers must implement {@link FeatureRenderer}s to support {@link ExtendedBlockModelSubmit}
+ * and {@link ExtendedItemSubmit}. This is typically done with
+ * {@link FeatureRendererRegistry#register(FeatureRendererType, Supplier)}.
  */
 public interface Renderer {
 	/**
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/model/FabricBlockStateModel.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/model/FabricBlockStateModel.java
index b8e71c10e8..deae8ab347 100644
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/model/FabricBlockStateModel.java
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/model/FabricBlockStateModel.java
@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.function.Predicate;
 
+import net.neoforged.neoforge.client.extensions.BlockStateModelExtension;
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.client.Minecraft;
@@ -48,7 +49,7 @@
  *
  * 
    Note: This interface is automatically implemented on {@link BlockStateModel} via Mixin and interface injection.
  */
-public interface FabricBlockStateModel {
+public interface FabricBlockStateModel extends BlockStateModelExtension {
 	/**
 	 * Produces this model's geometry. This method must be called instead of
 	 * {@link BlockStateModel#collectParts(RandomSource, List)}; the vanilla method
@@ -99,7 +100,7 @@ default void emitQuads(QuadEmitter emitter, BlockAndTintGetter level, BlockPos p
 		}
 
 		final List parts = new ArrayList<>();
-		((BlockStateModel) this).collectParts(random, parts);
+		this.collectParts(level, pos, state, random, parts);
 		final int partCount = parts.size();
 
 		for (int i = 0; i < partCount; i++) {
@@ -155,7 +156,7 @@ default Object createGeometryKey(BlockAndTintGetter level, BlockPos pos, BlockSt
 	 * @return the particle material
 	 */
 	default Material.Baked particleMaterial(BlockAndTintGetter level, BlockPos pos, BlockState state) {
-		return ((BlockStateModel) this).particleMaterial();
+		return BlockStateModelExtension.super.particleMaterial(level, pos, state);
 	}
 
 	/**
@@ -193,7 +194,7 @@ default Material.Baked particleMaterial(BlockAndTintGetter level, BlockPos pos,
 	 */
 	@BakedQuad.MaterialFlags
 	default int materialFlags(BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random) {
-		return ((BlockStateModel) this).materialFlags();
+		return BlockStateModelExtension.super.materialFlags(level, pos, state);
 	}
 
 	/**
@@ -218,6 +219,6 @@ default int materialFlags(BlockAndTintGetter level, BlockPos pos, BlockState sta
 	 * @see #materialFlags(BlockAndTintGetter, BlockPos, BlockState, RandomSource)
 	 */
 	default boolean hasMaterialFlag(BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random, @BakedQuad.MaterialFlags int flag) {
-		return (materialFlags(level, pos, state, random) & flag) != 0;
+		return BlockStateModelExtension.super.hasMaterialFlag(level, pos, state, flag);
 	}
 }
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/ChunkSectionLayerHelper.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/ChunkSectionLayerHelper.java
index fdcde5e11b..99bccb5f78 100644
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/ChunkSectionLayerHelper.java
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/ChunkSectionLayerHelper.java
@@ -34,6 +34,6 @@ public static RenderType getMovingBlockRenderType(ChunkSectionLayer layer) {
 	}
 
 	public static RenderType getRenderType(boolean translucent) {
-		return translucent ? Sheets.translucentBlockSheet() : Sheets.cutoutBlockSheet();
+		return translucent ? Sheets.translucentBlockItemSheet() : Sheets.cutoutBlockItemSheet();
 	}
 }
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/FabricOrderedSubmitNodeCollector.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/FabricOrderedSubmitNodeCollector.java
index 7de6d25f56..af3dee3f5f 100644
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/FabricOrderedSubmitNodeCollector.java
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/FabricOrderedSubmitNodeCollector.java
@@ -59,7 +59,22 @@ default void submitBlockModel(PoseStack poseStack, Function parts, Mesh mesh, int progress) {
+		((OrderedSubmitNodeCollector) this).submitBreakingBlockModel(poseStack, parts, progress);
+	}
+
+	/**
+	 * Alternative to {@link OrderedSubmitNodeCollector#submitItem(PoseStack, ItemDisplayContext, int, int, int, int[], List, ItemStackRenderState.FoilType)}
+	 * that also accepts a {@link MeshView}.
 	 *
 	 * @param poseStack the pose stack
 	 * @param displayContext the item display context
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/FabricSubmitNodeCollection.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/FabricSubmitNodeCollection.java
deleted file mode 100644
index e851cb80b6..0000000000
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/FabricSubmitNodeCollection.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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.api.client.renderer.v1.render;
-
-import java.util.List;
-import java.util.function.Function;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import org.jspecify.annotations.Nullable;
-
-import net.minecraft.client.renderer.SubmitNodeCollection;
-import net.minecraft.client.renderer.SubmitNodeStorage.BlockModelSubmit;
-import net.minecraft.client.renderer.SubmitNodeStorage.ItemSubmit;
-import net.minecraft.client.renderer.block.dispatch.BlockStateModelPart;
-import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
-import net.minecraft.client.renderer.item.ItemStackRenderState;
-import net.minecraft.client.renderer.rendertype.RenderType;
-import net.minecraft.client.resources.model.geometry.BakedQuad;
-import net.minecraft.world.item.ItemDisplayContext;
-
-import net.fabricmc.fabric.api.client.renderer.v1.mesh.Mesh;
-import net.fabricmc.fabric.api.client.renderer.v1.mesh.MeshView;
-
-/**
- * Note: This interface is automatically implemented on {@link SubmitNodeCollection} via Mixin and interface injection.
- */
-public interface FabricSubmitNodeCollection {
-	/**
-	 * @return {@linkplain ExtendedBlockModelSubmit extended block model submits} in this
-	 * {@link SubmitNodeCollection}.
-	 */
-	default List getExtendedBlockModelSubmits() {
-		throw new UnsupportedOperationException("Implemented via Mixin.");
-	}
-
-	/**
-	 * @return {@linkplain ExtendedItemSubmit extended item submits} in this
-	 * {@link SubmitNodeCollection}.
-	 */
-	default List getExtendedItemSubmits() {
-		throw new UnsupportedOperationException("Implemented via Mixin.");
-	}
-
-	// CHECKSTYLE:OFF MatchXpath
-	/**
-	 * An alternative to {@link BlockModelSubmit} that accepts a {@link Mesh}.
-	 */
-	record ExtendedBlockModelSubmit(PoseStack.Pose pose, Function renderTypeFunction, boolean translucent, List modelParts, @Nullable Mesh mesh, int[] tintLayers, int lightCoords, int overlayCoords, int outlineColor) {
-	}
-
-	/**
-	 * An alternative to {@link ItemSubmit} that accepts a {@link MeshView}.
-	 */
-	record ExtendedItemSubmit(PoseStack.Pose pose, ItemDisplayContext displayContext, int lightCoords, int overlayCoords, int outlineColor, int[] tintLayers, List quads, MeshView mesh, ItemStackRenderState.FoilType foilType) {
-	}
-
-	// CHECKSTYLE:ON MatchXpath
-}
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/submit/ExtendedBlockModelSubmit.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/submit/ExtendedBlockModelSubmit.java
new file mode 100644
index 0000000000..aea65fb23a
--- /dev/null
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/submit/ExtendedBlockModelSubmit.java
@@ -0,0 +1,55 @@
+/*
+ * 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.api.client.renderer.v1.render.submit;
+
+import java.util.List;
+import java.util.function.Function;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.client.renderer.block.dispatch.BlockStateModelPart;
+import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
+import net.minecraft.client.renderer.feature.BlockModelFeatureRenderer;
+import net.minecraft.client.renderer.feature.FeatureRendererType;
+import net.minecraft.client.renderer.feature.submit.TranslucentSubmit;
+import net.minecraft.client.renderer.rendertype.RenderType;
+
+import net.fabricmc.fabric.api.client.renderer.v1.mesh.Mesh;
+
+/**
+ * An alternative to {@link BlockModelFeatureRenderer.Submit} that optionally accepts a {@link Mesh}.
+ */
+//CHECKSTYLE.OFF: MatchXpath
+public record ExtendedBlockModelSubmit(PoseStack.Pose pose,
+									Function renderTypeFunction,
+									List modelParts, @Nullable Mesh mesh,
+									int[] tintLayers, int lightCoords, int overlayCoords,
+									int tintColor, PoseStack.@Nullable Pose sheetedDecalPose) implements TranslucentSubmit {
+	//CHECKSTYLE.ON: MatchXpath
+	public static final FeatureRendererType TYPE = FeatureRendererType.create("Extended Block Model");
+
+	@Override
+	public float distanceToCameraSq() {
+		return TranslucentSubmit.computeDistanceToCameraSq(pose.pose(), 0.5F, 0.5F, 0.5F);
+	}
+
+	@Override
+	public FeatureRendererType featureType() {
+		return TYPE;
+	}
+}
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/submit/ExtendedItemSubmit.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/submit/ExtendedItemSubmit.java
new file mode 100644
index 0000000000..98cb6fde59
--- /dev/null
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/render/submit/ExtendedItemSubmit.java
@@ -0,0 +1,76 @@
+/*
+ * 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.api.client.renderer.v1.render.submit;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+
+import net.minecraft.client.renderer.feature.FeatureRendererType;
+import net.minecraft.client.renderer.feature.ItemFeatureRenderer;
+import net.minecraft.client.renderer.feature.submit.TranslucentSubmit;
+import net.minecraft.client.renderer.item.ItemStackRenderState;
+import net.minecraft.client.resources.model.geometry.BakedQuad;
+import net.minecraft.world.item.ItemDisplayContext;
+
+import net.fabricmc.fabric.api.client.renderer.v1.mesh.MeshView;
+import net.fabricmc.fabric.api.client.renderer.v1.mesh.QuadView;
+
+/**
+ * An alternative to {@link ItemFeatureRenderer.Submit} that accepts a {@link MeshView}.
+ */
+//CHECKSTYLE.OFF: MatchXpath
+public record ExtendedItemSubmit(PoseStack.Pose pose, ItemDisplayContext displayContext,
+								int lightCoords, int overlayCoords, int outlineColor,
+								int[] tintLayers, List quads, MeshView mesh,
+								ItemStackRenderState.FoilType foilType) implements TranslucentSubmit {
+	//CHECKSTYLE.ON: MatchXpath
+	public static final FeatureRendererType TYPE = FeatureRendererType.create("Extended Item");
+
+	public boolean hasTranslucency() {
+		for (BakedQuad quad : quads()) {
+			if (quad.materialInfo().itemRenderType().hasBlending()) {
+				return true;
+			}
+		}
+
+		var quadInspector = new Consumer() {
+			private boolean translucent = false;
+
+			@Override
+			public void accept(QuadView quad) {
+				if (quad.itemRenderType().hasBlending()) {
+					translucent = true;
+				}
+			}
+		};
+		mesh.forEach(quadInspector);
+
+		return quadInspector.translucent;
+	}
+
+	@Override
+	public float distanceToCameraSq() {
+		return TranslucentSubmit.computeDistanceToCameraSq(pose.pose());
+	}
+
+	@Override
+	public FeatureRendererType featureType() {
+		return TYPE;
+	}
+}
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/impl/client/renderer/BlockModelBufferCache.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/impl/client/renderer/BlockModelBufferCache.java
deleted file mode 100644
index 8d1cef634d..0000000000
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/impl/client/renderer/BlockModelBufferCache.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.impl.client.renderer;
-
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import org.jspecify.annotations.Nullable;
-
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.OutlineBufferSource;
-import net.minecraft.client.renderer.rendertype.RenderType;
-
-public class BlockModelBufferCache {
-	private final MultiBufferSource.BufferSource bufferSource;
-	private final OutlineBufferSource outlineBufferSource;
-
-	private int outlineColor;
-
-	@Nullable
-	private RenderType lastRenderType;
-	@Nullable
-	private VertexConsumer lastBuffer;
-	@Nullable
-	private VertexConsumer lastOutlineBuffer;
-
-	public BlockModelBufferCache(MultiBufferSource.BufferSource bufferSource, OutlineBufferSource outlineBufferSource) {
-		this.bufferSource = bufferSource;
-		this.outlineBufferSource = outlineBufferSource;
-	}
-
-	public void outlineColor(int outlineColor) {
-		this.outlineColor = outlineColor;
-		lastRenderType = null;
-	}
-
-	public VertexConsumer getBuffer(RenderType renderType) {
-		if (renderType != lastRenderType) {
-			update(renderType);
-		}
-
-		return lastBuffer;
-	}
-
-	@Nullable
-	public VertexConsumer getOutlineBuffer(RenderType renderType) {
-		if (renderType != lastRenderType) {
-			update(renderType);
-		}
-
-		return lastOutlineBuffer;
-	}
-
-	private void update(RenderType renderType) {
-		lastRenderType = renderType;
-		lastBuffer = bufferSource.getBuffer(renderType);
-
-		if (outlineColor != 0) {
-			outlineBufferSource.setColor(outlineColor);
-			lastOutlineBuffer = outlineBufferSource.getBuffer(renderType);
-		} else {
-			lastOutlineBuffer = null;
-		}
-	}
-}
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/impl/client/renderer/MovingBlockQuadConsumer.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/impl/client/renderer/MovingBlockQuadConsumer.java
new file mode 100644
index 0000000000..69a3f2a9fe
--- /dev/null
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/impl/client/renderer/MovingBlockQuadConsumer.java
@@ -0,0 +1,29 @@
+/*
+ * 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.impl.client.renderer;
+
+import java.util.function.Consumer;
+
+import net.fabricmc.fabric.api.client.renderer.v1.mesh.MutableQuadView;
+
+public abstract class MovingBlockQuadConsumer implements Consumer {
+	protected int outlineColor;
+
+	public void outlineColor(int outlineColor) {
+		this.outlineColor = outlineColor;
+	}
+}
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/impl/client/renderer/QuadConsumers.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/impl/client/renderer/QuadConsumers.java
deleted file mode 100644
index 7f7ceeca0a..0000000000
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/impl/client/renderer/QuadConsumers.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.impl.client.renderer;
-
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-
-import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
-import net.minecraft.client.renderer.rendertype.RenderType;
-import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.util.LightCoordsUtil;
-
-import net.fabricmc.fabric.api.client.renderer.v1.mesh.MutableQuadView;
-
-// Workaround for mixin not allowing referencing members of anonymous classes defined within mixins.
-// Once that is fixed, this class should be inlined.
-public final class QuadConsumers {
-	private QuadConsumers() {
-	}
-
-	public static class BlockModel implements Consumer {
-		public int[] tintLayers;
-		public int lightCoords;
-		public int overlayCoords;
-		public PoseStack.Pose pose;
-		public Function renderTypeFunction;
-		public BlockModelBufferCache bufferCache;
-
-		@Override
-		public void accept(MutableQuadView quad) {
-			if (quad.emissive()) {
-				quad.lightmap(LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT);
-			} else {
-				quad.minLightmap(lightCoords);
-			}
-
-			int tintIndex = quad.tintIndex();
-
-			if (tintIndex != -1 && tintIndex < tintLayers.length) {
-				quad.multiplyColor(tintLayers[tintIndex]);
-			}
-
-			RenderType renderType = renderTypeFunction.apply(quad.chunkLayer());
-			quad.buffer(overlayCoords, pose, bufferCache.getBuffer(renderType));
-			VertexConsumer outlineBuffer = bufferCache.getOutlineBuffer(renderType);
-
-			if (outlineBuffer != null) {
-				quad.buffer(overlayCoords, pose, outlineBuffer);
-			}
-		}
-	}
-
-	public static class BreakingBlockModel implements Consumer {
-		public PoseStack.Pose pose;
-		public VertexConsumer buffer;
-
-		@Override
-		public void accept(MutableQuadView quad) {
-			quad.lightmap(LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT);
-			quad.buffer(OverlayTexture.NO_OVERLAY, pose, buffer);
-		}
-	}
-}
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/impl/client/renderer/VanillaBlockModelPartEncoder.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/impl/client/renderer/VanillaBlockModelPartEncoder.java
index 21773a572b..c3d6a489aa 100644
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/impl/client/renderer/VanillaBlockModelPartEncoder.java
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/impl/client/renderer/VanillaBlockModelPartEncoder.java
@@ -36,7 +36,7 @@
 public class VanillaBlockModelPartEncoder {
 	public static void emitQuads(BlockStateModelPart part, QuadEmitter emitter, Predicate<@Nullable Direction> cullTest) {
 		// This does not exactly match vanilla, but doing so requires hiding state all over the FRAPI impl.
-		final TriState ao = part.useAmbientOcclusion() ? TriState.DEFAULT : TriState.FALSE;
+		final TriState ao = TriState.fromVanilla(part.ambientOcclusion());
 
 		for (int i = 0; i <= ModelHelper.NULL_FACE_ID; i++) {
 			final Direction cullFace = ModelHelper.faceFromIndex(i);
@@ -51,9 +51,10 @@ public static void emitQuads(BlockStateModelPart part, QuadEmitter emitter, Pred
 
 			for (int j = 0; j < quadCount; j++) {
 				final BakedQuad q = quads.get(j);
+				final boolean neoAo = q.materialInfo().ambientOcclusion();
 				emitter.cullFace(cullFace);
 				emitter.fromBakedQuad(q);
-				emitter.ambientOcclusion(ao);
+				emitter.ambientOcclusion(neoAo ? ao : TriState.FALSE);
 				emitter.shadeMode(ShadeMode.VANILLA);
 				emitter.emit();
 			}
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/MultiPartModelMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/MultiPartModelMixin.java
index 34cde3a8e0..0fe3505742 100644
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/MultiPartModelMixin.java
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/MultiPartModelMixin.java
@@ -16,7 +16,6 @@
 
 package net.fabricmc.fabric.mixin.client.renderer.block.model;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Predicate;
 
@@ -29,7 +28,6 @@
 import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
 import net.minecraft.client.renderer.block.dispatch.multipart.MultiPartModel;
 import net.minecraft.client.resources.model.geometry.BakedQuad;
-import net.minecraft.client.resources.model.sprite.Material;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.util.RandomSource;
@@ -66,47 +64,6 @@ public void emitQuads(QuadEmitter emitter, BlockAndTintGetter level, BlockPos po
 		}
 	}
 
-	@Override
-	@Nullable
-	public Object createGeometryKey(BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random) {
-		if (models == null) {
-			models = shared.selectModels(this.blockState);
-		}
-
-		int count = models.size();
-		long seed = random.nextLong();
-
-		if (count == 1) {
-			random.setSeed(seed);
-			return models.getFirst().createGeometryKey(level, pos, state, random);
-		} else {
-			List subkeys = new ArrayList<>(count);
-
-			for (int i = 0; i < count; i++) {
-				random.setSeed(seed);
-				Object subkey = models.get(i).createGeometryKey(
-						level, pos, state, random);
-
-				if (subkey == null) {
-					return null;
-				}
-
-				subkeys.add(subkey);
-			}
-
-			record Key(List subkeys) {
-			}
-
-			return new Key(subkeys);
-		}
-	}
-
-	@Override
-	public Material.Baked particleMaterial(BlockAndTintGetter level, BlockPos pos, BlockState state) {
-		return ((MultiPartModelSharedBakedStateAccessor) (Object) shared).getSelectors().getFirst().model().particleMaterial(
-				level, pos, state);
-	}
-
 	@Override
 	@BakedQuad.MaterialFlags
 	public int materialFlags(BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random) {
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/SimpleModelWrapperMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/SimpleModelWrapperMixin.java
index 567d9638a0..d978ac0bd7 100644
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/SimpleModelWrapperMixin.java
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/SimpleModelWrapperMixin.java
@@ -20,18 +20,20 @@
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import com.llamalad7.mixinextras.sugar.ref.LocalRef;
 import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import net.minecraft.client.renderer.block.dispatch.BlockStateModelPart;
-import net.minecraft.client.renderer.block.dispatch.ModelState;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.model.ModelBaker;
 import net.minecraft.client.resources.model.SimpleModelWrapper;
@@ -53,8 +55,23 @@ abstract class SimpleModelWrapperMixin implements BlockStateModelPart {
 	@Final
 	private boolean useAmbientOcclusion;
 
-	@Inject(method = "bake", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/model/geometry/QuadCollection;getAll()Ljava/util/List;"))
-	private static void analyzeMesh(final ModelBaker modelBakery, final Identifier location, final ModelState state, CallbackInfoReturnable cir, @Local(name = "geometry") QuadCollection geometry, @Local(name = "forbiddenSprites") LocalRef> forbiddenSpritesRef) {
+	@Unique
+	private static final ScopedValue MODEL_BAKERY = ScopedValue.newInstance();
+
+	@WrapOperation(method = "bake(Lnet/minecraft/client/resources/model/ModelBaker;Lnet/minecraft/client/resources/model/ResolvedModel;Lnet/minecraft/client/renderer/block/dispatch/ModelState;)Lnet/minecraft/client/renderer/block/dispatch/BlockStateModelPart;", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/model/SimpleModelWrapper;findNonBlockSprites(Lnet/minecraft/client/resources/model/geometry/QuadCollection;)Lcom/google/common/collect/Multimap;"))
+	private static @Nullable Multimap storeModelBakery(QuadCollection geometry, Operation> original, @Local(argsOnly = true) ModelBaker modelBakery) {
+		return ScopedValue.where(MODEL_BAKERY, modelBakery).call(() -> original.call(geometry));
+	}
+
+	@Inject(method = "findNonBlockSprites", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/model/geometry/QuadCollection;getAll()Ljava/util/List;"))
+	private static void analyzeMesh(QuadCollection geometry, CallbackInfoReturnable> cir, @Local(name = "forbiddenSprites") LocalRef> forbiddenSpritesRef) {
+		// This can also be called from ModelBakery.MissingModels, but it's maybe not necessary to hook there?
+		if (!MODEL_BAKERY.isBound()) {
+			return;
+		}
+
+		ModelBaker modelBakery = MODEL_BAKERY.get();
+
 		if (geometry instanceof MeshQuadCollection meshQuadCollection) {
 			meshQuadCollection.getMesh().forEach(quad -> {
 				if (quad.atlas() != QuadAtlas.BLOCK) {
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/SingleVariantMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/SingleVariantMixin.java
index de5febe855..97385ce37c 100644
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/SingleVariantMixin.java
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/SingleVariantMixin.java
@@ -63,9 +63,4 @@ public void emitQuads(QuadEmitter emitter, BlockAndTintGetter level, BlockPos po
 			emitter.popTransform();
 		}
 	}
-
-	@Override
-	public Object createGeometryKey(BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random) {
-		return this;
-	}
 }
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/WeightedVariantsMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/WeightedVariantsMixin.java
index 9b4caa25dd..e2f479464a 100644
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/WeightedVariantsMixin.java
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/WeightedVariantsMixin.java
@@ -27,7 +27,6 @@
 import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
 import net.minecraft.client.renderer.block.dispatch.WeightedVariants;
 import net.minecraft.client.resources.model.geometry.BakedQuad;
-import net.minecraft.client.resources.model.sprite.Material;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.util.RandomSource;
@@ -48,19 +47,6 @@ public void emitQuads(QuadEmitter emitter, BlockAndTintGetter level, BlockPos po
 				level, pos, state, random, cullTest);
 	}
 
-	@Override
-	@Nullable
-	public Object createGeometryKey(BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random) {
-		return list.getRandomOrThrow(random).createGeometryKey(
-				level, pos, state, random);
-	}
-
-	@Override
-	public Material.Baked particleMaterial(BlockAndTintGetter level, BlockPos pos, BlockState state) {
-		return list.unwrap().getFirst().value().particleMaterial(
-				level, pos, state);
-	}
-
 	@Override
 	@BakedQuad.MaterialFlags
 	public int materialFlags(BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random) {
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/particle/ScreenEffectRendererMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/particle/ScreenEffectRendererMixin.java
deleted file mode 100644
index c56612e76c..0000000000
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/particle/ScreenEffectRendererMixin.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.mixin.client.renderer.block.particle;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local;
-import org.jspecify.annotations.Nullable;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.client.renderer.ScreenEffectRenderer;
-import net.minecraft.client.renderer.block.BlockAndTintGetter;
-import net.minecraft.client.renderer.block.BlockStateModelSet;
-import net.minecraft.client.resources.model.sprite.Material;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.block.state.BlockState;
-
-@Mixin(ScreenEffectRenderer.class)
-abstract class ScreenEffectRendererMixin {
-	@Unique
-	@Nullable
-	private static BlockPos pos;
-
-	@WrapOperation(method = "renderScreenEffect", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/block/BlockStateModelSet;getParticleMaterial(Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/client/resources/model/sprite/Material$Baked;"))
-	private static Material.Baked getParticleMaterialProxy(BlockStateModelSet models, BlockState state, Operation original, @Local(name = "player") Player player) {
-		if (pos != null && player.level() instanceof BlockAndTintGetter level) {
-			Material.Baked material = models.getParticleMaterial(state, level, pos);
-			pos = null;
-			return material;
-		}
-
-		return original.call(models, state);
-	}
-
-	@Inject(method = "getViewBlockingState", at = @At("RETURN"))
-	private static void onReturnGetInWallBlockState(CallbackInfoReturnable<@Nullable BlockState> cir, @Local(name = "testPos") BlockPos.MutableBlockPos testPos) {
-		if (cir.getReturnValue() != null) {
-			pos = testPos.immutable();
-		} else {
-			pos = null;
-		}
-	}
-}
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/BlockFeatureRendererMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/BlockFeatureRendererMixin.java
deleted file mode 100644
index a5359c6acb..0000000000
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/BlockFeatureRendererMixin.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * 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.mixin.client.renderer.block.render;
-
-import java.util.function.Function;
-
-import com.llamalad7.mixinextras.sugar.Local;
-import com.llamalad7.mixinextras.sugar.Share;
-import com.llamalad7.mixinextras.sugar.ref.LocalRef;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.QuadInstance;
-import com.mojang.blaze3d.vertex.SheetedDecalTextureGenerator;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import org.jspecify.annotations.Nullable;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.OutlineBufferSource;
-import net.minecraft.client.renderer.SubmitNodeCollection;
-import net.minecraft.client.renderer.SubmitNodeStorage;
-import net.minecraft.client.renderer.block.BlockAndTintGetter;
-import net.minecraft.client.renderer.block.BlockQuadOutput;
-import net.minecraft.client.renderer.block.BlockStateModelSet;
-import net.minecraft.client.renderer.block.ModelBlockRenderer;
-import net.minecraft.client.renderer.block.MovingBlockRenderState;
-import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
-import net.minecraft.client.renderer.block.dispatch.BlockStateModelPart;
-import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
-import net.minecraft.client.renderer.feature.BlockFeatureRenderer;
-import net.minecraft.client.renderer.rendertype.RenderType;
-import net.minecraft.client.renderer.state.OptionsRenderState;
-import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.client.resources.model.ModelBakery;
-import net.minecraft.client.resources.model.geometry.BakedQuad;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.util.RandomSource;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockState;
-
-import net.fabricmc.fabric.api.client.renderer.v1.Renderer;
-import net.fabricmc.fabric.api.client.renderer.v1.mesh.QuadEmitter;
-import net.fabricmc.fabric.api.client.renderer.v1.render.AltModelBlockRenderer;
-import net.fabricmc.fabric.api.client.renderer.v1.render.ChunkSectionLayerHelper;
-import net.fabricmc.fabric.api.client.renderer.v1.render.FabricSubmitNodeCollection;
-import net.fabricmc.fabric.impl.client.renderer.BlockModelBufferCache;
-import net.fabricmc.fabric.impl.client.renderer.QuadConsumers;
-
-@Mixin(BlockFeatureRenderer.class)
-abstract class BlockFeatureRendererMixin {
-	@Shadow
-	@Final
-	private static Direction[] DIRECTIONS;
-	@Shadow
-	@Final
-	private QuadInstance quadInstance;
-	@Shadow
-	@Final
-	private RandomSource random;
-
-	@Shadow
-	private static void putQuad(PoseStack.Pose pose, BakedQuad quad, QuadInstance instance, int[] tintLayers, VertexConsumer buffer, @Nullable VertexConsumer outlineBuffer) {
-	}
-
-	@Unique
-	private static void putPartQuads(BlockStateModelPart part, PoseStack.Pose pose, QuadInstance quadInstance, int[] tintLayers, Function renderTypeFunction, BlockModelBufferCache bufferCache) {
-		for (Direction direction : DIRECTIONS) {
-			for (BakedQuad quad : part.getQuads(direction)) {
-				RenderType renderType = renderTypeFunction.apply(quad.materialInfo().layer());
-				putQuad(pose, quad, quadInstance, tintLayers, bufferCache.getBuffer(renderType), bufferCache.getOutlineBuffer(renderType));
-			}
-		}
-
-		for (BakedQuad quad : part.getQuads(null)) {
-			RenderType renderType = renderTypeFunction.apply(quad.materialInfo().layer());
-			putQuad(pose, quad, quadInstance, tintLayers, bufferCache.getBuffer(renderType), bufferCache.getOutlineBuffer(renderType));
-		}
-	}
-
-	@Inject(method = "renderMovingBlockSubmits", at = @At(value = "INVOKE", target = "net/minecraft/client/renderer/block/ModelBlockRenderer.(ZZLnet/minecraft/client/color/block/BlockColors;)V"))
-	private void beforeInitBlockRenderer(SubmitNodeCollection nodeCollection, MultiBufferSource.BufferSource bufferSource, BlockStateModelSet blockStateModelSet, OptionsRenderState optionsState, boolean translucent, CallbackInfo ci, @Local(name = "poseStack") PoseStack poseStack, @Share("altBlockRenderer") LocalRef altBlockRenderer, @Share("altQuadOutput") LocalRef altQuadOutput) {
-		altBlockRenderer.set(Renderer.get().altModelBlockRenderer(optionsState.ambientOcclusion, false, Minecraft.getInstance().getBlockColors()));
-		altQuadOutput.set(Renderer.get().quadEmitter(quad -> {
-			RenderType renderType = ChunkSectionLayerHelper.getMovingBlockRenderType(quad.chunkLayer());
-			VertexConsumer buffer = bufferSource.getBuffer(renderType);
-			quad.buffer(OverlayTexture.NO_OVERLAY, poseStack.last(), buffer);
-		}));
-	}
-
-	@Redirect(method = "renderMovingBlockSubmits", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/block/dispatch/BlockStateModel;hasMaterialFlag(I)Z"))
-	private boolean hasMaterialFlagProxy(BlockStateModel model, @BakedQuad.MaterialFlags int flag, @Local(name = "movingBlockRenderState") MovingBlockRenderState movingBlockRenderState, @Local(name = "blockState") BlockState blockState) {
-		long blockSeed = blockState.getSeed(movingBlockRenderState.randomSeedPos);
-		random.setSeed(blockSeed);
-		return model.hasMaterialFlag(movingBlockRenderState, movingBlockRenderState.blockPos, blockState, random, flag);
-	}
-
-	@Redirect(method = "renderMovingBlockSubmits", at = @At(value = "INVOKE", target = "net/minecraft/client/renderer/block/ModelBlockRenderer.tesselateBlock(Lnet/minecraft/client/renderer/block/BlockQuadOutput;FFFLnet/minecraft/client/renderer/block/BlockAndTintGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/client/renderer/block/dispatch/BlockStateModel;J)V"))
-	private void tesselateBlockProxy(ModelBlockRenderer blockRenderer, BlockQuadOutput output, float x, float y, float z, BlockAndTintGetter level, BlockPos pos, BlockState blockState, BlockStateModel model, long seed, @Share("altBlockRenderer") LocalRef altBlockRenderer, @Share("altQuadOutput") LocalRef altQuadOutput) {
-		altBlockRenderer.get().tesselateBlock(altQuadOutput.get(), x, y, z, level, pos, blockState, model, seed);
-	}
-
-	@Inject(method = "renderBlockModelSubmits", at = @At("RETURN"))
-	private void onReturnRenderBlockModelSubmits(SubmitNodeCollection nodeCollection, MultiBufferSource.BufferSource bufferSource, OutlineBufferSource outlineBufferSource, boolean translucent, CallbackInfo ci) {
-		BlockModelBufferCache bufferCache = new BlockModelBufferCache(bufferSource, outlineBufferSource);
-		QuadConsumers.BlockModel quadConsumer = new QuadConsumers.BlockModel();
-		QuadEmitter output = Renderer.get().quadEmitter(quadConsumer);
-
-		for (FabricSubmitNodeCollection.ExtendedBlockModelSubmit submit : nodeCollection.getExtendedBlockModelSubmits()) {
-			if (submit.translucent() == translucent) {
-				PoseStack.Pose pose = submit.pose();
-				int[] tintLayers = submit.tintLayers();
-				Function renderTypeFunction = submit.renderTypeFunction();
-
-				bufferCache.outlineColor(submit.outlineColor());
-
-				quadInstance.setLightCoords(submit.lightCoords());
-				quadInstance.setOverlayCoords(submit.overlayCoords());
-
-				for (BlockStateModelPart part : submit.modelParts()) {
-					putPartQuads(part, pose, quadInstance, tintLayers, renderTypeFunction, bufferCache);
-				}
-
-				if (submit.mesh() != null) {
-					quadConsumer.tintLayers = tintLayers;
-					quadConsumer.lightCoords = submit.lightCoords();
-					quadConsumer.overlayCoords = submit.overlayCoords();
-					quadConsumer.pose = pose;
-					quadConsumer.renderTypeFunction = renderTypeFunction;
-					quadConsumer.bufferCache = bufferCache;
-					submit.mesh().outputTo(output);
-				}
-			}
-		}
-	}
-
-	@Overwrite
-	private void renderBreakingBlockModelSubmits(final SubmitNodeCollection nodeCollection, final MultiBufferSource.BufferSource bufferSource) {
-		QuadConsumers.BreakingBlockModel quadConsumer = new QuadConsumers.BreakingBlockModel();
-		QuadEmitter output = Renderer.get().quadEmitter(quadConsumer);
-
-		for (SubmitNodeStorage.BreakingBlockModelSubmit submit : nodeCollection.getBreakingBlockModelSubmits()) {
-			VertexConsumer buffer = new SheetedDecalTextureGenerator(bufferSource.getBuffer(ModelBakery.DESTROY_TYPES.get(submit.progress())), submit.pose(), 1.0F);
-			quadConsumer.pose = submit.pose();
-			quadConsumer.buffer = buffer;
-			output.clear();
-			random.setSeed(submit.seed());
-			// TODO 26.1: somehow pass the level, pos, and state here when available? maybe via extended submit type?
-			submit.model().emitQuads(output, BlockAndTintGetter.EMPTY, BlockPos.ZERO, Blocks.AIR.defaultBlockState(), random, _ -> false);
-		}
-	}
-}
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/BlockModelRenderStateMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/BlockModelRenderStateMixin.java
index 26a253cd0d..c842aee6e0 100644
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/BlockModelRenderStateMixin.java
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/BlockModelRenderStateMixin.java
@@ -40,7 +40,7 @@
 import net.minecraft.client.renderer.block.BlockModelRenderState;
 import net.minecraft.client.renderer.block.dispatch.BlockStateModelPart;
 import net.minecraft.client.renderer.rendertype.RenderType;
-import net.minecraft.util.RandomSource;
+import net.minecraft.util.LightCoordsUtil;
 
 import net.fabricmc.fabric.api.client.renderer.v1.Renderer;
 import net.fabricmc.fabric.api.client.renderer.v1.mesh.Mesh;
@@ -63,8 +63,7 @@ public abstract class BlockModelRenderStateMixin implements FabricBlockModelRend
 	@Nullable
 	private IntList tintLayers;
 	@Shadow
-	@Nullable
-	private RandomSource randomSource;
+	public int blockLightCoords;
 
 	@Unique
 	@Nullable
@@ -79,7 +78,7 @@ private static Matrix4fc identityToNull(Matrix4fc transformation) {
 	@Override
 	public QuadEmitter setupMesh(Matrix4fc transformation, boolean hasTranslucency) {
 		this.transformation = identityToNull(transformation);
-		renderType = hasTranslucency ? Sheets.translucentBlockSheet() : Sheets.cutoutBlockSheet();
+		renderType = hasTranslucency ? Sheets.translucentBlockItemSheet() : Sheets.cutoutBlockItemSheet();
 
 		if (mesh == null) {
 			mesh = Renderer.get().mutableMesh();
@@ -113,11 +112,13 @@ private void onReturnSetupModel(CallbackInfoReturnable
 
 	// TODO: improve this injection or use a second submit for just the mesh
 	@Inject(method = "submitModel", at = @At("HEAD"), cancellable = true)
-	private void submitMesh(RenderType renderType, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, int lightCoords, int overlayCoords, int outlineColor, CallbackInfo ci) {
+	private void submitMesh(RenderType renderType, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, int externalLightCoords, int overlayCoords, int outlineColor, CallbackInfo ci) {
 		if (mesh != null && mesh.size() > 0) {
 			List modelPartsCopy = modelParts != null && !modelParts.isEmpty() ? new ObjectArrayList<>(modelParts) : Collections.emptyList();
 			Mesh meshCopy = mesh.immutableCopy();
 			int[] tints = tintLayers != null ? tintLayers.toArray(EMPTY_TINTS) : EMPTY_TINTS;
+			// Match vanilla BlockModelRenderState#submitModel: lightCoords
+			int lightCoords = LightCoordsUtil.max(externalLightCoords, blockLightCoords);
 
 			if (transformation != null) {
 				poseStack.pushPose();
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/LevelExtractorMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/LevelExtractorMixin.java
new file mode 100644
index 0000000000..72e97178bb
--- /dev/null
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/LevelExtractorMixin.java
@@ -0,0 +1,41 @@
+/*
+ * 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.mixin.client.renderer.block.render;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import net.minecraft.client.renderer.block.BlockAndTintGetter;
+import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
+import net.minecraft.client.renderer.extract.LevelExtractor;
+import net.minecraft.core.BlockPos;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.level.block.state.BlockState;
+
+@Mixin(LevelExtractor.class)
+abstract class LevelExtractorMixin {
+	@Unique
+	private final RandomSource random = RandomSource.createThreadLocalInstance(0L);
+
+	@Redirect(method = "extractBlockOutline", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/block/dispatch/BlockStateModel;hasMaterialFlag(Lnet/minecraft/client/renderer/block/BlockAndTintGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)Z"))
+	private boolean hasMaterialFlagProxy(BlockStateModel model, BlockAndTintGetter level, BlockPos pos, BlockState state, int flag) {
+		random.setSeed(state.getSeed(pos));
+		return model.hasMaterialFlag(level, pos, state, random, flag);
+	}
+}
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/LevelRendererMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/LevelRendererMixin.java
index 803821bc33..8c6cd095d2 100644
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/LevelRendererMixin.java
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/LevelRendererMixin.java
@@ -16,32 +16,47 @@
 
 package net.fabricmc.fabric.mixin.client.renderer.block.render;
 
+import java.util.List;
+
 import com.llamalad7.mixinextras.sugar.Local;
+import com.llamalad7.mixinextras.sugar.Share;
+import com.llamalad7.mixinextras.sugar.ref.LocalRef;
+import com.mojang.blaze3d.vertex.PoseStack;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.LevelRenderer;
+import net.minecraft.client.renderer.SubmitNodeCollector;
+import net.minecraft.client.renderer.block.BlockAndTintGetter;
 import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
-import net.minecraft.client.resources.model.geometry.BakedQuad;
+import net.minecraft.client.renderer.block.dispatch.BlockStateModelPart;
+import net.minecraft.client.renderer.state.level.BlockBreakingRenderState;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.level.block.state.BlockState;
 
+import net.fabricmc.fabric.api.client.renderer.v1.Renderer;
+import net.fabricmc.fabric.api.client.renderer.v1.mesh.MutableMesh;
+
 @Mixin(LevelRenderer.class)
 abstract class LevelRendererMixin {
-	@Shadow
-	private ClientLevel level;
+	@Inject(method = "submitBlockDestroyAnimation(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/state/level/LevelRenderState;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/RandomSource;createThreadLocalInstance()Lnet/minecraft/util/RandomSource;"))
+	private void beforeCreateRandom(CallbackInfo ci, @Share("mutableMesh") LocalRef mutableMesh) {
+		mutableMesh.set(Renderer.get().mutableMesh());
+	}
 
-	@Unique
-	private final RandomSource random = RandomSource.createThreadLocalInstance(0L);
+	@Redirect(method = "submitBlockDestroyAnimation(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/state/level/LevelRenderState;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/block/dispatch/BlockStateModel;collectParts(Lnet/minecraft/client/renderer/block/BlockAndTintGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/util/RandomSource;Ljava/util/List;)V"))
+	private void cancelCollectParts(BlockStateModel instance, BlockAndTintGetter tintGetter, BlockPos blockPos, BlockState state, RandomSource randomSource, List list) {
+	}
 
-	@Redirect(method = "extractBlockOutline", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/block/dispatch/BlockStateModel;hasMaterialFlag(I)Z"))
-	private boolean hasMaterialFlagProxy(BlockStateModel model, @BakedQuad.MaterialFlags int flag, @Local(name = "pos") BlockPos pos, @Local(name = "state") BlockState state) {
-		random.setSeed(state.getSeed(pos));
-		return model.hasMaterialFlag(level, pos, state, random, flag);
+	@Redirect(method = "submitBlockDestroyAnimation(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/state/level/LevelRenderState;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/SubmitNodeCollector;submitBreakingBlockModel(Lcom/mojang/blaze3d/vertex/PoseStack;Ljava/util/List;I)V"))
+	private void submitBreakingBlockModelProxy(SubmitNodeCollector submitNodeCollector, PoseStack poseStack, List parts, int progress, @Local(name = "random") RandomSource random, @Local(name = "state") BlockBreakingRenderState state, @Local(name = "model") BlockStateModel model, @Share("mutableMesh") LocalRef mutableMeshRef) {
+		MutableMesh mutableMesh = mutableMeshRef.get();
+		mutableMesh.clear();
+		model.emitQuads(mutableMesh.emitter(), BlockAndTintGetter.EMPTY, state.blockPos(), state.blockState(), random, _ -> false);
+		submitNodeCollector.submitBreakingBlockModel(poseStack, parts, mutableMesh.immutableCopy(), progress);
 	}
 }
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/MovingBlockFeatureRendererMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/MovingBlockFeatureRendererMixin.java
new file mode 100644
index 0000000000..6d2cd85972
--- /dev/null
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/MovingBlockFeatureRendererMixin.java
@@ -0,0 +1,87 @@
+/*
+ * 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.mixin.client.renderer.block.render;
+
+import java.util.List;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import com.llamalad7.mixinextras.sugar.Share;
+import com.llamalad7.mixinextras.sugar.ref.LocalRef;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.client.renderer.block.BlockAndTintGetter;
+import net.minecraft.client.renderer.block.BlockQuadOutput;
+import net.minecraft.client.renderer.block.ModelBlockRenderer;
+import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
+import net.minecraft.client.renderer.feature.FeatureFrameContext;
+import net.minecraft.client.renderer.feature.MovingBlockFeatureRenderer;
+import net.minecraft.client.renderer.feature.RenderTypeFeatureRenderer;
+import net.minecraft.client.renderer.rendertype.RenderType;
+import net.minecraft.client.renderer.texture.OverlayTexture;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.state.BlockState;
+
+import net.fabricmc.fabric.api.client.renderer.v1.Renderer;
+import net.fabricmc.fabric.api.client.renderer.v1.mesh.MutableQuadView;
+import net.fabricmc.fabric.api.client.renderer.v1.mesh.QuadEmitter;
+import net.fabricmc.fabric.api.client.renderer.v1.render.AltModelBlockRenderer;
+import net.fabricmc.fabric.api.client.renderer.v1.render.ChunkSectionLayerHelper;
+import net.fabricmc.fabric.impl.client.renderer.MovingBlockQuadConsumer;
+
+@Mixin(MovingBlockFeatureRenderer.class)
+abstract class MovingBlockFeatureRendererMixin extends RenderTypeFeatureRenderer {
+	@Shadow
+	@Final
+	private PoseStack poseStack;
+
+	@Inject(method = "buildGroup", at = @At(value = "INVOKE", target = "net/minecraft/client/renderer/block/ModelBlockRenderer.(ZZLnet/minecraft/client/color/block/BlockColors;)V"))
+	private void beforeInitBlockRenderer(FeatureFrameContext context, List submits, CallbackInfo ci, @Share("altBlockRenderer") LocalRef altBlockRenderer, @Share("altQuadOutput") LocalRef altQuadOutput, @Share("quadConsumer") LocalRef quadConsumerRef) {
+		altBlockRenderer.set(Renderer.get().altModelBlockRenderer(context.options().ambientOcclusion, false, context.blockColors()));
+		MovingBlockQuadConsumer quadConsumer = new MovingBlockQuadConsumer() {
+			@Override
+			public void accept(MutableQuadView quad) {
+				RenderType renderType = ChunkSectionLayerHelper.getMovingBlockRenderType(quad.chunkLayer());
+				VertexConsumer buffer;
+
+				if (outlineColor != 0 && renderType.outline().isPresent()) {
+					quad.color(outlineColor, outlineColor, outlineColor, outlineColor);
+					buffer = getVertexBuilder(renderType.outline().get());
+				} else {
+					buffer = getVertexBuilder(renderType);
+				}
+
+				quad.buffer(OverlayTexture.NO_OVERLAY, poseStack.last(), buffer);
+			}
+		};
+		altQuadOutput.set(Renderer.get().quadEmitter(quadConsumer));
+		quadConsumerRef.set(quadConsumer);
+	}
+
+	@Redirect(method = "buildGroup", at = @At(value = "INVOKE", target = "net/minecraft/client/renderer/block/ModelBlockRenderer.tesselateBlock(Lnet/minecraft/client/renderer/block/BlockQuadOutput;FFFLnet/minecraft/client/renderer/block/BlockAndTintGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/client/renderer/block/dispatch/BlockStateModel;J)V"))
+	private void tesselateBlockProxy(ModelBlockRenderer blockRenderer, BlockQuadOutput output, float x, float y, float z, BlockAndTintGetter level, BlockPos pos, BlockState blockState, BlockStateModel model, long seed, @Local(name = "submit") MovingBlockFeatureRenderer.Submit submit, @Share("altBlockRenderer") LocalRef altBlockRenderer, @Share("altQuadOutput") LocalRef altQuadOutput, @Share("quadConsumer") LocalRef quadConsumer) {
+		quadConsumer.get().outlineColor(submit.outlineColor());
+		altBlockRenderer.get().tesselateBlock(altQuadOutput.get(), x, y, z, level, pos, blockState, model, seed);
+	}
+}
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/SectionCompilerMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/SectionCompilerMixin.java
index 704ea347cc..f9fbe8c563 100644
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/SectionCompilerMixin.java
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/SectionCompilerMixin.java
@@ -16,6 +16,7 @@
 
 package net.fabricmc.fabric.mixin.client.renderer.block.render;
 
+import java.util.List;
 import java.util.Map;
 
 import com.llamalad7.mixinextras.sugar.Local;
@@ -23,6 +24,7 @@
 import com.llamalad7.mixinextras.sugar.ref.LocalRef;
 import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.blaze3d.vertex.VertexSorting;
+import net.neoforged.neoforge.client.event.AddSectionGeometryEvent.AdditionalSectionRenderer;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -65,8 +67,8 @@ protected abstract BufferBuilder getOrBeginLayer(
 			ChunkSectionLayer layer
 	);
 
-	@Inject(method = "compile", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/BlockPos;betweenClosed(Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Ljava/lang/Iterable;"))
-	private void beforeLoopCompile(SectionPos sectionPos, RenderSectionRegion region, VertexSorting vertexSorting, SectionBufferBuilderPack builders, CallbackInfoReturnable cir, @Local(name = "startedLayers") Map startedLayers, @Share("altBlockRenderer") LocalRef altBlockRenderer, @Share("altQuadOutput") LocalRef altQuadOutput) {
+	@Inject(method = "compile(Lnet/minecraft/core/SectionPos;Lnet/minecraft/client/renderer/chunk/RenderSectionRegion;Lcom/mojang/blaze3d/vertex/VertexSorting;Lnet/minecraft/client/renderer/SectionBufferBuilderPack;Ljava/util/List;)Lnet/minecraft/client/renderer/chunk/SectionCompiler$Results;", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/BlockPos;betweenClosed(Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Ljava/lang/Iterable;"))
+	private void beforeLoopCompile(SectionPos sectionPos, RenderSectionRegion region, VertexSorting vertexSorting, SectionBufferBuilderPack builders, List additionalRenderers, CallbackInfoReturnable cir, @Local(name = "startedLayers") Map startedLayers, @Share("altBlockRenderer") LocalRef altBlockRenderer, @Share("altQuadOutput") LocalRef altQuadOutput) {
 		altBlockRenderer.set(Renderer.get().altModelBlockRenderer(ambientOcclusion, true, blockColors));
 		altQuadOutput.set(Renderer.get().quadEmitter(quad -> {
 			BufferBuilder builder = getOrBeginLayer(startedLayers, builders, quad.chunkLayer());
@@ -74,7 +76,7 @@ private void beforeLoopCompile(SectionPos sectionPos, RenderSectionRegion region
 		}));
 	}
 
-	@Redirect(method = "compile", at = @At(value = "INVOKE", target = "net/minecraft/client/renderer/block/ModelBlockRenderer.tesselateBlock(Lnet/minecraft/client/renderer/block/BlockQuadOutput;FFFLnet/minecraft/client/renderer/block/BlockAndTintGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/client/renderer/block/dispatch/BlockStateModel;J)V"))
+	@Redirect(method = "compile(Lnet/minecraft/core/SectionPos;Lnet/minecraft/client/renderer/chunk/RenderSectionRegion;Lcom/mojang/blaze3d/vertex/VertexSorting;Lnet/minecraft/client/renderer/SectionBufferBuilderPack;Ljava/util/List;)Lnet/minecraft/client/renderer/chunk/SectionCompiler$Results;", at = @At(value = "INVOKE", target = "net/minecraft/client/renderer/block/ModelBlockRenderer.tesselateBlock(Lnet/minecraft/client/renderer/block/BlockQuadOutput;FFFLnet/minecraft/client/renderer/block/BlockAndTintGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/client/renderer/block/dispatch/BlockStateModel;J)V"))
 	private void tesselateBlockProxy(ModelBlockRenderer blockRenderer, BlockQuadOutput output, float x, float y, float z, BlockAndTintGetter level, BlockPos pos, BlockState blockState, BlockStateModel model, long seed, @Share("altBlockRenderer") LocalRef altBlockRenderer, @Share("altQuadOutput") LocalRef altQuadOutput) {
 		altBlockRenderer.get().tesselateBlock(altQuadOutput.get(), x, y, z, level, pos, blockState, model, seed);
 	}
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/sprite/MaterialBakerMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/sprite/MaterialBakerMixin.java
index 7902454ae3..dbcc594856 100644
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/sprite/MaterialBakerMixin.java
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/sprite/MaterialBakerMixin.java
@@ -23,5 +23,5 @@
 import net.fabricmc.fabric.api.client.renderer.v1.sprite.FabricMaterialBaker;
 
 @Mixin(MaterialBaker.class)
-interface MaterialBakerMixin extends FabricMaterialBaker {
+abstract class MaterialBakerMixin implements FabricMaterialBaker {
 }
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/sprite/ModelManagerBlockOnlyMaterialBakerMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/sprite/ModelManagerBlockOnlyMaterialBakerMixin.java
new file mode 100644
index 0000000000..71c65149cd
--- /dev/null
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/sprite/ModelManagerBlockOnlyMaterialBakerMixin.java
@@ -0,0 +1,64 @@
+/*
+ * 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.mixin.client.renderer.sprite;
+
+import org.jspecify.annotations.Nullable;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+
+import net.minecraft.client.renderer.texture.SpriteLoader;
+import net.minecraft.client.resources.model.ModelManager;
+import net.minecraft.data.AtlasIds;
+import net.minecraft.resources.Identifier;
+
+import net.fabricmc.fabric.api.client.renderer.v1.sprite.FabricMaterialBaker;
+import net.fabricmc.fabric.api.client.renderer.v1.sprite.SpriteFinder;
+import net.fabricmc.fabric.impl.client.renderer.MissingSpriteFinderImpl;
+
+@Mixin(ModelManager.BlockOnlyMaterialBaker.class)
+abstract class ModelManagerBlockOnlyMaterialBakerMixin implements FabricMaterialBaker {
+	@Shadow
+	@Final
+	private SpriteLoader.Preparations blockAtlas;
+
+	@Unique
+	@Nullable
+	private volatile MissingSpriteFinderImpl missingSpriteFinder;
+
+	@Override
+	public SpriteFinder spriteFinder(Identifier atlasId) {
+		if (atlasId.equals(AtlasIds.BLOCKS)) {
+			return blockAtlas.spriteFinder();
+		}
+
+		MissingSpriteFinderImpl result = missingSpriteFinder;
+
+		if (result == null) {
+			synchronized (this) {
+				result = missingSpriteFinder;
+
+				if (result == null) {
+					missingSpriteFinder = result = new MissingSpriteFinderImpl(blockAtlas.missing());
+				}
+			}
+		}
+
+		return result;
+	}
+}
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/sprite/ModelManager1Mixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/sprite/ModelManagerCombinedBlockItemMaterialBakerMixin.java
similarity index 80%
rename from fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/sprite/ModelManager1Mixin.java
rename to fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/sprite/ModelManagerCombinedBlockItemMaterialBakerMixin.java
index 7cdcbb4c20..c8a37c98da 100644
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/sprite/ModelManager1Mixin.java
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/sprite/ModelManagerCombinedBlockItemMaterialBakerMixin.java
@@ -23,7 +23,7 @@
 import org.spongepowered.asm.mixin.Unique;
 
 import net.minecraft.client.renderer.texture.SpriteLoader;
-import net.minecraft.client.resources.model.sprite.Material;
+import net.minecraft.client.resources.model.ModelManager;
 import net.minecraft.data.AtlasIds;
 import net.minecraft.resources.Identifier;
 
@@ -31,17 +31,14 @@
 import net.fabricmc.fabric.api.client.renderer.v1.sprite.SpriteFinder;
 import net.fabricmc.fabric.impl.client.renderer.MissingSpriteFinderImpl;
 
-@Mixin(targets = "net.minecraft.client.resources.model.ModelManager$1")
-abstract class ModelManager1Mixin implements FabricMaterialBaker {
+@Mixin(ModelManager.CombinedBlockItemMaterialBaker.class)
+abstract class ModelManagerCombinedBlockItemMaterialBakerMixin implements FabricMaterialBaker {
 	@Shadow
 	@Final
-	private Material.Baked blockMissing;
+	private SpriteLoader.Preparations blockAtlas;
 	@Shadow
 	@Final
-	SpriteLoader.Preparations val$blockAtlas;
-	@Shadow
-	@Final
-	SpriteLoader.Preparations val$itemAtlas;
+	private SpriteLoader.Preparations itemAtlas;
 
 	@Unique
 	@Nullable
@@ -50,9 +47,9 @@ abstract class ModelManager1Mixin implements FabricMaterialBaker {
 	@Override
 	public SpriteFinder spriteFinder(Identifier atlasId) {
 		if (atlasId.equals(AtlasIds.BLOCKS)) {
-			return val$blockAtlas.spriteFinder();
+			return blockAtlas.spriteFinder();
 		} else if (atlasId.equals(AtlasIds.ITEMS)) {
-			return val$itemAtlas.spriteFinder();
+			return itemAtlas.spriteFinder();
 		}
 
 		MissingSpriteFinderImpl result = missingSpriteFinder;
@@ -62,7 +59,7 @@ public SpriteFinder spriteFinder(Identifier atlasId) {
 				result = missingSpriteFinder;
 
 				if (result == null) {
-					missingSpriteFinder = result = new MissingSpriteFinderImpl(blockMissing.sprite());
+					missingSpriteFinder = result = new MissingSpriteFinderImpl(blockAtlas.missing());
 				}
 			}
 		}
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/submit/SubmitNodeCollectionMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/submit/SubmitNodeCollectionMixin.java
index 430d3278af..ad5d563f8e 100644
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/submit/SubmitNodeCollectionMixin.java
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/submit/SubmitNodeCollectionMixin.java
@@ -16,67 +16,114 @@
 
 package net.fabricmc.fabric.mixin.client.renderer.submit;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
 
+import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.blaze3d.vertex.PoseStack;
 import org.jspecify.annotations.Nullable;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.Redirect;
 
 import net.minecraft.client.renderer.OrderedSubmitNodeCollector;
 import net.minecraft.client.renderer.SubmitNodeCollection;
+import net.minecraft.client.renderer.block.BlockAndTintGetter;
+import net.minecraft.client.renderer.block.BlockModelRenderState;
+import net.minecraft.client.renderer.block.MovingBlockRenderState;
+import net.minecraft.client.renderer.block.dispatch.BlockStateModel;
 import net.minecraft.client.renderer.block.dispatch.BlockStateModelPart;
 import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
+import net.minecraft.client.renderer.feature.phase.SimpleFeatureRenderPhase;
+import net.minecraft.client.renderer.feature.phase.TranslucentFeatureRenderPhase;
 import net.minecraft.client.renderer.item.ItemStackRenderState;
 import net.minecraft.client.renderer.rendertype.RenderType;
+import net.minecraft.client.renderer.texture.OverlayTexture;
+import net.minecraft.client.resources.model.ModelBakery;
 import net.minecraft.client.resources.model.geometry.BakedQuad;
+import net.minecraft.core.BlockPos;
+import net.minecraft.util.LightCoordsUtil;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.item.ItemDisplayContext;
+import net.minecraft.world.level.block.state.BlockState;
 
 import net.fabricmc.fabric.api.client.renderer.v1.mesh.Mesh;
 import net.fabricmc.fabric.api.client.renderer.v1.mesh.MeshView;
-import net.fabricmc.fabric.api.client.renderer.v1.render.FabricSubmitNodeCollection;
+import net.fabricmc.fabric.api.client.renderer.v1.render.submit.ExtendedBlockModelSubmit;
+import net.fabricmc.fabric.api.client.renderer.v1.render.submit.ExtendedItemSubmit;
 
 @Mixin(SubmitNodeCollection.class)
-abstract class SubmitNodeCollectionMixin implements OrderedSubmitNodeCollector, FabricSubmitNodeCollection {
+abstract class SubmitNodeCollectionMixin implements OrderedSubmitNodeCollector {
 	@Shadow
-	private boolean wasUsed;
+	@Final
+	public SimpleFeatureRenderPhase solid;
+	@Shadow
+	@Final
+	public TranslucentFeatureRenderPhase translucentBlocksAndItems;
+	@Shadow
+	@Final
+	public SimpleFeatureRenderPhase breakingOverlay;
+	@Shadow
+	@Final
+	public SimpleFeatureRenderPhase outline;
 
-	@Unique
-	private final List extendedBlockModelSubmits = new ArrayList<>();
-	@Unique
-	private final List extendedItemSubmits = new ArrayList<>();
+	@Shadow
+	@Nullable
+	private static RenderType getOutlineRenderType(RenderType renderType) {
+		return null;
+	}
 
 	@Override
 	public void submitBlockModel(PoseStack poseStack, Function renderTypeFunction, boolean translucent, List parts, @Nullable Mesh mesh, int[] tintLayers, int lightCoords, int overlayCoords, int outlineColor) {
-		wasUsed = true;
-		extendedBlockModelSubmits.add(new ExtendedBlockModelSubmit(poseStack.last().copy(), renderTypeFunction, translucent, parts, mesh, tintLayers, lightCoords, overlayCoords, outlineColor));
-	}
+		PoseStack.Pose pose = poseStack.last().copy();
+		Function filteringRenderTypeFunction = layer -> {
+			RenderType renderType = renderTypeFunction.apply(layer);
+			return renderType.isOutline() ? null : renderType;
+		};
+		ExtendedBlockModelSubmit submit = new ExtendedBlockModelSubmit(pose, filteringRenderTypeFunction, parts, mesh, tintLayers, lightCoords, overlayCoords, -1, null);
 
-	@Override
-	public void submitItem(PoseStack poseStack, ItemDisplayContext displayContext, int lightCoords, int overlayCoords, int outlineColor, int[] tintLayers, List quads, MeshView mesh, ItemStackRenderState.FoilType foilType) {
-		this.wasUsed = true;
-		extendedItemSubmits.add(new ExtendedItemSubmit(poseStack.last().copy(), displayContext, lightCoords, overlayCoords, outlineColor, tintLayers, quads, mesh, foilType));
+		if (translucent) {
+			translucentBlocksAndItems.submit(submit);
+		} else {
+			solid.submit(submit);
+		}
+
+		if (outlineColor != 0) {
+			Function outlineRenderTypeFunction = layer -> getOutlineRenderType(renderTypeFunction.apply(layer));
+			outline.submit(new ExtendedBlockModelSubmit(pose, outlineRenderTypeFunction, parts, mesh, BlockModelRenderState.EMPTY_TINTS, LightCoordsUtil.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, outlineColor, null));
+		}
 	}
 
 	@Override
-	public List getExtendedBlockModelSubmits() {
-		return extendedBlockModelSubmits;
+	public void submitBreakingBlockModel(PoseStack poseStack, List parts, Mesh mesh, int progress) {
+		PoseStack.Pose pose = poseStack.last().copy();
+		RenderType renderType = ModelBakery.DESTROY_TYPES.get(progress);
+		breakingOverlay.submit(new ExtendedBlockModelSubmit(pose, _ -> renderType, List.copyOf(parts), mesh, BlockModelRenderState.EMPTY_TINTS, LightCoordsUtil.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, 0, pose));
 	}
 
 	@Override
-	public List getExtendedItemSubmits() {
-		return extendedItemSubmits;
+	public void submitItem(PoseStack poseStack, ItemDisplayContext displayContext, int lightCoords, int overlayCoords, int outlineColor, int[] tintLayers, List quads, MeshView mesh, ItemStackRenderState.FoilType foilType) {
+		PoseStack.Pose pose = poseStack.last().copy();
+		ExtendedItemSubmit submit = new ExtendedItemSubmit(pose, displayContext, lightCoords, overlayCoords, 0, tintLayers, quads, mesh, foilType);
+
+		if (submit.hasTranslucency()) {
+			translucentBlocksAndItems.submit(submit);
+		} else {
+			solid.submit(submit);
+		}
+
+		if (outlineColor != 0) {
+			outline.submit(new ExtendedItemSubmit(pose, displayContext, LightCoordsUtil.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, outlineColor, ItemStackRenderState.LayerRenderState.EMPTY_TINTS, quads, mesh, ItemStackRenderState.FoilType.NONE));
+		}
 	}
 
-	@Inject(method = "clear", at = @At("RETURN"))
-	private void onReturnClear(CallbackInfo ci) {
-		extendedBlockModelSubmits.clear();
-		extendedItemSubmits.clear();
+	@Redirect(method = "submitMovingBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/block/dispatch/BlockStateModel;hasMaterialFlag(Lnet/minecraft/client/renderer/block/BlockAndTintGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)Z"))
+	private boolean hasMaterialFlagProxy(BlockStateModel model, BlockAndTintGetter tintGetter, BlockPos blockPos, BlockState state, int flag, @Local(name = "movingBlockRenderState") MovingBlockRenderState movingBlockRenderState) {
+		BlockState blockState = movingBlockRenderState.blockState;
+		long randomSeed = blockState.getSeed(movingBlockRenderState.randomSeedPos);
+		RandomSource random = RandomSource.createThreadLocalInstance(randomSeed);
+		return model.hasMaterialFlag(movingBlockRenderState, movingBlockRenderState.blockPos, blockState, random, flag);
 	}
 }
diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/submit/SubmitNodeStorageMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/submit/SubmitNodeStorageMixin.java
index f080fb5727..f7a8d49f4a 100644
--- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/submit/SubmitNodeStorageMixin.java
+++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/submit/SubmitNodeStorageMixin.java
@@ -42,6 +42,11 @@ public void submitBlockModel(PoseStack poseStack, Function parts, Mesh mesh, int progress) {
+		order(0).submitBreakingBlockModel(poseStack, parts, mesh, progress);
+	}
+
 	@Override
 	public void submitItem(PoseStack poseStack, ItemDisplayContext displayContext, int lightCoords, int overlayCoords, int outlineColor, int[] tintLayers, List quads, MeshView mesh, ItemStackRenderState.FoilType foilType) {
 		order(0).submitItem(poseStack, displayContext, lightCoords, overlayCoords, outlineColor, tintLayers, quads, mesh, foilType);
diff --git a/fabric-renderer-api-v1/src/client/resources/fabric-renderer-api-v1.classtweaker b/fabric-renderer-api-v1/src/client/resources/fabric-renderer-api-v1.classtweaker
index fc450edeea..2fd11c2300 100644
--- a/fabric-renderer-api-v1/src/client/resources/fabric-renderer-api-v1.classtweaker
+++ b/fabric-renderer-api-v1/src/client/resources/fabric-renderer-api-v1.classtweaker
@@ -1,13 +1,14 @@
 classTweaker	v1	official
 accessible	class	net/minecraft/client/renderer/block/dispatch/multipart/MultiPartModel$SharedBakedState
 accessible	method	net/minecraft/client/resources/model/geometry/QuadCollection		(Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;)V
+accessible	class	net/minecraft/client/resources/model/ModelManager$BlockOnlyMaterialBaker
+accessible	class	net/minecraft/client/resources/model/ModelManager$CombinedBlockItemMaterialBaker
 transitive-inject-interface	net/minecraft/client/renderer/block/dispatch/BlockStateModel	net/fabricmc/fabric/api/client/renderer/v1/model/FabricBlockStateModel
 transitive-inject-interface	net/minecraft/client/renderer/block/dispatch/BlockStateModelPart	net/fabricmc/fabric/api/client/renderer/v1/model/FabricBlockStateModelPart
 transitive-inject-interface	net/minecraft/client/renderer/block/BlockStateModelSet	net/fabricmc/fabric/api/client/renderer/v1/model/FabricBlockStateModelSet
 transitive-inject-interface	net/minecraft/client/renderer/block/BlockModelRenderState	net/fabricmc/fabric/api/client/renderer/v1/render/FabricBlockModelRenderState
 transitive-inject-interface	net/minecraft/client/renderer/item/ItemStackRenderState$LayerRenderState	net/fabricmc/fabric/api/client/renderer/v1/render/FabricLayerRenderState
 transitive-inject-interface	net/minecraft/client/renderer/OrderedSubmitNodeCollector	net/fabricmc/fabric/api/client/renderer/v1/render/FabricOrderedSubmitNodeCollector
-transitive-inject-interface	net/minecraft/client/renderer/SubmitNodeCollection	net/fabricmc/fabric/api/client/renderer/v1/render/FabricSubmitNodeCollection
 transitive-inject-interface	net/minecraft/client/resources/model/sprite/MaterialBaker	net/fabricmc/fabric/api/client/renderer/v1/sprite/FabricMaterialBaker
 transitive-inject-interface	net/minecraft/client/renderer/texture/SpriteLoader$Preparations	net/fabricmc/fabric/api/client/renderer/v1/sprite/FabricPreparations
 transitive-inject-interface	net/minecraft/client/renderer/texture/TextureAtlas	net/fabricmc/fabric/api/client/renderer/v1/sprite/FabricTextureAtlas
diff --git a/fabric-renderer-api-v1/src/client/resources/fabric-renderer-api-v1.mixins.json b/fabric-renderer-api-v1/src/client/resources/fabric-renderer-api-v1.mixins.json
index de817bf66f..ea5d38bdd4 100644
--- a/fabric-renderer-api-v1/src/client/resources/fabric-renderer-api-v1.mixins.json
+++ b/fabric-renderer-api-v1/src/client/resources/fabric-renderer-api-v1.mixins.json
@@ -12,18 +12,19 @@
     "block.model.WeightedVariantsMixin",
     "block.particle.BlockMarkerMixin",
     "block.particle.BlockStateModelSetMixin",
-    "block.particle.ScreenEffectRendererMixin",
     "block.particle.TerrainParticleMixin",
-    "block.render.BlockFeatureRendererMixin",
     "block.render.BlockModelRenderStateMixin",
     "block.render.BlockStateModelWrapperMixin",
+    "block.render.LevelExtractorMixin",
     "block.render.LevelRendererMixin",
+    "block.render.MovingBlockFeatureRendererMixin",
     "block.render.SectionCompilerMixin",
     "item.CuboidItemModelWrapperMixin",
     "item.ItemStackRenderStateLayerRenderStateMixin",
     "item.ItemStackRenderStateMixin",
     "sprite.MaterialBakerMixin",
-    "sprite.ModelManager1Mixin",
+    "sprite.ModelManagerBlockOnlyMaterialBakerMixin",
+    "sprite.ModelManagerCombinedBlockItemMaterialBakerMixin",
     "sprite.SpriteLoaderPreparationsMixin",
     "sprite.TextureAtlasMixin",
     "submit.OrderedSubmitNodeCollectorMixin",
@@ -35,5 +36,8 @@
   },
   "overwrites": {
     "requireAnnotations": true
+  },
+  "mixinextras": {
+    "minVersion": "0.5.0"
   }
 }
diff --git a/fabric-renderer-indigo/build.gradle b/fabric-renderer-indigo/build.gradle
index 12885b51b0..2f7a5c8e6c 100644
--- a/fabric-renderer-indigo/build.gradle
+++ b/fabric-renderer-indigo/build.gradle
@@ -11,24 +11,13 @@ moduleDependencies(project, [
 ])
 
 sourceSets {
-	mixinConfig {
-		compileClasspath += configurations.loaderLibraries
+	main {
+		java {
+			srcDir 'src/mixinConfig/java'
+		}
 	}
-	client {
-		compileClasspath += mixinConfig.output
-		runtimeClasspath += mixinConfig.output
-	}
-}
-
-configurations {
-	clientImplementation.extendsFrom mixinConfigImplementation
-	clientRuntimeOnly.extendsFrom mixinConfigRuntimeOnly
 }
 
 dependencies {
-	mixinConfigImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-}
-
-jar {
-	from sourceSets.mixinConfig.output
+	interfaceInjectionData project(':fabric-renderer-api-v1')
 }
diff --git a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/Indigo.java b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/Indigo.java
index a287bf40bc..2540be25b6 100644
--- a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/Indigo.java
+++ b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/Indigo.java
@@ -28,13 +28,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.minecraft.client.renderer.MultiBufferSource;
-
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.renderer.v1.Renderer;
+import net.fabricmc.fabric.api.client.renderer.v1.render.submit.ExtendedBlockModelSubmit;
+import net.fabricmc.fabric.api.client.renderer.v1.render.submit.ExtendedItemSubmit;
+import net.fabricmc.fabric.api.client.rendering.v1.FeatureRendererRegistry;
 import net.fabricmc.fabric.api.util.TriState;
 import net.fabricmc.fabric.impl.client.indigo.renderer.IndigoRenderer;
 import net.fabricmc.fabric.impl.client.indigo.renderer.aocalc.AoConfig;
+import net.fabricmc.fabric.impl.client.indigo.renderer.render.ExtendedBlockModelFeatureRenderer;
+import net.fabricmc.fabric.impl.client.indigo.renderer.render.ExtendedItemFeatureRenderer;
 import net.fabricmc.loader.api.FabricLoader;
 
 public class Indigo implements ClientModInitializer {
@@ -51,9 +54,6 @@ public class Indigo implements ClientModInitializer {
 	/** If set the default config file will be generated on startup, restoring pre 26.1 behavior. */
 	private static final boolean GENERATE_CONFIG_FILE = System.getProperty("fabric.indigo.generateConfigFile") != null;
 
-	// A hack for Mixins, check usages
-	public static final ScopedValue LEVEL_RENDERER_BUFFER_SOURCE = ScopedValue.newInstance();
-
 	private static boolean asBoolean(@Nullable String property, boolean defValue) {
 		return asTriState(property).orElse(defValue);
 	}
@@ -98,7 +98,7 @@ private static TriState asTriState(@Nullable String property) {
 			}
 		}
 
-		AMBIENT_OCCLUSION_MODE = asEnum((String) properties.computeIfAbsent("ambient-occlusion-mode", _ -> "hybrid"), AoConfig.HYBRID);
+		AMBIENT_OCCLUSION_MODE = asEnum((String) properties.computeIfAbsent("ambient-occlusion-mode", _ -> "enhanced"), AoConfig.ENHANCED);
 		DEBUG_COMPARE_LIGHTING = asBoolean((String) properties.computeIfAbsent("debug-compare-lighting", _ -> "auto"), false);
 		FIX_SMOOTH_LIGHTING_OFFSET = asBoolean((String) properties.computeIfAbsent("fix-smooth-lighting-offset", _ -> "auto"), true);
 		boolean fixMeanLightCalculation = asBoolean((String) properties.computeIfAbsent("fix-mean-light-calculation", _ -> "auto"), true);
@@ -134,6 +134,15 @@ public void onInitializeClient() {
 		if (IndigoMixinConfigPlugin.shouldApplyIndigo()) {
 			LOGGER.info("[Indigo] Registering Indigo renderer!");
 			Renderer.register(IndigoRenderer.INSTANCE);
+
+			FeatureRendererRegistry.register(
+					ExtendedBlockModelSubmit.TYPE,
+					ExtendedBlockModelFeatureRenderer::new
+			);
+			FeatureRendererRegistry.register(
+					ExtendedItemSubmit.TYPE,
+					ExtendedItemFeatureRenderer::new
+			);
 		} else {
 			LOGGER.info("[Indigo] Different rendering plugin detected; not applying Indigo.");
 		}
diff --git a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/aocalc/AoLuminanceFix.java b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/aocalc/AoLuminanceFix.java
index dbc2d80263..41b8491e53 100644
--- a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/aocalc/AoLuminanceFix.java
+++ b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/aocalc/AoLuminanceFix.java
@@ -37,6 +37,6 @@ static float vanilla(BlockGetter level, BlockPos pos, BlockState state) {
 	}
 
 	static float fixed(BlockGetter level, BlockPos pos, BlockState state) {
-		return state.getLightEmission() == 0 ? state.getShadeBrightness(level, pos) : 1f;
+		return state.getLightEmission(level, pos) == 0 ? state.getShadeBrightness(level, pos) : 1f;
 	}
 }
diff --git a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/mesh/MutableQuadViewImpl.java b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/mesh/MutableQuadViewImpl.java
index c65a9619c1..07bda38c6c 100644
--- a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/mesh/MutableQuadViewImpl.java
+++ b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/mesh/MutableQuadViewImpl.java
@@ -29,6 +29,8 @@
 import java.util.Objects;
 
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import net.neoforged.neoforge.client.model.quad.BakedNormals;
+import org.joml.Vector3f;
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.client.model.geom.builders.UVPair;
@@ -283,7 +285,9 @@ public final MutableQuadViewImpl fromBakedQuad(BakedQuad quad) {
 		pos(2, quad.position2());
 		pos(3, quad.position3());
 
-		color(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
+		for (int i = 0; i < 4; i++) {
+			color(i, quad.bakedColors().color(i));
+		}
 
 		long packedUV0 = quad.packedUV0();
 		long packedUV1 = quad.packedUV1();
@@ -315,6 +319,14 @@ public final MutableQuadViewImpl fromBakedQuad(BakedQuad quad) {
 		tintIndex(materialInfo.tintIndex());
 		diffuseShade(materialInfo.shade());
 		emissive(lightEmission == 15);
+		
+		if (quad.bakedNormals() != BakedNormals.UNSPECIFIED) {
+			for (int i = 0; i < 4; i++) {
+				Vector3f vec = BakedNormals.unpack(quad.bakedNormals().normal(i), null);
+				normal(i, vec);
+			}
+		}
+		
 		return this;
 	}
 
diff --git a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/AltItemRenderer.java b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/AltItemRenderer.java
deleted file mode 100644
index 9244da7889..0000000000
--- a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/AltItemRenderer.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * 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.impl.client.indigo.renderer.render;
-
-import java.util.List;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import org.jspecify.annotations.Nullable;
-
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.OutlineBufferSource;
-import net.minecraft.client.renderer.item.ItemStackRenderState;
-import net.minecraft.client.renderer.rendertype.RenderType;
-import net.minecraft.client.resources.model.geometry.BakedQuad;
-import net.minecraft.util.LightCoordsUtil;
-
-import net.fabricmc.fabric.api.client.renderer.v1.mesh.MeshView;
-import net.fabricmc.fabric.api.client.renderer.v1.mesh.QuadEmitter;
-import net.fabricmc.fabric.api.client.renderer.v1.render.FabricLayerRenderState;
-import net.fabricmc.fabric.api.client.renderer.v1.render.FabricSubmitNodeCollection;
-import net.fabricmc.fabric.impl.client.indigo.renderer.mesh.EncodingFormat;
-import net.fabricmc.fabric.impl.client.indigo.renderer.mesh.MutableQuadViewImpl;
-import net.fabricmc.fabric.mixin.client.indigo.renderer.ItemFeatureRendererAccessor;
-
-/**
- * Used during item buffering to support geometry added through {@link FabricLayerRenderState#emitter()}.
- */
-public class AltItemRenderer {
-	private final MutableQuadViewImpl emitter = new MutableQuadViewImpl() {
-		{
-			data = new int[EncodingFormat.TOTAL_STRIDE];
-			clear();
-		}
-
-		@Override
-		protected void emitDirectly() {
-			bufferQuad(this);
-		}
-	};
-
-	private MultiBufferSource bufferSource;
-	private OutlineBufferSource outlineBufferSource;
-	private boolean translucent;
-
-	private FabricSubmitNodeCollection.ExtendedItemSubmit submit;
-	private PoseStack.@Nullable Pose foilDecalPose;
-
-	public void prepare(MultiBufferSource.BufferSource bufferSource, OutlineBufferSource outlineBufferSource, boolean translucent) {
-		this.bufferSource = bufferSource;
-		this.outlineBufferSource = outlineBufferSource;
-		this.translucent = translucent;
-	}
-
-	public void clear() {
-		bufferSource = null;
-		outlineBufferSource = null;
-	}
-
-	public void renderItem(FabricSubmitNodeCollection.ExtendedItemSubmit submit) {
-		this.submit = submit;
-
-		if (submit.outlineColor() != 0) {
-			outlineBufferSource.setColor(submit.outlineColor());
-		}
-
-		bufferQuads(submit.quads(), submit.mesh());
-
-		foilDecalPose = null;
-	}
-
-	private void bufferQuads(List vanillaQuads, MeshView mesh) {
-		QuadEmitter emitter = this.emitter;
-		emitter.clear();
-
-		//noinspection ForLoopReplaceableByForEach
-		for (int i = 0; i < vanillaQuads.size(); i++) {
-			final BakedQuad q = vanillaQuads.get(i);
-			emitter.fromBakedQuad(q);
-			emitter.emit();
-		}
-
-		mesh.outputTo(emitter);
-	}
-
-	private void bufferQuad(MutableQuadViewImpl quad) {
-		final RenderType renderType = quad.itemRenderType();
-
-		if (renderType.hasBlending() != translucent) {
-			return;
-		}
-
-		shadeQuad(quad, quad.emissive());
-		tintQuad(quad);
-
-		final FabricSubmitNodeCollection.ExtendedItemSubmit submit = this.submit;
-		final ItemStackRenderState.FoilType foilType = quad.foilType() == null ? submit.foilType() : quad.foilType();
-
-		if (foilType != ItemStackRenderState.FoilType.NONE) {
-			final PoseStack.Pose foilDecalPose;
-
-			if (foilType == ItemStackRenderState.FoilType.SPECIAL) {
-				if (this.foilDecalPose == null) {
-					this.foilDecalPose = ItemFeatureRendererAccessor.fabric_computeFoilDecalPose(submit.displayContext(), submit.pose());
-				}
-
-				foilDecalPose = this.foilDecalPose;
-			} else {
-				foilDecalPose = null;
-			}
-
-			final VertexConsumer foilBuffer = ItemFeatureRendererAccessor.fabric_getFoilBuffer(bufferSource, renderType, foilDecalPose);
-			quad.buffer(submit.overlayCoords(), submit.pose(), foilBuffer);
-		}
-
-		if (submit.outlineColor() != 0) {
-			quad.buffer(submit.overlayCoords(), submit.pose(), outlineBufferSource.getBuffer(renderType));
-		}
-
-		quad.buffer(submit.overlayCoords(), submit.pose(), bufferSource.getBuffer(renderType));
-	}
-
-	private void shadeQuad(MutableQuadViewImpl quad, boolean emissive) {
-		if (emissive) {
-			quad.lightmap(LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT);
-		} else {
-			quad.minLightmap(submit.lightCoords());
-		}
-	}
-
-	private void tintQuad(MutableQuadViewImpl quad) {
-		final int tintIndex = quad.tintIndex();
-
-		if (tintIndex >= 0 && tintIndex < submit.tintLayers().length) {
-			quad.multiplyColor(submit.tintLayers()[tintIndex]);
-		}
-	}
-}
diff --git a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/AltModelBlockRendererImpl.java b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/AltModelBlockRendererImpl.java
index 9ed5131a02..1219fe5656 100644
--- a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/AltModelBlockRendererImpl.java
+++ b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/AltModelBlockRendererImpl.java
@@ -22,6 +22,7 @@
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import net.neoforged.neoforge.client.extensions.common.IClientBlockExtensions;
 import org.joml.Vector3f;
 import org.jspecify.annotations.Nullable;
 
@@ -45,6 +46,8 @@
 import net.fabricmc.fabric.api.client.renderer.v1.mesh.ShadeMode;
 import net.fabricmc.fabric.api.client.renderer.v1.render.AltModelBlockRenderer;
 import net.fabricmc.fabric.api.client.renderer.v1.render.ExtraLightCoordsUtil;
+import net.fabricmc.fabric.api.client.rendering.v1.BlockColorRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.BlockTintsFactory;
 import net.fabricmc.fabric.impl.client.indigo.renderer.aocalc.AoCalculator;
 import net.fabricmc.fabric.impl.client.indigo.renderer.aocalc.FlatLighter;
 import net.fabricmc.fabric.impl.client.indigo.renderer.mesh.MutableQuadViewImpl;
@@ -94,7 +97,7 @@ public void tesselateBlock(QuadEmitter output, float x, float y, float z, BlockA
 		this.level = level;
 		this.pos = pos;
 		this.blockState = blockState;
-		defaultAo = ambientOcclusion && blockState.getLightEmission() == 0;
+		defaultAo = ambientOcclusion && blockState.getLightEmission(level, pos) == 0;
 
 		cacheValid = 0;
 		shouldCullFaceCache = 0;
@@ -138,7 +141,7 @@ private boolean shouldCullFace(final @Nullable Direction direction) {
 			cacheValid |= cacheMask;
 			BlockState neighborState = level.getBlockState(scratchPos.setWithOffset(pos, direction));
 
-			if (!Block.shouldRenderFace(blockState, neighborState, direction)) {
+			if (!Block.shouldRenderFace(level, pos, blockState, neighborState, direction)) {
 				shouldCullFaceCache |= cacheMask;
 				return true;
 			} else {
@@ -184,7 +187,9 @@ private void tintQuad(MutableQuadView quad) {
 		}
 	}
 
-	private void configureTintCache(final BlockState blockState) {
+	private void configureTintCache(final BlockState blockState,
+	                                final BlockAndTintGetter level,
+	                                final BlockPos pos) {
 		List tintSources = blockColors.getTintSources(blockState);
 		int tintSourceCount = tintSources.size();
 
@@ -194,15 +199,36 @@ private void configureTintCache(final BlockState blockState) {
 			for (int i = 0; i < tintSourceCount; ++i) {
 				computedTintValues.add(-1);
 			}
+		} else {
+			final BlockTintsFactory factory = BlockColorRegistry.getFactory(blockState);
+
+			if (factory != null) {
+				factory.collect(blockState, level, pos, computedTintValues);
+			}
+
+			if (!this.computedTintValues.isEmpty()) {
+				for (int i = 0; i < this.computedTintValues.size(); i++) {
+					this.tintSources.add(null);
+				}
+			}
 		}
 	}
 
 	private int computeTintColor(final BlockAndTintGetter level, final BlockState state, final BlockPos pos, final int tintIndex) {
 		if (!tintSourcesInitialized) {
-			configureTintCache(state);
+			configureTintCache(state, level, pos);
 			tintSourcesInitialized = true;
 		}
 
+		if (this.tintSources.isEmpty()) {
+			IClientBlockExtensions.of(state).collectDynamicTintValues(state, level, pos, this.computedTintValues);
+			if (!this.computedTintValues.isEmpty()) {
+				for (int i = 0; i < this.computedTintValues.size(); ++i) {
+					this.tintSources.add(null);
+				}
+			}
+		}
+
 		if (tintIndex >= tintSources.size()) {
 			return -1;
 		} else {
diff --git a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/ExtendedBlockModelFeatureRenderer.java b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/ExtendedBlockModelFeatureRenderer.java
new file mode 100644
index 0000000000..95c5b4614f
--- /dev/null
+++ b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/ExtendedBlockModelFeatureRenderer.java
@@ -0,0 +1,178 @@
+/*
+ * 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.impl.client.indigo.renderer.render;
+
+import java.util.List;
+import java.util.function.Function;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.QuadInstance;
+import com.mojang.blaze3d.vertex.SheetedDecalTextureGenerator;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.client.renderer.block.dispatch.BlockStateModelPart;
+import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
+import net.minecraft.client.renderer.feature.FeatureFrameContext;
+import net.minecraft.client.renderer.feature.RenderTypeFeatureRenderer;
+import net.minecraft.client.renderer.rendertype.RenderType;
+import net.minecraft.client.resources.model.geometry.BakedQuad;
+import net.minecraft.core.Direction;
+import net.minecraft.util.ARGB;
+import net.minecraft.util.LightCoordsUtil;
+
+import net.fabricmc.fabric.api.client.renderer.v1.render.submit.ExtendedBlockModelSubmit;
+import net.fabricmc.fabric.impl.client.indigo.renderer.mesh.EncodingFormat;
+import net.fabricmc.fabric.impl.client.indigo.renderer.mesh.MutableQuadViewImpl;
+
+public class ExtendedBlockModelFeatureRenderer extends RenderTypeFeatureRenderer {
+	private static final Direction[] DIRECTIONS = Direction.values();
+	private final QuadInstance quadInstance = new QuadInstance();
+
+	private final BufferCache bufferCache = new BufferCache();
+	private final MutableQuadViewImpl emitter = new MutableQuadViewImpl() {
+		{
+			data = new int[EncodingFormat.TOTAL_STRIDE];
+			clear();
+		}
+
+		@Override
+		protected void emitDirectly() {
+			bufferQuad(this);
+		}
+	};
+
+	private ExtendedBlockModelSubmit submit;
+
+	@Override
+	protected void buildGroup(FeatureFrameContext context, List submits) {
+		BufferCache bufferCache = this.bufferCache;
+		MutableQuadViewImpl emitter = this.emitter;
+
+		for (ExtendedBlockModelSubmit submit : submits) {
+			bufferCache.prepare(submit.renderTypeFunction(), submit.sheetedDecalPose());
+
+			quadInstance.setLightCoords(submit.lightCoords());
+			quadInstance.setOverlayCoords(submit.overlayCoords());
+
+			for (BlockStateModelPart part : submit.modelParts()) {
+				putPartQuads(part, submit.pose(), quadInstance, submit.tintColor(), submit.tintLayers(), bufferCache);
+			}
+
+			if (submit.mesh() != null) {
+				this.submit = submit;
+				submit.mesh().outputTo(emitter);
+			}
+		}
+
+		bufferCache.clear();
+		submit = null;
+	}
+
+	private void putPartQuads(BlockStateModelPart part, PoseStack.Pose pose, QuadInstance quadInstance, int baseTintColor, int[] tintLayers, BufferCache bufferCache) {
+		for (Direction direction : DIRECTIONS) {
+			for (BakedQuad quad : part.getQuads(direction)) {
+				VertexConsumer buffer = bufferCache.getBuffer(quad.materialInfo().layer());
+
+				if (buffer == null) {
+					continue;
+				}
+
+				putQuad(pose, quad, quadInstance, baseTintColor, tintLayers, buffer);
+			}
+		}
+
+		for (BakedQuad quad : part.getQuads(null)) {
+			VertexConsumer buffer = bufferCache.getBuffer(quad.materialInfo().layer());
+
+			if (buffer == null) {
+				continue;
+			}
+
+			putQuad(pose, quad, quadInstance, baseTintColor, tintLayers, buffer);
+		}
+	}
+
+	private static void putQuad(PoseStack.Pose pose, BakedQuad quad, QuadInstance instance, int baseTintColor, int[] tintLayers, VertexConsumer buffer) {
+		int tintIndex = quad.materialInfo().tintIndex();
+		boolean useTintLayer = tintIndex != -1 && tintIndex < tintLayers.length;
+		instance.setColor(useTintLayer ? ARGB.multiply(baseTintColor, tintLayers[tintIndex]) : baseTintColor);
+		buffer.putBakedQuad(pose, quad, instance);
+	}
+
+	private void bufferQuad(MutableQuadViewImpl quad) {
+		VertexConsumer buffer = bufferCache.getBuffer(quad.chunkLayer());
+
+		if (buffer == null) {
+			return;
+		}
+
+		if (quad.emissive()) {
+			quad.lightmap(LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT);
+		} else {
+			quad.minLightmap(submit.lightCoords());
+		}
+
+		int[] tintLayers = submit.tintLayers();
+		int baseTintColor = submit.tintColor();
+
+		int tintIndex = quad.tintIndex();
+		boolean useTintLayer = tintIndex != -1 && tintIndex < tintLayers.length;
+		quad.multiplyColor(useTintLayer ? ARGB.multiply(baseTintColor, tintLayers[tintIndex]) : baseTintColor);
+		quad.buffer(submit.overlayCoords(), submit.pose(), buffer);
+	}
+
+	private class BufferCache {
+		private Function renderTypeFunction;
+		private PoseStack.@Nullable Pose sheetedDecalPose;
+
+		@Nullable
+		private ChunkSectionLayer lastLayer;
+		@Nullable
+		private VertexConsumer lastBuffer;
+
+		public void prepare(Function renderTypeFunction, PoseStack.@Nullable Pose sheetedDecalPose) {
+			this.renderTypeFunction = renderTypeFunction;
+			this.sheetedDecalPose = sheetedDecalPose;
+			lastLayer = null;
+		}
+
+		public void clear() {
+			renderTypeFunction = null;
+			sheetedDecalPose = null;
+			lastLayer = null;
+			lastBuffer = null;
+		}
+
+		@Nullable
+		public VertexConsumer getBuffer(ChunkSectionLayer layer) {
+			if (layer != lastLayer) {
+				lastLayer = layer;
+				RenderType renderType = renderTypeFunction.apply(layer);
+
+				if (renderType == null) {
+					lastBuffer = null;
+				} else {
+					VertexConsumer buffer = getVertexBuilder(renderType);
+					lastBuffer = sheetedDecalPose != null ? new SheetedDecalTextureGenerator(buffer, sheetedDecalPose, 1.0F) : buffer;
+				}
+			}
+
+			return lastBuffer;
+		}
+	}
+}
diff --git a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/ExtendedItemFeatureRenderer.java b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/ExtendedItemFeatureRenderer.java
new file mode 100644
index 0000000000..1700327633
--- /dev/null
+++ b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/ExtendedItemFeatureRenderer.java
@@ -0,0 +1,168 @@
+/*
+ * 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.impl.client.indigo.renderer.render;
+
+import java.util.List;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.SheetedDecalTextureGenerator;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.client.renderer.feature.FeatureFrameContext;
+import net.minecraft.client.renderer.feature.RenderTypeFeatureRenderer;
+import net.minecraft.client.renderer.item.ItemStackRenderState;
+import net.minecraft.client.renderer.rendertype.RenderType;
+import net.minecraft.client.renderer.rendertype.RenderTypes;
+import net.minecraft.client.resources.model.geometry.BakedQuad;
+import net.minecraft.util.LightCoordsUtil;
+
+import net.fabricmc.fabric.api.client.renderer.v1.mesh.QuadEmitter;
+import net.fabricmc.fabric.api.client.renderer.v1.render.submit.ExtendedItemSubmit;
+import net.fabricmc.fabric.impl.client.indigo.renderer.mesh.EncodingFormat;
+import net.fabricmc.fabric.impl.client.indigo.renderer.mesh.MutableQuadViewImpl;
+import net.fabricmc.fabric.mixin.client.indigo.renderer.ItemFeatureRendererAccessor;
+
+public class ExtendedItemFeatureRenderer extends RenderTypeFeatureRenderer {
+	private final MutableQuadViewImpl emitter = new MutableQuadViewImpl() {
+		{
+			data = new int[EncodingFormat.TOTAL_STRIDE];
+			clear();
+		}
+
+		@Override
+		protected void emitDirectly() {
+			switch (outputType) {
+				case MAIN -> bufferMain(this);
+				case OUTLINE -> bufferOutline(this);
+				case FOIL -> bufferFoil(this);
+			}
+		}
+	};
+
+	private ExtendedItemSubmit submit;
+	private PoseStack.@Nullable Pose foilDecalPose;
+	private OutputType outputType;
+
+	@Override
+	protected void buildGroup(FeatureFrameContext context, List submits) {
+		for (ExtendedItemSubmit submit : submits) {
+			prepareSubmit(submit, false);
+		}
+
+		for (ExtendedItemSubmit submit : submits) {
+			prepareSubmit(submit, true);
+		}
+
+		submit = null;
+		foilDecalPose = null;
+	}
+
+	private void prepareSubmit(ExtendedItemSubmit submit, boolean foil) {
+		this.submit = submit;
+
+		if (foil) {
+			foilDecalPose = null;
+			outputType = OutputType.FOIL;
+		} else if (submit.outlineColor() != 0) {
+			outputType = OutputType.OUTLINE;
+		} else {
+			outputType = OutputType.MAIN;
+		}
+
+		QuadEmitter emitter = this.emitter;
+		emitter.clear();
+
+		List vanillaQuads = submit.quads();
+
+		//noinspection ForLoopReplaceableByForEach
+		for (int i = 0; i < vanillaQuads.size(); i++) {
+			final BakedQuad q = vanillaQuads.get(i);
+			emitter.fromBakedQuad(q);
+			emitter.emit();
+		}
+
+		submit.mesh().outputTo(emitter);
+	}
+
+	private void bufferMain(MutableQuadViewImpl quad) {
+		if (quad.emissive()) {
+			quad.lightmap(LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT, LightCoordsUtil.FULL_BRIGHT);
+		} else {
+			quad.minLightmap(submit.lightCoords());
+		}
+
+		int tintIndex = quad.tintIndex();
+
+		if (tintIndex >= 0 && tintIndex < submit.tintLayers().length) {
+			quad.multiplyColor(submit.tintLayers()[tintIndex]);
+		}
+
+		quad.buffer(submit.overlayCoords(), submit.pose(), getVertexBuilder(quad.itemRenderType()));
+	}
+
+	private void bufferOutline(MutableQuadViewImpl quad) {
+		RenderType renderType = quad.itemRenderType().outline().orElse(null);
+
+		if (renderType != null) {
+			int outlineColor = submit.outlineColor();
+			quad.color(outlineColor, outlineColor, outlineColor, outlineColor);
+			quad.buffer(submit.overlayCoords(), submit.pose(), getVertexBuilder(renderType));
+		}
+	}
+
+	private void bufferFoil(MutableQuadViewImpl quad) {
+		ItemStackRenderState.FoilType quadFoilType = quad.foilType();
+		ItemStackRenderState.FoilType foilType = quadFoilType == null ? submit.foilType() : quadFoilType;
+
+		if (foilType == ItemStackRenderState.FoilType.NONE) {
+			return;
+		}
+
+		PoseStack.Pose foilDecalPose;
+
+		if (foilType == ItemStackRenderState.FoilType.SPECIAL) {
+			if (this.foilDecalPose == null) {
+				this.foilDecalPose = ItemFeatureRendererAccessor.fabric_computeFoilDecalPose(submit.displayContext(), submit.pose());
+			}
+
+			foilDecalPose = this.foilDecalPose;
+		} else {
+			foilDecalPose = null;
+		}
+
+		VertexConsumer foilBuffer = getFoilBuffer(quad.itemRenderType(), foilDecalPose);
+		quad.buffer(submit.overlayCoords(), submit.pose(), foilBuffer);
+	}
+
+	private VertexConsumer getFoilBuffer(RenderType renderType, PoseStack.@Nullable Pose foilDecalPose) {
+		RenderType foilRenderType = ItemFeatureRendererAccessor.fabric_useTransparentGlint(renderType) ? RenderTypes.glintTranslucent() : RenderTypes.glint();
+		VertexConsumer foilBuffer = getVertexBuilder(foilRenderType);
+
+		if (foilDecalPose != null) {
+			foilBuffer = new SheetedDecalTextureGenerator(foilBuffer, foilDecalPose, 0.0078125F);
+		}
+
+		return foilBuffer;
+	}
+
+	private enum OutputType {
+		MAIN,
+		OUTLINE,
+		FOIL
+	}
+}
diff --git a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/ItemFeatureRendererAccessor.java b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/ItemFeatureRendererAccessor.java
index 3880bd58c0..fdfff08d9f 100644
--- a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/ItemFeatureRendererAccessor.java
+++ b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/ItemFeatureRendererAccessor.java
@@ -17,25 +17,22 @@
 package net.fabricmc.fabric.mixin.client.indigo.renderer;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.feature.ItemFeatureRenderer;
 import net.minecraft.client.renderer.rendertype.RenderType;
 import net.minecraft.world.item.ItemDisplayContext;
 
 @Mixin(ItemFeatureRenderer.class)
 public interface ItemFeatureRendererAccessor {
-	@Invoker("getFoilBuffer")
-	static VertexConsumer fabric_getFoilBuffer(MultiBufferSource bufferSource, RenderType renderType, PoseStack.@Nullable Pose foilDecalPose) {
+	@Invoker("computeFoilDecalPose")
+	static PoseStack.Pose fabric_computeFoilDecalPose(ItemDisplayContext type, PoseStack.Pose pose) {
 		throw new AssertionError();
 	}
 
-	@Invoker("computeFoilDecalPose")
-	static PoseStack.Pose fabric_computeFoilDecalPose(ItemDisplayContext type, PoseStack.Pose pose) {
+	@Invoker("useTransparentGlint")
+	static boolean fabric_useTransparentGlint(RenderType renderType) {
 		throw new AssertionError();
 	}
 }
diff --git a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/ItemFeatureRendererMixin.java b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/ItemFeatureRendererMixin.java
deleted file mode 100644
index 94de5914d0..0000000000
--- a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/ItemFeatureRendererMixin.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.mixin.client.indigo.renderer;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.OutlineBufferSource;
-import net.minecraft.client.renderer.SubmitNodeCollection;
-import net.minecraft.client.renderer.feature.ItemFeatureRenderer;
-
-import net.fabricmc.fabric.api.client.renderer.v1.render.FabricSubmitNodeCollection;
-import net.fabricmc.fabric.impl.client.indigo.renderer.render.AltItemRenderer;
-
-@Mixin(ItemFeatureRenderer.class)
-abstract class ItemFeatureRendererMixin {
-	@Unique
-	private final AltItemRenderer altItemRenderer = new AltItemRenderer();
-
-	@Inject(method = "renderSolid", at = @At("RETURN"))
-	private void onReturnRenderSolid(SubmitNodeCollection nodeCollection, MultiBufferSource.BufferSource bufferSource, OutlineBufferSource outlineBufferSource, CallbackInfo ci) {
-		altItemRenderer.prepare(bufferSource, outlineBufferSource, false);
-
-		for (FabricSubmitNodeCollection.ExtendedItemSubmit submit : nodeCollection.getExtendedItemSubmits()) {
-			altItemRenderer.renderItem(submit);
-		}
-
-		altItemRenderer.clear();
-	}
-
-	@Inject(method = "renderTranslucent", at = @At("RETURN"))
-	private void onReturnRenderTranslucent(SubmitNodeCollection nodeCollection, MultiBufferSource.BufferSource bufferSource, OutlineBufferSource outlineBufferSource, CallbackInfo ci) {
-		altItemRenderer.prepare(bufferSource, outlineBufferSource, true);
-
-		for (FabricSubmitNodeCollection.ExtendedItemSubmit submit : nodeCollection.getExtendedItemSubmits()) {
-			altItemRenderer.renderItem(submit);
-		}
-
-		altItemRenderer.clear();
-	}
-}
diff --git a/fabric-renderer-indigo/src/client/resources/fabric-renderer-indigo.mixins.json b/fabric-renderer-indigo/src/client/resources/fabric-renderer-indigo.mixins.json
index 90b0804e1e..0baa29905c 100644
--- a/fabric-renderer-indigo/src/client/resources/fabric-renderer-indigo.mixins.json
+++ b/fabric-renderer-indigo/src/client/resources/fabric-renderer-indigo.mixins.json
@@ -5,8 +5,7 @@
   "plugin": "net.fabricmc.fabric.impl.client.indigo.IndigoMixinConfigPlugin",
   "client": [
     "BlockModelLighterAccessor",
-    "ItemFeatureRendererAccessor",
-    "ItemFeatureRendererMixin"
+    "ItemFeatureRendererAccessor"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-rendering-fluids-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/fluid/FluidRenderingRegistryImpl.java b/fabric-rendering-fluids-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/fluid/FluidRenderingRegistryImpl.java
index f89e94bf48..fa35086e2c 100644
--- a/fabric-rendering-fluids-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/fluid/FluidRenderingRegistryImpl.java
+++ b/fabric-rendering-fluids-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/fluid/FluidRenderingRegistryImpl.java
@@ -74,6 +74,10 @@ public static void setBlockTransparency(Block block, boolean transparent) {
 	public static boolean isBlockTransparent(Block block) {
 		return TRANSPARENCY_FOR_OVERLAY.getOrDefault(block, block instanceof HalfTransparentBlock || block instanceof LeavesBlock);
 	}
+	
+	public static boolean isBlockTransparent(Block block, boolean defaultValue) {
+		return TRANSPARENCY_FOR_OVERLAY.getOrDefault(block, defaultValue);
+	}
 
 	public static Map getUnbakedModels() {
 		return Collections.unmodifiableMap(MODELS);
diff --git a/fabric-rendering-fluids-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/fluid/FluidRendererMixin.java b/fabric-rendering-fluids-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/fluid/FluidRendererMixin.java
index ae74e461aa..bdd29170e3 100644
--- a/fabric-rendering-fluids-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/fluid/FluidRendererMixin.java
+++ b/fabric-rendering-fluids-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/fluid/FluidRendererMixin.java
@@ -16,10 +16,11 @@
 
 package net.fabricmc.fabric.mixin.client.rendering.fluid;
 
-import com.llamalad7.mixinextras.expression.Definition;
-import com.llamalad7.mixinextras.expression.Expression;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.sugar.Local;
+
+import net.fabricmc.fabric.impl.client.rendering.fluid.FluidRenderingRegistryImpl;
+
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -28,8 +29,6 @@
 import net.minecraft.client.renderer.block.BlockAndTintGetter;
 import net.minecraft.client.renderer.block.FluidRenderer;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.HalfTransparentBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.FluidState;
 
@@ -54,10 +53,8 @@ public void onHeadRender(BlockAndTintGetter view, BlockPos pos, FluidRenderer.Ou
 		}
 	}
 
-	@Definition(id = "HalfTransparentBlock", type = HalfTransparentBlock.class)
-	@Expression("? instanceof HalfTransparentBlock")
-	@ModifyExpressionValue(method = "tesselate", at = @At("MIXINEXTRAS:EXPRESSION"))
-	private boolean modifyNonOverlayCheck(boolean original, @Local(name = "relativeBlock") Block block) {
-		return FluidRenderingRegistry.isBlockTransparent(block);
+	@ModifyExpressionValue(method = "tesselate", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;shouldDisplayFluidOverlay(Lnet/minecraft/world/level/BlockAndLightGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/material/FluidState;)Z"))
+	private boolean modifyNonOverlayCheck(boolean original, @Local(name = "faceState") BlockState faceState) {
+		return FluidRenderingRegistryImpl.isBlockTransparent(faceState.getBlock(), original);
 	}
 }
diff --git a/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/CustomFluid.java b/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/CustomFluid.java
index 34e236ab49..7c918996c4 100644
--- a/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/CustomFluid.java
+++ b/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/CustomFluid.java
@@ -37,6 +37,9 @@
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.material.FluidState;
 
+import net.neoforged.neoforge.common.NeoForgeMod;
+import net.neoforged.neoforge.fluids.FluidType;
+
 public abstract class CustomFluid extends FlowingFluid {
 	public CustomFluid() {
 	}
@@ -106,6 +109,11 @@ protected float getExplosionResistance() {
 	public Optional getPickupSound() {
 		return Optional.of(SoundEvents.BUCKET_FILL);
 	}
+	
+	@Override
+	public FluidType getFluidType() {
+		return NeoForgeMod.EMPTY_TYPE.value();
+	}
 
 	public static class Flowing extends CustomFluid {
 		public Flowing() {
diff --git a/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/NoOverlayFluid.java b/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/NoOverlayFluid.java
index ac7fc35246..bfc4ed3fef 100644
--- a/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/NoOverlayFluid.java
+++ b/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/NoOverlayFluid.java
@@ -37,6 +37,9 @@
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.material.FluidState;
 
+import net.neoforged.neoforge.common.NeoForgeMod;
+import net.neoforged.neoforge.fluids.FluidType;
+
 public abstract class NoOverlayFluid extends FlowingFluid {
 	public NoOverlayFluid() {
 	}
@@ -106,6 +109,11 @@ protected float getExplosionResistance() {
 	public Optional getPickupSound() {
 		return Optional.of(SoundEvents.BUCKET_FILL);
 	}
+	
+	@Override
+	public FluidType getFluidType() {
+		return NeoForgeMod.EMPTY_TYPE.value();
+	}
 
 	public static class Flowing extends NoOverlayFluid {
 		public Flowing() {
diff --git a/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/OverlayFluid.java b/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/OverlayFluid.java
index e8a1deab05..adb872b776 100644
--- a/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/OverlayFluid.java
+++ b/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/OverlayFluid.java
@@ -37,6 +37,9 @@
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.material.FluidState;
 
+import net.neoforged.neoforge.common.NeoForgeMod;
+import net.neoforged.neoforge.fluids.FluidType;
+
 public abstract class OverlayFluid extends FlowingFluid {
 	public OverlayFluid() {
 	}
@@ -106,6 +109,11 @@ protected float getExplosionResistance() {
 	public Optional getPickupSound() {
 		return Optional.of(SoundEvents.BUCKET_FILL);
 	}
+	
+	@Override
+	public FluidType getFluidType() {
+		return NeoForgeMod.EMPTY_TYPE.value();
+	}
 
 	public static class Flowing extends OverlayFluid {
 		public Flowing() {
diff --git a/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/UnregisteredFluid.java b/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/UnregisteredFluid.java
index 3d4977d65b..200a249909 100644
--- a/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/UnregisteredFluid.java
+++ b/fabric-rendering-fluids-v1/src/testmod/java/net/fabricmc/fabric/test/client/rendering/fluid/UnregisteredFluid.java
@@ -37,6 +37,9 @@
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.material.FluidState;
 
+import net.neoforged.neoforge.common.NeoForgeMod;
+import net.neoforged.neoforge.fluids.FluidType;
+
 public abstract class UnregisteredFluid extends FlowingFluid {
 	public UnregisteredFluid() {
 	}
@@ -106,6 +109,11 @@ protected float getExplosionResistance() {
 	public Optional getPickupSound() {
 		return Optional.of(SoundEvents.BUCKET_FILL);
 	}
+	
+	@Override
+	public FluidType getFluidType() {
+		return NeoForgeMod.EMPTY_TYPE.value();
+	}
 
 	public static class Flowing extends UnregisteredFluid {
 		public Flowing() {
diff --git a/fabric-rendering-fluids-v1/src/testmodClient/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
index 00ee8bc4c9..e458d77ec5 100644
--- a/fabric-rendering-fluids-v1/src/testmodClient/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
@@ -18,13 +18,13 @@
 
 import com.mojang.blaze3d.vertex.VertexConsumer;
 
-import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.block.BlockAndTintGetter;
 import net.minecraft.client.renderer.block.FluidModel;
 import net.minecraft.client.renderer.block.FluidRenderer;
 import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.BlockPos;
+import net.minecraft.util.LightCoordsUtil;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.FluidState;
 
@@ -78,8 +78,8 @@ private void vertex(VertexConsumer vertexConsumer, float x, float y, float z, fl
 	}
 
 	private int getLight(BlockAndTintGetter level, BlockPos pos) {
-		int i = LevelRenderer.getLightCoords(level, pos);
-		int j = LevelRenderer.getLightCoords(level, pos.above());
+		int i = LightCoordsUtil.getLightCoords(level, pos);
+		int j = LightCoordsUtil.getLightCoords(level, pos.above());
 		int k = i & 255;
 		int l = j & 255;
 		int m = i >> 16 & 255;
diff --git a/fabric-rendering-fluids-v1/src/testmodClient/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
index eb7d98ec43..6f64135611 100644
--- a/fabric-rendering-fluids-v1/src/testmodClient/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
@@ -58,7 +58,7 @@ public void onInitializeClient() {
 		FluidRenderingRegistry.setBlockTransparency(Blocks.WARPED_DOOR, true);
 
 		// Red stained glass will have falling fluid textures to the side
-		FluidRenderingRegistry.setBlockTransparency(Blocks.RED_STAINED_GLASS, false);
+		FluidRenderingRegistry.setBlockTransparency(Blocks.STAINED_GLASS.red(), false);
 
 		FluidRenderingRegistry.register(TestFluids.NO_OVERLAY, TestFluids.NO_OVERLAY_FLOWING, NO_OVERLAY_MODEL);
 		FluidRenderingRegistry.register(TestFluids.OVERLAY, TestFluids.OVERLAY_FLOWING, OVERLAY_MODEL);
diff --git a/fabric-rendering-v1/build.gradle b/fabric-rendering-v1/build.gradle
index 03e7f6a0ee..d2fe12a9c3 100644
--- a/fabric-rendering-v1/build.gradle
+++ b/fabric-rendering-v1/build.gradle
@@ -14,5 +14,12 @@ testDependencies(project, [
 	':fabric-client-gametest-api-v1',
 	':fabric-item-api-v1',
 	':fabric-object-builder-api-v1',
-	':fabric-screen-api-v1'
+	':fabric-screen-api-v1',
+	':fabric-resource-loader-v1'
 ])
+
+neoForge.mods {
+	resourceLoaderTestMod {
+		sourceSet project(':fabric-resource-loader-v1').sourceSets.testmod
+	}
+}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/AtlasRegistry.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/AtlasRegistry.java
new file mode 100644
index 0000000000..04e28e6c50
--- /dev/null
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/AtlasRegistry.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.api.client.rendering.v1;
+
+import java.util.List;
+
+import net.minecraft.client.resources.model.sprite.AtlasManager;
+import net.minecraft.resources.Identifier;
+
+import net.fabricmc.fabric.impl.client.rendering.AtlasRegistryImpl;
+
+/**
+ * A registry to add atlases to {@link net.minecraft.client.resources.model.sprite.AtlasManager}.
+ */
+public final class AtlasRegistry {
+	/**
+	 * Registers an atlas using an atlas config.
+	 *
+	 * @param config The atlas config to register.
+	 */
+	public static void register(AtlasManager.AtlasConfig config) {
+		AtlasRegistryImpl.register(config);
+	}
+
+	/**
+	 * Generates a texture id based on an atlas id.
+	 * @param atlasId The atlas id to generate a texture id for.
+	 * @return The generated texture id.
+	 */
+	public static Identifier generateTextureLocation(Identifier atlasId) {
+		return AtlasRegistryImpl.generateTextureLocation(atlasId);
+	}
+
+	/**
+	 * Get all registered atlases.
+	 *
+	 * @return The currently registered atlases.
+	 */
+	public static List getAtlases() {
+		return AtlasRegistryImpl.getAtlases();
+	}
+
+	private AtlasRegistry() { }
+}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/BlockColorRegistry.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/BlockColorRegistry.java
index 0df6180d7d..f58534acb3 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/BlockColorRegistry.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/BlockColorRegistry.java
@@ -18,10 +18,13 @@
 
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.color.block.BlockColors;
 import net.minecraft.client.color.block.BlockTintSource;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
 
 import net.fabricmc.fabric.impl.client.rendering.BlockColorRegistryImpl;
 
@@ -44,4 +47,25 @@ private BlockColorRegistry() {
 	public static void register(List layers, Block... blocks) {
 		BlockColorRegistryImpl.register(layers, blocks);
 	}
+
+	/**
+	 * Register a block tint factory for one or more blocks. Overriding existing registration is allowed.
+	 *
+	 * @param factory The factory which allows dynamic tinting.
+	 * @param blocks The blocks which should be colored using the given factory.
+	 */
+	public static void register(BlockTintsFactory factory, Block... blocks) {
+		BlockColorRegistryImpl.register(factory, blocks);
+	}
+
+	/**
+	 * Retrieves the current {@link BlockTintsFactory factory}, or {@code null} if no factory exists,
+	 * for the given {@link BlockState block state}.
+	 *
+	 * @param blockState The block state to look up.
+	 * @return The factory.
+	 */
+	public static @Nullable BlockTintsFactory getFactory(BlockState blockState) {
+		return BlockColorRegistryImpl.getFactory(blockState);
+	}
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/BlockTintsFactory.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/BlockTintsFactory.java
new file mode 100644
index 0000000000..3e8aff1b49
--- /dev/null
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/BlockTintsFactory.java
@@ -0,0 +1,77 @@
+/*
+ * 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.api.client.rendering.v1;
+
+import it.unimi.dsi.fastutil.ints.IntList;
+
+import net.minecraft.client.renderer.block.BlockAndTintGetter;
+import net.minecraft.client.resources.model.geometry.BakedQuad;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.state.BlockState;
+
+/**
+ * This factory takes over the collection of tint colors in a model renderer.
+ *
+ * 
    
+ *     If this factory provides any tints in the tintValues collections of its {@link #collect(BlockState, BlockAndTintGetter, BlockPos, IntList)}
+ *     method then the default vanilla behaviour of iterating the registered {@link net.minecraft.client.color.block.BlockTintSource block tint sources}
+ *     is skipped.
+ * 
    
+ *
+ * 
    
+ *     This factory is only invoked if no {@link net.minecraft.client.color.block.BlockTintSource tint source} has been registered for the {@link BlockState block state}.
+ * 
    
+ */
+@FunctionalInterface
+public interface BlockTintsFactory {
+	/**
+	 * Invoked to collect the dynamic tint values for the given block state.
+	 *
+	 * 
    
+	 *     The tint applied to a given {@link net.minecraft.client.resources.model.geometry.BakedQuad quad}
+	 *     is then determined based on the index stored in {@link BakedQuad.MaterialInfo#tintIndex()} by looking
+	 *     them up in the tint values list after this collect method is called.
+	 * 
    
+	 *
+	 * 
    
+	 *     The resulting tints might be cached for this state, level and position, while the
+	 *     given position and model are rendered, but may not be stored beyond that time window,
+	 *     especially not beyond any given frame being rendered.
+	 * 
    
+	 *
+	 * 
    
+	 *     The given tint list is guaranteed to be empty.
+	 *     It is recommended to call the {@link IntList#size(int) size} method if you at the start of the method, ahead of time, how many
+	 *     tints your system will eventually register as this will pre-allocate enough memory to hold your ints.
+	 *     If you use this mechanic, remember to use {@link IntList#set(int, int) set} instead of {@link IntList#add(int) add}
+	 *     to put the tint into the list, because add will always append to the end, even if pre-sized.
+	 * 
    
+	 *
+	 * 
    
+	 *     This method will be invoked from multiple threads simultaneously, primarily from the chunk meshing threads,
+	 *     as such it is of the up most importance that you consider that while implementing this method.
+	 *     In particular use the block entity render data system to access custom data, instead of directly
+	 *     accessing the underlying block entity in the given position.
+	 * 
    
+	 *
+	 * @param state The state for which the tints are retrieved.
+	 * @param level The level in which they are retrieved.
+	 * @param pos The position inside the level for which they are retrieved.
+	 * @param tintValues The target collection in which to store the tint values for the given index.
+	 */
+	void collect(BlockState state, BlockAndTintGetter level, BlockPos pos, IntList tintValues);
+}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/BuiltInBlockModelsCallback.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/BuiltInBlockModelsCallback.java
new file mode 100644
index 0000000000..165d454bd2
--- /dev/null
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/BuiltInBlockModelsCallback.java
@@ -0,0 +1,46 @@
+/*
+ * 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.api.client.rendering.v1;
+
+import net.minecraft.client.color.block.BlockColors;
+import net.minecraft.client.renderer.block.BuiltInBlockModels;
+import net.minecraft.client.renderer.block.model.BlockModel;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+
+/**
+ * Called when custom {@link BlockModel.Unbaked BlockModels} are registered in
+ * {@link BuiltInBlockModels#createBlockModels(BlockColors)}.
+ *
+ * 
    This allows for overriding block models which eventually end up being used in
+ * {@link net.minecraft.client.renderer.block.BlockModelResolver}.
+ */
+public interface BuiltInBlockModelsCallback {
+	Event EVENT = EventFactory.createArrayBacked(
+			BuiltInBlockModelsCallback.class,
+			listeners -> builder -> {
+				for (BuiltInBlockModelsCallback listener : listeners) {
+					listener.createBlockModels(builder);
+				}
+			});
+
+	/**
+	 * @param builder the block models builder instance
+	 */
+	void createBlockModels(BuiltInBlockModels.Builder builder);
+}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/FabricOrderedSubmitNodeCollector.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/FabricOrderedSubmitNodeCollector.java
new file mode 100644
index 0000000000..4b9b10ab95
--- /dev/null
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/FabricOrderedSubmitNodeCollector.java
@@ -0,0 +1,43 @@
+/*
+ * 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.api.client.rendering.v1;
+
+import net.minecraft.client.renderer.OrderedSubmitNodeCollector;
+import net.minecraft.client.renderer.feature.FeatureRendererType;
+import net.minecraft.client.renderer.feature.submit.SubmitNode;
+import net.minecraft.client.renderer.feature.submit.TranslucentSubmit;
+
+/**
+ * General purpose Fabric extensions to the {@link OrderedSubmitNodeCollector} class.
+ *
+ * 
    Note: This interface is automatically implemented on all render pipelines via Mixin and interface injection.
+ */
+public interface FabricOrderedSubmitNodeCollector {
+	/**
+	 * Submit an arbitrary {@link SubmitNode} with a custom {@link FeatureRendererType}.
+	 *
+	 * @param phase The phase this node will be rendered with.
+	 * @param node  The node to render.
+	 * @param    The kind of node we're rendering, either a {@link SubmitNode} or
+	 *              {@link TranslucentSubmit}.
+	 * @see SubmitRenderPhases Vanilla's built-in render phases.
+	 * @see FeatureRendererRegistry Registry for custom feature renderers.
+	 */
+	default  void submitCustom(SubmitRenderPhase phase, T node) {
+		throw new UnsupportedOperationException("Implemented via mixin");
+	}
+}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/FabricRenderPipeline.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/FabricRenderPipeline.java
index 689b4bed21..fc30a326ec 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/FabricRenderPipeline.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/FabricRenderPipeline.java
@@ -83,7 +83,7 @@ default Optional usePipelineDrawModeForGui() {
 		 * @return a new RenderPipeline.Snippet instance with the specified pipeline draw mode.
 		 */
 		static RenderPipeline.Snippet withPipelineDrawModeForGui(RenderPipeline.Snippet base, boolean usePipelineDrawMode) {
-			return RenderPipeline.builder(base).withUsePipelineDrawModeForGui(usePipelineDrawMode).buildSnippet();
+			return ((FabricRenderPipeline.Builder) RenderPipeline.builder(base)).withUsePipelineDrawModeForGui(usePipelineDrawMode).buildSnippet();
 		}
 
 		/**
@@ -92,7 +92,7 @@ static RenderPipeline.Snippet withPipelineDrawModeForGui(RenderPipeline.Snippet
 		 * @return a new RenderPipeline.Snippet instance without any effect on whether the pipeline draw mode will be used for GUI rendering.
 		 */
 		static RenderPipeline.Snippet withoutPipelineDrawModeForGui(RenderPipeline.Snippet base) {
-			return RenderPipeline.builder(base).withoutUsePipelineDrawModeForGui().buildSnippet();
+			return ((FabricRenderPipeline.Builder) RenderPipeline.builder(base)).withoutUsePipelineDrawModeForGui().buildSnippet();
 		}
 	}
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/FeatureRendererRegistry.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/FeatureRendererRegistry.java
new file mode 100644
index 0000000000..1deb866b04
--- /dev/null
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/FeatureRendererRegistry.java
@@ -0,0 +1,48 @@
+/*
+ * 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.api.client.rendering.v1;
+
+import java.util.function.Supplier;
+
+import net.minecraft.client.renderer.feature.FeatureRenderer;
+import net.minecraft.client.renderer.feature.FeatureRendererType;
+import net.minecraft.client.renderer.feature.submit.SubmitNode;
+
+import net.fabricmc.fabric.impl.client.rendering.FeatureRendererRegistryImpl;
+
+/**
+ * The registry for custom {@link FeatureRenderer}s. Custom feature renderers must be registered
+ * during client initialization for them to be usable with
+ * {@link FabricOrderedSubmitNodeCollector#submitCustom(SubmitRenderPhase, SubmitNode)}.
+ */
+public final class FeatureRendererRegistry {
+	private FeatureRendererRegistry() {
+	}
+
+	/**
+	 * Register a custom {@link FeatureRenderer} for the given {@link FeatureRendererType}.
+	 *
+	 * @param type     The {@link FeatureRendererType} to register a renderer for.
+	 * @param renderer A factory to create the new feature renderer.
+	 * @param       The type of node to render.
+	 * @see FabricOrderedSubmitNodeCollector#submitCustom(SubmitRenderPhase, SubmitNode)
+	 * @see SubmitNode#featureType()
+	 */
+	public static  void register(FeatureRendererType type, Supplier> renderer) {
+		FeatureRendererRegistryImpl.register(type, renderer);
+	}
+}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/PictureInPictureRendererRegistry.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/PictureInPictureRendererRegistry.java
index 234d813011..24d599aed6 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/PictureInPictureRendererRegistry.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/PictureInPictureRendererRegistry.java
@@ -22,8 +22,6 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.render.pip.PictureInPictureRenderer;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.SubmitNodeCollector;
 import net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState;
 
 import net.fabricmc.fabric.impl.client.rendering.PictureInPictureRendererRegistryImpl;
@@ -54,19 +52,9 @@ public interface Factory {
 
 	@ApiStatus.NonExtendable
 	public interface Context {
-		/**
-		 * @return the {@link MultiBufferSource.BufferSource}.
-		 */
-		MultiBufferSource.BufferSource bufferSource();
-
 		/**
 		 * @return the {@link Minecraft} instance.
 		 */
 		Minecraft minecraft();
-
-		/**
-		 * @return the {@link SubmitNodeCollector} instance.
-		 */
-		SubmitNodeCollector submitNodeCollector();
 	}
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/SubmitRenderPhase.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/SubmitRenderPhase.java
new file mode 100644
index 0000000000..ac49170a6b
--- /dev/null
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/SubmitRenderPhase.java
@@ -0,0 +1,50 @@
+/*
+ * 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.api.client.rendering.v1;
+
+import java.util.function.Function;
+
+import net.minecraft.client.renderer.SubmitNodeCollection;
+import net.minecraft.client.renderer.feature.phase.FeatureRenderPhase;
+import net.minecraft.client.renderer.feature.submit.SubmitNode;
+
+/**
+ * A phase that submit nodes can be rendered with, for use with
+ * {@link FabricOrderedSubmitNodeCollector#submitCustom(SubmitRenderPhase, SubmitNode)}.
+ *
+ * @param  The type of node that can be rendered in this phase.
+ * @see SubmitNodeCollection
+ * @see SubmitRenderPhases The built-in vanilla phases.
+ * @see FabricOrderedSubmitNodeCollector#submitCustom(SubmitRenderPhase, SubmitNode)
+ */
+public class SubmitRenderPhase {
+	private final Function> phaseGetter;
+
+	public SubmitRenderPhase(Function> phaseGetter) {
+		this.phaseGetter = phaseGetter;
+	}
+
+	/**
+	 * Submit a node to the given collection using this phase.
+	 *
+	 * @param collection The collection to submit to.
+	 * @param node       The node to submit.
+	 */
+	public void submit(SubmitNodeCollection collection, T node) {
+		phaseGetter.apply(collection).submit(node);
+	}
+}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/SubmitRenderPhases.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/SubmitRenderPhases.java
new file mode 100644
index 0000000000..377be6906a
--- /dev/null
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/SubmitRenderPhases.java
@@ -0,0 +1,44 @@
+/*
+ * 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.api.client.rendering.v1;
+
+import net.minecraft.client.renderer.feature.submit.SubmitNode;
+import net.minecraft.client.renderer.feature.submit.TranslucentSubmit;
+
+/**
+ * Vanilla's built-in {@link SubmitRenderPhase}s.
+ */
+public final class SubmitRenderPhases {
+	public static final SubmitRenderPhase SOLID = new SubmitRenderPhase<>(x -> x.solid);
+	public static final SubmitRenderPhase SHADOWS = new SubmitRenderPhase<>(x -> x.shadows);
+	public static final SubmitRenderPhase NAME_TAGS = new SubmitRenderPhase<>(x -> x.nameTags);
+	public static final SubmitRenderPhase SEE_THROUGH_NAME_TAGS = new SubmitRenderPhase<>(x -> x.seeThroughNameTags);
+	public static final SubmitRenderPhase TEXTS = new SubmitRenderPhase<>(x -> x.texts);
+	public static final SubmitRenderPhase SHAPE_OUTLINES = new SubmitRenderPhase<>(x -> x.shapeOutlines);
+	public static final SubmitRenderPhase TRANSLUCENT_BLOCKS_AND_ITEMS = new SubmitRenderPhase<>(x -> x.translucentBlocksAndItems);
+	public static final SubmitRenderPhase TRANSLUCENT_MODELS = new SubmitRenderPhase<>(x -> x.translucentModels);
+	public static final SubmitRenderPhase TRANSLUCENT_CUSTOM_GEOMETRY = new SubmitRenderPhase<>(x -> x.translucentCustomGeometry);
+	public static final SubmitRenderPhase GIZMOS = new SubmitRenderPhase<>(x -> x.gizmos);
+	public static final SubmitRenderPhase BREAKING_OVERLAY = new SubmitRenderPhase<>(x -> x.breakingOverlay);
+	public static final SubmitRenderPhase WATER_MASK = new SubmitRenderPhase<>(x -> x.waterMask);
+	public static final SubmitRenderPhase AFTER_TERRAIN = new SubmitRenderPhase<>(x -> x.afterTerrain);
+	public static final SubmitRenderPhase ALWAYS_ON_TOP = new SubmitRenderPhase<>(x -> x.alwaysOnTop);
+	public static final SubmitRenderPhase OUTLINE = new SubmitRenderPhase<>(x -> x.outline);
+
+	private SubmitRenderPhases() {
+	}
+}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/hud/HudElementRegistry.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/hud/HudElementRegistry.java
index 3d23109e5a..7fed98e8e3 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/hud/HudElementRegistry.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/hud/HudElementRegistry.java
@@ -19,6 +19,7 @@
 import java.util.Objects;
 import java.util.function.Function;
 
+import net.minecraft.client.gui.Hud;
 import net.minecraft.resources.Identifier;
 
 import net.fabricmc.fabric.impl.client.rendering.hud.HudElementRegistryImpl;
@@ -29,7 +30,7 @@
  * 
    Operations relative to a vanilla element will inherit that element's render condition.
  *
  * 
    The render condition for all vanilla layers except {@link VanillaHudElements#SLEEP} is
- * {@link net.minecraft.client.Options#hideGui}.
+ * {@link Hud#isHidden()}.
  *
  * 
    Only {@link #addFirst(Identifier, HudElement)} and {@link #addLast(Identifier, HudElement)} will not inherit any
  * render condition.
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/hud/HudStatusBarHeightRegistry.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/hud/HudStatusBarHeightRegistry.java
index 65fc490455..be9f993e0d 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/hud/HudStatusBarHeightRegistry.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/hud/HudStatusBarHeightRegistry.java
@@ -19,7 +19,7 @@
 import java.util.Objects;
 import java.util.function.Function;
 
-import net.minecraft.client.gui.Gui;
+import net.minecraft.client.Minecraft;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.entity.player.Player;
 
@@ -71,7 +71,7 @@ public final class HudStatusBarHeightRegistry {
 	 * @param id             the {@link Identifier}; must be registered with a corresponding {@link HudElement} in
 	 *                       {@link HudElementRegistry}.
 	 * @param heightProvider a {@link StatusBarHeightProvider} that takes a {@link Player} from
-	 *                       {@link Gui#getCameraPlayer()} and returns the height.
+	 *                       {@link Minecraft#getCameraEntity()} and returns the height.
 	 */
 	public static void addLeft(Identifier id, StatusBarHeightProvider heightProvider) {
 		Objects.requireNonNull(id, "id is null");
@@ -99,7 +99,7 @@ public static void addLeft(Identifier id, StatusBarHeightProvider heightProvider
 	 * @param id             the {@link Identifier}; must be registered with a corresponding {@link HudElement} in
 	 *                       {@link HudElementRegistry}.
 	 * @param heightProvider a {@link StatusBarHeightProvider} that takes a {@link Player} from
-	 *                       {@link Gui#getCameraPlayer()} and returns the height.
+	 *                       {@link Minecraft#getCameraEntity()} and returns the height.
 	 */
 	public static void addRight(Identifier id, StatusBarHeightProvider heightProvider) {
 		Objects.requireNonNull(id, "id is null");
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/hud/StatusBarHeightProvider.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/hud/StatusBarHeightProvider.java
index 79a587bccd..6cd087796c 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/hud/StatusBarHeightProvider.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/hud/StatusBarHeightProvider.java
@@ -20,6 +20,7 @@
 
 import org.jetbrains.annotations.ApiStatus;
 
+import net.minecraft.client.Minecraft;
 import net.minecraft.world.entity.player.Player;
 
 /**
@@ -31,7 +32,7 @@
 @FunctionalInterface
 public interface StatusBarHeightProvider extends ToIntFunction {
 	/**
-	 * @param player the {@link Player} from {@link net.minecraft.client.gui.Gui#getCameraPlayer()}
+	 * @param player the {@link Player} from {@link Minecraft#getCameraEntity()}
 	 * @return the vertical space occupied by the status bar
 	 */
 	int getStatusBarHeight(Player player);
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/hud/VanillaHudElements.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/hud/VanillaHudElements.java
index b760212e36..a726b8df0e 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/hud/VanillaHudElements.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/hud/VanillaHudElements.java
@@ -16,6 +16,7 @@
 
 package net.fabricmc.fabric.api.client.rendering.v1.hud;
 
+import net.minecraft.client.gui.Hud;
 import net.minecraft.resources.Identifier;
 
 /**
@@ -23,7 +24,7 @@
  *
  * 
    The identifiers in this interface are the vanilla hud layers in the order they are drawn in.
  * The first element is drawn first, which means it is at the bottom.
- * All vanilla layers except {@link #SLEEP} are in sub drawers and have a render condition attached ({@link net.minecraft.client.Options#hideGui}).
+ * All vanilla layers except {@link #SLEEP} are in sub drawers and have a render condition attached ({@link Hud#isHidden()}).
  * Operations relative to any element will generally inherit that element's render condition.
  * There is currently no mechanism to change the render condition of an element.
  *
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelExtractionContext.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelExtractionContext.java
index 09bca1ea04..7feffb43b0 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelExtractionContext.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelExtractionContext.java
@@ -21,12 +21,12 @@
 import net.minecraft.client.Camera;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.LevelRenderer;
+import net.minecraft.client.renderer.extract.LevelExtractor;
 
 @ApiStatus.NonExtendable
 public interface LevelExtractionContext extends AbstractLevelRenderContext {
 	/**
-	 * Convenient access to {@link LevelRenderer#level}.
+	 * Convenient access to {@link LevelExtractor#level}.
 	 *
 	 * @return the level renderer's client level instance
 	 */
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelExtractionEvents.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelExtractionEvents.java
new file mode 100644
index 0000000000..fa732f7ef5
--- /dev/null
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelExtractionEvents.java
@@ -0,0 +1,85 @@
+/*
+ * 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.api.client.rendering.v1.level;
+
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.client.renderer.extract.LevelExtractor;
+import net.minecraft.world.phys.HitResult;
+
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+
+/**
+ * Events fired from within {@link LevelExtractor} to be used by mods to add or modify extracted render state.
+ */
+public class LevelExtractionEvents {
+	/**
+	 * Called after the block outline render state is extracted, before it is drawn.
+	 * Can optionally cancel the default rendering by setting the outline render state to null
+	 * but all handlers for this event will always be called.
+	 *
+	 * 
    Use this to extract custom data needed when decorating or replacing
+	 * the default block outline rendering for specific modded blocks
+	 * or when normally, the block outline would not be extracted to be rendered.
+	 * Normally, outline rendering will not happen for entities, fluids,
+	 * or other game objects that do not register a block-type hit.
+	 *
+	 * 
    To attach modded data to vanilla render states, see {@link net.fabricmc.fabric.api.client.rendering.v1.FabricRenderState FabricRenderState}.
+	 * Only attach the minimum data needed for rendering. Do not attach objects that are not thread-safe such as {@link net.minecraft.client.multiplayer.ClientLevel}.
+	 *
+	 * 
    Setting the outline render state to null by any event subscriber
+	 * will cancel the default block outline render and suppress the {@link LevelRenderEvents#BEFORE_BLOCK_OUTLINE} event.
+	 * This has no effect on other subscribers to this event - all subscribers will always be called.
+	 * Setting outline render state to null here is appropriate
+	 * when there is still a valid block hit (with a fluid, for example)
+	 * and you don't want the block outline render to appear.
+	 *
+	 * 
    This event should NOT be used for general-purpose replacement of
+	 * the default block outline rendering because it will interfere with mod-specific
+	 * renders.  Mods that replace the default block outline for specific blocks
+	 * should instead subscribe to {@link LevelRenderEvents#BEFORE_BLOCK_OUTLINE}.
+	 */
+	public static final Event AFTER_BLOCK_OUTLINE_EXTRACTION = EventFactory.createArrayBacked(AfterBlockOutlineExtraction.class, callbacks -> (context, hit) -> {
+		for (final AfterBlockOutlineExtraction callback : callbacks) {
+			callback.afterBlockOutlineExtraction(context, hit);
+		}
+	});
+
+	/**
+	 * Called after all render states are extracted, before any are drawn.
+	 * Use this to extract general custom data needed for rendering.
+	 *
+	 * 
    To attach modded data to vanilla render states, see {@link net.fabricmc.fabric.api.client.rendering.v1.FabricRenderState FabricRenderState}.
+	 * Only attach the minimum data needed for rendering. Do not attach objects that are not thread-safe such as {@link net.minecraft.client.multiplayer.ClientLevel}.
+	 */
+	public static final Event END_EXTRACTION = EventFactory.createArrayBacked(EndExtraction.class, callbacks -> context -> {
+		for (final EndExtraction callback : callbacks) {
+			callback.endExtraction(context);
+		}
+	});
+
+	@FunctionalInterface
+	public interface AfterBlockOutlineExtraction {
+		void afterBlockOutlineExtraction(LevelExtractionContext context, @Nullable HitResult result);
+	}
+
+	@FunctionalInterface
+	public interface EndExtraction {
+		void endExtraction(LevelExtractionContext context);
+	}
+}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelRenderContext.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelRenderContext.java
index d8129cafb5..8278415e35 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelRenderContext.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelRenderContext.java
@@ -19,29 +19,11 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import org.jetbrains.annotations.ApiStatus;
 
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.SubmitNodeCollector;
 
-import net.fabricmc.fabric.impl.client.rendering.LevelRenderContextBackwardsCompatHack;
-
 @ApiStatus.NonExtendable
-public interface LevelRenderContext extends LevelTerrainRenderContext, LevelRenderContextBackwardsCompatHack {
+public interface LevelRenderContext extends LevelTerrainRenderContext {
 	SubmitNodeCollector submitNodeCollector();
 
 	PoseStack poseStack();
-
-	/**
-	 * The {@code MultiBufferSource} instance being used by the level renderer for most non-terrain renders.
-	 * Generally this will be better for most use cases because quads for the same layer can be buffered
-	 * incrementally and then drawn all at once by the level renderer.
-	 *
-	 * 
    IMPORTANT - all vertex coordinates sent to consumers should be relative to the camera to
-	 * be consistent with other quads emitted by the level renderer and other mods.  If this isn't
-	 * possible, caller should use a separate "immediate" instance.
-	 *
-	 * 
    Renders that cannot draw in one of the supported events must be drawn directly to the frame buffer,
-	 * preferably in {@link LevelRenderEvents#END_MAIN} to avoid being overdrawn or cleared.
-	 */
-	@Override
-	MultiBufferSource.BufferSource bufferSource();
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelRenderEvents.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelRenderEvents.java
index d213bef1ea..ab01afc41d 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelRenderEvents.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelRenderEvents.java
@@ -16,19 +16,15 @@
 
 package net.fabricmc.fabric.api.client.rendering.v1.level;
 
-import org.jspecify.annotations.Nullable;
-
 import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.chunk.ChunkSectionLayerGroup;
 import net.minecraft.client.renderer.state.level.BlockOutlineRenderState;
-import net.minecraft.world.phys.HitResult;
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 
 /**
- * Mods should use these events to introduce custom rendering during {@link LevelRenderer#renderLevel}
+ * Mods should use these events to introduce custom rendering during {@link LevelRenderer#render}
  * without adding complicated and conflict-prone injections there.  Using these events also enables 3rd-party renderers
  * that make large-scale rendering changes to maintain compatibility by calling any broken event invokers directly.
  *
@@ -43,51 +39,6 @@
 public final class LevelRenderEvents {
 	private LevelRenderEvents() { }
 
-	/**
-	 * Called after the block outline render state is extracted, before it is drawn.
-	 * Can optionally cancel the default rendering by setting the outline render state to null
-	 * but all handlers for this event will always be called.
-	 *
-	 * 
    Use this to extract custom data needed when decorating or replacing
-	 * the default block outline rendering for specific modded blocks
-	 * or when normally, the block outline would not be extracted to be rendered.
-	 * Normally, outline rendering will not happen for entities, fluids,
-	 * or other game objects that do not register a block-type hit.
-	 *
-	 * 
    To attach modded data to vanilla render states, see {@link net.fabricmc.fabric.api.client.rendering.v1.FabricRenderState FabricRenderState}.
-	 * Only attach the minimum data needed for rendering. Do not attach objects that are not thread-safe such as {@link net.minecraft.client.multiplayer.ClientLevel}.
-	 *
-	 * 
    Setting the outline render state to null by any event subscriber
-	 * will cancel the default block outline render and suppress the {@link #BEFORE_BLOCK_OUTLINE} event.
-	 * This has no effect on other subscribers to this event - all subscribers will always be called.
-	 * Setting outline render state to null here is appropriate
-	 * when there is still a valid block hit (with a fluid, for example)
-	 * and you don't want the block outline render to appear.
-	 *
-	 * 
    This event should NOT be used for general-purpose replacement of
-	 * the default block outline rendering because it will interfere with mod-specific
-	 * renders.  Mods that replace the default block outline for specific blocks
-	 * should instead subscribe to {@link #BEFORE_BLOCK_OUTLINE}.
-	 */
-	public static final Event AFTER_BLOCK_OUTLINE_EXTRACTION = EventFactory.createArrayBacked(AfterBlockOutlineExtraction.class, callbacks -> (context, hit) -> {
-		for (final AfterBlockOutlineExtraction callback : callbacks) {
-			callback.afterBlockOutlineExtraction(context, hit);
-		}
-	});
-
-	/**
-	 * Called after all render states are extracted, before any are drawn.
-	 * Use this to extract general custom data needed for rendering.
-	 *
-	 * 
    To attach modded data to vanilla render states, see {@link net.fabricmc.fabric.api.client.rendering.v1.FabricRenderState FabricRenderState}.
-	 * Only attach the minimum data needed for rendering. Do not attach objects that are not thread-safe such as {@link net.minecraft.client.multiplayer.ClientLevel}.
-	 */
-	public static final Event END_EXTRACTION = EventFactory.createArrayBacked(EndExtraction.class, callbacks -> context -> {
-		for (final EndExtraction callback : callbacks) {
-			callback.endExtraction(context);
-		}
-	});
-
 	/**
 	 * Called at the start of the main pass, after the sky is drawn to the appropriate framebuffers and all chunks to be
 	 * rendered are uploaded to GPU, and before any chunks are drawn to the appropriate framebuffers.
@@ -147,7 +98,7 @@ private LevelRenderEvents() { }
 	 * Called after block outline render checks are made
 	 * and before the default block outline is drawn to the appropriate framebuffers.
 	 * This will NOT be called if the default outline render state
-	 * was set to null in {@link #AFTER_BLOCK_OUTLINE_EXTRACTION}.
+	 * was set to null in {@link LevelExtractionEvents#AFTER_BLOCK_OUTLINE_EXTRACTION}.
 	 *
 	 * 
    Use this to replace the default block outline rendering for specific blocks that
 	 * need special outline rendering or to add information that doesn't replace the block outline.
@@ -210,10 +161,6 @@ private LevelRenderEvents() { }
 	 * Called at the end of the main render pass, after terrain, entities, block entities, and particles are drawn to
 	 * the appropriate framebuffers, and before clouds, weather, and late debug are drawn to the appropriate
 	 * framebuffers and before fabulous translucent framebuffers are combined.
-	 *
-	 * 
    Warning: after rendering things in this event, consumers should call
-	 * {@link MultiBufferSource.BufferSource#endBatch() context.bufferSource().endBatch()}, otherwise
-	 * you may get strange rendering bugs!
 	 */
 	public static final Event END_MAIN = EventFactory.createArrayBacked(EndMain.class, callbacks -> context -> {
 		for (final EndMain callback : callbacks) {
@@ -221,15 +168,17 @@ private LevelRenderEvents() { }
 		}
 	});
 
-	@FunctionalInterface
-	public interface AfterBlockOutlineExtraction {
-		void afterBlockOutlineExtraction(LevelExtractionContext context, @Nullable HitResult result);
-	}
+	/**
+	 * @see LevelExtractionEvents#AFTER_BLOCK_OUTLINE_EXTRACTION
+	 */
+	@Deprecated
+	public static final Event AFTER_BLOCK_OUTLINE_EXTRACTION = LevelExtractionEvents.AFTER_BLOCK_OUTLINE_EXTRACTION;
 
-	@FunctionalInterface
-	public interface EndExtraction {
-		void endExtraction(LevelExtractionContext context);
-	}
+	/**
+	 * @see LevelExtractionEvents#END_EXTRACTION
+	 */
+	@Deprecated
+	public static final Event END_EXTRACTION = LevelExtractionEvents.END_EXTRACTION;
 
 	@FunctionalInterface
 	public interface StartMain {
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelTerrainRenderContext.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelTerrainRenderContext.java
index 497982859b..2814645622 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelTerrainRenderContext.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/api/client/rendering/v1/level/LevelTerrainRenderContext.java
@@ -17,6 +17,7 @@
 package net.fabricmc.fabric.api.client.rendering.v1.level;
 
 import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.Nullable;
 
 import net.minecraft.client.renderer.chunk.ChunkSectionsToRender;
 
@@ -27,6 +28,11 @@ public interface LevelTerrainRenderContext extends AbstractLevelRenderContext {
 	 *
 	 * 
    Render states contain information about the current frame used for rendering,
 	 * and should be used instead of accessing the level or other objects directly from rendering events.
+	 *
+	 * 
    Note: This may be null for events that fire before terrain preparation (e.g., COLLECT_SUBMITS, BEFORE_GIZMOS).
+	 *
+	 * @return the chunk sections to render, or null if not yet prepared
 	 */
+	@Nullable
 	ChunkSectionsToRender sectionsToRender();
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/ArmorRendererRegistryImpl.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/ArmorRendererRegistryImpl.java
index 4701f25925..c04020ebee 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/ArmorRendererRegistryImpl.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/ArmorRendererRegistryImpl.java
@@ -16,8 +16,9 @@
 
 package net.fabricmc.fabric.impl.client.rendering;
 
-import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.jspecify.annotations.Nullable;
 
@@ -27,10 +28,11 @@
 import net.minecraft.world.level.ItemLike;
 
 import net.fabricmc.fabric.api.client.rendering.v1.ArmorRenderer;
+import net.fabricmc.fabric.api.client.rendering.v1.ArmorRenderer.Factory;
 
 public class ArmorRendererRegistryImpl {
-	private static final HashMap FACTORIES = new HashMap<>();
-	private static final HashMap RENDERERS = new HashMap<>();
+	private static final Map FACTORIES = new ConcurrentHashMap<>();
+	private static final Map RENDERERS = new ConcurrentHashMap<>();
 
 	public static void register(ArmorRenderer.Factory factory, ItemLike... items) {
 		Objects.requireNonNull(factory, "renderer factory is null");
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/AtlasRegistryImpl.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/AtlasRegistryImpl.java
new file mode 100644
index 0000000000..d90abea6ad
--- /dev/null
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/AtlasRegistryImpl.java
@@ -0,0 +1,80 @@
+/*
+ * 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.impl.client.rendering;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+import net.minecraft.client.resources.model.sprite.AtlasManager;
+import net.minecraft.resources.Identifier;
+
+import net.fabricmc.fabric.mixin.client.rendering.AtlasManagerAccessor;
+
+public final class AtlasRegistryImpl {
+	private static final List REGISTERED_CONFIGS = new ArrayList<>();
+
+	private static final Set REGISTERED_TEXTURES = new HashSet<>();
+	private static final Set REGISTERED_ATLASES = new HashSet<>();
+
+	static {
+		for (final AtlasManager.AtlasConfig knownAtlas : AtlasManagerAccessor.getKnownAtlases()) {
+			REGISTERED_TEXTURES.add(knownAtlas.textureId());
+			REGISTERED_ATLASES.add(knownAtlas.definitionLocation());
+		}
+	}
+
+	private static boolean frozen;
+
+	public static void register(AtlasManager.AtlasConfig config) {
+		Objects.requireNonNull(config, "config must not be null");
+
+		if (frozen) {
+			throw new IllegalStateException("The atlas registry has already been finalized.");
+		}
+
+		if (REGISTERED_TEXTURES.contains(config.textureId())) {
+			throw new IllegalArgumentException("An atlas with texture " + config.textureId() + " has already been registered.");
+		}
+
+		if (REGISTERED_ATLASES.contains(config.definitionLocation())) {
+			throw new IllegalArgumentException("Atlas " + config.definitionLocation() + " has already been registered.");
+		}
+
+		REGISTERED_CONFIGS.add(config);
+		REGISTERED_ATLASES.add(config.definitionLocation());
+		REGISTERED_TEXTURES.add(config.textureId());
+	}
+
+	public static Identifier generateTextureLocation(Identifier atlasId) {
+		Objects.requireNonNull(atlasId, "atlasId must not be null");
+		return atlasId.withPath(path -> "textures/atlas/" + path + ".png");
+	}
+
+	public static List getAtlases() {
+		return List.copyOf(REGISTERED_CONFIGS);
+	}
+
+	public static List finalizeConfigs() {
+		frozen = true;
+		return getAtlases();
+	}
+
+	private AtlasRegistryImpl() { }
+}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/BlockColorRegistryImpl.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/BlockColorRegistryImpl.java
index 1b6d81ce5b..b07f2fa559 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/BlockColorRegistryImpl.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/BlockColorRegistryImpl.java
@@ -25,6 +25,9 @@
 import net.minecraft.client.color.block.BlockColors;
 import net.minecraft.client.color.block.BlockTintSource;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
+
+import net.fabricmc.fabric.api.client.rendering.v1.BlockTintsFactory;
 
 public final class BlockColorRegistryImpl {
 	@Nullable
@@ -32,6 +35,8 @@ public final class BlockColorRegistryImpl {
 	@Nullable
 	private static Map> map = new IdentityHashMap<>();
 
+	private static Map factories = new IdentityHashMap<>();
+
 	public static void initialize(BlockColors blockColors) {
 		if (BlockColorRegistryImpl.blockColors != null) {
 			return;
@@ -44,6 +49,14 @@ public static void initialize(BlockColors blockColors) {
 	}
 
 	public static void register(List layers, Block... blocks) {
+		for (final Block block : blocks) {
+			if (factories.containsKey(block)) {
+				throw new IllegalStateException("A dynamic block color factory for the block %s has already been registered and as such no static usage is allowed!".formatted(
+						block
+				));
+			}
+		}
+
 		if (blockColors != null) {
 			blockColors.register(layers, blocks);
 		} else {
@@ -52,4 +65,25 @@ public static void register(List layers, Block... blocks) {
 			}
 		}
 	}
+
+	public static void register(final BlockTintsFactory factory, final Block[] blocks) {
+		for (final Block block : blocks) {
+			if (map != null && map.containsKey(block)) {
+				throw new IllegalStateException("A static block color provider for the block: %s has already been registered and as such no dynamic usage is allowed!".formatted(
+						block));
+			}
+
+			if (blockColors != null && !blockColors.getTintSources(block.defaultBlockState()).isEmpty()) {
+				throw new IllegalStateException(
+						"A static block color provider for the block: %s has already been registered and as such no dynamic usage is allowed!".formatted(
+								block));
+			}
+
+			factories.put(block, factory);
+		}
+	}
+
+	public static @Nullable BlockTintsFactory getFactory(final BlockState blockState) {
+		return factories.get(blockState.getBlock());
+	}
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/BlockEntityRendererRegistryImpl.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/BlockEntityRendererRegistryImpl.java
index dd4a097dbb..6725217a9b 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/BlockEntityRendererRegistryImpl.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/BlockEntityRendererRegistryImpl.java
@@ -16,7 +16,8 @@
 
 package net.fabricmc.fabric.impl.client.rendering;
 
-import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
@@ -25,7 +26,7 @@
 import net.minecraft.world.level.block.entity.BlockEntityType;
 
 public final class BlockEntityRendererRegistryImpl {
-	private static final HashMap, BlockEntityRendererProvider> MAP = new HashMap<>();
+	private static final Map, BlockEntityRendererProvider> MAP = new ConcurrentHashMap<>();
 	private static BiConsumer, BlockEntityRendererProvider> handler = (type, function) -> MAP.put(type, function);
 
 	public static  void register(BlockEntityType blockEntityType, BlockEntityRendererProvider blockEntityRendererProvider) {
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/DebugOptionsComparator.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/DebugOptionsComparator.java
deleted file mode 100644
index 4befb6428e..0000000000
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/DebugOptionsComparator.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.impl.client.rendering;
-
-import java.util.Comparator;
-
-import net.minecraft.resources.Identifier;
-
-public class DebugOptionsComparator implements Comparator {
-	public static final DebugOptionsComparator INSTANCE = new DebugOptionsComparator();
-
-	@Override
-	public int compare(Identifier o1, Identifier o2) {
-		// Sort 'minecraft' namespace first, then alphabetically by namespace, then path.
-		boolean o1IsMinecraft = Identifier.DEFAULT_NAMESPACE.equals(o1.getNamespace());
-		boolean o2IsMinecraft = Identifier.DEFAULT_NAMESPACE.equals(o2.getNamespace());
-
-		if (o1IsMinecraft && !o2IsMinecraft) {
-			return -1;
-		}
-
-		if (!o1IsMinecraft && o2IsMinecraft) {
-			return 1;
-		}
-
-		int c = o1.getNamespace().compareTo(o2.getNamespace());
-
-		if (c != 0) {
-			return c;
-		}
-
-		return o1.getPath().compareTo(o2.getPath());
-	}
-}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/EntityRendererRegistryImpl.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/EntityRendererRegistryImpl.java
index 0faef3326a..f0452d77e2 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/EntityRendererRegistryImpl.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/EntityRendererRegistryImpl.java
@@ -17,6 +17,8 @@
 package net.fabricmc.fabric.impl.client.rendering;
 
 import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
@@ -27,7 +29,7 @@
  * Helper class for registering EntityRenderers.
  */
 public final class EntityRendererRegistryImpl {
-	private static HashMap, EntityRendererProvider> map = new HashMap<>();
+	private static Map, EntityRendererProvider> map = new ConcurrentHashMap<>();
 	private static BiConsumer, EntityRendererProvider> handler = (type, function) -> map.put(type, function);
 
 	public static  void register(EntityType entityType, EntityRendererProvider factory) {
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/FabricRenderingImpl.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/FabricRenderingImpl.java
new file mode 100644
index 0000000000..4ade3a940e
--- /dev/null
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/FabricRenderingImpl.java
@@ -0,0 +1,21 @@
+package net.fabricmc.fabric.impl.client.rendering;
+
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.client.event.RegisterPictureInPictureRenderersEvent;
+import org.sinytra.fabric.rendering.generated.GeneratedEntryPoint;
+
+import net.fabricmc.fabric.impl.client.rendering.hud.HudElementRegistryImpl;
+
+@Mod(GeneratedEntryPoint.MOD_ID)
+public class FabricRenderingImpl {
+	
+	public FabricRenderingImpl(IEventBus bus) {
+		bus.addListener(FabricRenderingImpl::registerPictureInPictureRenderers);
+		bus.addListener(HudElementRegistryImpl::register);
+	}
+	
+	private static void registerPictureInPictureRenderers(RegisterPictureInPictureRenderersEvent event) {
+		PictureInPictureRendererRegistryImpl.apply(event);
+	}
+}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/FeatureRendererRegistryImpl.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/FeatureRendererRegistryImpl.java
new file mode 100644
index 0000000000..8d8c00c7be
--- /dev/null
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/FeatureRendererRegistryImpl.java
@@ -0,0 +1,48 @@
+/*
+ * 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.impl.client.rendering;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+
+import net.minecraft.client.renderer.feature.FeatureRenderer;
+import net.minecraft.client.renderer.feature.FeatureRendererMap;
+import net.minecraft.client.renderer.feature.FeatureRendererType;
+import net.minecraft.client.renderer.feature.submit.SubmitNode;
+
+public class FeatureRendererRegistryImpl {
+	private static final List> featureRenderers = new ArrayList<>();
+
+	public static  void register(FeatureRendererType type, Supplier> renderer) {
+		featureRenderers.add(new FeatureRendererRegistration<>(type, renderer));
+	}
+
+	public static void registerRenderers(FeatureRendererMap map) {
+		for (FeatureRendererRegistration feature : featureRenderers) {
+			feature.register(map);
+		}
+	}
+
+	private record FeatureRendererRegistration(
+			FeatureRendererType type, Supplier> renderer
+	) {
+		private void register(FeatureRendererMap map) {
+			map.put(type(), renderer().get());
+		}
+	}
+}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/LevelRenderContextBackwardsCompatHack.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/LevelRenderContextBackwardsCompatHack.java
deleted file mode 100644
index c59aef3afa..0000000000
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/LevelRenderContextBackwardsCompatHack.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.impl.client.rendering;
-
-import net.minecraft.client.renderer.MultiBufferSource;
-
-// Forces javac to generate a bridge method in LevelRenderContext returning MultiBufferSource,
-// allowing code compiled against the old LevelRenderContext, where this method returned
-// MultiBufferSource, to still run. Should be removed as soon as we're allowed to make breaking
-// changes.
-@Deprecated(forRemoval = true)
-public interface LevelRenderContextBackwardsCompatHack {
-	MultiBufferSource bufferSource();
-}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/ModelLayerImpl.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/ModelLayerImpl.java
index 4ab43a5129..9657cc4a9d 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/ModelLayerImpl.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/ModelLayerImpl.java
@@ -16,8 +16,8 @@
 
 package net.fabricmc.fabric.impl.client.rendering;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import net.minecraft.client.model.geom.ModelLayerLocation;
 import net.minecraft.client.renderer.entity.ArmorModelSet;
@@ -25,8 +25,8 @@
 import net.fabricmc.fabric.api.client.rendering.v1.ModelLayerRegistry;
 
 public final class ModelLayerImpl {
-	public static final Map PROVIDERS = new HashMap<>();
-	public static final Map, ModelLayerRegistry.TexturedArmorModelSetProvider> ARMOR_PROVIDERS = new HashMap<>();
+	public static final Map PROVIDERS = new ConcurrentHashMap<>();
+	public static final Map, ModelLayerRegistry.TexturedArmorModelSetProvider> ARMOR_PROVIDERS = new ConcurrentHashMap<>();
 
 	private ModelLayerImpl() {
 	}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/PictureInPictureRendererPool.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/PictureInPictureRendererPool.java
deleted file mode 100644
index c7f76493cb..0000000000
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/PictureInPictureRendererPool.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.impl.client.rendering;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.render.pip.PictureInPictureRenderer;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.SubmitNodeCollector;
-import net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState;
-
-public final class PictureInPictureRendererPool implements AutoCloseable {
-	private int index = 0;
-	private final List> renderers = new ArrayList<>();
-
-	public void newFrame() {
-		index = 0;
-	}
-
-	public PictureInPictureRenderer substitute(PictureInPictureRenderer original, T elementState, Minecraft client, MultiBufferSource.BufferSource immediate, SubmitNodeCollector submitNodeCollector) {
-		int index = this.index++;
-
-		if (index == 0) {
-			return original;
-		} else if (index <= renderers.size()) {
-			return renderers.get(index - 1);
-		} else {
-			PictureInPictureRenderer newRenderer = PictureInPictureRendererRegistryImpl.createNewRenderer(elementState, client, immediate, submitNodeCollector);
-
-			if (newRenderer == null) {
-				// This renderer has been registered in an unofficial way (using mixins rather than through FAPI).
-				// We don't have a factory to create a new renderer, so don't fix in this case.
-				return original;
-			}
-
-			renderers.add(newRenderer);
-			return newRenderer;
-		}
-	}
-
-	public void cleanUpUnusedRenderers() {
-		int firstUnusedIndex = Math.max(0, index - 1);
-
-		if (firstUnusedIndex >= renderers.size()) {
-			return;
-		}
-
-		for (int i = firstUnusedIndex; i < renderers.size(); i++) {
-			renderers.get(i).close();
-		}
-
-		renderers.subList(firstUnusedIndex, renderers.size()).clear();
-	}
-
-	@Override
-	public void close() {
-		renderers.forEach(PictureInPictureRenderer::close);
-
-		index = 0;
-		renderers.clear();
-	}
-}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/PictureInPictureRendererRegistryImpl.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/PictureInPictureRendererRegistryImpl.java
index 44019046df..26c9932120 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/PictureInPictureRendererRegistryImpl.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/PictureInPictureRendererRegistryImpl.java
@@ -17,37 +17,18 @@
 package net.fabricmc.fabric.impl.client.rendering;
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
-import org.jetbrains.annotations.VisibleForTesting;
-import org.jspecify.annotations.Nullable;
+import net.neoforged.neoforge.client.event.RegisterPictureInPictureRenderersEvent;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.render.pip.GuiBannerResultRenderer;
-import net.minecraft.client.gui.render.pip.GuiBookModelRenderer;
-import net.minecraft.client.gui.render.pip.GuiEntityRenderer;
-import net.minecraft.client.gui.render.pip.GuiProfilerChartRenderer;
-import net.minecraft.client.gui.render.pip.GuiSignRenderer;
-import net.minecraft.client.gui.render.pip.GuiSkinRenderer;
 import net.minecraft.client.gui.render.pip.PictureInPictureRenderer;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.SubmitNodeCollector;
-import net.minecraft.client.renderer.state.gui.pip.GuiBannerResultRenderState;
-import net.minecraft.client.renderer.state.gui.pip.GuiBookModelRenderState;
-import net.minecraft.client.renderer.state.gui.pip.GuiEntityRenderState;
-import net.minecraft.client.renderer.state.gui.pip.GuiProfilerChartRenderState;
-import net.minecraft.client.renderer.state.gui.pip.GuiSignRenderState;
-import net.minecraft.client.renderer.state.gui.pip.GuiSkinRenderState;
-import net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState;
 
 import net.fabricmc.fabric.api.client.rendering.v1.PictureInPictureRendererRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.PictureInPictureRendererRegistry.Context;
 
 public final class PictureInPictureRendererRegistryImpl {
 	private static final List FACTORIES = new ArrayList<>();
-	private static final Map, PictureInPictureRendererRegistry.Factory> REGISTERED_FACTORIES = new HashMap<>();
 	private static boolean frozen;
 
 	private PictureInPictureRendererRegistryImpl() {
@@ -62,41 +43,18 @@ public static void register(PictureInPictureRendererRegistry.Factory factory) {
 	}
 
 	// Called after the vanilla PiP renderers are created.
-	public static void onReady(Minecraft client, MultiBufferSource.BufferSource immediate, SubmitNodeCollector submitNodeCollector, Map, PictureInPictureRenderer> specialElementRenderers) {
+	public static void apply(RegisterPictureInPictureRenderersEvent event) {
 		frozen = true;
 
-		registerVanillaFactories();
-
-		ContextImpl context = new ContextImpl(client, immediate, submitNodeCollector);
-
 		for (PictureInPictureRendererRegistry.Factory factory : FACTORIES) {
-			PictureInPictureRenderer elementRenderer = factory.createRenderer(context);
-			specialElementRenderers.put(elementRenderer.getRenderStateClass(), elementRenderer);
-			REGISTERED_FACTORIES.put(elementRenderer.getRenderStateClass(), factory);
+			PictureInPictureRenderer elementRenderer = factory.createRenderer(new ContextImpl(null));
+			event.register((Class) elementRenderer.getRenderStateClass(), () -> {
+				Context context = new ContextImpl(Minecraft.getInstance());
+				return factory.createRenderer(context);
+			});
 		}
 	}
 
-	// null for render states registered outside FAPI
-	@Nullable
-	public static  PictureInPictureRenderer createNewRenderer(S state, Minecraft client, MultiBufferSource.BufferSource immediate, SubmitNodeCollector submitNodeCollector) {
-		PictureInPictureRendererRegistry.Factory factory = REGISTERED_FACTORIES.get(state.getClass());
-		return factory == null ? null : (PictureInPictureRenderer) factory.createRenderer(new ContextImpl(client, immediate, submitNodeCollector));
-	}
-
-	private static void registerVanillaFactories() {
-		// Vanilla creates its picture in picture renderers in the GameRenderer constructor
-		REGISTERED_FACTORIES.put(GuiEntityRenderState.class, context -> new GuiEntityRenderer(context.bufferSource(), context.minecraft().getEntityRenderDispatcher()));
-		REGISTERED_FACTORIES.put(GuiSkinRenderState.class, context -> new GuiSkinRenderer(context.bufferSource()));
-		REGISTERED_FACTORIES.put(GuiBookModelRenderState.class, context -> new GuiBookModelRenderer(context.bufferSource()));
-		REGISTERED_FACTORIES.put(GuiBannerResultRenderState.class, context -> new GuiBannerResultRenderer(context.bufferSource(), context.minecraft().getAtlasManager()));
-		REGISTERED_FACTORIES.put(GuiSignRenderState.class, context -> new GuiSignRenderer(context.bufferSource(), context.minecraft().getAtlasManager()));
-		REGISTERED_FACTORIES.put(GuiProfilerChartRenderState.class, context -> new GuiProfilerChartRenderer(context.bufferSource()));
+	public record ContextImpl(Minecraft minecraft) implements PictureInPictureRendererRegistry.Context {
 	}
-
-	@VisibleForTesting
-	public static Collection> getRegisteredFactoryStateClasses() {
-		return REGISTERED_FACTORIES.keySet();
-	}
-
-	record ContextImpl(Minecraft minecraft, MultiBufferSource.BufferSource bufferSource, SubmitNodeCollector submitNodeCollector) implements PictureInPictureRendererRegistry.Context { }
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/hud/HudElementRegistryImpl.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/hud/HudElementRegistryImpl.java
index 3da9707c22..79d870c752 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/hud/HudElementRegistryImpl.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/hud/HudElementRegistryImpl.java
@@ -17,22 +17,32 @@
 package net.fabricmc.fabric.impl.client.rendering.hud;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import net.neoforged.neoforge.client.event.RegisterGuiLayersEvent;
+import net.neoforged.neoforge.client.gui.GuiLayer;
+import net.neoforged.neoforge.client.gui.GuiLayerManager;
+import net.neoforged.neoforge.client.gui.GuiLayerManager.NamedLayer;
+import net.neoforged.neoforge.client.gui.VanillaGuiLayers;
 import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.jetbrains.annotations.VisibleForTesting;
 
 import net.minecraft.client.DeltaTracker;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.resources.Identifier;
 
 import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElement;
 import net.fabricmc.fabric.api.client.rendering.v1.hud.VanillaHudElements;
+import net.fabricmc.fabric.mixin.client.rendering.GuiLayerManagerAccessor;
+import net.fabricmc.fabric.mixin.client.rendering.HudAccessor;
 
 public class HudElementRegistryImpl {
 	@VisibleForTesting
@@ -71,6 +81,28 @@ public class HudElementRegistryImpl {
 			.collect(Collectors.toMap(RootLayer::id, Function.identity(), (a, b) -> a, IdentityHashMap::new));
 	private static final RootLayer FIRST = ROOT_ELEMENTS.get(VanillaHudElements.MISC_OVERLAYS);
 	private static final RootLayer LAST = ROOT_ELEMENTS.get(VanillaHudElements.SUBTITLES);
+	
+	private static final Map FABRIC_TO_NEO_IDS = buildVanillaIDTranslations();
+	private static boolean registered;
+	private static List> LATE_CALLS = new ArrayList<>();
+
+	public static void register(RegisterGuiLayersEvent event) {
+		LATE_CALLS.forEach(c -> c.accept(event));
+		LATE_CALLS = List.of(); // Make immutable
+		registered = true;
+	}
+	
+	private static void addLateLayer(Consumer consumer) {
+		if (registered) {
+			GuiLayerManager manager = ((HudAccessor) Minecraft.getInstance().gui.hud).fabric$getLayerManager();
+			List layers = ((GuiLayerManagerAccessor) manager).getLayers();
+
+			RegisterGuiLayersEvent event = new RegisterGuiLayersEvent(layers);
+			consumer.accept(event);
+		} else {
+			LATE_CALLS.add(consumer);
+		}
+	}
 
 	public static RootLayer getRoot(Identifier id) {
 		return ROOT_ELEMENTS.get(id);
@@ -79,11 +111,13 @@ public static RootLayer getRoot(Identifier id) {
 	public static void addFirst(Identifier id, HudElement element) {
 		validateUnique(id);
 		FIRST.layers().addFirst(HudLayer.ofElement(id, element));
+		addLateLayer(e -> e.registerBelowAll(translate(id), asGuiLayer(element)));
 	}
 
 	public static void addLast(Identifier id, HudElement element) {
 		validateUnique(id);
 		LAST.layers().addLast(HudLayer.ofElement(id, element));
+		addLateLayer(e -> e.registerAboveAll(translate(id), asGuiLayer(element)));
 	}
 
 	public static void attachElementBefore(Identifier beforeThis, Identifier id, HudElement element) {
@@ -99,6 +133,8 @@ public static void attachElementBefore(Identifier beforeThis, Identifier id, Hud
 		if (!didChange) {
 			throw new IllegalArgumentException("Layer with identifier " + beforeThis + " not found");
 		}
+
+		addLateLayer(e -> e.registerBelow(translate(beforeThis), translate(id), asGuiLayer(element)));
 	}
 
 	public static void attachElementAfter(Identifier afterThis, Identifier id, HudElement element) {
@@ -112,6 +148,8 @@ public static void attachElementAfter(Identifier afterThis, Identifier id, HudEl
 		if (!didChange) {
 			throw new IllegalArgumentException("Layer with identifier " + afterThis + " not found");
 		}
+
+		addLateLayer(e -> e.registerAbove(translate(afterThis), translate(id), asGuiLayer(element)));
 	}
 
 	public static void removeElement(Identifier identifier) {
@@ -123,6 +161,9 @@ public static void removeElement(Identifier identifier) {
 		if (!didChange) {
 			throw new IllegalArgumentException("Layer with identifier " + identifier + " not found");
 		}
+
+		addLateLayer(e -> e.wrapLayer(translate(identifier), l -> (g, d) -> {
+		}));
 	}
 
 	public static void replaceElement(Identifier identifier, Function replacer) {
@@ -134,6 +175,8 @@ public static void replaceElement(Identifier identifier, Function e.wrapLayer(translate(identifier), l -> asGuiLayer(replacer.apply(asHudElement(l)))));
 	}
 
 	@VisibleForTesting
@@ -218,4 +261,46 @@ public void extractRenderState(GuiGraphicsExtractor graphics, DeltaTracker delta
 			}
 		}
 	}
+
+	private static GuiLayer asGuiLayer(HudElement element) {
+		return element::extractRenderState;
+	}
+
+	private static HudElement asHudElement(GuiLayer layer) {
+		return layer::render;
+	}
+	
+	private static Identifier translate(Identifier id) {
+		return FABRIC_TO_NEO_IDS.getOrDefault(id, id);
+	}
+	
+	private static Map buildVanillaIDTranslations() {
+		Map map = new HashMap<>();
+		
+		map.put(VanillaHudElements.MISC_OVERLAYS, VanillaGuiLayers.CAMERA_OVERLAYS);
+		map.put(VanillaHudElements.CROSSHAIR, VanillaGuiLayers.CROSSHAIR);
+		map.put(VanillaHudElements.SPECTATOR_MENU, VanillaGuiLayers.HOTBAR);
+		map.put(VanillaHudElements.HOTBAR, VanillaGuiLayers.HOTBAR);
+		map.put(VanillaHudElements.ARMOR_BAR, VanillaGuiLayers.ARMOR_LEVEL);
+		map.put(VanillaHudElements.HEALTH_BAR, VanillaGuiLayers.PLAYER_HEALTH);
+		map.put(VanillaHudElements.FOOD_BAR, VanillaGuiLayers.FOOD_LEVEL);
+		map.put(VanillaHudElements.AIR_BAR, VanillaGuiLayers.AIR_LEVEL);
+		map.put(VanillaHudElements.MOUNT_HEALTH, VanillaGuiLayers.VEHICLE_HEALTH);
+		map.put(VanillaHudElements.INFO_BAR, VanillaGuiLayers.CONTEXTUAL_INFO_BAR);
+		map.put(VanillaHudElements.EXPERIENCE_LEVEL, VanillaGuiLayers.EXPERIENCE_LEVEL);
+		map.put(VanillaHudElements.HELD_ITEM_TOOLTIP, VanillaGuiLayers.SELECTED_ITEM_NAME);
+		map.put(VanillaHudElements.SPECTATOR_TOOLTIP, VanillaGuiLayers.SPECTATOR_TOOLTIP);
+		map.put(VanillaHudElements.MOB_EFFECTS, VanillaGuiLayers.EFFECTS);
+		map.put(VanillaHudElements.BOSS_BAR, VanillaGuiLayers.BOSS_OVERLAY);
+		map.put(VanillaHudElements.SLEEP, VanillaGuiLayers.SLEEP_OVERLAY);
+		map.put(VanillaHudElements.DEMO_TIMER, VanillaGuiLayers.DEMO_OVERLAY);
+		map.put(VanillaHudElements.SCOREBOARD, VanillaGuiLayers.SCOREBOARD_SIDEBAR);
+		map.put(VanillaHudElements.OVERLAY_MESSAGE, VanillaGuiLayers.OVERLAY_MESSAGE);
+		map.put(VanillaHudElements.TITLE_AND_SUBTITLE, VanillaGuiLayers.TITLE);
+		map.put(VanillaHudElements.CHAT, VanillaGuiLayers.CHAT);
+		map.put(VanillaHudElements.PLAYER_LIST, VanillaGuiLayers.TAB_LIST);
+		map.put(VanillaHudElements.SUBTITLES, VanillaGuiLayers.SUBTITLE_OVERLAY);
+		
+		return map;
+	}
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/hud/HudStatusBarHeightRegistryImpl.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/hud/HudStatusBarHeightRegistryImpl.java
index de7753d93f..c3079449ff 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/hud/HudStatusBarHeightRegistryImpl.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/hud/HudStatusBarHeightRegistryImpl.java
@@ -40,6 +40,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.Hud;
 import net.minecraft.resources.Identifier;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.util.Mth;
@@ -53,7 +54,7 @@
 import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElementRegistry;
 import net.fabricmc.fabric.api.client.rendering.v1.hud.StatusBarHeightProvider;
 import net.fabricmc.fabric.api.client.rendering.v1.hud.VanillaHudElements;
-import net.fabricmc.fabric.mixin.client.rendering.GuiAccessor;
+import net.fabricmc.fabric.mixin.client.rendering.HudAccessor;
 
 public final class HudStatusBarHeightRegistryImpl implements ClientModInitializer {
 	public static final Logger LOGGER = LoggerFactory.getLogger("fabric-rendering-v1");
@@ -78,7 +79,7 @@ public final class HudStatusBarHeightRegistryImpl implements ClientModInitialize
 	static final StatusBarHeightProvider HEALTH_BAR = (Player player) -> {
 		Gui hud = Minecraft.getInstance().gui;
 		int playerHealth = Mth.ceil(player.getHealth());
-		int displayHealth = ((GuiAccessor) hud).fabric$getRenderHealthValue();
+		int displayHealth = ((HudAccessor) hud.hud).fabric$getRenderHealthValue();
 		float maxHealth = Math.max((float) player.getAttributeValue(Attributes.MAX_HEALTH),
 				Math.max(displayHealth, playerHealth));
 		int absorptionAmount = Mth.ceil(player.getAbsorptionAmount());
@@ -96,18 +97,18 @@ public final class HudStatusBarHeightRegistryImpl implements ClientModInitialize
 	 * Height provider for the vanilla mount health.
 	 */
 	static final StatusBarHeightProvider MOUNT_HEALTH = (Player player) -> {
-		Gui hud = Minecraft.getInstance().gui;
-		LivingEntity livingEntity = ((GuiAccessor) hud).fabric$callGetRiddenEntity();
-		int vehicleMaxHearts = ((GuiAccessor) hud).fabric$callGetHeartCount(livingEntity);
-		return ((GuiAccessor) hud).fabric$callGetHeartRows(vehicleMaxHearts) * 10;
+		Hud hud = Minecraft.getInstance().gui.hud;
+		LivingEntity livingEntity = ((HudAccessor) hud).fabric$callGetRiddenEntity();
+		int vehicleMaxHearts = ((HudAccessor) hud).fabric$callGetHeartCount(livingEntity);
+		return ((HudAccessor) hud).fabric$callGetHeartRows(vehicleMaxHearts) * 10;
 	};
 	/**
 	 * Height provider for the vanilla food bar.
 	 */
 	static final StatusBarHeightProvider FOOD_BAR = (Player player) -> {
-		Gui hud = Minecraft.getInstance().gui;
-		LivingEntity livingEntity = ((GuiAccessor) hud).fabric$callGetRiddenEntity();
-		return ((GuiAccessor) hud).fabric$callGetHeartCount(livingEntity) == 0 ? 10 : 0;
+		Hud hud = Minecraft.getInstance().gui.hud;
+		LivingEntity livingEntity = ((HudAccessor) hud).fabric$callGetRiddenEntity();
+		return ((HudAccessor) hud).fabric$callGetHeartCount(livingEntity) == 0 ? 10 : 0;
 	};
 	/**
 	 * Height provider for the vanilla air bar.
@@ -215,7 +216,7 @@ public static int getHeight(Identifier id) {
 			throw new IllegalArgumentException("Unknown status bar: " + id);
 		}
 
-		Player player = ((GuiAccessor) Minecraft.getInstance().gui).fabric$callGetCameraPlayer();
+		Player player = ((HudAccessor) Minecraft.getInstance().gui.hud).fabric$callGetCameraPlayer();
 
 		if (player == null) {
 			throw new IllegalStateException("Trying to get status bar height for " + id + " without a camera player");
@@ -368,7 +369,7 @@ private static boolean isVanillaHeightProvider(Identifier id) {
 	private static void replaceVanillaElement(Identifier id, ResolvedHeightProvider heightProvider) {
 		HudElementRegistry.replaceElement(id, (HudElement layer) -> {
 			return (GuiGraphicsExtractor graphics, DeltaTracker deltaTracker) -> {
-				Player player = ((GuiAccessor) Minecraft.getInstance().gui).fabric$callGetCameraPlayer();
+				Player player = ((HudAccessor) Minecraft.getInstance().gui.hud).fabric$callGetCameraPlayer();
 				int height = player != null ? heightProvider.getResolvedHeight(player) : 0;
 
 				if (height != 0) {
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/level/LevelRenderContextImpl.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/level/LevelRenderContextImpl.java
index 08b5470d27..d53ef62421 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/level/LevelRenderContextImpl.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/level/LevelRenderContextImpl.java
@@ -21,7 +21,6 @@
 
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.SubmitNodeCollector;
 import net.minecraft.client.renderer.chunk.ChunkSectionsToRender;
 import net.minecraft.client.renderer.state.level.LevelRenderState;
@@ -34,32 +33,33 @@ public final class LevelRenderContextImpl implements AbstractLevelRenderContext,
 	private GameRenderer gameRenderer;
 	private LevelRenderer levelRenderer;
 	private LevelRenderState levelRenderState;
+	private SubmitNodeCollector nodeCollector;
 
+	@Nullable
 	private ChunkSectionsToRender sectionsToRender;
-	private SubmitNodeCollector nodeCollector;
 	@Nullable
 	private PoseStack poseStack;
-	private MultiBufferSource.BufferSource bufferSource;
 
 	public void prepare(
 			GameRenderer gameRenderer,
 			LevelRenderer levelRenderer,
 			LevelRenderState levelRenderState,
-			ChunkSectionsToRender sectionsToRender,
-			SubmitNodeCollector nodeCollector,
-			MultiBufferSource.BufferSource bufferSource
+			SubmitNodeCollector nodeCollector
 	) {
 		this.gameRenderer = gameRenderer;
 		this.levelRenderer = levelRenderer;
 		this.levelRenderState = levelRenderState;
-		this.sectionsToRender = sectionsToRender;
 
 		this.nodeCollector = nodeCollector;
-		this.bufferSource = bufferSource;
 
+		sectionsToRender = null;
 		poseStack = null;
 	}
 
+	public void setSectionsToRender(ChunkSectionsToRender sectionsToRender) {
+		this.sectionsToRender = sectionsToRender;
+	}
+
 	public void setPoseStack(@Nullable PoseStack poseStack) {
 		this.poseStack = poseStack;
 	}
@@ -94,9 +94,4 @@ public SubmitNodeCollector submitNodeCollector() {
 	public PoseStack poseStack() {
 		return poseStack;
 	}
-
-	@Override
-	public MultiBufferSource.BufferSource bufferSource() {
-		return bufferSource;
-	}
 }
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/VarIntAccessor.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/AtlasManagerAccessor.java
similarity index 67%
rename from fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/VarIntAccessor.java
rename to fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/AtlasManagerAccessor.java
index 332ae6622e..fa193dde85 100644
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/VarIntAccessor.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/AtlasManagerAccessor.java
@@ -14,17 +14,19 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.attachment;
+package net.fabricmc.fabric.mixin.client.rendering;
+
+import java.util.List;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-import net.minecraft.network.VarInt;
+import net.minecraft.client.resources.model.sprite.AtlasManager;
 
-@Mixin(VarInt.class)
-public interface VarIntAccessor {
-	@Accessor("MAX_VARINT_SIZE")
-	static int getMaxByteSize() {
-		throw new UnsupportedOperationException("implemented via mixin");
+@Mixin(AtlasManager.class)
+public interface AtlasManagerAccessor {
+	@Accessor("KNOWN_ATLASES")
+	static List getKnownAtlases() {
+		throw new AssertionError("Implemented via mixin");
 	}
 }
diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/MinecraftMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/AtlasManagerMixin.java
similarity index 50%
rename from fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/MinecraftMixin.java
rename to fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/AtlasManagerMixin.java
index cd2ace6970..0101ffeda2 100644
--- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/input/MinecraftMixin.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/AtlasManagerMixin.java
@@ -14,29 +14,27 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.client.gametest.input;
+package net.fabricmc.fabric.mixin.client.rendering;
 
+import java.util.List;
+
+import com.google.common.collect.ImmutableList;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import com.mojang.blaze3d.platform.Window;
 import org.objectweb.asm.Opcodes;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 
-import net.minecraft.client.Minecraft;
-
-import net.fabricmc.fabric.impl.client.gametest.util.WindowHooks;
+import net.minecraft.client.resources.model.sprite.AtlasManager;
 
-@Mixin(Minecraft.class)
-public class MinecraftMixin {
-	@Shadow
-	@Final
-	private Window window;
+import net.fabricmc.fabric.impl.client.rendering.AtlasRegistryImpl;
 
-	@ModifyExpressionValue(method = "renderFrame", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/state/WindowRenderState;isMinimized:Z", opcode = Opcodes.GETFIELD))
-	private boolean hasZeroRealWidthOrHeight(boolean original) {
-		WindowHooks windowHooks = (WindowHooks) (Object) window;
-		return windowHooks.fabric_getRealFramebufferWidth() == 0 || windowHooks.fabric_getRealFramebufferHeight() == 0;
+@Mixin(AtlasManager.class)
+class AtlasManagerMixin {
+	@ModifyExpressionValue(method = "", at = @At(value = "FIELD", target = "Lnet/minecraft/client/resources/model/sprite/AtlasManager;KNOWN_ATLASES:Ljava/util/List;", opcode = Opcodes.GETSTATIC))
+	private static List addAtlases(List original) {
+		final ImmutableList.Builder builder = ImmutableList.builder();
+		builder.addAll(original);
+		builder.addAll(AtlasRegistryImpl.finalizeConfigs());
+		return builder.build();
 	}
 }
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BlocksMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/BuiltInBlockModelsMixin.java
similarity index 52%
rename from fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BlocksMixin.java
rename to fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/BuiltInBlockModelsMixin.java
index b0b5867682..77d9108390 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BlocksMixin.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/BuiltInBlockModelsMixin.java
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.registry.sync;
+package net.fabricmc.fabric.mixin.client.rendering;
 
+import java.util.Map;
+
+import com.llamalad7.mixinextras.sugar.Local;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.world.level.block.Blocks;
+import net.minecraft.client.renderer.block.BuiltInBlockModels;
+import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.world.level.block.state.BlockState;
 
-import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
+import net.fabricmc.fabric.api.client.rendering.v1.BuiltInBlockModelsCallback;
 
-@Mixin(Blocks.class)
-public class BlocksMixin {
-	@Inject(method = "", at = @At("TAIL"))
-	private static void initShapeCache(CallbackInfo ci) {
-		// Ensure that any blocks added after this point have their shape cache initialized.
-		RegistryEntryAddedCallback.event(BuiltInRegistries.BLOCK).register((rawId, id, block) -> {
-			for (BlockState state : block.getStateDefinition().getPossibleStates()) {
-				state.initCache();
-			}
-		});
+@Mixin(BuiltInBlockModels.class)
+abstract class BuiltInBlockModelsMixin {
+	@Inject(method = "createBlockModels",
+			at = @At(value = "INVOKE",
+					target = "Lnet/minecraft/client/renderer/block/BuiltInBlockModels$Builder;build()Ljava/util/Map;"))
+	private static void createBlockModels(CallbackInfoReturnable> callback, @Local BuiltInBlockModels.Builder builder) {
+		BuiltInBlockModelsCallback.EVENT.invoker().createBlockModels(builder);
 	}
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/DebugOptionsScreenEntryMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/DebugOptionsScreenEntryMixin.java
deleted file mode 100644
index ef69aa5d28..0000000000
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/DebugOptionsScreenEntryMixin.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.mixin.client.rendering;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.resources.Identifier;
-
-@Mixin(targets = "net.minecraft.client.gui.screens.debug.DebugOptionsScreen$OptionEntry")
-public abstract class DebugOptionsScreenEntryMixin {
-	@WrapOperation(method = "", at = @At(value = "INVOKE", target = "Lnet/minecraft/resources/Identifier;getPath()Ljava/lang/String;"))
-	private String showNamespace(Identifier instance, Operation original) {
-		if (!Identifier.DEFAULT_NAMESPACE.equals(instance.getNamespace())) {
-			return instance.toString();
-		}
-
-		return original.call(instance);
-	}
-}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/DebugOptionsScreenOptionListMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/DebugOptionsScreenOptionListMixin.java
deleted file mode 100644
index 3e0dd466f7..0000000000
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/DebugOptionsScreenOptionListMixin.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.mixin.client.rendering;
-
-import java.util.Map;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import net.minecraft.client.gui.components.debug.DebugScreenEntry;
-import net.minecraft.resources.Identifier;
-
-import net.fabricmc.fabric.impl.client.rendering.DebugOptionsComparator;
-
-@Mixin(targets = "net.minecraft.client.gui.screens.debug.DebugOptionsScreen$OptionList")
-public class DebugOptionsScreenOptionListMixin {
-	@Redirect(method = "lambda$static$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/resources/Identifier;compareTo(Lnet/minecraft/resources/Identifier;)I"))
-	private static int sort(Identifier o1, Identifier o2) {
-		return DebugOptionsComparator.INSTANCE.compare(o1, o2);
-	}
-
-	@WrapOperation(method = "updateSearch", at = @At(value = "INVOKE", target = "Ljava/lang/String;contains(Ljava/lang/CharSequence;)Z"))
-	private boolean searchPath(String instance, CharSequence searchStrings, Operation original, @Local(name = "entry") Map.Entry entry) {
-		final String namespace = entry.getKey().getNamespace();
-		return original.call(instance, searchStrings)
-				|| (!Identifier.DEFAULT_NAMESPACE.equals(namespace) && namespace.contains(searchStrings));
-	}
-}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/EntityRenderersMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/EntityRenderersMixin.java
index 15bc8618e7..da45cc05c8 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/EntityRenderersMixin.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/EntityRenderersMixin.java
@@ -35,6 +35,7 @@
 import net.minecraft.client.renderer.entity.LivingEntityRenderer;
 import net.minecraft.client.renderer.entity.player.AvatarRenderer;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EntityTypes;
 import net.minecraft.world.entity.LivingEntity;
 
 import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityRenderLayerRegistrationCallback;
@@ -73,7 +74,7 @@ private static AvatarRenderer createAvatarRenderer(EntityRendererProvider.Contex
 		AvatarRenderer entityRenderer = original.call(context, slim);
 
 		LivingEntityRendererAccessor accessor = (LivingEntityRendererAccessor) entityRenderer;
-		LivingEntityRenderLayerRegistrationCallback.EVENT.invoker().registerLayers(EntityType.PLAYER, (LivingEntityRenderer) entityRenderer, new RegistrationHelperImpl(accessor::callAddLayer), context);
+		LivingEntityRenderLayerRegistrationCallback.EVENT.invoker().registerLayers(EntityTypes.PLAYER, (LivingEntityRenderer) entityRenderer, new RegistrationHelperImpl(accessor::callAddLayer), context);
 
 		return entityRenderer;
 	}
diff --git a/fabric-key-mapping-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/keymapping/OptionsMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/FeatureRenderDispatcherMixin.java
similarity index 61%
rename from fabric-key-mapping-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/keymapping/OptionsMixin.java
rename to fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/FeatureRenderDispatcherMixin.java
index 2a314d7d29..29ad6227b3 100644
--- a/fabric-key-mapping-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/keymapping/OptionsMixin.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/FeatureRenderDispatcherMixin.java
@@ -14,30 +14,28 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.client.keymapping;
+package net.fabricmc.fabric.mixin.client.rendering;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.Options;
+import net.minecraft.client.renderer.feature.FeatureRenderDispatcher;
+import net.minecraft.client.renderer.feature.FeatureRendererMap;
 
-import net.fabricmc.fabric.impl.client.keymapping.KeyMappingRegistryImpl;
+import net.fabricmc.fabric.impl.client.rendering.FeatureRendererRegistryImpl;
 
-@Mixin(Options.class)
-public class OptionsMixin {
-	@Mutable
+@Mixin(FeatureRenderDispatcher.class)
+abstract class FeatureRenderDispatcherMixin {
 	@Shadow
 	@Final
-	public KeyMapping[] keyMappings;
+	private FeatureRendererMap featureRenderers;
 
-	@Inject(at = @At("HEAD"), method = "load()V")
-	public void loadHook(CallbackInfo info) {
-		keyMappings = KeyMappingRegistryImpl.process(keyMappings);
+	@Inject(method = "", at = @At("RETURN"))
+	private void registerExtendedFeatureRenderers(CallbackInfo ci) {
+		FeatureRendererRegistryImpl.registerRenderers(featureRenderers);
 	}
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GameRendererMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GameRendererMixin.java
index 5f6b5b93e6..cbb921db36 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GameRendererMixin.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GameRendererMixin.java
@@ -25,38 +25,20 @@
 
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.render.GuiRenderer;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.ItemInHandRenderer;
-import net.minecraft.client.renderer.RenderBuffers;
-import net.minecraft.client.renderer.SubmitNodeStorage;
 import net.minecraft.client.resources.model.ModelManager;
 
-import net.fabricmc.fabric.impl.client.rendering.GuiRendererExtensions;
 import net.fabricmc.fabric.impl.client.rendering.LevelRendererExtensions;
 
 @Mixin(GameRenderer.class)
 public class GameRendererMixin {
-	@Shadow
-	@Final
-	private GuiRenderer guiRenderer;
-
-	@Shadow
-	@Final
-	private SubmitNodeStorage submitNodeStorage;
-
 	@Shadow
 	@Final
 	private Minecraft minecraft;
 
-	@Inject(method = "", at = @At(value = "RETURN"))
-	private void guiRendererReady(Minecraft minecraft, ItemInHandRenderer itemInHandRenderer, RenderBuffers renderBuffers, ModelManager modelManager, CallbackInfo ci) {
-		GuiRendererExtensions guiRenderer = (GuiRendererExtensions) this.guiRenderer;
-		guiRenderer.fabric_onReady(this.submitNodeStorage);
-	}
-
 	@Inject(method = "extract", at = @At(value = "HEAD"))
 	private void beforeExtract(DeltaTracker deltaTracker, boolean advanceGameTime, CallbackInfo ci) {
-		((LevelRendererExtensions) (Object) minecraft.levelRenderer).fabric_prepareLevelExtractionContext(deltaTracker);
+		((LevelRendererExtensions) minecraft.levelExtractor).fabric_prepareLevelExtractionContext(deltaTracker);
 	}
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiLayerManagerAccessor.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiLayerManagerAccessor.java
new file mode 100644
index 0000000000..c66a131ec5
--- /dev/null
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiLayerManagerAccessor.java
@@ -0,0 +1,14 @@
+package net.fabricmc.fabric.mixin.client.rendering;
+
+import net.neoforged.neoforge.client.gui.GuiLayerManager;
+import net.neoforged.neoforge.client.gui.GuiLayerManager.NamedLayer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.List;
+
+@Mixin(GuiLayerManager.class)
+public interface GuiLayerManagerAccessor {
+	@Accessor
+	List getLayers();
+}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiMixin.java
deleted file mode 100644
index 6a9a9c4c46..0000000000
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiMixin.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * 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.mixin.client.rendering;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiGraphicsExtractor;
-import net.minecraft.client.gui.components.spectator.SpectatorGui;
-import net.minecraft.client.gui.contextualbar.ContextualBarRenderer;
-import net.minecraft.world.entity.player.Player;
-
-import net.fabricmc.fabric.api.client.rendering.v1.hud.VanillaHudElements;
-import net.fabricmc.fabric.impl.client.rendering.hud.HudElementRegistryImpl;
-
-@Mixin(Gui.class)
-abstract class GuiMixin {
-	@Shadow
-	@Final
-	private Minecraft minecraft;
-
-	@WrapOperation(method = "extractRenderState", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractCameraOverlays(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V"))
-	private void wrapMiscOverlays(Gui instance, GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.MISC_OVERLAYS).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, dt) -> renderVanilla.call(instance, ctx, dt));
-	}
-
-	@WrapOperation(method = "extractRenderState", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractCrosshair(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V"))
-	private void wrapCrosshair(Gui instance, GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.CROSSHAIR).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, dt) -> renderVanilla.call(instance, ctx, dt));
-	}
-
-	@WrapOperation(method = "extractHotbarAndDecorations", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/spectator/SpectatorGui;extractHotbar(Lnet/minecraft/client/gui/GuiGraphicsExtractor;)V"))
-	private void wrapSpectatorMenu(SpectatorGui instance, GuiGraphicsExtractor graphics, Operation renderVanilla, @Local(argsOnly = true) DeltaTracker deltaTracker) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.SPECTATOR_MENU).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, _) -> renderVanilla.call(instance, ctx));
-	}
-
-	@WrapOperation(method = "extractHotbarAndDecorations", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractItemHotbar(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V"))
-	private void wrapHotbar(Gui instance, GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.HOTBAR).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, dt) -> renderVanilla.call(instance, ctx, dt));
-	}
-
-	@WrapOperation(method = "extractPlayerHealth", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractArmor(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/world/entity/player/Player;IIII)V"))
-	private void wrapArmorBar(GuiGraphicsExtractor graphics, Player player, int i, int j, int k, int x, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.ARMOR_BAR).extractRenderState(
-				graphics, minecraft.getDeltaTracker(), (ctx, _) -> renderVanilla.call(ctx, player, i, j, k, x));
-	}
-
-	@WrapOperation(method = "extractPlayerHealth", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractHearts(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/world/entity/player/Player;IIIIFIIIZ)V"))
-	private void wrapHealthBar(Gui instance, GuiGraphicsExtractor graphics, Player player, int x, int y, int lines, int regeneratingHeartIndex, float maxHealth, int lastHealth, int health, int absorption, boolean blinking, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.HEALTH_BAR).extractRenderState(
-				graphics, minecraft.getDeltaTracker(), (ctx, _) -> renderVanilla.call(instance, ctx, player, x, y, lines, regeneratingHeartIndex, maxHealth, lastHealth, health, absorption, blinking));
-	}
-
-	@WrapOperation(method = "extractPlayerHealth", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractFood(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/world/entity/player/Player;II)V"))
-	private void wrapFoodBar(Gui instance, GuiGraphicsExtractor graphics, Player player, int top, int right, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.FOOD_BAR).extractRenderState(
-				graphics, minecraft.getDeltaTracker(), (ctx, _) -> renderVanilla.call(instance, ctx, player, top, right));
-	}
-
-	@WrapOperation(method = "extractPlayerHealth", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractAirBubbles(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/world/entity/player/Player;III)V"))
-	private void wrapAirBar(Gui instance, GuiGraphicsExtractor graphics, Player player, int heartCount, int top, int left, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.AIR_BAR).extractRenderState(
-				graphics, minecraft.getDeltaTracker(), (ctx, _) -> renderVanilla.call(instance, ctx, player, heartCount, top, left));
-	}
-
-	@WrapOperation(method = "extractHotbarAndDecorations", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractVehicleHealth(Lnet/minecraft/client/gui/GuiGraphicsExtractor;)V"))
-	private void wrapMountHealth(Gui instance, GuiGraphicsExtractor graphics, Operation renderVanilla, @Local(argsOnly = true) DeltaTracker deltaTracker) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.MOUNT_HEALTH).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, _) -> renderVanilla.call(instance, ctx));
-	}
-
-	@WrapOperation(method = "extractHotbarAndDecorations", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/contextualbar/ContextualBarRenderer;extractBackground(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V"))
-	private void wrapExtractInfoBar(ContextualBarRenderer instance, GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.INFO_BAR).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, dt) -> renderVanilla.call(instance, ctx, dt));
-	}
-
-	@WrapOperation(method = "extractHotbarAndDecorations", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/contextualbar/ContextualBarRenderer;extractExperienceLevel(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/gui/Font;I)V"))
-	private void wrapExperienceLevel(GuiGraphicsExtractor graphics, Font font, int level, Operation renderVanilla, @Local(argsOnly = true) DeltaTracker deltaTracker) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.EXPERIENCE_LEVEL).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, _) -> renderVanilla.call(ctx, font, level));
-	}
-
-	@WrapOperation(method = "extractHotbarAndDecorations", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractSelectedItemName(Lnet/minecraft/client/gui/GuiGraphicsExtractor;)V"))
-	private void wrapHeldItemTooltip(Gui instance, GuiGraphicsExtractor graphics, Operation renderVanilla, @Local(argsOnly = true) DeltaTracker deltaTracker) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.HELD_ITEM_TOOLTIP).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, _) -> renderVanilla.call(instance, ctx));
-	}
-
-	@WrapOperation(method = "extractHotbarAndDecorations", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/spectator/SpectatorGui;extractAction(Lnet/minecraft/client/gui/GuiGraphicsExtractor;)V"))
-	private void wrapExtractSpectatorGui(SpectatorGui instance, GuiGraphicsExtractor graphics, Operation renderVanilla, @Local(argsOnly = true) DeltaTracker deltaTracker) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.SPECTATOR_TOOLTIP).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, _) -> renderVanilla.call(instance, ctx));
-	}
-
-	@WrapOperation(method = "extractRenderState", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractEffects(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V"))
-	private void wrapMobEffectOverlay(Gui instance, GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.MOB_EFFECTS).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, dt) -> renderVanilla.call(instance, ctx, dt));
-	}
-
-	@WrapOperation(method = "extractRenderState", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractBossOverlay(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V"))
-	private void wrapBossHealthOverlay(Gui instance, GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.BOSS_BAR).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, dt) -> renderVanilla.call(instance, ctx, dt));
-	}
-
-	@WrapOperation(method = "extractRenderState", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractSleepOverlay(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V"))
-	private void wrapSleepOverlay(Gui instance, GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.SLEEP).extractRenderState(graphics,
-				deltaTracker, (ctx, dt) -> renderVanilla.call(instance, ctx, dt));
-	}
-
-	@WrapOperation(method = "extractRenderState", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractDemoOverlay(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V"))
-	private void wrapDemoTimer(Gui instance, GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.DEMO_TIMER).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, dt) -> renderVanilla.call(instance, ctx, dt));
-	}
-
-	@WrapOperation(method = "extractRenderState", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractScoreboardSidebar(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V"))
-	private void wrapScoreboardSidebar(Gui instance, GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.SCOREBOARD).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, dt) -> renderVanilla.call(instance, ctx, dt));
-	}
-
-	@WrapOperation(method = "extractRenderState", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractOverlayMessage(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V"))
-	private void wrapOverlayMessage(Gui instance, GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.OVERLAY_MESSAGE).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, dt) -> renderVanilla.call(instance, ctx, dt));
-	}
-
-	@WrapOperation(method = "extractRenderState", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractTitle(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V"))
-	private void wrapTitleAndSubtitle(Gui instance, GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.TITLE_AND_SUBTITLE).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, dt) -> renderVanilla.call(instance, ctx, dt));
-	}
-
-	@WrapOperation(method = "extractRenderState", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractChat(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V"))
-	private void wrapChat(Gui instance, GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.CHAT).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, dt) -> renderVanilla.call(instance, ctx,
-				dt
-		));
-	}
-
-	@WrapOperation(method = "extractRenderState", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractTabList(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V"))
-	private void wrapPlayerList(Gui instance, GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, Operation renderVanilla) {
-		HudElementRegistryImpl.getRoot(VanillaHudElements.PLAYER_LIST).extractRenderState(
-				graphics,
-				deltaTracker, (ctx, dt) -> renderVanilla.call(instance, ctx,
-				dt
-		));
-	}
-}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/DrawAccessor.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiRendererDrawAccessor.java
similarity index 86%
rename from fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/DrawAccessor.java
rename to fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiRendererDrawAccessor.java
index 5820189d45..033e372226 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/DrawAccessor.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiRendererDrawAccessor.java
@@ -20,11 +20,13 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
+import net.minecraft.client.renderer.StagedVertexBuffer;
+
 @Mixin(targets = "net/minecraft/client/gui/render/GuiRenderer$Draw")
-interface DrawAccessor {
+interface GuiRendererDrawAccessor {
 	@Accessor("pipeline")
 	RenderPipeline fabric$pipeline();
 
-	@Accessor("indexCount")
-	int fabric$indexCount();
+	@Accessor("draw")
+	StagedVertexBuffer.Draw fabric$Draw();
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiRendererMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiRendererMixin.java
index 8abc2be1f3..8e0ff0beca 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiRendererMixin.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiRendererMixin.java
@@ -16,113 +16,37 @@
 
 package net.fabricmc.fabric.mixin.client.rendering;
 
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
+import com.mojang.blaze3d.IndexType;
+import com.mojang.blaze3d.PrimitiveTopology;
 import com.mojang.blaze3d.buffers.GpuBuffer;
 import com.mojang.blaze3d.pipeline.RenderPipeline;
 import com.mojang.blaze3d.systems.RenderPass;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.VertexFormat;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Coerce;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.render.GuiRenderer;
-import net.minecraft.client.gui.render.pip.PictureInPictureRenderer;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.SubmitNodeCollector;
-import net.minecraft.client.renderer.SubmitNodeStorage;
-import net.minecraft.client.renderer.feature.FeatureRenderDispatcher;
-import net.minecraft.client.renderer.state.gui.GuiRenderState;
-import net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState;
-
-import net.fabricmc.fabric.impl.client.rendering.GuiRendererExtensions;
-import net.fabricmc.fabric.impl.client.rendering.PictureInPictureRendererPool;
-import net.fabricmc.fabric.impl.client.rendering.PictureInPictureRendererRegistryImpl;
 
 @Mixin(GuiRenderer.class)
-abstract class GuiRendererMixin implements GuiRendererExtensions {
-	@Shadow
-	@Final
-	@Mutable
-	private Map, PictureInPictureRenderer> pictureInPictureRenderers;
-	@Shadow
-	@Final
-	private MultiBufferSource.BufferSource bufferSource;
-
-	@Unique
-	private boolean hasFabricInitialized = false;
-	@Unique
-	private final Map, PictureInPictureRendererPool> pipRendererPools = new HashMap<>();
-	@Unique
-	private SubmitNodeCollector submitNodeStorage = null;
-
-	@Inject(method = "", at = @At(value = "RETURN"))
-	private void mutableSpecialElementRenderers(GuiRenderState state, MultiBufferSource.BufferSource bufferSource, SubmitNodeCollector submitNodeCollector, FeatureRenderDispatcher renderDispatcher, List list, CallbackInfo ci) {
-		this.pictureInPictureRenderers = new IdentityHashMap<>(this.pictureInPictureRenderers);
-	}
-
-	@Override
-	public void fabric_onReady(SubmitNodeStorage submitNodeStorage) {
-		this.submitNodeStorage = submitNodeStorage;
-		PictureInPictureRendererRegistryImpl.onReady(Minecraft.getInstance(), bufferSource, submitNodeStorage, this.pictureInPictureRenderers);
-		this.hasFabricInitialized = true;
-	}
-
-	@Inject(method = "preparePictureInPicture", at = @At("HEAD"))
-	private void prePrepareSpecialElements(CallbackInfo ci) {
-		pipRendererPools.values().forEach(PictureInPictureRendererPool::newFrame);
-	}
-
-	@Inject(method = "preparePictureInPicture", at = @At("RETURN"))
-	private void postPrepareSpecialElements(CallbackInfo ci) {
-		pipRendererPools.values().forEach(PictureInPictureRendererPool::cleanUpUnusedRenderers);
-	}
-
-	@ModifyVariable(method = "preparePictureInPictureState", at = @At("STORE"), name = "renderer")
-	private  PictureInPictureRenderer substituteSpecialElementRenderer(PictureInPictureRenderer original, T elementState) {
-		if (original == null || !hasFabricInitialized) {
-			return original;
-		}
-
-		PictureInPictureRendererPool rendererPool = (PictureInPictureRendererPool) pipRendererPools.computeIfAbsent(original.getRenderStateClass(), k -> new PictureInPictureRendererPool<>());
-		return rendererPool.substitute(original, elementState, Minecraft.getInstance(), bufferSource, Objects.requireNonNull(submitNodeStorage, "renderDispatcher"));
-	}
-
-	@Inject(method = "close", at = @At("RETURN"))
-	private void closeRendererPools(CallbackInfo ci) {
-		pipRendererPools.values().forEach(PictureInPictureRendererPool::close);
-	}
-
+abstract class GuiRendererMixin {
 	@WrapOperation(
-			method = "executeDraw(Lnet/minecraft/client/gui/render/GuiRenderer$Draw;Lcom/mojang/blaze3d/systems/RenderPass;Lcom/mojang/blaze3d/buffers/GpuBuffer;Lcom/mojang/blaze3d/vertex/VertexFormat$IndexType;)V",
+			method = "executeDraw",
 			at = @At(
 					value = "INVOKE",
-					target = "Lcom/mojang/blaze3d/systems/RenderPass;setIndexBuffer(Lcom/mojang/blaze3d/buffers/GpuBuffer;Lcom/mojang/blaze3d/vertex/VertexFormat$IndexType;)V"
+					target = "Lcom/mojang/blaze3d/systems/RenderPass;setIndexBuffer(Lcom/mojang/blaze3d/buffers/GpuBuffer;Lcom/mojang/blaze3d/IndexType;)V"
 			)
 	)
-	private void fixNonQuadIndexing(RenderPass instance, GpuBuffer buffer, VertexFormat.IndexType indexType, Operation original, @Coerce DrawAccessor draw) {
+	private void fixNonQuadIndexing(RenderPass instance, GpuBuffer buffer, IndexType indexType, Operation original, @Coerce GuiRendererDrawAccessor draw) {
 		RenderPipeline pipeline = draw.fabric$pipeline();
 
-		if (pipeline.usePipelineDrawModeForGui() && pipeline.getVertexFormatMode() != VertexFormat.Mode.QUADS) {
-			RenderSystem.AutoStorageIndexBuffer shapeIndexBuffer = RenderSystem.getSequentialBuffer(pipeline.getVertexFormatMode());
-			buffer = shapeIndexBuffer.getBuffer(draw.fabric$indexCount());
+		if (pipeline.usePipelineDrawModeForGui() && pipeline.getPrimitiveTopology() != PrimitiveTopology.QUADS) {
+			RenderSystem.AutoStorageIndexBuffer shapeIndexBuffer = RenderSystem.getSequentialBuffer(pipeline.getPrimitiveTopology());
+			buffer = shapeIndexBuffer.getBuffer(((StagedVertexBufferDrawAccessor) draw.fabric$Draw()).fabric$indexCount());
 			indexType = shapeIndexBuffer.type();
 		}
 
@@ -131,6 +55,6 @@ private void fixNonQuadIndexing(RenderPass instance, GpuBuffer buffer, VertexFor
 
 	@ModifyExpressionValue(method = "addElementToMesh", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/render/GuiRenderer;scissorChanged(Lnet/minecraft/client/gui/navigation/ScreenRectangle;Lnet/minecraft/client/gui/navigation/ScreenRectangle;)Z"))
 	private boolean uploadPrimitivesIndividually(boolean original, @Local RenderPipeline pipeline) {
-		return original || pipeline.getVertexFormatMode().connectedPrimitives;
+		return original || pipeline.getPrimitiveTopology().connectedPrimitives;
 	}
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiAccessor.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/HudAccessor.java
similarity index 85%
rename from fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiAccessor.java
rename to fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/HudAccessor.java
index 5a53442dd4..7ebd2e4d94 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiAccessor.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/HudAccessor.java
@@ -16,16 +16,17 @@
 
 package net.fabricmc.fabric.mixin.client.rendering;
 
+import net.neoforged.neoforge.client.gui.GuiLayerManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
-import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.Hud;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 
-@Mixin(Gui.class)
-public interface GuiAccessor {
+@Mixin(Hud.class)
+public interface HudAccessor {
 	@Accessor("displayHealth")
 	int fabric$getRenderHealthValue();
 
@@ -40,4 +41,7 @@ public interface GuiAccessor {
 
 	@Invoker("getCameraPlayer")
 	Player fabric$callGetCameraPlayer();
+	
+	@Accessor("layerManager")
+	GuiLayerManager fabric$getLayerManager();
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/LevelExtractorMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/LevelExtractorMixin.java
new file mode 100644
index 0000000000..464d7f583a
--- /dev/null
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/LevelExtractorMixin.java
@@ -0,0 +1,78 @@
+/*
+ * 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.mixin.client.rendering;
+
+import org.jspecify.annotations.Nullable;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.client.Camera;
+import net.minecraft.client.DeltaTracker;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.renderer.extract.LevelExtractor;
+import net.minecraft.client.renderer.state.level.LevelRenderState;
+
+import net.fabricmc.fabric.api.client.rendering.v1.InvalidateRenderStateCallback;
+import net.fabricmc.fabric.api.client.rendering.v1.level.LevelExtractionEvents;
+import net.fabricmc.fabric.impl.client.rendering.LevelRendererExtensions;
+import net.fabricmc.fabric.impl.client.rendering.level.LevelExtractionContextImpl;
+
+@Mixin(LevelExtractor.class)
+public class LevelExtractorMixin implements LevelRendererExtensions {
+	@Shadow
+	@Final
+	private Minecraft minecraft;
+	@Shadow
+	@Final
+	private LevelRenderState levelRenderState;
+	@Shadow
+	private @Nullable ClientLevel level;
+	@Unique
+	private final LevelExtractionContextImpl extractionContext = new LevelExtractionContextImpl();
+
+	@Override
+	public void fabric_prepareLevelExtractionContext(DeltaTracker deltaTracker) {
+		extractionContext.prepare(
+				minecraft.gameRenderer,
+				minecraft.levelRenderer,
+				levelRenderState,
+				level,
+				deltaTracker,
+				minecraft.gameRenderer.mainCamera());
+	}
+
+	@Inject(method = "extractBlockOutline", at = @At("RETURN"))
+	private void afterBlockOutlineExtraction(Camera camera, LevelRenderState renderStates, CallbackInfo ci) {
+		LevelExtractionEvents.AFTER_BLOCK_OUTLINE_EXTRACTION.invoker().afterBlockOutlineExtraction(extractionContext, minecraft.hitResult);
+	}
+
+	@Inject(method = "extract", at = @At("RETURN"))
+	private void afterExtractLevel(DeltaTracker deltaTracker, Camera camera, float deltaPartialTick, CallbackInfo ci) {
+		LevelExtractionEvents.END_EXTRACTION.invoker().endExtraction(extractionContext);
+	}
+
+	@Inject(method = "allChanged", at = @At("HEAD"))
+	private void onReload(CallbackInfo ci) {
+		InvalidateRenderStateCallback.EVENT.invoker().onInvalidate();
+	}
+}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/LevelRendererMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/LevelRendererMixin.java
index 48f3a6d429..0deb518c3f 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/LevelRendererMixin.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/LevelRendererMixin.java
@@ -25,7 +25,6 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import org.joml.Matrix4fc;
 import org.joml.Vector4f;
-import org.jspecify.annotations.Nullable;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -34,31 +33,24 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import net.minecraft.client.Camera;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderBuffers;
+import net.minecraft.client.renderer.SubmitNodeCollector;
 import net.minecraft.client.renderer.SubmitNodeStorage;
 import net.minecraft.client.renderer.chunk.ChunkSectionLayerGroup;
 import net.minecraft.client.renderer.chunk.ChunkSectionsToRender;
 import net.minecraft.client.renderer.state.level.CameraRenderState;
 import net.minecraft.client.renderer.state.level.LevelRenderState;
 
-import net.fabricmc.fabric.api.client.rendering.v1.InvalidateRenderStateCallback;
 import net.fabricmc.fabric.api.client.rendering.v1.level.LevelRenderEvents;
-import net.fabricmc.fabric.impl.client.rendering.LevelRendererExtensions;
-import net.fabricmc.fabric.impl.client.rendering.level.LevelExtractionContextImpl;
 import net.fabricmc.fabric.impl.client.rendering.level.LevelRenderContextImpl;
 
 @Mixin(LevelRenderer.class)
-public abstract class LevelRendererMixin implements LevelRendererExtensions {
-	@Shadow
-	@Final
-	private Minecraft minecraft;
+public abstract class LevelRendererMixin {
 	@Shadow
 	@Final
 	private RenderBuffers renderBuffers;
@@ -66,41 +58,20 @@ public abstract class LevelRendererMixin implements LevelRendererExtensions {
 	@Final
 	private LevelRenderState levelRenderState;
 	@Shadow
-	@Nullable
-	private ClientLevel level;
-	@Shadow
 	@Final
 	private SubmitNodeStorage submitNodeStorage;
 
 	@Unique
 	private final LevelRenderContextImpl renderContext = new LevelRenderContextImpl();
-	@Unique
-	private final LevelExtractionContextImpl extractionContext = new LevelExtractionContextImpl();
-
-	@Override
-	public void fabric_prepareLevelExtractionContext(DeltaTracker deltaTracker) {
-		extractionContext.prepare(
-				minecraft.gameRenderer,
-				minecraft.levelRenderer,
-				levelRenderState,
-				level,
-				deltaTracker,
-				minecraft.gameRenderer.getMainCamera());
-	}
 
-	@Inject(method = "renderLevel", at = @At("HEAD"))
-	private void beforeRender(GraphicsResourceAllocator resourceAllocator, DeltaTracker deltaTracker, boolean renderOutline, CameraRenderState cameraState, Matrix4fc modelViewMatrix, GpuBufferSlice terrainFog, Vector4f fogColor, boolean shouldRenderSky, ChunkSectionsToRender chunkSectionsToRender, CallbackInfo ci) {
-		renderContext.prepare(minecraft.gameRenderer, (LevelRenderer) (Object) this, levelRenderState, chunkSectionsToRender, submitNodeStorage, renderBuffers.bufferSource());
+	@Inject(method = "render", at = @At("HEAD"))
+	private void beforeRender(GraphicsResourceAllocator resourceAllocator, DeltaTracker deltaTracker, boolean renderOutline, CameraRenderState cameraState, Matrix4fc modelViewMatrix, GpuBufferSlice terrainFog, Vector4f fogColor, boolean shouldRenderSky, CallbackInfo ci) {
+		renderContext.prepare(Minecraft.getInstance().gameRenderer, (LevelRenderer) (Object) this, levelRenderState, submitNodeStorage);
 	}
 
-	@Inject(method = "extractBlockOutline", at = @At("RETURN"))
-	private void afterBlockOutlineExtraction(Camera camera, LevelRenderState renderStates, CallbackInfo ci) {
-		LevelRenderEvents.AFTER_BLOCK_OUTLINE_EXTRACTION.invoker().afterBlockOutlineExtraction(extractionContext, minecraft.hitResult);
-	}
-
-	@Inject(method = "extractLevel", at = @At("RETURN"))
-	private void afterExtractLevel(DeltaTracker deltaTracker, Camera camera, float deltaPartialTick, CallbackInfo ci) {
-		LevelRenderEvents.END_EXTRACTION.invoker().endExtraction(extractionContext);
+	@Inject(method = "prepareChunkRenders", at = @At("RETURN"))
+	private void prepareChunkRenders(CallbackInfoReturnable cir) {
+		renderContext.setSectionsToRender(cir.getReturnValue());
 	}
 
 	@WrapOperation(method = "lambda$addMainPass$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/chunk/ChunkSectionsToRender;renderGroup(Lnet/minecraft/client/renderer/chunk/ChunkSectionLayerGroup;Lcom/mojang/blaze3d/textures/GpuSampler;)V", ordinal = 0))
@@ -110,36 +81,35 @@ private void wrapRenderOpaqueTerrain(ChunkSectionsToRender chunkSectionsToRender
 		LevelRenderEvents.AFTER_OPAQUE_TERRAIN.invoker().afterOpaqueTerrain(renderContext);
 	}
 
-	@ModifyExpressionValue(method = "lambda$addMainPass$0", at = @At(value = "NEW", target = "Lcom/mojang/blaze3d/vertex/PoseStack;"))
+	@ModifyExpressionValue(method = "submitFeatures", at = @At(value = "NEW", target = "Lcom/mojang/blaze3d/vertex/PoseStack;"))
 	private PoseStack onCreatePoseStack(PoseStack poseStack) {
 		renderContext.setPoseStack(poseStack);
 		return poseStack;
 	}
 
-	@Inject(method = "lambda$addMainPass$0", at = @At(value = "INVOKE_STRING", target = "Lnet/minecraft/util/profiling/ProfilerFiller;popPush(Ljava/lang/String;)V", args = "ldc=renderSolidFeatures"))
+	@Inject(method = "submitFeatures", at = @At("RETURN"))
 	private void afterCollectSubmits(CallbackInfo ci) {
 		LevelRenderEvents.COLLECT_SUBMITS.invoker().collectSubmits(renderContext);
 	}
 
-	@Inject(method = "lambda$addMainPass$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;checkPoseStack(Lcom/mojang/blaze3d/vertex/PoseStack;)V", ordinal = 0))
+	@Inject(method = "lambda$addMainPass$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiling/ProfilerFiller;pop()V", ordinal = 0))
 	private void afterRenderSolidFeatures(CallbackInfo ci) {
 		LevelRenderEvents.AFTER_SOLID_FEATURES.invoker().afterSolidFeatures(renderContext);
 	}
 
-	@Inject(method = "lambda$addMainPass$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/feature/FeatureRenderDispatcher;renderTranslucentFeatures()V", shift = At.Shift.AFTER))
+	@Inject(method = "lambda$addMainPass$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/feature/FeatureRenderDispatcher$PreparedFrame;executeTranslucent()V", shift = At.Shift.AFTER))
 	private void afterRenderTranslucentFeatures(CallbackInfo ci) {
 		LevelRenderEvents.AFTER_TRANSLUCENT_FEATURES.invoker().afterTranslucentFeatures(renderContext);
 	}
 
-	@Inject(method = "renderBlockOutline", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/state/level/CameraRenderState;pos:Lnet/minecraft/world/phys/Vec3;", opcode = Opcodes.GETFIELD), cancellable = true)
-	private void beforeRenderBlockOutline(MultiBufferSource.BufferSource bufferSource, PoseStack poseStack, boolean translucent, LevelRenderState levelRenderState, CallbackInfo ci) {
+	@Inject(method = "submitBlockOutline", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/state/level/CameraRenderState;pos:Lnet/minecraft/world/phys/Vec3;", opcode = Opcodes.GETFIELD), cancellable = true)
+	private void beforeRenderBlockOutline(PoseStack poseStack, SubmitNodeCollector submitNodeCollector, LevelRenderState levelRenderState, CallbackInfo ci) {
 		if (!LevelRenderEvents.BEFORE_BLOCK_OUTLINE.invoker().beforeBlockOutline(renderContext, renderContext.levelState().blockOutlineRenderState)) {
-			bufferSource.endLastBatch();
 			ci.cancel();
 		}
 	}
 
-	@Inject(method = "lambda$addMainPass$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;finalizeGizmoCollection()V"))
+	@Inject(method = "submitFeatures", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;finalizeGizmoCollection()V"))
 	private void beforeCollectGizmos(CallbackInfo ci) {
 		LevelRenderEvents.BEFORE_GIZMOS.invoker().beforeGizmos(renderContext);
 	}
@@ -155,9 +125,4 @@ private void wrapRenderTranslucentTerrain(ChunkSectionsToRender chunkSectionsToR
 	private void endMainRender(CallbackInfo ci) {
 		LevelRenderEvents.END_MAIN.invoker().endMain(renderContext);
 	}
-
-	@Inject(method = "allChanged()V", at = @At("HEAD"))
-	private void onReload(CallbackInfo ci) {
-		InvalidateRenderStateCallback.EVENT.invoker().onInvalidate();
-	}
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/ModelBlockRendererMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/ModelBlockRendererMixin.java
new file mode 100644
index 0000000000..78ddec7287
--- /dev/null
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/ModelBlockRendererMixin.java
@@ -0,0 +1,79 @@
+/*
+ * 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.mixin.client.rendering;
+
+import java.util.List;
+
+import it.unimi.dsi.fastutil.ints.IntList;
+import org.jspecify.annotations.Nullable;
+import org.objectweb.asm.Opcodes;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.client.color.block.BlockTintSource;
+import net.minecraft.client.renderer.block.BlockAndTintGetter;
+import net.minecraft.client.renderer.block.ModelBlockRenderer;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.state.BlockState;
+
+import net.fabricmc.fabric.api.client.rendering.v1.BlockColorRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.BlockTintsFactory;
+
+@Mixin(ModelBlockRenderer.class)
+public abstract class ModelBlockRendererMixin {
+	@Shadow
+	@Final
+	private IntList computedTintValues;
+	@Shadow
+	@Final
+	private List<@Nullable BlockTintSource> tintSources;
+
+	@Inject(
+			method = "computeTintColor(Lnet/minecraft/client/renderer/block/BlockAndTintGetter;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;I)I",
+			at = @At(
+					value = "FIELD",
+					target = "Lnet/minecraft/client/renderer/block/ModelBlockRenderer;tintSourcesInitialized:Z",
+					opcode = Opcodes.PUTFIELD,
+					shift = At.Shift.AFTER
+			)
+
+	)
+	private void injectFactoryTintCacheLoading(
+			final BlockAndTintGetter level,
+			final BlockState state,
+			final BlockPos pos,
+			final int tintIndex,
+			final CallbackInfoReturnable cir) {
+		if (this.tintSources.isEmpty()) {
+			final BlockTintsFactory factory = BlockColorRegistry.getFactory(state);
+
+			if (factory != null) {
+				factory.collect(state, level, pos, this.computedTintValues);
+			}
+
+			if (!this.computedTintValues.isEmpty()) {
+				for (int i = 0; i < this.computedTintValues.size(); i++) {
+					this.tintSources.add(null);
+				}
+			}
+		}
+	}
+}
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/RenderPipelineBuilderMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/RenderPipelineBuilderMixin.java
index 28866876ac..a8b01f6ec9 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/RenderPipelineBuilderMixin.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/RenderPipelineBuilderMixin.java
@@ -22,11 +22,15 @@
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.mojang.blaze3d.PrimitiveTopology;
+import com.mojang.blaze3d.pipeline.BindGroupLayout;
 import com.mojang.blaze3d.pipeline.ColorTargetState;
 import com.mojang.blaze3d.pipeline.DepthStencilState;
 import com.mojang.blaze3d.pipeline.RenderPipeline;
 import com.mojang.blaze3d.platform.PolygonMode;
 import com.mojang.blaze3d.vertex.VertexFormat;
+import net.neoforged.neoforge.client.stencil.StencilTest;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -37,6 +41,7 @@
 import net.minecraft.resources.Identifier;
 
 import net.fabricmc.fabric.api.client.rendering.v1.FabricRenderPipeline;
+import net.fabricmc.fabric.api.client.rendering.v1.FabricRenderPipeline.Snippet;
 import net.fabricmc.fabric.impl.client.rendering.FabricRenderPipelineImpl;
 import net.fabricmc.fabric.impl.client.rendering.FabricRenderPipelineInternals;
 
@@ -62,7 +67,7 @@ public RenderPipeline.Builder withoutUsePipelineDrawModeForGui() {
 			at = @At("TAIL")
 	)
 	private void copyUsePipelineDrawModeForGuiFromSnippet(RenderPipeline.Snippet snippet, CallbackInfo ci) {
-		snippet.usePipelineDrawModeForGui().ifPresent(value -> this.usePipelineDrawModeForGui = Optional.of(value));
+		((Snippet) (Object) snippet).usePipelineDrawModeForGui().ifPresent(value -> this.usePipelineDrawModeForGui = Optional.of(value));
 	}
 
 	@WrapOperation(
@@ -76,17 +81,18 @@ private RenderPipeline.Snippet copyUsePipelineDrawModeForGuiToSnippet(
 			Optional vertexShader,
 			Optional fragmentShader,
 			Optional shaderDefines,
-			Optional> samplers,
-			Optional> uniforms,
-			Optional colorTargetState,
+			Optional> bindGroupLayouts,
+			@Nullable ColorTargetState[] colorTargetStates,
+			int activeColorTargetStateCount,
 			Optional depthStencilState,
 			Optional polygonMode,
 			Optional cull,
-			Optional vertexFormat,
-			Optional vertexFormatMode,
+			@Nullable VertexFormat[] vertexFormatPerBuffer,
+			Optional vertexFormatMode,
+			Optional stencilTest,
 			Operation original
 	) {
-		return FabricRenderPipelineInternals.withSnippetUsePipelineVertexFormatForGui(() -> original.call(vertexShader, fragmentShader, shaderDefines, samplers, uniforms, colorTargetState, depthStencilState, polygonMode, cull, vertexFormat, vertexFormatMode), usePipelineDrawModeForGui);
+		return FabricRenderPipelineInternals.withSnippetUsePipelineVertexFormatForGui(() -> original.call(vertexShader, fragmentShader, shaderDefines, bindGroupLayouts, colorTargetStates, activeColorTargetStateCount, depthStencilState, polygonMode, cull, vertexFormatPerBuffer, vertexFormatMode, stencilTest), usePipelineDrawModeForGui);
 	}
 
 	@ModifyReturnValue(
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/BucketItemAccessor.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/StagedVertexBufferDrawAccessor.java
similarity index 73%
rename from fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/BucketItemAccessor.java
rename to fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/StagedVertexBufferDrawAccessor.java
index 3fc889a5d1..c764cf7c58 100644
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/BucketItemAccessor.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/StagedVertexBufferDrawAccessor.java
@@ -14,16 +14,13 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.transfer;
+package net.fabricmc.fabric.mixin.client.rendering;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-import net.minecraft.world.item.BucketItem;
-import net.minecraft.world.level.material.Fluid;
-
-@Mixin(BucketItem.class)
-public interface BucketItemAccessor {
-	@Accessor("content")
-	Fluid fabric_getContent();
+@Mixin(targets = "net/minecraft/client/renderer/StagedVertexBuffer$Draw")
+interface StagedVertexBufferDrawAccessor {
+	@Accessor("indexCount")
+	int fabric$indexCount();
 }
diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MultiNoiseBiomeSourceMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/SubmitNodeCollectionMixin.java
similarity index 53%
rename from fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MultiNoiseBiomeSourceMixin.java
rename to fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/SubmitNodeCollectionMixin.java
index 0f3c761441..c3c74d58b1 100644
--- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MultiNoiseBiomeSourceMixin.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/SubmitNodeCollectionMixin.java
@@ -14,27 +14,20 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.biome;
+package net.fabricmc.fabric.mixin.client.rendering;
 
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
 
-import net.minecraft.world.level.biome.MultiNoiseBiomeSource;
+import net.minecraft.client.renderer.OrderedSubmitNodeCollector;
+import net.minecraft.client.renderer.SubmitNodeCollection;
+import net.minecraft.client.renderer.feature.submit.SubmitNode;
 
-import net.fabricmc.fabric.impl.biome.BiomeSourceAccess;
-
-@Mixin(MultiNoiseBiomeSource.class)
-public class MultiNoiseBiomeSourceMixin implements BiomeSourceAccess {
-	@Unique
-	private boolean modifyBiomeEntries = true;
-
-	@Override
-	public void fabric_setModifyBiomeEntries(boolean modifyBiomeEntries) {
-		this.modifyBiomeEntries = modifyBiomeEntries;
-	}
+import net.fabricmc.fabric.api.client.rendering.v1.SubmitRenderPhase;
 
+@Mixin(SubmitNodeCollection.class)
+abstract class SubmitNodeCollectionMixin implements OrderedSubmitNodeCollector {
 	@Override
-	public boolean fabric_shouldModifyBiomeEntries() {
-		return this.modifyBiomeEntries;
+	public  void submitCustom(SubmitRenderPhase phase, T node) {
+		phase.submit((SubmitNodeCollection) (Object) this, node);
 	}
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/GuiRendererExtensions.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/SubmitNodeStorageMixin.java
similarity index 56%
rename from fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/GuiRendererExtensions.java
rename to fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/SubmitNodeStorageMixin.java
index 364b616873..eeee4f4250 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/GuiRendererExtensions.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/SubmitNodeStorageMixin.java
@@ -14,10 +14,20 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.client.rendering;
+package net.fabricmc.fabric.mixin.client.rendering;
 
+import org.spongepowered.asm.mixin.Mixin;
+
+import net.minecraft.client.renderer.SubmitNodeCollector;
 import net.minecraft.client.renderer.SubmitNodeStorage;
+import net.minecraft.client.renderer.feature.submit.SubmitNode;
+
+import net.fabricmc.fabric.api.client.rendering.v1.SubmitRenderPhase;
 
-public interface GuiRendererExtensions {
-	void fabric_onReady(SubmitNodeStorage submitNodeStorage);
+@Mixin(SubmitNodeStorage.class)
+abstract class SubmitNodeStorageMixin implements SubmitNodeCollector {
+	@Override
+	public  void submitCustom(SubmitRenderPhase phase, T node) {
+		order(0).submitCustom(phase, node);
+	}
 }
diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/renderstate/LevelRenderStateMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/renderstate/LevelRenderStateMixin.java
index 18827e3b24..2649260b2d 100644
--- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/renderstate/LevelRenderStateMixin.java
+++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/renderstate/LevelRenderStateMixin.java
@@ -17,18 +17,24 @@
 package net.fabricmc.fabric.mixin.client.rendering.renderstate;
 
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import net.minecraft.client.renderer.state.level.CameraRenderState;
 import net.minecraft.client.renderer.state.level.LevelRenderState;
 
 import net.fabricmc.fabric.api.client.rendering.v1.FabricRenderState;
 
 @Mixin(LevelRenderState.class)
 abstract class LevelRenderStateMixin {
+	@Shadow
+	public CameraRenderState cameraRenderState;
+
 	@Inject(method = "reset", at = @At("TAIL"))
 	private void clearExtraRenderData(CallbackInfo ci) {
 		((FabricRenderState) this).clearExtraData();
+		cameraRenderState.clearExtraData();
 	}
 }
diff --git a/fabric-rendering-v1/src/client/resources/fabric-rendering-v1.classtweaker b/fabric-rendering-v1/src/client/resources/fabric-rendering-v1.classtweaker
index 302a4d3553..db716c37a6 100644
--- a/fabric-rendering-v1/src/client/resources/fabric-rendering-v1.classtweaker
+++ b/fabric-rendering-v1/src/client/resources/fabric-rendering-v1.classtweaker
@@ -1,8 +1,9 @@
 classTweaker	v1	official
 transitive-inject-interface	com/mojang/blaze3d/pipeline/RenderPipeline	net/fabricmc/fabric/api/client/rendering/v1/FabricRenderPipeline
-transitive-inject-interface	com/mojang/blaze3d/pipeline/RenderPipeline$Snippet	net/fabricmc/fabric/api/client/rendering/v1/FabricRenderPipeline$Snippet
-transitive-inject-interface	com/mojang/blaze3d/pipeline/RenderPipeline$Builder	net/fabricmc/fabric/api/client/rendering/v1/FabricRenderPipeline$Builder
+# transitive-inject-interface	com/mojang/blaze3d/pipeline/RenderPipeline$Snippet	net/fabricmc/fabric/api/client/rendering/v1/FabricRenderPipeline$Snippet
+# transitive-inject-interface	com/mojang/blaze3d/pipeline/RenderPipeline$Builder	net/fabricmc/fabric/api/client/rendering/v1/FabricRenderPipeline$Builder
 transitive-inject-interface	net/minecraft/client/model/Model	net/fabricmc/fabric/api/client/rendering/v1/FabricModel
+transitive-inject-interface	net/minecraft/client/renderer/OrderedSubmitNodeCollector	net/fabricmc/fabric/api/client/rendering/v1/FabricOrderedSubmitNodeCollector
 transitive-inject-interface	net/minecraft/client/renderer/block/BlockModelRenderState	net/fabricmc/fabric/api/client/rendering/v1/FabricRenderState
 transitive-inject-interface	net/minecraft/client/renderer/block/MovingBlockRenderState	net/fabricmc/fabric/api/client/rendering/v1/FabricRenderState
 transitive-inject-interface	net/minecraft/client/renderer/blockentity/state/BlockEntityRenderState	net/fabricmc/fabric/api/client/rendering/v1/FabricRenderState
diff --git a/fabric-rendering-v1/src/client/resources/fabric-rendering-v1.mixins.json b/fabric-rendering-v1/src/client/resources/fabric-rendering-v1.mixins.json
index 75bc1ddb82..d482298825 100644
--- a/fabric-rendering-v1/src/client/resources/fabric-rendering-v1.mixins.json
+++ b/fabric-rendering-v1/src/client/resources/fabric-rendering-v1.mixins.json
@@ -3,27 +3,31 @@
   "package": "net.fabricmc.fabric.mixin.client.rendering",
   "compatibilityLevel": "JAVA_25",
   "client": [
+    "AtlasManagerAccessor",
+    "AtlasManagerMixin",
     "BlockColorsMixin",
     "BlockEntityRenderersMixin",
+    "BuiltInBlockModelsMixin",
     "CapeLayerMixin",
     "ClientLevelMixin",
     "ClientTooltipComponentMixin",
-    "DebugOptionsScreenEntryMixin",
-    "DebugOptionsScreenOptionListMixin",
-    "DrawAccessor",
     "EntityRenderDispatcherMixin",
     "EntityRenderersMixin",
+    "FeatureRenderDispatcherMixin",
     "GameRendererMixin",
-    "GuiAccessor",
     "GuiGraphicsExtractorMixin",
-    "GuiMixin",
+    "GuiLayerManagerAccessor",
+    "GuiRendererDrawAccessor",
     "GuiRendererMixin",
+    "HudAccessor",
     "HumanoidArmorLayerMixin",
     "HumanoidMobRendererMixin",
     "LayerDefinitionsMixin",
+    "LevelExtractorMixin",
     "LevelRendererMixin",
     "LivingEntityRendererAccessor",
     "LivingEntityRendererMixin",
+    "ModelBlockRendererMixin",
     "ModelLayersAccessor",
     "ModelMixin",
     "ModelPartAccessor",
@@ -31,6 +35,9 @@
     "RenderPipelineMixin",
     "RenderPipelineSnippetMixin",
     "SpriteSourcesAccessor",
+    "StagedVertexBufferDrawAccessor",
+    "SubmitNodeCollectionMixin",
+    "SubmitNodeStorageMixin",
     "SubtitleOverlayMixin",
     "advancement.AdvancementsScreenMixin",
     "advancement.AdvancementTabAccessor",
diff --git a/fabric-rendering-v1/src/test/java/net/fabricmc/fabric/impl/client/rendering/hud/RenderPipelineGuiVertexFormatTest.java b/fabric-rendering-v1/src/test/java/net/fabricmc/fabric/impl/client/rendering/hud/RenderPipelineGuiVertexFormatTest.java
deleted file mode 100644
index 4961035a26..0000000000
--- a/fabric-rendering-v1/src/test/java/net/fabricmc/fabric/impl/client/rendering/hud/RenderPipelineGuiVertexFormatTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * 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.impl.client.rendering.hud;
-
-import java.util.Optional;
-
-import com.mojang.blaze3d.pipeline.RenderPipeline;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import net.minecraft.client.renderer.RenderPipelines;
-import net.minecraft.resources.Identifier;
-
-import net.fabricmc.fabric.api.client.rendering.v1.FabricRenderPipeline;
-
-public class RenderPipelineGuiVertexFormatTest {
-	@Test
-	void testBuilderTransfersToSnippet() {
-		RenderPipeline.Builder builder = RenderPipeline.builder();
-		builder.withUsePipelineDrawModeForGui(true);
-		RenderPipeline.Snippet snippet = builder.buildSnippet();
-		Assertions.assertEquals(Optional.of(true), snippet.usePipelineDrawModeForGui());
-		builder.withUsePipelineDrawModeForGui(false);
-		snippet = builder.buildSnippet();
-		Assertions.assertEquals(Optional.of(false), snippet.usePipelineDrawModeForGui());
-		builder.withoutUsePipelineDrawModeForGui();
-		snippet = builder.buildSnippet();
-		Assertions.assertEquals(Optional.empty(), snippet.usePipelineDrawModeForGui());
-	}
-
-	@Test
-	void testSnippetTransfersToPipeline() {
-		RenderPipeline.Snippet snippet = FabricRenderPipeline.Snippet.withPipelineDrawModeForGui(createEmptySnippet(), true);
-		RenderPipeline pipeline = RenderPipeline.builder(
-						RenderPipelines.DEBUG_FILLED_SNIPPET,
-						RenderPipelines.MATRICES_PROJECTION_SNIPPET,
-						snippet
-				)
-				.withLocation(Identifier.fromNamespaceAndPath("test", "pipeline_454b"))
-				.build();
-		Assertions.assertTrue(pipeline.usePipelineDrawModeForGui());
-
-		snippet = FabricRenderPipeline.Snippet.withPipelineDrawModeForGui(createEmptySnippet(), false);
-
-		pipeline = RenderPipeline.builder(
-						RenderPipelines.DEBUG_FILLED_SNIPPET,
-						RenderPipelines.MATRICES_PROJECTION_SNIPPET,
-						snippet
-				)
-				.withLocation(Identifier.fromNamespaceAndPath("test", "pipeline_454cc"))
-				.build();
-		Assertions.assertFalse(pipeline.usePipelineDrawModeForGui());
-		// now the default should apply if no snippet sets the value, and the value isn't set on the builder
-		snippet = FabricRenderPipeline.Snippet.withoutPipelineDrawModeForGui(createEmptySnippet());
-
-		pipeline = RenderPipeline.builder(
-						RenderPipelines.DEBUG_FILLED_SNIPPET,
-						RenderPipelines.MATRICES_PROJECTION_SNIPPET,
-						snippet
-				)
-				.withLocation(Identifier.fromNamespaceAndPath("test", "pipeline_4547q"))
-				.build();
-		Assertions.assertFalse(pipeline.usePipelineDrawModeForGui());
-	}
-
-	@Test
-	void testBuilderTransfersToPipeline() {
-		RenderPipeline.Builder builder = RenderPipeline.builder(
-						RenderPipelines.DEBUG_FILLED_SNIPPET,
-						RenderPipelines.MATRICES_PROJECTION_SNIPPET
-				)
-				.withUsePipelineDrawModeForGui(true)
-				.withLocation(Identifier.fromNamespaceAndPath("test", "pipeline_454gg"));
-		RenderPipeline pipeline = builder.build();
-		Assertions.assertTrue(pipeline.usePipelineDrawModeForGui());
-
-		builder.withUsePipelineDrawModeForGui(false)
-				.withLocation(Identifier.fromNamespaceAndPath("test", "pipeline_454ff"));
-		pipeline = builder.build();
-		Assertions.assertFalse(pipeline.usePipelineDrawModeForGui());
-
-		builder.withoutUsePipelineDrawModeForGui()
-				.withLocation(Identifier.fromNamespaceAndPath("test", "pipeline_454jj"));
-		pipeline = builder.build();
-		Assertions.assertFalse(pipeline.usePipelineDrawModeForGui());
-	}
-
-	@Test
-	void testSnippetRecordMethods() {
-		FabricRenderPipeline.Snippet snippet = RenderPipeline.builder()
-				.withUsePipelineDrawModeForGui(true)
-				.buildSnippet();
-		String expectedToString = "Snippet[vertexShader=Optional.empty, fragmentShader=Optional.empty, shaderDefines=Optional.empty, samplers=Optional.empty, uniforms=Optional.empty, colorTargetState=Optional.empty, depthStencilState=Optional.empty, polygonMode=Optional.empty, cull=Optional.empty, vertexFormat=Optional.empty, vertexFormatMode=Optional.empty, usePipelineDrawModeForGui=Optional[true]]";
-		Assertions.assertEquals(expectedToString, snippet.toString());
-		FabricRenderPipeline.Snippet snippet2 = RenderPipeline.builder()
-				.withUsePipelineDrawModeForGui(true)
-				.buildSnippet();
-		Assertions.assertEquals(snippet, snippet2);
-		Assertions.assertEquals(snippet.hashCode(), snippet2.hashCode());
-
-		FabricRenderPipeline.Snippet snippet3 = RenderPipeline.builder()
-				.buildSnippet();
-		Assertions.assertNotEquals(snippet, snippet3);
-		Assertions.assertNotEquals(snippet.hashCode(), snippet3.hashCode());
-	}
-
-	private static RenderPipeline.Snippet createEmptySnippet() {
-		return new RenderPipeline.Snippet(
-				Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(),
-				Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(),
-				Optional.empty(), Optional.empty(), Optional.empty()
-		);
-	}
-}
diff --git a/fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/CustomColorResolverTestInit.java b/fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/CustomColorResolverTestInit.java
index 42f6cd6bac..6f4196e805 100644
--- a/fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/CustomColorResolverTestInit.java
+++ b/fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/CustomColorResolverTestInit.java
@@ -30,12 +30,18 @@
 
 public class CustomColorResolverTestInit implements ModInitializer {
 	public static final ResourceKey KEY = ResourceKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath("fabric-rendering-v1-testmod", "custom_color_block"));
+	public static final ResourceKey KEY_DYNAMIC = ResourceKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath("fabric-rendering-v1-testmod", "custom_color_block_dynamic"));
 	public static final Block CUSTOM_COLOR_BLOCK = new Block(BlockBehaviour.Properties.of().setId(KEY));
+	public static final Block CUSTOM_COLOR_BLOCK_DYNAMIC = new Block(BlockBehaviour.Properties.of().setId(KEY_DYNAMIC));
+
 	public static final Item CUSTOM_COLOR_BLOCK_ITEM = new BlockItem(CUSTOM_COLOR_BLOCK, new Item.Properties().setId(ResourceKey.create(Registries.ITEM, KEY.identifier())));
+	public static final Item CUSTOM_COLOR_BLOCK_ITEM_DYNAMIC = new BlockItem(CUSTOM_COLOR_BLOCK_DYNAMIC, new Item.Properties().setId(ResourceKey.create(Registries.ITEM, KEY_DYNAMIC.identifier())));
 
 	@Override
 	public void onInitialize() {
 		Registry.register(BuiltInRegistries.BLOCK, KEY, CUSTOM_COLOR_BLOCK);
+		Registry.register(BuiltInRegistries.BLOCK, KEY_DYNAMIC, CUSTOM_COLOR_BLOCK_DYNAMIC);
 		Registry.register(BuiltInRegistries.ITEM, KEY.identifier(), CUSTOM_COLOR_BLOCK_ITEM);
+		Registry.register(BuiltInRegistries.ITEM, KEY_DYNAMIC.identifier(), CUSTOM_COLOR_BLOCK_ITEM_DYNAMIC);
 	}
 }
diff --git a/fabric-rendering-v1/src/testmod/resources/fabric.mod.json b/fabric-rendering-v1/src/testmod/resources/fabric.mod.json
index 0d80f4733e..b4bb40148d 100644
--- a/fabric-rendering-v1/src/testmod/resources/fabric.mod.json
+++ b/fabric-rendering-v1/src/testmod/resources/fabric.mod.json
@@ -14,10 +14,13 @@
     ],
     "client": [
       "net.fabricmc.fabric.test.rendering.client.AdvancementRenderingTests",
+      "net.fabricmc.fabric.test.rendering.client.AtlasTests",
       "net.fabricmc.fabric.test.rendering.client.ArmorRenderingTests",
+      "net.fabricmc.fabric.test.rendering.client.BuiltInBlockModelsTest",
       "net.fabricmc.fabric.test.rendering.client.CustomSpriteSourcesTest",
       "net.fabricmc.fabric.test.rendering.client.CustomColorResolverTest",
       "net.fabricmc.fabric.test.rendering.client.DebugOptionsTests",
+      "net.fabricmc.fabric.test.rendering.client.FeatureRendererTest",
       "net.fabricmc.fabric.test.rendering.client.RenderLayerTest",
       "net.fabricmc.fabric.test.rendering.client.HudStatusBarHeightsTest",
       "net.fabricmc.fabric.test.rendering.client.HudTests",
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/AtlasTests.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/AtlasTests.java
new file mode 100644
index 0000000000..fb432e9899
--- /dev/null
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/AtlasTests.java
@@ -0,0 +1,74 @@
+/*
+ * 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.rendering.client;
+
+import java.util.Set;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.RenderPipelines;
+import net.minecraft.client.renderer.texture.SpriteContents;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.resources.model.sprite.AtlasManager;
+import net.minecraft.client.resources.model.sprite.SpriteId;
+import net.minecraft.resources.Identifier;
+import net.minecraft.server.packs.metadata.MetadataSectionType;
+import net.minecraft.util.ExtraCodecs;
+
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.rendering.v1.AtlasRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElementRegistry;
+
+public class AtlasTests implements ClientModInitializer {
+	private static final Identifier ATLAS_ID = Identifier.fromNamespaceAndPath("fabric-rendering-v1-testmod", "test_atlas");
+	private static final Identifier TEXTURE_ID = AtlasRegistry.generateTextureLocation(ATLAS_ID);
+	private static final SpriteId[] SPRITES = new SpriteId[] {
+			new SpriteId(
+					TEXTURE_ID,
+					Identifier.fromNamespaceAndPath("fabric-rendering-v1-testmod", "test_atlas/double_iron_ingot")
+			),
+			new SpriteId(
+					TEXTURE_ID,
+					Identifier.fromNamespaceAndPath("fabric-rendering-v1-testmod", "test_atlas/blank")
+			)
+	};
+	private static final Identifier HUD_ID = Identifier.fromNamespaceAndPath("fabric-rendering-v1-testmod", "atlas_hud");
+	public static final MetadataSectionType COLOR = new MetadataSectionType<>("color", ExtraCodecs.STRING_ARGB_COLOR);
+
+	@Override
+	public void onInitializeClient() {
+		AtlasRegistry.register(new AtlasManager.AtlasConfig(TEXTURE_ID, ATLAS_ID, false, Set.of(COLOR)));
+
+		HudElementRegistry.addLast(
+				HUD_ID,
+				(graphics, deltaTracker) -> {
+					final AtlasManager atlasManager = Minecraft.getInstance().getAtlasManager();
+					final int y = 18;
+					int x = 0;
+
+					for (SpriteId spriteId : SPRITES) {
+						final TextureAtlasSprite sprite = atlasManager.get(spriteId);
+						final SpriteContents contents = sprite.contents();
+						final int color = sprite.contents().getAdditionalMetadata(COLOR).orElse(-1);
+
+						graphics.blitSprite(RenderPipelines.GUI_TEXTURED, sprite, x, y, contents.width(), contents.height(), color);
+
+						x += contents.width() + 2;
+					}
+				}
+		);
+	}
+}
diff --git a/fabric-recipe-api-v1/src/client/java/net/fabricmc/fabric/impl/recipe/ingredient/client/CustomIngredientSyncClient.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/BuiltInBlockModelsTest.java
similarity index 50%
rename from fabric-recipe-api-v1/src/client/java/net/fabricmc/fabric/impl/recipe/ingredient/client/CustomIngredientSyncClient.java
rename to fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/BuiltInBlockModelsTest.java
index f5a8e9f880..b3f32e8ea5 100644
--- a/fabric-recipe-api-v1/src/client/java/net/fabricmc/fabric/impl/recipe/ingredient/client/CustomIngredientSyncClient.java
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/BuiltInBlockModelsTest.java
@@ -14,21 +14,22 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.recipe.ingredient.client;
+package net.fabricmc.fabric.test.rendering.client;
+
+import net.minecraft.client.renderer.block.BuiltInBlockModels;
+import net.minecraft.world.level.block.Blocks;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationNetworking;
-import net.fabricmc.fabric.impl.recipe.ingredient.ClientboundCustomIngredientPayload;
-import net.fabricmc.fabric.impl.recipe.ingredient.CustomIngredientSync;
+import net.fabricmc.fabric.api.client.rendering.v1.BuiltInBlockModelsCallback;
 
-/**
- * @see CustomIngredientSync
- */
-public class CustomIngredientSyncClient implements ClientModInitializer {
+public class BuiltInBlockModelsTest implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {
-		ClientConfigurationNetworking.registerGlobalReceiver(ClientboundCustomIngredientPayload.TYPE, (payload, context) -> {
-			context.responseSender().sendPacket(CustomIngredientSync.createResponsePayload(payload.protocolVersion()));
+		BuiltInBlockModelsCallback.EVENT.register(builder -> {
+			// Overrides the yellow shulker box built-in block model with an empty one.
+			// This can be tested in-game e.g., by checking out a minecart with that block.
+			// summon minecraft:minecart ~ ~ ~ {DisplayState:{Name:"minecraft:yellow_shulker_box"}}
+			BuiltInBlockModels.createAir(builder, Blocks.DYED_SHULKER_BOX.yellow());
 		});
 	}
 }
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/CustomColorResolverTest.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/CustomColorResolverTest.java
index 2f94a72d85..e18719910a 100644
--- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/CustomColorResolverTest.java
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/CustomColorResolverTest.java
@@ -18,14 +18,19 @@
 
 import java.util.List;
 
+import it.unimi.dsi.fastutil.ints.IntList;
+
 import net.minecraft.client.color.block.BlockTintSource;
 import net.minecraft.client.renderer.block.BlockAndTintGetter;
 import net.minecraft.core.BlockPos;
+import net.minecraft.util.ARGB;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.level.ColorResolver;
 import net.minecraft.world.level.block.state.BlockState;
 
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.rendering.v1.BlockColorRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.BlockTintsFactory;
 import net.fabricmc.fabric.api.client.rendering.v1.ColorResolverRegistry;
 import net.fabricmc.fabric.test.rendering.CustomColorResolverTestInit;
 
@@ -50,9 +55,25 @@ public int colorInWorld(BlockState state, BlockAndTintGetter level, BlockPos pos
 		}
 	};
 
+	private static final BlockTintsFactory TINTS_FACTORY = new BlockTintsFactory() {
+		private final ThreadLocal RANDOM = ThreadLocal.withInitial(() -> RandomSource.createThreadLocalInstance(42L));
+
+		@Override
+		public void collect(
+				final BlockState state,
+				final BlockAndTintGetter level,
+				final BlockPos pos,
+				final IntList tintValues) {
+			tintValues.size(2);
+			tintValues.set(0, ARGB.color(255, RANDOM.get().nextInt()));
+			tintValues.set(1, ARGB.color(255, RANDOM.get().nextInt()));
+		}
+	};
+
 	@Override
 	public void onInitializeClient() {
 		ColorResolverRegistry.register(TEST_COLOR_RESOLVER);
 		BlockColorRegistry.register(List.of(TINT_SOURCE), CustomColorResolverTestInit.CUSTOM_COLOR_BLOCK);
+		BlockColorRegistry.register(TINTS_FACTORY, CustomColorResolverTestInit.CUSTOM_COLOR_BLOCK_DYNAMIC);
 	}
 }
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/CustomSpriteSourcesTest.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/CustomSpriteSourcesTest.java
index 83c729e194..a9101f8f07 100644
--- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/CustomSpriteSourcesTest.java
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/CustomSpriteSourcesTest.java
@@ -36,6 +36,7 @@
 import net.minecraft.server.packs.resources.Resource;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.server.packs.resources.ResourceMetadata;
+import net.minecraft.util.ARGB;
 import net.minecraft.util.Mth;
 
 import net.fabricmc.api.ClientModInitializer;
@@ -129,7 +130,7 @@ public SpriteContents get(SpriteResourceLoader spriteResourceLoader) {
 				int offsetX = frameWidth / 16;
 				int offsetY = frameHeight / 16;
 
-				NativeImage doubleImage = new NativeImage(image.format(), image.getWidth(), image.getHeight(), false);
+				NativeImage doubleImage = new NativeImage(image.format(), image.getWidth(), image.getHeight(), true);
 
 				for (int frameY = 0; frameY < frameCountY; frameY++) {
 					for (int frameX = 0; frameX < frameCountX; frameX++) {
@@ -138,14 +139,15 @@ public SpriteContents get(SpriteResourceLoader spriteResourceLoader) {
 					}
 				}
 
-				return new SpriteContents(spriteId, dimensions, doubleImage, Optional.of(animationMetadata), List.of(), Optional.empty());
+				return new SpriteContents(spriteId, dimensions, doubleImage, Optional.of(animationMetadata), List.of(AtlasTests.COLOR.withValue(0xFFFFAAAA)), Optional.empty());
 			}
 
 			private static void blendRect(NativeImage src, NativeImage dst, int srcX, int srcY, int destX, int destY, int width, int height) {
 				for (int y = 0; y < height; ++y) {
 					for (int x = 0; x < width; ++x) {
-						int c = src.getPixel(srcX + x, srcY + y);
-						dst.setPixel(destX + x, destY + y, c);
+						int sc = src.getPixel(srcX + x, srcY + y);
+						int dc = dst.getPixel(destX + x, destY + y);
+						dst.setPixel(destX + x, destY + y, ARGB.alphaBlend(dc, sc));
 					}
 				}
 			}
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/FeatureRendererTest.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/FeatureRendererTest.java
new file mode 100644
index 0000000000..4ddaf168aa
--- /dev/null
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/FeatureRendererTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.rendering.client;
+
+import java.util.List;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+
+import net.minecraft.client.renderer.feature.FeatureFrameContext;
+import net.minecraft.client.renderer.feature.FeatureRendererType;
+import net.minecraft.client.renderer.feature.RenderTypeFeatureRenderer;
+import net.minecraft.client.renderer.feature.submit.SubmitNode;
+import net.minecraft.client.renderer.rendertype.RenderTypes;
+import net.minecraft.util.ARGB;
+import net.minecraft.world.phys.AABB;
+
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.rendering.v1.FabricOrderedSubmitNodeCollector;
+import net.fabricmc.fabric.api.client.rendering.v1.FeatureRendererRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.SubmitRenderPhase;
+
+/**
+ * Tests {@link FeatureRendererRegistry} and
+ * {@link FabricOrderedSubmitNodeCollector#submitCustom(SubmitRenderPhase, SubmitNode)} by rendering
+ * a quad above every lectern.
+ */
+public class FeatureRendererTest implements ClientModInitializer {
+	@Override
+	public void onInitializeClient() {
+		FeatureRendererRegistry.register(CustomFeatureRenderer.TYPE, CustomFeatureRenderer::new);
+	}
+
+	public record CustomSubmit(PoseStack.Pose pose) implements SubmitNode {
+		@Override
+		public FeatureRendererType featureType() {
+			return CustomFeatureRenderer.TYPE;
+		}
+	}
+
+	private static class CustomFeatureRenderer extends RenderTypeFeatureRenderer {
+		private static final FeatureRendererType TYPE = FeatureRendererType.create("custom");
+
+		private static final AABB box = new AABB(0.25, 1.0, 0.0, 0.75, 1.5, 0.0);
+
+		@Override
+		protected void buildGroup(FeatureFrameContext context, List customSubmits) {
+			if (customSubmits.isEmpty()) return;
+
+			VertexConsumer buffer = getVertexBuilder(RenderTypes.debugFilledBox());
+
+			for (CustomSubmit submit : customSubmits) {
+				TestRenderUtils.drawFilledBox(submit.pose(), buffer, box, ARGB.colorFromFloat(1.0f, 0, 1, 0));
+			}
+		}
+	}
+}
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/HudStatusBarHeightsTest.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/HudStatusBarHeightsTest.java
index 6aa2b87358..28fc66990c 100644
--- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/HudStatusBarHeightsTest.java
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/HudStatusBarHeightsTest.java
@@ -20,6 +20,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.Hud;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.resources.Identifier;
 import net.minecraft.util.Mth;
@@ -32,7 +33,7 @@
 import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElementRegistry;
 import net.fabricmc.fabric.api.client.rendering.v1.hud.HudStatusBarHeightRegistry;
 import net.fabricmc.fabric.api.client.rendering.v1.hud.VanillaHudElements;
-import net.fabricmc.fabric.mixin.client.rendering.GuiAccessor;
+import net.fabricmc.fabric.mixin.client.rendering.HudAccessor;
 
 public class HudStatusBarHeightsTest implements ClientModInitializer {
 	private static final Identifier HEART_CONTAINER_TEXTURE = Identifier.withDefaultNamespace("hud/heart/container");
@@ -70,11 +71,11 @@ private static void testHealthBar() {
 					Minecraft minecraft = Minecraft.getInstance();
 
 					if (minecraft.gameMode.canHurtPlayer()) {
-						Gui hud = minecraft.gui;
+						Hud hud = minecraft.gui.hud;
 						int width = graphics.guiWidth() / 2 - 91;
 						int height = graphics.guiHeight() - HudStatusBarHeightRegistry.getHeight(
 								VanillaHudElements.HEALTH_BAR);
-						Player player = ((GuiAccessor) hud).fabric$callGetCameraPlayer();
+						Player player = ((HudAccessor) hud).fabric$callGetCameraPlayer();
 						extractHealth(graphics, player, height, 0, 10, width);
 					}
 				});
@@ -91,11 +92,11 @@ private static void testArmorBar() {
 					Minecraft minecraft = Minecraft.getInstance();
 
 					if (minecraft.gameMode.canHurtPlayer()) {
-						Gui hud = minecraft.gui;
+						Hud hud = minecraft.gui.hud;
 						int width = graphics.guiWidth() / 2 - 91;
 						int height = graphics.guiHeight() - HudStatusBarHeightRegistry.getHeight(
 								VanillaHudElements.ARMOR_BAR);
-						Player player = ((GuiAccessor) hud).fabric$callGetCameraPlayer();
+						Player player = ((HudAccessor) hud).fabric$callGetCameraPlayer();
 						extractArmor(graphics, player, height, 0, 10, width);
 					}
 				});
@@ -118,10 +119,10 @@ private static void testToughnessBar() {
 					Minecraft minecraft = Minecraft.getInstance();
 
 					if (minecraft.gameMode.canHurtPlayer()) {
-						Gui hud = minecraft.gui;
+						Hud hud = minecraft.gui.hud;
 						int width = graphics.guiWidth() / 2 - 91;
 						int height = graphics.guiHeight() - HudStatusBarHeightRegistry.getHeight(id);
-						Player player = ((GuiAccessor) hud).fabric$callGetCameraPlayer();
+						Player player = ((HudAccessor) hud).fabric$callGetCameraPlayer();
 						extractToughness(graphics, player, height, 0, 10, width);
 					}
 				});
@@ -141,14 +142,14 @@ private static void testStaminaBar() {
 					Minecraft minecraft = Minecraft.getInstance();
 
 					if (minecraft.gameMode.canHurtPlayer()) {
-						Gui hud = minecraft.gui;
-						LivingEntity livingEntity = ((GuiAccessor) hud).fabric$callGetRiddenEntity();
+						Hud hud = minecraft.gui.hud;
+						LivingEntity livingEntity = ((HudAccessor) hud).fabric$callGetRiddenEntity();
 
-						if (((GuiAccessor) hud).fabric$callGetHeartCount(livingEntity) == 0) {
+						if (((HudAccessor) hud).fabric$callGetHeartCount(livingEntity) == 0) {
 							int width = graphics.guiWidth() / 2 + 91;
 							int height = graphics.guiHeight() - HudStatusBarHeightRegistry.getHeight(id);
 							extractStamina(graphics,
-									((GuiAccessor) hud).fabric$callGetCameraPlayer(),
+									((HudAccessor) hud).fabric$callGetCameraPlayer(),
 									height,
 									width);
 						}
@@ -158,10 +159,10 @@ private static void testStaminaBar() {
 			Minecraft minecraft = Minecraft.getInstance();
 
 			if (minecraft.gameMode.canHurtPlayer()) {
-				Gui hud = minecraft.gui;
-				LivingEntity livingEntity = ((GuiAccessor) hud).fabric$callGetRiddenEntity();
+				Hud hud = minecraft.gui.hud;
+				LivingEntity livingEntity = ((HudAccessor) hud).fabric$callGetRiddenEntity();
 
-				if (((GuiAccessor) hud).fabric$callGetHeartCount(livingEntity) == 0) {
+				if (((HudAccessor) hud).fabric$callGetHeartCount(livingEntity) == 0) {
 					return 10;
 				}
 			}
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/HudTests.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/HudTests.java
index e2ea08de97..e0da0736bf 100644
--- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/HudTests.java
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/HudTests.java
@@ -114,7 +114,10 @@ public void runTest(ClientGameTestContext context) {
 		// Set up required test environment
 		context.getInput().resizeWindow(2048, 1024); // Multiple of 256 to not squish the pixels of 256x overlays.
 		context.runOnClient(client -> {
-			client.options.hideGui = false;
+			if (client.gui.hud.isHidden()) {
+				client.gui.hud.toggle();
+			}
+
 			client.options.guiScale().set(2);
 		});
 		shouldRender = true;
@@ -128,7 +131,7 @@ public void runTest(ClientGameTestContext context) {
 			singleplayer.getServer().runOnServer(server -> server.overworld().setBlockAndUpdate(new BlockPos(0, -59, 0), Blocks.POWDER_SNOW.defaultBlockState()));
 
 			// Wait for stuff to load
-			singleplayer.getClientLevel().waitForChunksRender();
+			singleplayer.getConnection().waitForChunksRender();
 			singleplayer.getServer().runOnServer(server -> server.getPlayerList().broadcastSystemMessage(Component.nullToEmpty("hud_layer_" + BEFORE_CHAT), false)); // Chat messages disappear in 200 ticks so we send one 150 ticks in advance to test the before chat layer
 			context.waitTicks(150); // The powder snow frosty vignette takes 140 ticks to fully appear, so we additionally wait for a total of 150 ticks
 
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/ItemStackOverlayTest.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/ItemStackOverlayTest.java
index 96b7f78cfe..1e2eab32e7 100644
--- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/ItemStackOverlayTest.java
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/ItemStackOverlayTest.java
@@ -16,7 +16,7 @@
 
 package net.fabricmc.fabric.test.rendering.client;
 
-import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.TextColor;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.util.ARGB;
 
@@ -35,7 +35,7 @@ public void onInitializeClient() {
 						s,
 						x + 19 - 2 - font.width(s),
 						y + 6 + 3,
-						ARGB.opaque(ChatFormatting.YELLOW.getColor()),
+						ARGB.opaque(TextColor.YELLOW.getValue()),
 						true);
 				graphics.pose().popMatrix();
 			}
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/LevelRenderEventsTests.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/LevelRenderEventsTests.java
index c3b49c3524..ee4fe8930a 100644
--- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/LevelRenderEventsTests.java
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/LevelRenderEventsTests.java
@@ -38,6 +38,7 @@
 import net.fabricmc.fabric.api.client.rendering.v1.RenderStateDataKey;
 import net.fabricmc.fabric.api.client.rendering.v1.level.AbstractLevelRenderContext;
 import net.fabricmc.fabric.api.client.rendering.v1.level.LevelExtractionContext;
+import net.fabricmc.fabric.api.client.rendering.v1.level.LevelExtractionEvents;
 import net.fabricmc.fabric.api.client.rendering.v1.level.LevelRenderContext;
 import net.fabricmc.fabric.api.client.rendering.v1.level.LevelRenderEvents;
 import net.fabricmc.fabric.api.client.rendering.v1.level.LevelTerrainRenderContext;
@@ -66,7 +67,9 @@ private static boolean beforeBlockOutline(LevelRenderContext context, BlockOutli
 			poseStack.scale(0.5f, 0.5f, 0.5f);
 			AABB box = new AABB(0, 0, 0, 1, 1, 1);
 			int green = ARGB.colorFromFloat(1.0f, 0, 1, 0);
-			TestRenderUtils.drawFilledBox(poseStack, context.bufferSource().getBuffer(RenderTypes.debugFilledBox()), box, green);
+			context.submitNodeCollector().submitCustomGeometry(poseStack, RenderTypes.debugFilledBox(), (pose, buffer) -> {
+				TestRenderUtils.drawFilledBox(pose, buffer, box, green);
+			});
 			poseStack.popPose();
 		}
 
@@ -84,7 +87,9 @@ private static void renderBeforeTranslucent(LevelRenderContext context) {
 
 		AABB box = new AABB(BlockPos.ZERO.above(100));
 		int color = ARGB.colorFromFloat(0.5f, 0, 1, 0);
-		TestRenderUtils.drawFilledBox(context.poseStack(), context.bufferSource().getBuffer(RenderTypes.debugFilledBox()), box, color);
+		context.submitNodeCollector().submitCustomGeometry(context.poseStack(), RenderTypes.debugFilledBox(), (pose, buffer) -> {
+			TestRenderUtils.drawFilledBox(pose, buffer, box, color);
+		});
 
 		context.poseStack().popPose();
 	}
@@ -92,7 +97,7 @@ private static void renderBeforeTranslucent(LevelRenderContext context) {
 	@Override
 	public void onInitializeClient() {
 		// Renders a diamond block above diamond blocks when they are looked at.
-		LevelRenderEvents.AFTER_BLOCK_OUTLINE_EXTRACTION.register(
+		LevelExtractionEvents.AFTER_BLOCK_OUTLINE_EXTRACTION.register(
 				LevelRenderEventsTests::extractBlockOutline);
 		LevelRenderEvents.BEFORE_BLOCK_OUTLINE.register(LevelRenderEventsTests::beforeBlockOutline);
 		// Renders a translucent filled box at (0, 100, 0)
@@ -101,24 +106,24 @@ public void onInitializeClient() {
 
 	@Override
 	public void runTest(ClientGameTestContext context) {
-		LevelRenderEvents.AFTER_BLOCK_OUTLINE_EXTRACTION.register((renderContext, hitResult) -> assertExtractionContext(renderContext));
-		LevelRenderEvents.END_EXTRACTION.register(LevelRenderEventsTests::assertExtractionContext);
+		LevelExtractionEvents.AFTER_BLOCK_OUTLINE_EXTRACTION.register((renderContext, hitResult) -> assertExtractionContext(renderContext));
+		LevelExtractionEvents.END_EXTRACTION.register(LevelRenderEventsTests::assertExtractionContext);
 		LevelRenderEvents.START_MAIN.register(LevelRenderEventsTests::assertTerrainRenderContext);
 		LevelRenderEvents.AFTER_OPAQUE_TERRAIN.register(LevelRenderEventsTests::assertTerrainRenderContext);
 		LevelRenderEvents.COLLECT_SUBMITS.register(LevelRenderEventsTests::assertRenderContext);
-		LevelRenderEvents.AFTER_SOLID_FEATURES.register(LevelRenderEventsTests::assertRenderContext);
-		LevelRenderEvents.AFTER_TRANSLUCENT_FEATURES.register(LevelRenderEventsTests::assertRenderContext);
+		LevelRenderEvents.AFTER_SOLID_FEATURES.register(LevelRenderEventsTests::assertRenderContextWithTerrain);
+		LevelRenderEvents.AFTER_TRANSLUCENT_FEATURES.register(LevelRenderEventsTests::assertRenderContextWithTerrain);
 		LevelRenderEvents.BEFORE_GIZMOS.register(LevelRenderEventsTests::assertRenderContext);
-		LevelRenderEvents.BEFORE_TRANSLUCENT_TERRAIN.register(LevelRenderEventsTests::assertRenderContext);
-		LevelRenderEvents.AFTER_TRANSLUCENT_TERRAIN.register(LevelRenderEventsTests::assertRenderContext);
-		LevelRenderEvents.END_MAIN.register(LevelRenderEventsTests::assertRenderContext);
+		LevelRenderEvents.BEFORE_TRANSLUCENT_TERRAIN.register(LevelRenderEventsTests::assertRenderContextWithTerrain);
+		LevelRenderEvents.AFTER_TRANSLUCENT_TERRAIN.register(LevelRenderEventsTests::assertRenderContextWithTerrain);
+		LevelRenderEvents.END_MAIN.register(LevelRenderEventsTests::assertRenderContextWithTerrain);
 
 		try (TestSingleplayerContext singleplayer = context.worldBuilder().create()) {
 			// Set up the test world
 			singleplayer.getServer().runCommand("/setblock 0 99 -3 minecraft:stone");
 			singleplayer.getServer().runCommand("/tp @a 0 100 -3");
 			singleplayer.getServer().runCommand("/setblock 0 101 0 minecraft:diamond_block");
-			singleplayer.getClientLevel().waitForChunksRender();
+			singleplayer.getConnection().waitForChunksRender();
 			context.waitTicks(10);
 			context.assertScreenshotEquals(TestScreenshotComparisonOptions.of("level_render_events_block_outline_and_after_translucent").withRegion(356, 98, 142, 238).save());
 		}
@@ -132,10 +137,13 @@ private static void assertExtractionContext(LevelExtractionContext context) {
 	}
 
 	private static void assertRenderContext(LevelRenderContext context) {
-		assertTerrainRenderContext(context);
 		assertNotNull(context.submitNodeCollector(), "submitNodeCollector is null");
 		assertNotNull(context.poseStack(), "poseStack is null");
-		assertNotNull(context.bufferSource(), "bufferSource is null");
+	}
+
+	private static void assertRenderContextWithTerrain(LevelRenderContext context) {
+		assertRenderContext(context);
+		assertTerrainRenderContext(context);
 	}
 
 	private static void assertTerrainRenderContext(LevelTerrainRenderContext context) {
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/RenderLayerTest.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/RenderLayerTest.java
index 9fe4c727a9..891ce5ff66 100644
--- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/RenderLayerTest.java
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/RenderLayerTest.java
@@ -31,7 +31,7 @@
 import net.minecraft.client.renderer.entity.state.AvatarRenderState;
 import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EntityTypes;
 
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityRenderLayerRegistrationCallback;
@@ -50,7 +50,7 @@ public void onInitializeClient() {
 			// minecraft:player SHOULD be printed twice
 			LOGGER.info(String.format("Received registration for %s", BuiltInRegistries.ENTITY_TYPE.getKey(entityType)));
 
-			if (entityType == EntityType.PLAYER) {
+			if (entityType == EntityTypes.PLAYER) {
 				this.playerRegistrations++;
 			}
 
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/SpecialBlockRendererTest.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/SpecialBlockRendererTest.java
index cd58cd8068..28ad9b4a65 100644
--- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/SpecialBlockRendererTest.java
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/SpecialBlockRendererTest.java
@@ -64,7 +64,7 @@ public void submit(PoseStack poseStack, SubmitNodeCollector submitNodeCollector,
 			poseStack.mulPose(Axis.YP.rotation((float) (Util.getMillis() * 0.001)));
 			poseStack.translate(0, -1.46875f, 0);
 			submitNodeCollector.order(0)
-					.submitCustomGeometry(poseStack, RenderTypes.solidMovingBlock(), (matricesEntry, vertexConsumer) -> allayModel.renderToBuffer(poseStack, vertexConsumer, lightCoords, overlayCoords));
+					.submitCustomGeometry(poseStack, RenderTypes.solidMovingBlock(), (matricesEntry, vertexConsumer) -> allayModel.renderToBuffer(poseStack, vertexConsumer, lightCoords, overlayCoords, outlineColor));
 			poseStack.popPose();
 		}
 
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/TestRenderUtils.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/TestRenderUtils.java
index 647582fb94..353ce7aed7 100644
--- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/TestRenderUtils.java
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/TestRenderUtils.java
@@ -18,43 +18,40 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import org.joml.Matrix4f;
 
 import net.minecraft.world.phys.AABB;
 
 public class TestRenderUtils {
-	public static void drawFilledBox(PoseStack poseStack, VertexConsumer vertexConsumer, AABB box, int color) {
-		Matrix4f matrix4f = poseStack.last().pose();
-
+	public static void drawFilledBox(PoseStack.Pose pose, VertexConsumer vertexConsumer, AABB box, int color) {
 		// Front
-		vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.minY, (float) box.minZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.minY, (float) box.minZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.maxY, (float) box.minZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.maxY, (float) box.minZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.minX, (float) box.minY, (float) box.minZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.minY, (float) box.minZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.maxY, (float) box.minZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.minX, (float) box.maxY, (float) box.minZ).setColor(color);
 		// Back
-		vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.minY, (float) box.maxZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.minY, (float) box.maxZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.maxY, (float) box.maxZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.maxY, (float) box.maxZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.minY, (float) box.maxZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.minX, (float) box.minY, (float) box.maxZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.minX, (float) box.maxY, (float) box.maxZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.maxY, (float) box.maxZ).setColor(color);
 		// Left
-		vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.minY, (float) box.maxZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.minY, (float) box.minZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.maxY, (float) box.minZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.maxY, (float) box.maxZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.minX, (float) box.minY, (float) box.maxZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.minX, (float) box.minY, (float) box.minZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.minX, (float) box.maxY, (float) box.minZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.minX, (float) box.maxY, (float) box.maxZ).setColor(color);
 		// Right
-		vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.minY, (float) box.minZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.minY, (float) box.maxZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.maxY, (float) box.maxZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.maxY, (float) box.minZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.minY, (float) box.minZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.minY, (float) box.maxZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.maxY, (float) box.maxZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.maxY, (float) box.minZ).setColor(color);
 		// Top
-		vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.maxY, (float) box.minZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.maxY, (float) box.minZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.maxY, (float) box.maxZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.maxY, (float) box.maxZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.minX, (float) box.maxY, (float) box.minZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.maxY, (float) box.minZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.maxY, (float) box.maxZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.minX, (float) box.maxY, (float) box.maxZ).setColor(color);
 		// Bottom
-		vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.minY, (float) box.maxZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.minY, (float) box.maxZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.maxX, (float) box.minY, (float) box.minZ).setColor(color);
-		vertexConsumer.addVertex(matrix4f, (float) box.minX, (float) box.minY, (float) box.minZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.minX, (float) box.minY, (float) box.maxZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.minY, (float) box.maxZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.maxX, (float) box.minY, (float) box.minZ).setColor(color);
+		vertexConsumer.addVertex(pose, (float) box.minX, (float) box.minY, (float) box.minZ).setColor(color);
 	}
 }
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/gui/BannerGuiElementRenderer.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/gui/BannerGuiElementRenderer.java
index 1057fa7ee3..a13d0ecbf4 100644
--- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/gui/BannerGuiElementRenderer.java
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/gui/BannerGuiElementRenderer.java
@@ -23,7 +23,7 @@
 import net.minecraft.client.gui.render.pip.PictureInPictureRenderer;
 import net.minecraft.client.model.geom.ModelLayers;
 import net.minecraft.client.model.object.banner.BannerModel;
-import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.SubmitNodeCollector;
 import net.minecraft.client.renderer.blockentity.BannerRenderer;
 import net.minecraft.client.renderer.feature.FeatureRenderDispatcher;
 import net.minecraft.client.renderer.texture.OverlayTexture;
@@ -32,8 +32,7 @@
 import net.minecraft.world.level.block.entity.BannerPatternLayers;
 
 public class BannerGuiElementRenderer extends PictureInPictureRenderer {
-	protected BannerGuiElementRenderer(MultiBufferSource.BufferSource bufferSource) {
-		super(bufferSource);
+	protected BannerGuiElementRenderer() {
 	}
 
 	@Override
@@ -42,14 +41,14 @@ public Class getRenderStateClass() {
 	}
 
 	@Override
-	protected void renderToTexture(BannerGuiElementRenderState state, PoseStack poseStack) {
+	protected void renderToTexture(BannerGuiElementRenderState state, PoseStack poseStack, SubmitNodeCollector submitNodeCollector) {
 		Minecraft client = Minecraft.getInstance();
-		client.gameRenderer.getLighting().setupFor(Lighting.Entry.ITEMS_FLAT);
-		FeatureRenderDispatcher renderDispatcher = client.gameRenderer.getFeatureRenderDispatcher();
+		client.gameRenderer.lighting().setupFor(Lighting.Entry.ITEMS_FLAT);
+		FeatureRenderDispatcher renderDispatcher = client.gameRenderer.featureRenderDispatcher();
 		BannerRenderer.submitPatterns(
 				client.getAtlasManager(),
 				poseStack,
-				renderDispatcher.getSubmitNodeStorage(),
+				submitNodeCollector,
 				LightCoordsUtil.FULL_BRIGHT,
 				OverlayTexture.NO_OVERLAY,
 				new BannerModel(Minecraft.getInstance().getEntityModels().bakeLayer(ModelLayers.STANDING_BANNER_FLAG).getChild("flag")),
@@ -58,7 +57,6 @@ protected void renderToTexture(BannerGuiElementRenderState state, PoseStack pose
 				state.color(),
 				BannerPatternLayers.EMPTY,
 				null);
-		renderDispatcher.renderAllFeatures();
 	}
 
 	@Override
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/gui/GuiRendererNonQuadsTest.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/gui/GuiRendererNonQuadsTest.java
index c0be15648a..de50401706 100644
--- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/gui/GuiRendererNonQuadsTest.java
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/gui/GuiRendererNonQuadsTest.java
@@ -18,10 +18,9 @@
 
 import java.util.function.BiFunction;
 
+import com.mojang.blaze3d.PrimitiveTopology;
 import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.blaze3d.vertex.VertexFormat;
 import org.joml.Matrix3x2f;
 import org.jspecify.annotations.Nullable;
 
@@ -33,6 +32,7 @@
 import net.minecraft.util.Util;
 
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.rendering.v1.FabricRenderPipeline;
 import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElementRegistry;
 
 public class GuiRendererNonQuadsTest implements ClientModInitializer {
@@ -53,7 +53,7 @@ public void onInitializeClient() {
 							graphics.guiHeight() / 8 + xOffset, graphics.guiHeight() / 8 + yOffset,
 							graphics.guiHeight() / 8 + 16 + xOffset, graphics.guiHeight() / 8 + 16 + yOffset,
 							graphics.guiWidth() / 8 + xOffset, graphics.guiHeight() / 8 + yOffset
-			);
+					);
 
 			graphics.guiRenderState.addGuiElement(testStateCreator.apply(0, 0));
 			// this second triangle should not stretch to include the first triangle's vertex
@@ -63,16 +63,22 @@ public void onInitializeClient() {
 		});
 	}
 
-	record CustomTestState(Matrix3x2f matrix, ScreenRectangle bounds, @Nullable ScreenRectangle scissorArea, int x0, int y0, int x1, int y1, int x2, int y2) implements GuiElementRenderState {
+	record CustomTestState(Matrix3x2f matrix, ScreenRectangle bounds,
+	                       @Nullable ScreenRectangle scissorArea, int x0, int y0, int x1, int y1,
+	                       int x2, int y2) implements GuiElementRenderState {
 		CustomTestState(Matrix3x2f matrix, @Nullable ScreenRectangle scissorArea, int x0, int y0, int x1, int y1, int x2, int y2) {
 			this(matrix, createTriangleBounds(x0, y0, x1, y1, x2, y2, matrix, scissorArea), scissorArea, x0, y0, x1, y1, x2, y2);
 		}
 
-		private static final RenderPipeline PIPELINE = RenderPipeline.builder(RenderPipelines.GUI_SNIPPET)
-				.withLocation(Identifier.fromNamespaceAndPath("test", "gui_renderer_non_quads_test"))
-				.withUsePipelineDrawModeForGui(true)
-				.withVertexFormat(DefaultVertexFormat.POSITION_COLOR, VertexFormat.Mode.TRIANGLE_FAN)
-				.build();
+		private static final RenderPipeline PIPELINE;
+
+		static {
+			RenderPipeline.Builder builder = RenderPipeline.builder(RenderPipelines.GUI_SNIPPET)
+					.withLocation(Identifier.fromNamespaceAndPath("test", "gui_renderer_non_quads_test"))
+					.withPrimitiveTopology(PrimitiveTopology.TRIANGLE_FAN);
+			((FabricRenderPipeline.Builder) builder).withUsePipelineDrawModeForGui(true);
+			PIPELINE = builder.build();
+		}
 
 		@Override
 		public void buildVertices(VertexConsumer vertices) {
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/gui/PictureInPictureRendererTest.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/gui/PictureInPictureRendererTest.java
index 52cc79a8af..f64b6cb24d 100644
--- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/gui/PictureInPictureRendererTest.java
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/gui/PictureInPictureRendererTest.java
@@ -16,24 +16,10 @@
 
 package net.fabricmc.fabric.test.rendering.client.gui;
 
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
-import net.minecraft.client.gui.render.GuiRenderer;
-import net.minecraft.client.gui.render.pip.PictureInPictureRenderer;
 import net.minecraft.client.gui.screens.inventory.InventoryScreen;
-import net.minecraft.client.model.Model;
-import net.minecraft.client.renderer.blockentity.StandingSignRenderer;
-import net.minecraft.client.renderer.state.gui.pip.GuiSignRenderState;
-import net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.item.DyeColor;
-import net.minecraft.world.level.block.PlainSignBlock;
-import net.minecraft.world.level.block.state.properties.WoodType;
 
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.gametest.v1.FabricClientGameTest;
@@ -41,9 +27,6 @@
 import net.fabricmc.fabric.api.client.rendering.v1.PictureInPictureRendererRegistry;
 import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElementRegistry;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
-import net.fabricmc.fabric.impl.client.rendering.PictureInPictureRendererRegistryImpl;
-import net.fabricmc.fabric.test.rendering.client.mixin.GameRendererAccessor;
-import net.fabricmc.fabric.test.rendering.client.mixin.GuiRendererAccessor;
 
 /**
  * This test mod renders two banners and two signs in the top left corner.
@@ -51,16 +34,12 @@
 public class PictureInPictureRendererTest implements ClientModInitializer, FabricClientGameTest {
 	@Override
 	public void onInitializeClient() {
-		PictureInPictureRendererRegistry.register(ctx -> new BannerGuiElementRenderer(ctx.bufferSource()));
+		PictureInPictureRendererRegistry.register(ctx -> new BannerGuiElementRenderer());
 
 		HudElementRegistry.addFirst(Identifier.fromNamespaceAndPath("fabric-rendering-v1-testmod", "pip"), (graphics, deltaTracker) -> {
 			// render it twice to test that PiPs can be added multiple times in the same frame
 			graphics.guiRenderState.addPicturesInPictureState(new BannerGuiElementRenderState(DyeColor.BLUE, 20, 0, 40, 20, new ScreenRectangle(20, 0, 40, 20)));
 			graphics.guiRenderState.addPicturesInPictureState(new BannerGuiElementRenderState(DyeColor.RED, 40, 0, 60, 20, new ScreenRectangle(40, 0, 60, 20)));
-
-			// also render some vanilla PiPs to check that they still work and can be rendered multiple times
-			graphics.guiRenderState.addPicturesInPictureState(createSignState(60, WoodType.BIRCH));
-			graphics.guiRenderState.addPicturesInPictureState(createSignState(80, WoodType.DARK_OAK));
 		});
 
 		// Test that InventoryScreen.drawEntity works with the same type of entity more than once
@@ -75,27 +54,22 @@ public void onInitializeClient() {
 		});
 	}
 
-	private static GuiSignRenderState createSignState(int x, WoodType woodType) {
-		Model.Simple signModel = StandingSignRenderer.createSignModel(Minecraft.getInstance().getEntityModels(), woodType, PlainSignBlock.Attachment.WALL);
-		return new GuiSignRenderState(signModel, woodType, x, 0, x + 20, 20, 10f, new ScreenRectangle(x, 0, x + 20, 20));
-	}
-
 	@Override
 	public void runTest(ClientGameTestContext context) {
-		context.runOnClient(client -> {
-			GuiRenderer guiRenderer = ((GameRendererAccessor) client.gameRenderer).getGuiRenderer();
-			Map, PictureInPictureRenderer> specialElementRenderers = ((GuiRendererAccessor) guiRenderer).getSpecialElementRenderers();
-			Set> missingRenderFactories = new HashSet<>(specialElementRenderers.keySet());
-
-			for (Class registeredFactoryStateClass : PictureInPictureRendererRegistryImpl.getRegisteredFactoryStateClasses()) {
-				missingRenderFactories.remove(registeredFactoryStateClass);
-			}
-
-			if (!missingRenderFactories.isEmpty()) {
-				String missingFactoriesString = missingRenderFactories.stream().map(Class::getSimpleName).sorted().collect(Collectors.joining(", "));
-				throw new AssertionError("Missing PiP render factories for state classes: " + missingFactoriesString + ". "
-						+ "Please add them to PictureInPictureRendererRegistryImpl.registerVanillaFactories");
-			}
-		});
+//		context.runOnClient(client -> {
+//			GuiRenderer guiRenderer = ((GameRendererAccessor) client.gameRenderer).getGuiRenderer();
+//			Map, PictureInPictureRenderer> specialElementRenderers = ((GuiRendererAccessor) guiRenderer).getSpecialElementRenderers();
+//			Set> missingRenderFactories = new HashSet<>(specialElementRenderers.keySet());
+//
+//			for (Class registeredFactoryStateClass : PictureInPictureRendererRegistryImpl.getRegisteredFactoryStateClasses()) {
+//				missingRenderFactories.remove(registeredFactoryStateClass);
+//			}
+//
+//			if (!missingRenderFactories.isEmpty()) {
+//				String missingFactoriesString = missingRenderFactories.stream().map(Class::getSimpleName).sorted().collect(Collectors.joining(", "));
+//				throw new AssertionError("Missing PiP render factories for state classes: " + missingFactoriesString + ". "
+//						+ "Please add them to PictureInPictureRendererRegistryImpl.registerVanillaFactories");
+//			}
+//		});
 	}
 }
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/gui/PictureInPictureRendererTestWithNewGuiRenderer.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/gui/PictureInPictureRendererTestWithNewGuiRenderer.java
index d17faf2801..523a9bfb80 100644
--- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/gui/PictureInPictureRendererTestWithNewGuiRenderer.java
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/gui/PictureInPictureRendererTestWithNewGuiRenderer.java
@@ -58,9 +58,9 @@ public void onInitializeClient() {
 			ProjectionType orgProjectionType = RenderSystem.getProjectionType();
 			GpuBufferSlice orgShaderFog = RenderSystem.getShaderFog();
 
-			GuiRenderer guiRenderer = new GuiRenderer(newGuiRenderState, client.renderBuffers().bufferSource(), client.gameRenderer.getSubmitNodeStorage(), client.gameRenderer.getFeatureRenderDispatcher(), Collections.emptyList());
+			GuiRenderer guiRenderer = new GuiRenderer(newGuiRenderState, client.gameRenderer.featureRenderDispatcher(), Collections.emptyList());
 			FogRenderer fogRenderer = new FogRenderer();
-			guiRenderer.render(fogRenderer.getBuffer(FogRenderer.FogMode.NONE));
+			guiRenderer.render();
 			fogRenderer.close();
 			guiRenderer.close();
 
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/mixin/GuiRendererAccessor.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/mixin/GuiRendererAccessor.java
deleted file mode 100644
index 219da0363f..0000000000
--- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/mixin/GuiRendererAccessor.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.rendering.client.mixin;
-
-import java.util.Map;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import net.minecraft.client.gui.render.GuiRenderer;
-import net.minecraft.client.gui.render.pip.PictureInPictureRenderer;
-import net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState;
-
-@Mixin(GuiRenderer.class)
-public interface GuiRendererAccessor {
-	@Accessor("pictureInPictureRenderers")
-	Map, PictureInPictureRenderer> getSpecialElementRenderers();
-}
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/mixin/LecternRendererMixin.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/mixin/LecternRendererMixin.java
new file mode 100644
index 0000000000..cc9c586248
--- /dev/null
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/mixin/LecternRendererMixin.java
@@ -0,0 +1,53 @@
+/*
+ * 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.rendering.client.mixin;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.client.renderer.SubmitNodeCollector;
+import net.minecraft.client.renderer.blockentity.LecternRenderer;
+import net.minecraft.client.renderer.blockentity.state.LecternRenderState;
+import net.minecraft.client.renderer.feature.submit.SubmitNode;
+import net.minecraft.client.renderer.state.level.CameraRenderState;
+
+import net.fabricmc.fabric.api.client.rendering.v1.FabricOrderedSubmitNodeCollector;
+import net.fabricmc.fabric.api.client.rendering.v1.FeatureRendererRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.SubmitRenderPhase;
+import net.fabricmc.fabric.api.client.rendering.v1.SubmitRenderPhases;
+import net.fabricmc.fabric.test.rendering.client.FeatureRendererTest;
+
+/**
+ * Tests {@link FeatureRendererRegistry} and
+ * {@link FabricOrderedSubmitNodeCollector#submitCustom(SubmitRenderPhase, SubmitNode)} by rendering
+ * a quad above every lectern.
+ *
+ * @see FeatureRendererTest
+ */
+@Mixin(LecternRenderer.class)
+abstract class LecternRendererMixin {
+	@Inject(
+			method = "submit(Lnet/minecraft/client/renderer/blockentity/state/LecternRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/state/level/CameraRenderState;)V",
+			at = @At(value = "HEAD")
+	)
+	private void submit(LecternRenderState state, PoseStack poseStack, SubmitNodeCollector queue, CameraRenderState cameraRenderState, CallbackInfo ci) {
+		queue.submitCustom(SubmitRenderPhases.SOLID, new FeatureRendererTest.CustomSubmit(poseStack.last().copy()));
+	}
+}
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/mixin/MinecraftAccessor.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/mixin/MinecraftAccessor.java
deleted file mode 100644
index e1edfed3ed..0000000000
--- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/mixin/MinecraftAccessor.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.rendering.client.mixin;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.block.BlockModelResolver;
-
-@Mixin(Minecraft.class)
-public interface MinecraftAccessor {
-	@Accessor
-	BlockModelResolver getBlockModelResolver();
-}
diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/mixin/PigRendererMixin.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/mixin/PigRendererMixin.java
index 985d316ed9..dfa591ad94 100644
--- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/mixin/PigRendererMixin.java
+++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/mixin/PigRendererMixin.java
@@ -66,7 +66,7 @@ private void renderUsingRenderStateData(PigRenderState state, PoseStack poseStac
 		MovingBlockRenderState movingBlockRenderState = state.getData(MOVING_BLOCK);
 
 		if (movingBlockRenderState != null) {
-			queue.submitMovingBlock(poseStack, movingBlockRenderState);
+			queue.submitMovingBlock(poseStack, movingBlockRenderState, 0x0);
 		}
 	}
 }
diff --git a/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/atlases/test_atlas.json b/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/atlases/test_atlas.json
new file mode 100644
index 0000000000..1c7b81d957
--- /dev/null
+++ b/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/atlases/test_atlas.json
@@ -0,0 +1,14 @@
+{
+  "sources": [
+    {
+      "type": "fabric-rendering-v1-testmod:double",
+      "resource": "minecraft:item/iron_ingot",
+      "sprite": "fabric-rendering-v1-testmod:test_atlas/double_iron_ingot"
+    },
+    {
+      "type": "directory",
+      "prefix": "test_atlas/",
+      "source": "test_atlas"
+    }
+  ]
+}
diff --git a/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/blockstates/custom_color_block_dynamic.json b/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/blockstates/custom_color_block_dynamic.json
new file mode 100644
index 0000000000..430fd67cde
--- /dev/null
+++ b/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/blockstates/custom_color_block_dynamic.json
@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "fabric-rendering-v1-testmod:block/custom_color_block_dynamic"}
+  }
+}
diff --git a/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/models/block/custom_color_block_dynamic.json b/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/models/block/custom_color_block_dynamic.json
new file mode 100644
index 0000000000..23a58617d8
--- /dev/null
+++ b/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/models/block/custom_color_block_dynamic.json
@@ -0,0 +1,20 @@
+{
+    "parent": "block/block",
+    "textures": {
+        "all": "fabric-rendering-v1-testmod:block/blank",
+        "particle": "#all"
+    },
+    "elements": [
+        {   "from": [ 0, 0, 0 ],
+            "to": [ 16, 16, 16 ],
+            "faces": {
+                "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "down" },
+                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "tintindex": 0, "cullface": "up" },
+                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "tintindex": 1, "cullface": "north" },
+                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "south" },
+                "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "west" },
+                "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "east" }
+            }
+        }
+    ]
+}
diff --git a/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/textures/test_atlas/blank.png b/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/textures/test_atlas/blank.png
new file mode 100644
index 0000000000..1368db5441
Binary files /dev/null and b/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/textures/test_atlas/blank.png differ
diff --git a/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/textures/test_atlas/blank.png.mcmeta b/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/textures/test_atlas/blank.png.mcmeta
new file mode 100644
index 0000000000..7dbb9afb79
--- /dev/null
+++ b/fabric-rendering-v1/src/testmodClient/resources/assets/fabric-rendering-v1-testmod/textures/test_atlas/blank.png.mcmeta
@@ -0,0 +1,3 @@
+{
+  "color": "#FFAAAAFF"
+}
diff --git a/fabric-rendering-v1/src/testmodClient/resources/fabric-rendering-v1-testmod.client.mixins.json b/fabric-rendering-v1/src/testmodClient/resources/fabric-rendering-v1-testmod.client.mixins.json
index 50a0c6eccf..cce60f19f0 100644
--- a/fabric-rendering-v1/src/testmodClient/resources/fabric-rendering-v1-testmod.client.mixins.json
+++ b/fabric-rendering-v1/src/testmodClient/resources/fabric-rendering-v1-testmod.client.mixins.json
@@ -5,9 +5,8 @@
   "client": [
     "AvatarRendererMixin",
     "GameRendererAccessor",
-    "GuiRendererAccessor",
-    "PigRendererMixin",
-    "MinecraftAccessor"
+    "LecternRendererMixin",
+    "PigRendererMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceConditions.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceConditions.java
index 0df5896979..50825325aa 100644
--- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceConditions.java
+++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceConditions.java
@@ -30,6 +30,7 @@
 import net.fabricmc.fabric.impl.resource.conditions.conditions.AllModsLoadedResourceCondition;
 import net.fabricmc.fabric.impl.resource.conditions.conditions.AndResourceCondition;
 import net.fabricmc.fabric.impl.resource.conditions.conditions.AnyModsLoadedResourceCondition;
+import net.fabricmc.fabric.impl.resource.conditions.conditions.FalseResourceCondition;
 import net.fabricmc.fabric.impl.resource.conditions.conditions.FeaturesEnabledResourceCondition;
 import net.fabricmc.fabric.impl.resource.conditions.conditions.NotResourceCondition;
 import net.fabricmc.fabric.impl.resource.conditions.conditions.OrResourceCondition;
@@ -83,6 +84,13 @@ public static ResourceCondition alwaysTrue() {
 		return new TrueResourceCondition();
 	}
 
+	/**
+	 * A condition that always passes. Has ID {@code fabric:false}.
+	 */
+	public static ResourceCondition alwaysFalse() {
+		return new FalseResourceCondition();
+	}
+
 	/**
 	 * A condition that passes if {@code condition} does not pass. Has ID {@code fabric:not} and
 	 * takes one field, {@code value}, which is a resource condition.
diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/DefaultResourceConditionTypes.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/DefaultResourceConditionTypes.java
index 0e2e1fd318..4caf3cd631 100644
--- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/DefaultResourceConditionTypes.java
+++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/DefaultResourceConditionTypes.java
@@ -25,6 +25,7 @@
 import net.fabricmc.fabric.impl.resource.conditions.conditions.AllModsLoadedResourceCondition;
 import net.fabricmc.fabric.impl.resource.conditions.conditions.AndResourceCondition;
 import net.fabricmc.fabric.impl.resource.conditions.conditions.AnyModsLoadedResourceCondition;
+import net.fabricmc.fabric.impl.resource.conditions.conditions.FalseResourceCondition;
 import net.fabricmc.fabric.impl.resource.conditions.conditions.FeaturesEnabledResourceCondition;
 import net.fabricmc.fabric.impl.resource.conditions.conditions.NotResourceCondition;
 import net.fabricmc.fabric.impl.resource.conditions.conditions.OrResourceCondition;
@@ -34,6 +35,7 @@
 
 public class DefaultResourceConditionTypes {
 	public static final ResourceConditionType TRUE = createResourceConditionType("true", TrueResourceCondition.CODEC);
+	public static final ResourceConditionType FALSE = createResourceConditionType("false", FalseResourceCondition.CODEC);
 	public static final ResourceConditionType NOT = createResourceConditionType("not", NotResourceCondition.CODEC);
 	public static final ResourceConditionType OR = createResourceConditionType("or", OrResourceCondition.CODEC);
 	public static final ResourceConditionType AND = createResourceConditionType("and", AndResourceCondition.CODEC);
diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/ResourceConditionsImpl.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/ResourceConditionsImpl.java
index d31afcfed6..f9b62e553a 100644
--- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/ResourceConditionsImpl.java
+++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/ResourceConditionsImpl.java
@@ -50,6 +50,7 @@ public final class ResourceConditionsImpl implements ModInitializer {
 	@Override
 	public void onInitialize() {
 		ResourceConditions.register(DefaultResourceConditionTypes.TRUE);
+		ResourceConditions.register(DefaultResourceConditionTypes.FALSE);
 		ResourceConditions.register(DefaultResourceConditionTypes.NOT);
 		ResourceConditions.register(DefaultResourceConditionTypes.AND);
 		ResourceConditions.register(DefaultResourceConditionTypes.OR);
diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/FalseResourceCondition.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/FalseResourceCondition.java
new file mode 100644
index 0000000000..56872791e2
--- /dev/null
+++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/FalseResourceCondition.java
@@ -0,0 +1,40 @@
+/*
+ * 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.impl.resource.conditions.conditions;
+
+import com.mojang.serialization.MapCodec;
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.resources.RegistryOps;
+
+import net.fabricmc.fabric.api.resource.conditions.v1.ResourceCondition;
+import net.fabricmc.fabric.api.resource.conditions.v1.ResourceConditionType;
+import net.fabricmc.fabric.impl.resource.conditions.DefaultResourceConditionTypes;
+
+public class FalseResourceCondition implements ResourceCondition {
+	public static final MapCodec CODEC = MapCodec.unit(FalseResourceCondition::new);
+
+	@Override
+	public ResourceConditionType getType() {
+		return DefaultResourceConditionTypes.FALSE;
+	}
+
+	@Override
+	public boolean test(RegistryOps.@Nullable RegistryInfoLookup registryInfo) {
+		return false;
+	}
+}
diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/PackMixin.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/PackMixin.java
index 37b76705ef..22ae54465b 100644
--- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/PackMixin.java
+++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/PackMixin.java
@@ -21,6 +21,11 @@
 import java.util.List;
 
 import com.llamalad7.mixinextras.sugar.Local;
+
+import net.minecraft.server.packs.OverlayMetadataSection;
+
+import net.minecraft.server.packs.PackType;
+
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
@@ -32,8 +37,17 @@
 
 @Mixin(Pack.class)
 public class PackMixin {
-	@ModifyVariable(method = "readPackMetadata", at = @At("STORE"), name = "overlaySet")
-	private static List applyOverlayConditions(List overlays, @Local(name = "pack") PackResources pack) throws IOException {
+	@ModifyVariable(method = "readPackMetadata", at = @At(value = "STORE", ordinal = 0), name = "overlaySet")
+	private static List applyOverlayConditions(List overlays,
+													   @Local(argsOnly = true) PackType type,
+													   @Local(name = "pack") PackResources pack
+	) throws IOException {
+		// Avoid trying to load Fabric overlays for xplat mods that define both.
+		// The condition registry entries would be missing.
+		if (pack.getMetadataSection(OverlayMetadataSection.forPackTypeNeoForge(type)) != null) {
+			return overlays;
+		}
+
 		List appliedOverlays = new ArrayList<>(overlays);
 		OverlayConditionsMetadata overlayMetadata = pack.getMetadataSection(OverlayConditionsMetadata.SERIALIZER);
 
diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/RegistryLoadTaskPendingRegistrationMixin.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/RegistryLoadTaskPendingRegistrationMixin.java
index f50bfc4bcf..c62fbe9936 100644
--- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/RegistryLoadTaskPendingRegistrationMixin.java
+++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/RegistryLoadTaskPendingRegistrationMixin.java
@@ -34,7 +34,7 @@
 
 @Mixin(RegistryLoadTask.PendingRegistration.class)
 public abstract class RegistryLoadTaskPendingRegistrationMixin {
-	@Inject(method = "loadFromResource", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/Decoder;parse(Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;"), cancellable = true)
+	@Inject(method = "loadFromResource", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/Codec;parse(Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;"), cancellable = true)
 	private static  void loadFromResource(Decoder elementDecoder, RegistryOps ops, ResourceKey elementKey, Resource thunk, CallbackInfoReturnable> cir, @Local(name = "json") JsonElement json) {
 		if (json.isJsonObject() && !ResourceConditionsImpl.applyResourceConditions(json.getAsJsonObject(), elementKey.registry().toString(), elementKey.identifier(), ops.lookupProvider)) {
 			cir.setReturnValue(Either.right(ResourceConditionsImpl.DISABLED_RESOURCE_EXCEPTION));
diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/ResourcePackLoaderMixin.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/ResourcePackLoaderMixin.java
new file mode 100644
index 0000000000..1c912c97e3
--- /dev/null
+++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/ResourcePackLoaderMixin.java
@@ -0,0 +1,65 @@
+/*
+ * 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.mixin.resource.conditions;
+
+import java.io.IOException;
+import java.util.List;
+
+import com.llamalad7.mixinextras.sugar.Local;
+
+import net.minecraft.server.packs.OverlayMetadataSection;
+
+import net.minecraft.server.packs.PackLocationInfo;
+import net.minecraft.server.packs.PackType;
+import net.minecraft.server.packs.repository.Pack;
+
+import net.neoforged.neoforge.resource.ResourcePackLoader;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.server.packs.PackResources;
+
+import net.fabricmc.fabric.impl.resource.conditions.OverlayConditionsMetadata;
+
+@Mixin(ResourcePackLoader.class)
+public class ResourcePackLoaderMixin {
+	@Inject(
+			method = "readMeta",
+			at = @At(
+					value = "INVOKE",
+					target = "Ljava/util/List;addAll(Ljava/util/Collection;)Z"
+			)
+	)
+	private static void applyOverlayConditions(PackType type, PackLocationInfo location, Pack.ResourcesSupplier resources, CallbackInfoReturnable cir,
+	                                           @Local(name = "overlays") List overlays,
+	                                           @Local(name = "primaryResources") PackResources pack
+	) throws IOException {
+		// Avoid trying to load Fabric overlays for xplat mods that define both.
+		// The condition registry entries would be missing.
+		if (pack.getMetadataSection(OverlayMetadataSection.forPackTypeNeoForge(type)) != null) {
+			return;
+		}
+		
+		OverlayConditionsMetadata overlayMetadata = pack.getMetadataSection(OverlayConditionsMetadata.SERIALIZER);
+
+		if (overlayMetadata != null) {
+			overlays.addAll(overlayMetadata.appliedOverlays());
+		}
+	}
+}
diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/SimpleJsonResourceReloadListenerMixin.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/SimpleJsonResourceReloadListenerMixin.java
index ae93b4d39f..1f62ba8aa5 100644
--- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/SimpleJsonResourceReloadListenerMixin.java
+++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/SimpleJsonResourceReloadListenerMixin.java
@@ -17,6 +17,7 @@
 package net.fabricmc.fabric.mixin.resource.conditions;
 
 import java.util.Map;
+import java.util.Optional;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -28,10 +29,7 @@
 import com.mojang.serialization.DynamicOps;
 import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.resources.FileToIdConverter;
 import net.minecraft.resources.Identifier;
@@ -43,11 +41,13 @@
 
 @Mixin(SimpleJsonResourceReloadListener.class)
 public class SimpleJsonResourceReloadListenerMixin {
-	@Unique
-	private static final Object SKIP_DATA_MARKER = new Object();
-
-	@WrapOperation(method = "scanDirectory(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/resources/FileToIdConverter;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/util/Map;)V", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/Codec;parse(Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;"))
-	private static DataResult applyResourceConditions(Codec instance, DynamicOps dynamicOps, Object object, Operation> original,
+	@WrapOperation(
+			method = {
+					"scanDirectory(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/resources/FileToIdConverter;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/util/Map;)V",
+					"scanDirectoryWithModifier(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/resources/FileToIdConverter;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/util/Map;Ljava/util/function/Consumer;)V"
+			},
+			at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/Codec;parse(Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;"))
+	private static DataResult> applyResourceConditions(Codec instance, DynamicOps dynamicOps, Object object, Operation>> original,
 														@Local(argsOnly = true) FileToIdConverter resourceFinder,
 														@Local(name = "entry") Map.Entry entry) {
 		final JsonElement resourceData = (JsonElement) object;
@@ -63,18 +63,10 @@ private static DataResult applyResourceConditions(Codec instance, DynamicO
 			final String dataType = resourceFinder.prefix();
 
 			if (!ResourceConditionsImpl.applyResourceConditions(obj, dataType, entry.getKey(), registryInfo)) {
-				return DataResult.success(SKIP_DATA_MARKER);
+				return DataResult.success(Optional.empty());
 			}
 		}
 
 		return original.call(instance, dynamicOps, object);
 	}
-
-	// parse.ifSuccess
-	@Inject(method = "lambda$scanDirectory$0", at = @At("HEAD"), cancellable = true)
-	private static void skipData(Map map, Identifier identifier, Object object, CallbackInfo ci) {
-		if (object == SKIP_DATA_MARKER) {
-			ci.cancel();
-		}
-	}
 }
diff --git a/fabric-resource-conditions-api-v1/src/main/resources/fabric-resource-conditions-api-v1.mixins.json b/fabric-resource-conditions-api-v1/src/main/resources/fabric-resource-conditions-api-v1.mixins.json
index fec96d6a30..23671b1ec6 100644
--- a/fabric-resource-conditions-api-v1/src/main/resources/fabric-resource-conditions-api-v1.mixins.json
+++ b/fabric-resource-conditions-api-v1/src/main/resources/fabric-resource-conditions-api-v1.mixins.json
@@ -10,7 +10,8 @@
     "ResourceManagerRegistryLoadTaskMixin",
     "RegistryOpsAccessor",
     "FileToIdConverterAccessor",
-    "PackMixin"
+    "PackMixin",
+    "ResourcePackLoaderMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-resource-conditions-api-v1/src/test/java/net/fabricmc/fabric/test/resource/conditions/ResourceConditionsUnitTest.java b/fabric-resource-conditions-api-v1/src/test/java/net/fabricmc/fabric/test/resource/conditions/ResourceConditionsUnitTest.java
index 4c6aad5ecc..69a8184276 100644
--- a/fabric-resource-conditions-api-v1/src/test/java/net/fabricmc/fabric/test/resource/conditions/ResourceConditionsUnitTest.java
+++ b/fabric-resource-conditions-api-v1/src/test/java/net/fabricmc/fabric/test/resource/conditions/ResourceConditionsUnitTest.java
@@ -64,7 +64,7 @@ static void beforeAll() {
 	@Test
 	public void logics() {
 		ResourceCondition alwaysTrue = ResourceConditions.alwaysTrue();
-		ResourceCondition alwaysFalse = ResourceConditions.not(alwaysTrue);
+		ResourceCondition alwaysFalse = ResourceConditions.alwaysFalse();
 		ResourceCondition trueAndTrue = ResourceConditions.and(alwaysTrue, alwaysTrue);
 		ResourceCondition trueAndFalse = ResourceConditions.and(alwaysTrue, alwaysFalse);
 		ResourceCondition emptyAnd = ResourceConditions.and();
diff --git a/fabric-resource-conditions-api-v1/src/testmod/resources/data/fabric-resource-conditions-api-v1-testmod/predicate/loaded.json b/fabric-resource-conditions-api-v1/src/testmod/resources/data/fabric-resource-conditions-api-v1-testmod/predicate/loaded.json
index f7ed2d36db..4997c756d6 100644
--- a/fabric-resource-conditions-api-v1/src/testmod/resources/data/fabric-resource-conditions-api-v1-testmod/predicate/loaded.json
+++ b/fabric-resource-conditions-api-v1/src/testmod/resources/data/fabric-resource-conditions-api-v1-testmod/predicate/loaded.json
@@ -2,7 +2,7 @@
   "condition": "minecraft:entity_properties",
   "entity": "this",
   "predicate": {
-    "type": "minecraft:pig"
+    "minecraft:entity_type": "minecraft:pig"
   },
   "fabric:load_conditions": {
     "condition": "fabric:true"
diff --git a/fabric-resource-conditions-api-v1/src/testmod/resources/data/fabric-resource-conditions-api-v1-testmod/predicate/not_loaded.json b/fabric-resource-conditions-api-v1/src/testmod/resources/data/fabric-resource-conditions-api-v1-testmod/predicate/not_loaded.json
index 8d291c860f..f0b36fcd94 100644
--- a/fabric-resource-conditions-api-v1/src/testmod/resources/data/fabric-resource-conditions-api-v1-testmod/predicate/not_loaded.json
+++ b/fabric-resource-conditions-api-v1/src/testmod/resources/data/fabric-resource-conditions-api-v1-testmod/predicate/not_loaded.json
@@ -2,7 +2,7 @@
   "condition": "minecraft:entity_properties",
   "entity": "this",
   "predicate": {
-    "type": "minecraft:pig"
+    "minecraft:entity_type": "minecraft:pig"
   },
   "fabric:load_conditions": [
     {
diff --git a/fabric-resource-loader-v1/build.gradle b/fabric-resource-loader-v1/build.gradle
index 591c6ea58d..f9069e2b95 100644
--- a/fabric-resource-loader-v1/build.gradle
+++ b/fabric-resource-loader-v1/build.gradle
@@ -34,24 +34,24 @@ sourceSets {
 	}
 }
 
-rootProject.allprojects.each { p ->
-	if (p.extensions.findByName("loom") == null) {
-		return // Skip over the meta projects
-	}
+//rootProject.allprojects.each { p ->
+//	if (p.extensions.findByName("loom") == null) {
+//		return // Skip over the meta projects
+//	}
 
-	p.loom.mods.register("fabric-resource-loader-v0-testmod-a") {
+	neoForge.mods.register("fabric-resource-loader-v0-testmod-a") {
 		sourceSet sourceSets.testmodA
 	}
-	p.loom.mods.register("fabric-resource-loader-v0-testmod-b") {
+	neoForge.mods.register("fabric-resource-loader-v0-testmod-b") {
 		sourceSet sourceSets.testmodB
 	}
-	p.loom.mods.register("fabric-resource-loader-v0-testmod-c") {
+	neoForge.mods.register("fabric-resource-loader-v0-testmod-c") {
 		sourceSet sourceSets.testmodC
 	}
-}
+//}
 
-loom.nestJars(tasks.named("testmodJar"), project.files(
-	tasks.testmodAJar,
-	tasks.testmodBJar,
-	tasks.testmodCJar
-))
+//loom.nestJars(tasks.named("testmodJar"), project.files(
+//	tasks.testmodAJar,
+//	tasks.testmodBJar,
+//	tasks.testmodCJar
+//))
diff --git a/fabric-resource-loader-v1/src/client/java/net/fabricmc/fabric/impl/resource/client/PackTooltipComponent.java b/fabric-resource-loader-v1/src/client/java/net/fabricmc/fabric/impl/resource/client/PackTooltipComponent.java
index 4ed8dfd92d..77998cf495 100644
--- a/fabric-resource-loader-v1/src/client/java/net/fabricmc/fabric/impl/resource/client/PackTooltipComponent.java
+++ b/fabric-resource-loader-v1/src/client/java/net/fabricmc/fabric/impl/resource/client/PackTooltipComponent.java
@@ -19,11 +19,11 @@
 import java.util.List;
 import java.util.Optional;
 
-import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextColor;
 import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.world.inventory.tooltip.TooltipComponent;
 
@@ -83,7 +83,7 @@ public void extractImage(Font font, int x, int y, int width, int height, GuiGrap
 			graphics.fill(
 					x, y + font.lineHeight + 4,
 					x + this.getWidth(font), y + font.lineHeight + 5,
-					0xff000000 | ChatFormatting.GRAY.getColor()
+					0xff000000 | TextColor.GRAY.getValue()
 			);
 		}
 	}
diff --git a/fabric-resource-loader-v1/src/client/java/net/fabricmc/fabric/mixin/resource/client/KeyedClientResourceReloadListenerMixin.java b/fabric-resource-loader-v1/src/client/java/net/fabricmc/fabric/mixin/resource/client/KeyedClientResourceReloadListenerMixin.java
index 03381592ab..3bdf4c14ef 100644
--- a/fabric-resource-loader-v1/src/client/java/net/fabricmc/fabric/mixin/resource/client/KeyedClientResourceReloadListenerMixin.java
+++ b/fabric-resource-loader-v1/src/client/java/net/fabricmc/fabric/mixin/resource/client/KeyedClientResourceReloadListenerMixin.java
@@ -30,6 +30,7 @@
 import net.minecraft.client.renderer.ShaderManager;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
 import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
+import net.minecraft.client.renderer.extract.LevelExtractor;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.client.resources.DryFoliageColorReloadListener;
 import net.minecraft.client.resources.FoliageColorReloadListener;
@@ -66,7 +67,7 @@
 		TextureManager.class,
 		WaypointStyleManager.class,
 		/* private */
-		LevelRenderer.class, GpuWarnlistManager.class, PeriodicNotificationManager.class
+		LevelRenderer.class, LevelExtractor.class, GpuWarnlistManager.class, PeriodicNotificationManager.class
 })
 public abstract class KeyedClientResourceReloadListenerMixin implements FabricResourceReloader {
 	@Unique
diff --git a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/api/resource/v1/DataResourceStore.java b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/api/resource/v1/DataResourceStore.java
index d141b30a3a..6924782a04 100644
--- a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/api/resource/v1/DataResourceStore.java
+++ b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/api/resource/v1/DataResourceStore.java
@@ -35,10 +35,12 @@ final class Key {
 	 * Gets data stored at the given key, or throws if not found.
 	 *
 	 * @param key the key
-	 * @return the data stored at the given key
 	 * @param  the type of data
+	 * @return the data stored at the given key
 	 */
-	 T getOrThrow(Key key);
+	default  T getOrThrow(Key key) {
+		throw new AssertionError("Implemented in Mixin");
+	}
 
 	interface Mutable extends DataResourceStore {
 		/**
diff --git a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/impl/resource/ResourceLoaderImpl.java b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/impl/resource/ResourceLoaderImpl.java
index b8ae4bdf0c..64b1ec195a 100644
--- a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/impl/resource/ResourceLoaderImpl.java
+++ b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/impl/resource/ResourceLoaderImpl.java
@@ -64,8 +64,9 @@ public sealed class ResourceLoaderImpl implements ResourceLoader permits DataRes
 	private static final Map IMPL_MAP = new EnumMap<>(PackType.class);
 	private static final Set BUILTIN_PACK_RESOURCES = new HashSet<>();
 
+	private static final boolean DEBUG_RELOADERS_IDENTITY_STRICT = Boolean.getBoolean("fabric.resource_loader.debug.reloaders_identity.strict");
 	private static final boolean DEBUG_RELOADERS_IDENTITY = TriState.fromSystemProperty("fabric.resource_loader.debug.reloaders_identity")
-			.orElse(FabricLoader.getInstance().isDevelopmentEnvironment());
+			.orElse(DEBUG_RELOADERS_IDENTITY_STRICT || FabricLoader.getInstance().isDevelopmentEnvironment());
 	public static final boolean DEBUG_PROFILE_RESOURCE_RELOADERS = Boolean.getBoolean("fabric.resource_loader.debug.profile_resource_reloaders");
 	private static final boolean DEBUG_RELOADERS_ORDER = Boolean.getBoolean("fabric.resource_loader.debug.reloaders_order");
 
@@ -130,11 +131,12 @@ private Identifier getResourceReloaderIdForSorting(PreparableReloadListener relo
 			return identifiable.fabric$getId();
 		} else {
 			if (DEBUG_RELOADERS_IDENTITY) {
-				LOGGER.warn(
-						"The resource listener at {} does not use identifiable registration "
-								+ "making ordering support more difficult for other modders.",
-						reloader.getClass().getName()
-				);
+				String message = "The resource listener at %s does not use identifiable registration making ordering support more difficult for other modders.".formatted(reloader.getClass().getName());
+				LOGGER.warn(message);
+
+				if (DEBUG_RELOADERS_IDENTITY_STRICT) {
+					throw new IllegalStateException(message);
+				}
 			}
 
 			return Identifier.fromNamespaceAndPath("unknown",
diff --git a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/impl/resource/ServerLanguageUtil.java b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/impl/resource/ServerLanguageUtil.java
deleted file mode 100644
index 76e0aa875b..0000000000
--- a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/impl/resource/ServerLanguageUtil.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.impl.resource;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-
-import net.minecraft.locale.Language;
-import net.minecraft.server.packs.PackType;
-
-import net.fabricmc.fabric.impl.resource.pack.ModNioPackResources;
-import net.fabricmc.loader.api.FabricLoader;
-import net.fabricmc.loader.api.ModContainer;
-
-public final class ServerLanguageUtil {
-	private static final String ASSETS_PREFIX = PackType.CLIENT_RESOURCES.getDirectory() + '/';
-
-	private ServerLanguageUtil() {
-	}
-
-	public static Collection getModLanguageFiles() {
-		Set paths = new LinkedHashSet<>();
-
-		for (ModContainer mod : FabricLoader.getInstance().getAllMods()) {
-			if (mod.getMetadata().getType().equals("builtin")) continue;
-
-			final Map> map = ModNioPackResources.readNamespaces(mod.getRootPaths(), mod.getMetadata().getId());
-
-			for (String ns : map.get(PackType.CLIENT_RESOURCES)) {
-				mod.findPath(ASSETS_PREFIX + ns + "/lang/" + Language.DEFAULT + ".json")
-						.filter(Files::isRegularFile)
-						.ifPresent(paths::add);
-			}
-		}
-
-		return Collections.unmodifiableCollection(paths);
-	}
-}
diff --git a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/impl/resource/pack/ModResourcePackCreator.java b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/impl/resource/pack/ModResourcePackCreator.java
index c857c33d96..ce5d7c3922 100644
--- a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/impl/resource/pack/ModResourcePackCreator.java
+++ b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/impl/resource/pack/ModResourcePackCreator.java
@@ -103,7 +103,7 @@ public void loadPacks(Consumer consumer) {
 		 */
 
 		// Build a list of mod resource packs.
-		this.registerModPack(consumer, null, BASE_PARENT);
+//		this.registerModPack(consumer, null, BASE_PARENT);
 
 		if (this.type == PackType.CLIENT_RESOURCES) {
 			// Programmer Art/High Contrast data packs can never be enabled.
diff --git a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/MinecraftServerMixin.java b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/MinecraftServerMixin.java
index ff2453b8fa..8d1a6b33eb 100644
--- a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/MinecraftServerMixin.java
+++ b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/MinecraftServerMixin.java
@@ -33,11 +33,11 @@
 import net.minecraft.server.Services;
 import net.minecraft.server.WorldStem;
 import net.minecraft.server.level.progress.LevelLoadListener;
+import net.minecraft.server.notifications.NotificationManager;
 import net.minecraft.server.packs.PackResources;
 import net.minecraft.server.packs.repository.KnownPack;
 import net.minecraft.server.packs.repository.Pack;
 import net.minecraft.server.packs.repository.PackRepository;
-import net.minecraft.world.level.gamerules.GameRules;
 import net.minecraft.world.level.storage.LevelStorageSource;
 
 import net.fabricmc.fabric.api.resource.v1.DataResourceStore;
@@ -63,7 +63,7 @@ public  T getOrThrow(Key key) {
 	}
 
 	@Inject(method = "", at = @At("TAIL"))
-	private void init(Thread serverThread, LevelStorageSource.LevelStorageAccess storageAccess, PackRepository dataPackManager, WorldStem worldStem, Optional gameRules, Proxy proxy, DataFixer dataFixer, Services apiServices, LevelLoadListener chunkLoadProgress, boolean propagatesCrashes, CallbackInfo ci) {
+	private void init(Thread serverThread, LevelStorageSource.LevelStorageAccess storageSource, PackRepository packRepository, WorldStem worldStem, Optional gameRules, Proxy proxy, DataFixer fixerUpper, Services services, LevelLoadListener levelLoadListener, boolean propagatesCrashes, NotificationManager notificationManager, CallbackInfo ci) {
 		this.originalKnownPacks = worldStem.resourceManager().listPacks().flatMap(pack -> pack.location().knownPackInfo().stream()).toList();
 	}
 
diff --git a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/PackMixin.java b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/PackMixin.java
index dd1da738e2..073959dae9 100644
--- a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/PackMixin.java
+++ b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/PackMixin.java
@@ -24,6 +24,7 @@
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import net.minecraft.server.packs.PackLocationInfo;
@@ -46,10 +47,15 @@ abstract class PackMixin implements FabricPack {
 	@Unique
 	private static final Predicate> DEFAULT_PARENT_PREDICATE = parents -> true;
 	@Unique
-	private Predicate> parentsPredicate = DEFAULT_PARENT_PREDICATE;
+	private Predicate> parentsPredicate;
 
 	@Shadow
 	public abstract PackLocationInfo location();
+	
+	@Inject(method = "(Lnet/minecraft/server/packs/PackLocationInfo;Lnet/minecraft/server/packs/repository/Pack$ResourcesSupplier;Lnet/minecraft/server/packs/repository/Pack$Metadata;Lnet/minecraft/server/packs/PackSelectionConfig;Ljava/util/List;)V", at = @At("TAIL"))
+	private void PackMixin(CallbackInfo ci) {
+		this.parentsPredicate = DEFAULT_PARENT_PREDICATE;
+	}
 
 	@Inject(method = "open", at = @At("RETURN"))
 	private void onCreateResourcePack(CallbackInfoReturnable cir) {
diff --git a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/ServerConfigurationPacketListenerImplMixin.java b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/ServerConfigurationPacketListenerImplMixin.java
index 949f472ca5..3264d205e1 100644
--- a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/ServerConfigurationPacketListenerImplMixin.java
+++ b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/ServerConfigurationPacketListenerImplMixin.java
@@ -42,7 +42,7 @@ public ServerConfigurationPacketListenerImplMixin(MinecraftServer server, Connec
 	 * enabled or disabled before the client joins. Since the server registry contents aren't reloaded, we don't want
 	 * the client to use the new data pack data.
 	 */
-	@ModifyArg(method = "startConfiguration", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/config/SynchronizeRegistriesTask;(Ljava/util/List;Lnet/minecraft/core/LayeredRegistryAccess;)V", ordinal = 0))
+	@ModifyArg(method = "runConfiguration", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/config/SynchronizeRegistriesTask;(Ljava/util/List;Lnet/minecraft/core/LayeredRegistryAccess;)V", ordinal = 0))
 	public List filterKnownPacks(List currentKnownPacks) {
 		return ((FabricOriginalKnownPacksGetter) this.server).fabric$getOriginalKnownPacks().stream().filter(currentKnownPacks::contains).toList();
 	}
diff --git a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/server/LanguageMixin.java b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/server/LanguageMixin.java
deleted file mode 100644
index fc90c6409f..0000000000
--- a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/server/LanguageMixin.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.mixin.resource.server;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Map;
-import java.util.function.BiConsumer;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.gson.JsonParseException;
-import org.slf4j.Logger;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import net.minecraft.locale.Language;
-
-import net.fabricmc.fabric.impl.resource.ServerLanguageUtil;
-import net.fabricmc.loader.api.FabricLoader;
-import net.fabricmc.loader.api.ModContainer;
-
-@Mixin(Language.class)
-class LanguageMixin {
-	@Shadow
-	@Final
-	private static Logger LOGGER;
-
-	@Redirect(method = "loadDefault", at = @At(value = "INVOKE", target = "Ljava/util/Map;copyOf(Ljava/util/Map;)Ljava/util/Map;"))
-	private static Map create(Map map) {
-		for (Path path : ServerLanguageUtil.getModLanguageFiles()) {
-			loadFromPath(path, map::put);
-		}
-
-		return ImmutableMap.copyOf(map);
-	}
-
-	@Redirect(method = "parseTranslations(Ljava/util/function/BiConsumer;Ljava/lang/String;)V", at = @At(value = "INVOKE", target = "Ljava/lang/Class;getResourceAsStream(Ljava/lang/String;)Ljava/io/InputStream;"))
-	private static InputStream readCorrectVanillaResource(Class instance, String path) throws IOException {
-		ModContainer mod = FabricLoader.getInstance().getModContainer("minecraft").orElseThrow();
-		Path langPath = mod.findPath(path).orElse(null);
-
-		if (langPath == null) {
-			throw new IOException("Could not read %s from minecraft ModContainer".formatted(path));
-		} else {
-			return Files.newInputStream(langPath);
-		}
-	}
-
-	@Unique
-	private static void loadFromPath(Path path, BiConsumer entryConsumer) {
-		try (InputStream stream = Files.newInputStream(path)) {
-			LOGGER.debug("Loading translations from {}", path);
-			loadFromJson(stream, entryConsumer);
-		} catch (JsonParseException | IOException e) {
-			LOGGER.error("Couldn't read strings from {}", path, e);
-		}
-	}
-
-	@Shadow
-	public static void loadFromJson(InputStream inputStream, BiConsumer entryConsumer) {
-	}
-}
diff --git a/fabric-resource-loader-v1/src/main/resources/fabric-resource-loader-v1.mixins.json b/fabric-resource-loader-v1/src/main/resources/fabric-resource-loader-v1.mixins.json
index 0b7407931b..262348215d 100644
--- a/fabric-resource-loader-v1/src/main/resources/fabric-resource-loader-v1.mixins.json
+++ b/fabric-resource-loader-v1/src/main/resources/fabric-resource-loader-v1.mixins.json
@@ -19,7 +19,6 @@
     "SynchronizeRegistriesTaskMixin"
   ],
   "server": [
-    "server.LanguageMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-resource-loader-v1/src/testmod/resources/fabric.mod.json b/fabric-resource-loader-v1/src/testmod/resources/fabric.mod.json
index d6a1f4ab23..eefe08d290 100644
--- a/fabric-resource-loader-v1/src/testmod/resources/fabric.mod.json
+++ b/fabric-resource-loader-v1/src/testmod/resources/fabric.mod.json
@@ -6,10 +6,7 @@
   "environment": "*",
   "license": "Apache-2.0",
   "depends": {
-    "fabric-resource-loader-v1": "*",
-    "fabric-resource-loader-v1-testmod-a": "*",
-    "fabric-resource-loader-v1-testmod-b": "*",
-    "fabric-resource-loader-v1-testmod-c": "*"
+    "fabric-resource-loader-v1": "*"
   },
   "entrypoints": {
     "main": [
diff --git a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/api/client/screen/v1/ScreenEvents.java b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/api/client/screen/v1/ScreenEvents.java
index c6155748b5..598a39f9a9 100644
--- a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/api/client/screen/v1/ScreenEvents.java
+++ b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/api/client/screen/v1/ScreenEvents.java
@@ -123,7 +123,7 @@ public static Event remove(Screen screen) {
 	public static Event beforeExtract(Screen screen) {
 		Objects.requireNonNull(screen, "Screen cannot be null");
 
-		return ScreenExtensions.getExtensions(screen).fabric_getBeforeRenderEvent();
+		return ScreenExtensions.getExtensions(screen).fabric_getBeforeExtractEvent();
 	}
 
 	/**
@@ -137,6 +137,17 @@ public static Event afterBackground(Screen screen) {
 		return ScreenExtensions.getExtensions(screen).fabric_getAfterBackgroundEvent();
 	}
 
+	/**
+	 * An event that is called after a screen's foreground is extracted.
+	 *
+	 * @return the event
+	 */
+	public static Event afterForeground(Screen screen) {
+		Objects.requireNonNull(screen, "Screen cannot be null");
+
+		return ScreenExtensions.getExtensions(screen).fabric_getAfterForegroundEvent();
+	}
+
 	/**
 	 * An event that is called after a screen is extracted.
 	 *
@@ -145,7 +156,7 @@ public static Event afterBackground(Screen screen) {
 	public static Event afterExtract(Screen screen) {
 		Objects.requireNonNull(screen, "Screen cannot be null");
 
-		return ScreenExtensions.getExtensions(screen).fabric_getAfterRenderEvent();
+		return ScreenExtensions.getExtensions(screen).fabric_getAfterExtractEvent();
 	}
 
 	/**
@@ -195,6 +206,11 @@ public interface AfterBackground {
 		void afterBackground(Screen screen, GuiGraphicsExtractor graphics, int mouseX, int mouseY, float tickProgress);
 	}
 
+	@FunctionalInterface
+	public interface AfterForeground {
+		void afterForeground(Screen screen, GuiGraphicsExtractor graphics, int mouseX, int mouseY, float tickProgress);
+	}
+
 	@FunctionalInterface
 	public interface AfterExtract {
 		void afterExtract(Screen screen, GuiGraphicsExtractor graphics, int mouseX, int mouseY, float tickProgress);
diff --git a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/api/client/screen/v1/ScreenKeyboardEvents.java b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/api/client/screen/v1/ScreenKeyboardEvents.java
index 78d3d24a81..70d0ffe7c1 100644
--- a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/api/client/screen/v1/ScreenKeyboardEvents.java
+++ b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/api/client/screen/v1/ScreenKeyboardEvents.java
@@ -19,6 +19,7 @@
 import java.util.Objects;
 
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.input.CharacterEvent;
 import net.minecraft.client.input.KeyEvent;
 
 import net.fabricmc.fabric.api.event.Event;
@@ -83,7 +84,7 @@ public static Event allowKeyRelease(Screen screen) {
 	}
 
 	/**
-	 * An event that is called after the release of a key is processed for a screen.
+	 * An event that is called before the release of a key is processed for a screen.
 	 *
 	 * @return the event
 	 */
@@ -104,6 +105,39 @@ public static Event afterKeyRelease(Screen screen) {
 		return ScreenExtensions.getExtensions(screen).fabric_getAfterKeyReleaseEvent();
 	}
 
+	/**
+	 * An event that checks if typing a character should be allowed.
+	 *
+	 * @return the event
+	 */
+	public static Event allowCharType(Screen screen) {
+		Objects.requireNonNull(screen, "Screen cannot be null");
+
+		return ScreenExtensions.getExtensions(screen).fabric_getAllowCharTypeEvent();
+	}
+
+	/**
+	 * An event that is called before typing a character is processed for a screen.
+	 *
+	 * @return the event
+	 */
+	public static Event beforeCharType(Screen screen) {
+		Objects.requireNonNull(screen, "Screen cannot be null");
+
+		return ScreenExtensions.getExtensions(screen).fabric_getBeforeCharTypeEvent();
+	}
+
+	/**
+	 * An event that is called after typing a character is processed for a screen.
+	 *
+	 * @return the event
+	 */
+	public static Event afterCharType(Screen screen) {
+		Objects.requireNonNull(screen, "Screen cannot be null");
+
+		return ScreenExtensions.getExtensions(screen).fabric_getAfterCharTypeEvent();
+	}
+
 	private ScreenKeyboardEvents() {
 	}
 
@@ -180,4 +214,41 @@ public interface AfterKeyRelease {
 		 */
 		void afterKeyRelease(Screen screen, KeyEvent event);
 	}
+
+	@FunctionalInterface
+	public interface AllowCharType {
+		/**
+		 * Checks if typing a character should be allowed.
+		 *
+		 * @param event the char type event, containing the codepoint
+		 * @return whether the character should be typed
+		 * @see CharacterEvent#codepointAsString()
+		 * @see Modifier key flags
+		 */
+		boolean allowCharType(Screen screen, CharacterEvent event);
+	}
+
+	@FunctionalInterface
+	public interface BeforeCharType {
+		/**
+		 * Called before a character is typed.
+		 *
+		 * @param event the char type event, containing the codepoint
+		 * @see CharacterEvent#codepointAsString()
+		 * @see Modifier key flags
+		 */
+		void beforeCharType(Screen screen, CharacterEvent event);
+	}
+
+	@FunctionalInterface
+	public interface AfterCharType {
+		/**
+		 * Called after a character is typed.
+		 *
+		 * @param event the char type event, containing the codepoint
+		 * @see CharacterEvent#codepointAsString()
+		 * @see Modifier key flags
+		 */
+		void afterCharType(Screen screen, CharacterEvent event);
+	}
 }
diff --git a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/ButtonList.java b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/ButtonList.java
index 186be34fb9..76e65b94e7 100644
--- a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/ButtonList.java
+++ b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/ButtonList.java
@@ -38,88 +38,110 @@ public ButtonList(List renderables, List narratable
 
 	@Override
 	public AbstractWidget get(int index) {
-		final int renderableIndex = translateIndex(renderables, index, false);
-		return (AbstractWidget) renderables.get(renderableIndex);
+		int remaining = index;
+
+		for (Renderable renderable : renderables) {
+			if (renderable instanceof AbstractWidget widget) {
+				if (remaining == 0) {
+					return widget;
+				}
+
+				remaining--;
+			}
+		}
+
+		throw new IndexOutOfBoundsException(String.format("Index: %d, Size: %d", index, size()));
 	}
 
 	@Override
 	public AbstractWidget set(int index, AbstractWidget element) {
-		final int renderableIndex = translateIndex(renderables, index, false);
-		renderables.set(renderableIndex, element);
+		AbstractWidget existing = get(index);
+
+		int i = renderables.indexOf(existing);
+		if (i >= 0) renderables.set(i, element);
+
+		i = narratables.indexOf(existing);
+		if (i >= 0) narratables.set(i, element);
 
-		final int narratableIndex = translateIndex(narratables, index, false);
-		narratables.set(narratableIndex, element);
+		i = children.indexOf(existing);
+		if (i >= 0) children.set(i, element);
 
-		final int childIndex = translateIndex(children, index, false);
-		return (AbstractWidget) children.set(childIndex, element);
+		return existing;
 	}
 
 	@Override
 	public void add(int index, AbstractWidget element) {
-		// ensure no duplicates
-		final int duplicateIndex = renderables.indexOf(element);
+		// Remove any existing occurrence and adjust the target index accordingly.
+		int duplicateIndex = listIndexOf(element);
 
 		if (duplicateIndex >= 0) {
 			renderables.remove(element);
 			narratables.remove(element);
 			children.remove(element);
 
-			if (duplicateIndex <= translateIndex(renderables, index, true)) {
+			if (duplicateIndex < index) {
 				index--;
 			}
 		}
 
-		final int renderableIndx = translateIndex(renderables, index, true);
-		renderables.add(renderableIndx, element);
+		if (index > size()) {
+			throw new IndexOutOfBoundsException(String.format("Index: %d, Size: %d", index, size()));
+		} else if (index == size()) {
+			renderables.add(element);
+			narratables.add(element);
+			children.add(element);
+		} else {
+			// Use an anchor widget and insert before it.
+			AbstractWidget anchor = get(index);
+
+			int i = renderables.indexOf(anchor);
+			renderables.add(i >= 0 ? i : renderables.size(), element);
+
+			i = narratables.indexOf(anchor);
+			narratables.add(i >= 0 ? i : narratables.size(), element);
+
+			i = children.indexOf(anchor);
+			children.add(i >= 0 ? i : children.size(), element);
+		}
+	}
+
+	private int listIndexOf(AbstractWidget element) {
+		int index = 0;
 
-		final int narratableIndex = translateIndex(narratables, index, true);
-		narratables.add(narratableIndex, element);
+		for (Renderable renderable : renderables) {
+			if (renderable instanceof AbstractWidget widget) {
+				if (widget == element) {
+					return index;
+				}
+
+				index++;
+			}
+		}
 
-		final int childIndex = translateIndex(children, index, true);
-		children.add(childIndex, element);
+		return -1;
 	}
 
 	@Override
 	public AbstractWidget remove(int index) {
-		index = translateIndex(renderables, index, false);
+		AbstractWidget removedButton = get(index);
 
-		final AbstractWidget removedButton = (AbstractWidget) renderables.remove(index);
-		this.narratables.remove(removedButton);
-		this.children.remove(removedButton);
+		renderables.remove(removedButton);
+		narratables.remove(removedButton);
+		children.remove(removedButton);
 
 		return removedButton;
 	}
 
 	@Override
 	public int size() {
-		int ret = 0;
+		int size = 0;
 
 		for (Renderable renderable : renderables) {
 			if (renderable instanceof AbstractWidget) {
-				ret++;
-			}
-		}
-
-		return ret;
-	}
-
-	private int translateIndex(List list, int index, boolean allowAfter) {
-		int remaining = index;
-
-		for (int i = 0, max = list.size(); i < max; i++) {
-			if (list.get(i) instanceof AbstractWidget) {
-				if (remaining == 0) {
-					return i;
-				}
-
-				remaining--;
+				size++;
 			}
 		}
 
-		if (allowAfter && remaining == 0) {
-			return list.size();
-		}
-
-		throw new IndexOutOfBoundsException(String.format("Index: %d, Size: %d", index, index - remaining));
+		return size;
 	}
 }
diff --git a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/impl/particle/BlockParticleOptionExtension.java b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/GuiExtensions.java
similarity index 75%
rename from fabric-particles-v1/src/main/java/net/fabricmc/fabric/impl/particle/BlockParticleOptionExtension.java
rename to fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/GuiExtensions.java
index 375e36ca88..3e662c8652 100644
--- a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/impl/particle/BlockParticleOptionExtension.java
+++ b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/GuiExtensions.java
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.particle;
+package net.fabricmc.fabric.impl.client.screen;
 
 import org.jspecify.annotations.Nullable;
 
-import net.minecraft.core.BlockPos;
+import net.minecraft.client.gui.screens.Screen;
 
-public interface BlockParticleOptionExtension {
-	void fabric_setBlockPos(@Nullable BlockPos pos);
+public interface GuiExtensions {
+	@Nullable Screen getTickingScreen();
+
+	void setTickingScreen(@Nullable Screen screen);
 }
diff --git a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/ScreenEventFactory.java b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/ScreenEventFactory.java
index 0620bc3f79..bed3859f68 100644
--- a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/ScreenEventFactory.java
+++ b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/ScreenEventFactory.java
@@ -34,7 +34,7 @@ public static Event createRemoveEvent() {
 		});
 	}
 
-	public static Event createBeforeRenderEvent() {
+	public static Event createBeforeExtractEvent() {
 		return EventFactory.createArrayBacked(ScreenEvents.BeforeExtract.class, callbacks -> (screen, matrices, mouseX, mouseY, tickDelta) -> {
 			for (ScreenEvents.BeforeExtract callback : callbacks) {
 				callback.beforeExtract(screen, matrices, mouseX, mouseY, tickDelta);
@@ -50,7 +50,15 @@ public static Event createAfterBackgroundEvent() {
 		});
 	}
 
-	public static Event createAfterRenderEvent() {
+	public static Event createAfterForegroundEvent() {
+		return EventFactory.createArrayBacked(ScreenEvents.AfterForeground.class, callbacks -> (screen, matrices, mouseX, mouseY, tickDelta) -> {
+			for (ScreenEvents.AfterForeground callback : callbacks) {
+				callback.afterForeground(screen, matrices, mouseX, mouseY, tickDelta);
+			}
+		});
+	}
+
+	public static Event createAfterExtractEvent() {
 		return EventFactory.createArrayBacked(ScreenEvents.AfterExtract.class, callbacks -> (screen, matrices, mouseX, mouseY, tickDelta) -> {
 			for (ScreenEvents.AfterExtract callback : callbacks) {
 				callback.afterExtract(screen, matrices, mouseX, mouseY, tickDelta);
@@ -77,9 +85,9 @@ public static Event createAfterTickEvent() {
 	// Keyboard events
 
 	public static Event createAllowKeyPressEvent() {
-		return EventFactory.createArrayBacked(ScreenKeyboardEvents.AllowKeyPress.class, callbacks -> (screen, context) -> {
+		return EventFactory.createArrayBacked(ScreenKeyboardEvents.AllowKeyPress.class, callbacks -> (screen, event) -> {
 			for (ScreenKeyboardEvents.AllowKeyPress callback : callbacks) {
-				if (!callback.allowKeyPress(screen, context)) {
+				if (!callback.allowKeyPress(screen, event)) {
 					return false;
 				}
 			}
@@ -89,25 +97,25 @@ public static Event createAllowKeyPressEvent
 	}
 
 	public static Event createBeforeKeyPressEvent() {
-		return EventFactory.createArrayBacked(ScreenKeyboardEvents.BeforeKeyPress.class, callbacks -> (screen, context) -> {
+		return EventFactory.createArrayBacked(ScreenKeyboardEvents.BeforeKeyPress.class, callbacks -> (screen, event) -> {
 			for (ScreenKeyboardEvents.BeforeKeyPress callback : callbacks) {
-				callback.beforeKeyPress(screen, context);
+				callback.beforeKeyPress(screen, event);
 			}
 		});
 	}
 
 	public static Event createAfterKeyPressEvent() {
-		return EventFactory.createArrayBacked(ScreenKeyboardEvents.AfterKeyPress.class, callbacks -> (screen, context) -> {
+		return EventFactory.createArrayBacked(ScreenKeyboardEvents.AfterKeyPress.class, callbacks -> (screen, event) -> {
 			for (ScreenKeyboardEvents.AfterKeyPress callback : callbacks) {
-				callback.afterKeyPress(screen, context);
+				callback.afterKeyPress(screen, event);
 			}
 		});
 	}
 
 	public static Event createAllowKeyReleaseEvent() {
-		return EventFactory.createArrayBacked(ScreenKeyboardEvents.AllowKeyRelease.class, callbacks -> (screen, context) -> {
+		return EventFactory.createArrayBacked(ScreenKeyboardEvents.AllowKeyRelease.class, callbacks -> (screen, event) -> {
 			for (ScreenKeyboardEvents.AllowKeyRelease callback : callbacks) {
-				if (!callback.allowKeyRelease(screen, context)) {
+				if (!callback.allowKeyRelease(screen, event)) {
 					return false;
 				}
 			}
@@ -117,17 +125,45 @@ public static Event createAllowKeyReleaseE
 	}
 
 	public static Event createBeforeKeyReleaseEvent() {
-		return EventFactory.createArrayBacked(ScreenKeyboardEvents.BeforeKeyRelease.class, callbacks -> (screen, context) -> {
+		return EventFactory.createArrayBacked(ScreenKeyboardEvents.BeforeKeyRelease.class, callbacks -> (screen, event) -> {
 			for (ScreenKeyboardEvents.BeforeKeyRelease callback : callbacks) {
-				callback.beforeKeyRelease(screen, context);
+				callback.beforeKeyRelease(screen, event);
 			}
 		});
 	}
 
 	public static Event createAfterKeyReleaseEvent() {
-		return EventFactory.createArrayBacked(ScreenKeyboardEvents.AfterKeyRelease.class, callbacks -> (screen, context) -> {
+		return EventFactory.createArrayBacked(ScreenKeyboardEvents.AfterKeyRelease.class, callbacks -> (screen, event) -> {
 			for (ScreenKeyboardEvents.AfterKeyRelease callback : callbacks) {
-				callback.afterKeyRelease(screen, context);
+				callback.afterKeyRelease(screen, event);
+			}
+		});
+	}
+
+	public static Event createAllowCharTypeEvent() {
+		return EventFactory.createArrayBacked(ScreenKeyboardEvents.AllowCharType.class, callbacks -> (screen, event) -> {
+			for (ScreenKeyboardEvents.AllowCharType callback : callbacks) {
+				if (!callback.allowCharType(screen, event)) {
+					return false;
+				}
+			}
+
+			return true;
+		});
+	}
+
+	public static Event createBeforeCharTypeEvent() {
+		return EventFactory.createArrayBacked(ScreenKeyboardEvents.BeforeCharType.class, callbacks -> (screen, event) -> {
+			for (ScreenKeyboardEvents.BeforeCharType callback : callbacks) {
+				callback.beforeCharType(screen, event);
+			}
+		});
+	}
+
+	public static Event createAfterCharTypeEvent() {
+		return EventFactory.createArrayBacked(ScreenKeyboardEvents.AfterCharType.class, callbacks -> (screen, event) -> {
+			for (ScreenKeyboardEvents.AfterCharType callback : callbacks) {
+				callback.afterCharType(screen, event);
 			}
 		});
 	}
@@ -135,9 +171,9 @@ public static Event createAfterKeyReleaseE
 	// Mouse Events
 
 	public static Event createAllowMouseClickEvent() {
-		return EventFactory.createArrayBacked(ScreenMouseEvents.AllowMouseClick.class, callbacks -> (screen, context) -> {
+		return EventFactory.createArrayBacked(ScreenMouseEvents.AllowMouseClick.class, callbacks -> (screen, event) -> {
 			for (ScreenMouseEvents.AllowMouseClick callback : callbacks) {
-				if (!callback.allowMouseClick(screen, context)) {
+				if (!callback.allowMouseClick(screen, event)) {
 					return false;
 				}
 			}
@@ -147,19 +183,19 @@ public static Event createAllowMouseClickEven
 	}
 
 	public static Event createBeforeMouseClickEvent() {
-		return EventFactory.createArrayBacked(ScreenMouseEvents.BeforeMouseClick.class, callbacks -> (screen, context) -> {
+		return EventFactory.createArrayBacked(ScreenMouseEvents.BeforeMouseClick.class, callbacks -> (screen, event) -> {
 			for (ScreenMouseEvents.BeforeMouseClick callback : callbacks) {
-				callback.beforeMouseClick(screen, context);
+				callback.beforeMouseClick(screen, event);
 			}
 		});
 	}
 
 	public static Event createAfterMouseClickEvent() {
-		return EventFactory.createArrayBacked(ScreenMouseEvents.AfterMouseClick.class, callbacks -> (screen, context, consumed) -> {
+		return EventFactory.createArrayBacked(ScreenMouseEvents.AfterMouseClick.class, callbacks -> (screen, event, consumed) -> {
 			boolean consume = false;
 
 			for (ScreenMouseEvents.AfterMouseClick callback : callbacks) {
-				consume |= callback.afterMouseClick(screen, context, consume | consumed);
+				consume |= callback.afterMouseClick(screen, event, consume | consumed);
 			}
 
 			return consume;
@@ -167,9 +203,9 @@ public static Event createAfterMouseClickEven
 	}
 
 	public static Event createAllowMouseReleaseEvent() {
-		return EventFactory.createArrayBacked(ScreenMouseEvents.AllowMouseRelease.class, callbacks -> (screen, context) -> {
+		return EventFactory.createArrayBacked(ScreenMouseEvents.AllowMouseRelease.class, callbacks -> (screen, event) -> {
 			for (ScreenMouseEvents.AllowMouseRelease callback : callbacks) {
-				if (!callback.allowMouseRelease(screen, context)) {
+				if (!callback.allowMouseRelease(screen, event)) {
 					return false;
 				}
 			}
@@ -179,19 +215,19 @@ public static Event createAllowMouseRelease
 	}
 
 	public static Event createBeforeMouseReleaseEvent() {
-		return EventFactory.createArrayBacked(ScreenMouseEvents.BeforeMouseRelease.class, callbacks -> (screen, context) -> {
+		return EventFactory.createArrayBacked(ScreenMouseEvents.BeforeMouseRelease.class, callbacks -> (screen, event) -> {
 			for (ScreenMouseEvents.BeforeMouseRelease callback : callbacks) {
-				callback.beforeMouseRelease(screen, context);
+				callback.beforeMouseRelease(screen, event);
 			}
 		});
 	}
 
 	public static Event createAfterMouseReleaseEvent() {
-		return EventFactory.createArrayBacked(ScreenMouseEvents.AfterMouseRelease.class, callbacks -> (screen, context, consumed) -> {
+		return EventFactory.createArrayBacked(ScreenMouseEvents.AfterMouseRelease.class, callbacks -> (screen, event, consumed) -> {
 			boolean consume = false;
 
 			for (ScreenMouseEvents.AfterMouseRelease callback : callbacks) {
-				consume |= callback.afterMouseRelease(screen, context, consume | consumed);
+				consume |= callback.afterMouseRelease(screen, event, consume | consumed);
 			}
 
 			return consume;
@@ -199,9 +235,9 @@ public static Event createAfterMouseRelease
 	}
 
 	public static Event createAllowMouseDragEvent() {
-		return EventFactory.createArrayBacked(ScreenMouseEvents.AllowMouseDrag.class, callbacks -> (screen, context, horizontalAmount, verticalAmount) -> {
+		return EventFactory.createArrayBacked(ScreenMouseEvents.AllowMouseDrag.class, callbacks -> (screen, event, horizontalAmount, verticalAmount) -> {
 			for (ScreenMouseEvents.AllowMouseDrag callback : callbacks) {
-				if (!callback.allowMouseDrag(screen, context, horizontalAmount, verticalAmount)) {
+				if (!callback.allowMouseDrag(screen, event, horizontalAmount, verticalAmount)) {
 					return false;
 				}
 			}
@@ -211,19 +247,19 @@ public static Event createAllowMouseDragEvent(
 	}
 
 	public static Event createBeforeMouseDragEvent() {
-		return EventFactory.createArrayBacked(ScreenMouseEvents.BeforeMouseDrag.class, callbacks -> (screen, context, horizontalAmount, verticalAmount) -> {
+		return EventFactory.createArrayBacked(ScreenMouseEvents.BeforeMouseDrag.class, callbacks -> (screen, event, horizontalAmount, verticalAmount) -> {
 			for (ScreenMouseEvents.BeforeMouseDrag callback : callbacks) {
-				callback.beforeMouseDrag(screen, context, horizontalAmount, verticalAmount);
+				callback.beforeMouseDrag(screen, event, horizontalAmount, verticalAmount);
 			}
 		});
 	}
 
 	public static Event createAfterMouseDragEvent() {
-		return EventFactory.createArrayBacked(ScreenMouseEvents.AfterMouseDrag.class, callbacks -> (screen, context, horizontalAmount, verticalAmount, consumed) -> {
+		return EventFactory.createArrayBacked(ScreenMouseEvents.AfterMouseDrag.class, callbacks -> (screen, event, horizontalAmount, verticalAmount, consumed) -> {
 			boolean consume = false;
 
 			for (ScreenMouseEvents.AfterMouseDrag callback : callbacks) {
-				consume |= callback.afterMouseDrag(screen, context, horizontalAmount, verticalAmount, consume | consumed);
+				consume |= callback.afterMouseDrag(screen, event, horizontalAmount, verticalAmount, consume | consumed);
 			}
 
 			return consume;
diff --git a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/ScreenEventHooks.java b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/ScreenEventHooks.java
new file mode 100644
index 0000000000..c1c5b767d9
--- /dev/null
+++ b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/ScreenEventHooks.java
@@ -0,0 +1,123 @@
+package net.fabricmc.fabric.impl.client.screen;
+
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.client.event.ScreenEvent;
+
+import net.minecraft.client.gui.screens.Screen;
+
+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.ScreenMouseEvents;
+
+@EventBusSubscriber(Dist.CLIENT)
+public class ScreenEventHooks {
+	@SubscribeEvent
+	public static void beforeScreenDraw(ScreenEvent.Render.Pre event) {
+		Screen screen = event.getScreen();
+		ScreenEvents.beforeExtract(screen).invoker().beforeExtract(screen, event.getGuiGraphics(), event.getMouseX(), event.getMouseY(), event.getPartialTick());
+	}
+
+	@SubscribeEvent
+	public static void afterScreenDraw(ScreenEvent.Render.Post event) {
+		Screen screen = event.getScreen();
+		ScreenEvents.afterExtract(screen).invoker().afterExtract(screen, event.getGuiGraphics(), event.getMouseX(), event.getMouseY(), event.getPartialTick());
+	}
+
+	@SubscribeEvent
+	public static void beforeKeyPressed(ScreenEvent.KeyPressed.Pre event) {
+		Screen screen = event.getScreen();
+		if (!ScreenKeyboardEvents.allowKeyPress(screen).invoker().allowKeyPress(screen, event.getKeyEvent())) {
+			event.setCanceled(true);
+		} else {
+			ScreenKeyboardEvents.beforeKeyPress(screen).invoker().beforeKeyPress(screen, event.getKeyEvent());
+		}
+	}
+
+	@SubscribeEvent
+	public static void afterKeyPressed(ScreenEvent.KeyPressed.Post event) {
+		Screen screen = event.getScreen();
+		ScreenKeyboardEvents.afterKeyPress(screen).invoker().afterKeyPress(screen, event.getKeyEvent());
+	}
+
+	@SubscribeEvent
+	public static void beforeKeyReleased(ScreenEvent.KeyReleased.Pre event) {
+		Screen screen = event.getScreen();
+		if (!ScreenKeyboardEvents.allowKeyRelease(screen).invoker().allowKeyRelease(screen, event.getKeyEvent())) {
+			event.setCanceled(true);
+		} else {
+			ScreenKeyboardEvents.beforeKeyRelease(screen).invoker().beforeKeyRelease(screen, event.getKeyEvent());
+		}
+	}
+
+	@SubscribeEvent
+	public static void afterKeyReleased(ScreenEvent.KeyReleased.Post event) {
+		Screen screen = event.getScreen();
+		ScreenKeyboardEvents.afterKeyRelease(screen).invoker().afterKeyRelease(screen, event.getKeyEvent());
+	}
+
+	@SubscribeEvent
+	public static void beforeMouseClicked(ScreenEvent.MouseButtonPressed.Pre event) {
+		Screen screen = event.getScreen();
+		if (!ScreenMouseEvents.allowMouseClick(screen).invoker().allowMouseClick(screen, event.getMouseButtonEvent())) {
+			event.setCanceled(true);
+		} else {
+			ScreenMouseEvents.beforeMouseClick(screen).invoker().beforeMouseClick(screen, event.getMouseButtonEvent());
+		}
+	}
+
+	@SubscribeEvent
+	public static void afterMouseClicked(ScreenEvent.MouseButtonPressed.Post event) {
+		Screen screen = event.getScreen();
+		ScreenMouseEvents.afterMouseClick(screen).invoker().afterMouseClick(screen, event.getMouseButtonEvent(), event.wasClickHandled());
+	}
+
+	@SubscribeEvent
+	public static void beforeMouseReleased(ScreenEvent.MouseButtonReleased.Pre event) {
+		Screen screen = event.getScreen();
+		if (!ScreenMouseEvents.allowMouseRelease(screen).invoker().allowMouseRelease(screen, event.getMouseButtonEvent())) {
+			event.setCanceled(true);
+		} else {
+			ScreenMouseEvents.beforeMouseRelease(screen).invoker().beforeMouseRelease(screen, event.getMouseButtonEvent());
+		}
+	}
+
+	@SubscribeEvent
+	public static void afterMouseReleased(ScreenEvent.MouseButtonReleased.Post event) {
+		Screen screen = event.getScreen();
+		ScreenMouseEvents.afterMouseRelease(screen).invoker().afterMouseRelease(screen, event.getMouseButtonEvent(), event.wasReleaseHandled());
+	}
+
+	@SubscribeEvent
+	public static void beforeMouseScroll(ScreenEvent.MouseScrolled.Pre event) {
+		Screen screen = event.getScreen();
+		if (!ScreenMouseEvents.allowMouseScroll(screen).invoker().allowMouseScroll(screen, event.getMouseX(), event.getMouseY(), event.getScrollDeltaX(), event.getScrollDeltaY())) {
+			event.setCanceled(true);
+		} else {
+			ScreenMouseEvents.beforeMouseScroll(screen).invoker().beforeMouseScroll(screen, event.getMouseX(), event.getMouseY(), event.getScrollDeltaX(), event.getScrollDeltaY());
+		}
+	}
+
+	@SubscribeEvent
+	public static void afterMouseScroll(ScreenEvent.MouseScrolled.Post event) {
+		Screen screen = event.getScreen();
+		ScreenMouseEvents.afterMouseScroll(screen).invoker().afterMouseScroll(screen, event.getMouseX(), event.getMouseY(), event.getScrollDeltaX(), event.getScrollDeltaY(), false);
+	}
+
+	@SubscribeEvent
+	public static void beforeMouseDragged(ScreenEvent.MouseDragged.Pre event) {
+		Screen screen = event.getScreen();
+		if (!ScreenMouseEvents.allowMouseDrag(screen).invoker().allowMouseDrag(screen, event.getMouseButtonEvent(), event.getDragX(), event.getDragY())) {
+			event.setCanceled(true);
+		} else {
+			ScreenMouseEvents.beforeMouseDrag(screen).invoker().beforeMouseDrag(screen, event.getMouseButtonEvent(), event.getDragX(), event.getDragY());
+		}
+	}
+
+	@SubscribeEvent
+	public static void afterMouseDragged(ScreenEvent.MouseDragged.Post event) {
+		Screen screen = event.getScreen();
+		ScreenMouseEvents.afterMouseDrag(screen).invoker().afterMouseDrag(screen, event.getMouseButtonEvent(), event.getDragX(), event.getDragY(), false);
+	}
+}
diff --git a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/ScreenExtensions.java b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/ScreenExtensions.java
index ab691e3f0b..fd14524d28 100644
--- a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/ScreenExtensions.java
+++ b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/impl/client/screen/ScreenExtensions.java
@@ -39,11 +39,13 @@ static ScreenExtensions getExtensions(Screen screen) {
 
 	Event fabric_getAfterTickEvent();
 
-	Event fabric_getBeforeRenderEvent();
+	Event fabric_getBeforeExtractEvent();
 
 	Event fabric_getAfterBackgroundEvent();
 
-	Event fabric_getAfterRenderEvent();
+	Event fabric_getAfterForegroundEvent();
+
+	Event fabric_getAfterExtractEvent();
 
 	// Keyboard
 
@@ -59,6 +61,12 @@ static ScreenExtensions getExtensions(Screen screen) {
 
 	Event fabric_getAfterKeyReleaseEvent();
 
+	Event fabric_getAllowCharTypeEvent();
+
+	Event fabric_getBeforeCharTypeEvent();
+
+	Event fabric_getAfterCharTypeEvent();
+
 	// Mouse
 
 	Event fabric_getAllowMouseClickEvent();
diff --git a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/AbstractContainerScreenMixin.java b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/AbstractContainerScreenMixin.java
index d2ece3b289..0c1c46ec15 100644
--- a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/AbstractContainerScreenMixin.java
+++ b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/AbstractContainerScreenMixin.java
@@ -19,19 +19,29 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.network.chat.Component;
 
+import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
+
 @Mixin(AbstractContainerScreen.class)
 public abstract class AbstractContainerScreenMixin extends Screen {
 	private AbstractContainerScreenMixin(Component title) {
 		super(title);
 	}
 
+	@Inject(method = "extractRenderState", at = @At(value = "INVOKE",
+													target = "Lnet/minecraft/client/gui/screens/inventory/AbstractContainerScreen;extractContents(Lnet/minecraft/client/gui/GuiGraphicsExtractor;IIF)V", shift = At.Shift.AFTER))
+	public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a, CallbackInfo ci) {
+		ScreenEvents.afterForeground(this).invoker().afterForeground(this, graphics, mouseX, mouseY, a);
+	}
+
 	@Inject(method = "mouseReleased", at = @At("HEAD"), cancellable = true)
 	private void callSuperMouseReleased(MouseButtonEvent ctx, CallbackInfoReturnable cir) {
 		if (super.mouseReleased(ctx)) {
diff --git a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/AbstractRecipeBookScreenMixin.java b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/AbstractRecipeBookScreenMixin.java
new file mode 100644
index 0000000000..46c2e289ea
--- /dev/null
+++ b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/AbstractRecipeBookScreenMixin.java
@@ -0,0 +1,48 @@
+/*
+ * 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.mixin.screen;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.client.gui.screens.inventory.AbstractRecipeBookScreen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.inventory.RecipeBookMenu;
+
+import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
+
+@Mixin(AbstractRecipeBookScreen.class)
+abstract class AbstractRecipeBookScreenMixin extends AbstractContainerScreen {
+	private AbstractRecipeBookScreenMixin(T menu, Inventory inventory, Component title) {
+		super(menu, inventory, title);
+	}
+
+	@Inject(method = "extractRenderState",
+			at = @At(value = "INVOKE",
+					target = "Lnet/minecraft/client/gui/screens/recipebook/RecipeBookComponent;extractRenderState(Lnet/minecraft/client/gui/GuiGraphicsExtractor;IIF)V",
+					shift = At.Shift.AFTER))
+	public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a, CallbackInfo ci) {
+		ScreenEvents.afterForeground((this))
+				.invoker()
+				.afterForeground(this, graphics, mouseX, mouseY, a);
+	}
+}
diff --git a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/GameRendererMixin.java b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/GameRendererMixin.java
deleted file mode 100644
index 35a846c18d..0000000000
--- a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/GameRendererMixin.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.mixin.screen;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.client.gui.GuiGraphicsExtractor;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.renderer.GameRenderer;
-
-import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
-
-@Mixin(GameRenderer.class)
-abstract class GameRendererMixin {
-	@WrapOperation(method = "extractGui", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;extractRenderStateWithTooltipAndSubtitles(Lnet/minecraft/client/gui/GuiGraphicsExtractor;IIF)V"))
-	private void onExtractGui(Screen currentScreen, GuiGraphicsExtractor graphics, int mouseX, int mouseY, float tickDelta, Operation operation) {
-		ScreenEvents.beforeExtract(currentScreen).invoker().beforeExtract(currentScreen, graphics, mouseX, mouseY, tickDelta);
-		operation.call(currentScreen, graphics, mouseX, mouseY, tickDelta);
-		ScreenEvents.afterExtract(currentScreen).invoker().afterExtract(currentScreen, graphics, mouseX, mouseY, tickDelta);
-	}
-}
diff --git a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/GuiMixin.java b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/GuiMixin.java
new file mode 100644
index 0000000000..875d0eda81
--- /dev/null
+++ b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/GuiMixin.java
@@ -0,0 +1,93 @@
+/*
+ * 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.mixin.screen;
+
+import org.jspecify.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.screens.Screen;
+
+import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
+import net.fabricmc.fabric.impl.client.screen.GuiExtensions;
+import net.fabricmc.loader.api.FabricLoader;
+
+@Mixin(Gui.class)
+public class GuiMixin implements GuiExtensions {
+	@Unique
+	private static final Logger LOGGER = LoggerFactory.getLogger("fabric-screen-api-v1");
+	@Unique
+	private static final boolean DEBUG_SCREEN = FabricLoader.getInstance().isDevelopmentEnvironment() || Boolean.getBoolean("fabric.debugScreen");
+
+	@Shadow
+	private @Nullable Screen screen;
+	@Shadow
+	@Final
+	private Minecraft minecraft;
+
+	@Unique
+	private Screen tickingScreen;
+
+	@Inject(method = "setScreen", at = @At("HEAD"))
+	private void checkThreadOnDev(@Nullable Screen screen, CallbackInfo ci) {
+		Thread currentThread = Thread.currentThread();
+
+		if (DEBUG_SCREEN && currentThread != minecraft.getRunningThread()) {
+			LOGGER.error("Attempted to set screen to \"{}\" outside the render thread (\"{}\"). This will likely follow a crash! Make sure to call setScreen on the render thread.", screen, currentThread.getName());
+		}
+	}
+
+	@Inject(method = "setScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;removed()V", shift = At.Shift.AFTER))
+	private void onScreenRemove(@Nullable Screen screen, CallbackInfo ci) {
+		ScreenEvents.remove(this.screen).invoker().onRemove(this.screen);
+	}
+
+	// These two injections should be caught by the try-catch block if anything fails in an event and then rethrown in the crash report
+	@Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;tick()V"))
+	private void beforeScreenTick(CallbackInfo ci) {
+		// Store the screen in a variable in case someone tries to change the screen during this before tick event.
+		// If someone changes the screen, the after tick event will likely have class cast exceptions or an NPE.
+		this.tickingScreen = this.screen;
+		ScreenEvents.beforeTick(this.tickingScreen).invoker().beforeTick(this.tickingScreen);
+	}
+
+	@Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;tick()V", shift = At.Shift.AFTER))
+	private void afterScreenTick(CallbackInfo ci) {
+		ScreenEvents.afterTick(this.tickingScreen).invoker().afterTick(this.tickingScreen);
+		// Finally set the currently ticking screen to null
+		this.tickingScreen = null;
+	}
+
+	@Override
+	public @Nullable Screen getTickingScreen() {
+		return tickingScreen;
+	}
+
+	@Override
+	public void setTickingScreen(@Nullable Screen screen) {
+		this.tickingScreen = screen;
+	}
+}
diff --git a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/KeyboardHandlerMixin.java b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/KeyboardHandlerMixin.java
deleted file mode 100644
index 2137666d91..0000000000
--- a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/KeyboardHandlerMixin.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.mixin.screen;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.client.KeyboardHandler;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.input.KeyEvent;
-
-import net.fabricmc.fabric.api.client.screen.v1.ScreenKeyboardEvents;
-
-@Mixin(KeyboardHandler.class)
-abstract class KeyboardHandlerMixin {
-	@WrapOperation(method = "keyPress", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;keyPressed(Lnet/minecraft/client/input/KeyEvent;)Z"))
-	private boolean invokeKeyPressedEvents(Screen screen, KeyEvent ctx, Operation operation) {
-		// The screen passed to events is the same as the screen the handler method is called on,
-		// regardless of whether the screen changes within the handler or event invocations.
-
-		if (screen != null) {
-			if (!ScreenKeyboardEvents.allowKeyPress(screen).invoker().allowKeyPress(screen, ctx)) {
-				// Set this press action as handled
-				return true;
-			}
-
-			ScreenKeyboardEvents.beforeKeyPress(screen).invoker().beforeKeyPress(screen, ctx);
-		}
-
-		boolean result = operation.call(screen, ctx);
-
-		if (screen != null) {
-			ScreenKeyboardEvents.afterKeyPress(screen).invoker().afterKeyPress(screen, ctx);
-		}
-
-		return result;
-	}
-
-	@WrapOperation(method = "keyPress", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;keyReleased(Lnet/minecraft/client/input/KeyEvent;)Z"))
-	private boolean invokeKeyReleasedEvents(Screen screen, KeyEvent ctx, Operation operation) {
-		// The screen passed to events is the same as the screen the handler method is called on,
-		// regardless of whether the screen changes within the handler or event invocations.
-
-		if (screen != null) {
-			if (!ScreenKeyboardEvents.allowKeyRelease(screen).invoker().allowKeyRelease(screen, ctx)) {
-				// Set this release action as handled
-				return true;
-			}
-
-			ScreenKeyboardEvents.beforeKeyRelease(screen).invoker().beforeKeyRelease(screen, ctx);
-		}
-
-		boolean result = operation.call(screen, ctx);
-
-		if (screen != null) {
-			ScreenKeyboardEvents.afterKeyRelease(screen).invoker().afterKeyRelease(screen, ctx);
-		}
-
-		return result;
-	}
-}
diff --git a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/MinecraftMixin.java b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/MinecraftMixin.java
index 8786e85213..9bc4a700b5 100644
--- a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/MinecraftMixin.java
+++ b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/MinecraftMixin.java
@@ -16,9 +16,7 @@
 
 package net.fabricmc.fabric.mixin.screen;
 
-import org.jspecify.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -27,59 +25,29 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.screens.Screen;
 
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
-import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.fabric.impl.client.screen.GuiExtensions;
 
 @Mixin(Minecraft.class)
 abstract class MinecraftMixin {
-	@Unique
-	private static final Logger LOGGER = LoggerFactory.getLogger("fabric-screen-api-v1");
-	@Unique
-	private static final boolean DEBUG_SCREEN = FabricLoader.getInstance().isDevelopmentEnvironment() || Boolean.getBoolean("fabric.debugScreen");
-
 	@Shadow
-	public Screen screen;
+	@Final
+	public Gui gui;
 
-	@Shadow
-	private Thread gameThread;
 	@Unique
-	private Screen tickingScreen;
-
-	@Inject(method = "setScreen", at = @At("HEAD"))
-	private void checkThreadOnDev(@Nullable Screen screen, CallbackInfo ci) {
-		Thread currentThread = Thread.currentThread();
-
-		if (DEBUG_SCREEN && currentThread != this.gameThread) {
-			LOGGER.error("Attempted to set screen to \"{}\" outside the render thread (\"{}\"). This will likely follow a crash! Make sure to call setScreen on the render thread.", screen, currentThread.getName());
-		}
-	}
+	private GuiExtensions guiExtensions;
 
-	@Inject(method = "setScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;removed()V", shift = At.Shift.AFTER))
-	private void onScreenRemove(@Nullable Screen screen, CallbackInfo ci) {
-		ScreenEvents.remove(this.screen).invoker().onRemove(this.screen);
+	@Inject(method = "", at = @At("RETURN"))
+	private void onInit(CallbackInfo ci) {
+		this.guiExtensions = (GuiExtensions) this.gui;
 	}
 
-	@Inject(method = "destroy", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;removed()V", shift = At.Shift.AFTER))
+	@Inject(method = "exitWorldAndClose", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;removed()V", shift = At.Shift.AFTER))
 	private void onScreenRemoveBecauseStopping(CallbackInfo ci) {
-		ScreenEvents.remove(this.screen).invoker().onRemove(this.screen);
-	}
-
-	// These two injections should be caught by the try-catch block if anything fails in an event and then rethrown in the crash report
-	@Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;tick()V"))
-	private void beforeScreenTick(CallbackInfo ci) {
-		// Store the screen in a variable in case someone tries to change the screen during this before tick event.
-		// If someone changes the screen, the after tick event will likely have class cast exceptions or an NPE.
-		this.tickingScreen = this.screen;
-		ScreenEvents.beforeTick(this.tickingScreen).invoker().beforeTick(this.tickingScreen);
-	}
-
-	@Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;tick()V", shift = At.Shift.AFTER))
-	private void afterScreenTick(CallbackInfo ci) {
-		ScreenEvents.afterTick(this.tickingScreen).invoker().afterTick(this.tickingScreen);
-		// Finally set the currently ticking screen to null
-		this.tickingScreen = null;
+		ScreenEvents.remove(this.gui.screen()).invoker().onRemove(this.gui.screen());
 	}
 
 	// The LevelLoadingScreen is the odd screen that isn't ticked by the main tick loop, so we fire events for this screen.
@@ -88,14 +56,15 @@ private void afterScreenTick(CallbackInfo ci) {
 	private void beforeLoadingScreenTick(CallbackInfo ci) {
 		// Store the screen in a variable in case someone tries to change the screen during this before tick event.
 		// If someone changes the screen, the after tick event will likely have class cast exceptions or throw a NPE.
-		this.tickingScreen = this.screen;
-		ScreenEvents.beforeTick(this.tickingScreen).invoker().beforeTick(this.tickingScreen);
+		Screen screen = this.gui.screen();
+		guiExtensions.setTickingScreen(screen);
+		ScreenEvents.beforeTick(guiExtensions.getTickingScreen()).invoker().beforeTick(guiExtensions.getTickingScreen());
 	}
 
 	@Inject(method = "doWorldLoad", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;renderFrame(Z)V"))
 	private void afterLoadingScreenTick(CallbackInfo ci) {
-		ScreenEvents.afterTick(this.tickingScreen).invoker().afterTick(this.tickingScreen);
+		ScreenEvents.afterTick(guiExtensions.getTickingScreen()).invoker().afterTick(guiExtensions.getTickingScreen());
 		// Finally set the currently ticking screen to null
-		this.tickingScreen = null;
+		guiExtensions.setTickingScreen(null);
 	}
 }
diff --git a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/MouseHandlerMixin.java b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/MouseHandlerMixin.java
deleted file mode 100644
index e4773f74ff..0000000000
--- a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/MouseHandlerMixin.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 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.mixin.screen;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.client.MouseHandler;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.input.MouseButtonEvent;
-
-import net.fabricmc.fabric.api.client.screen.v1.ScreenMouseEvents;
-
-@Mixin(MouseHandler.class)
-abstract class MouseHandlerMixin {
-	@WrapOperation(method = "onButton", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;mouseClicked(Lnet/minecraft/client/input/MouseButtonEvent;Z)Z"))
-	private boolean invokeMouseClickedEvents(Screen screen, MouseButtonEvent ctx, boolean doubleClick, Operation operation) {
-		// The screen passed to events is the same as the screen the handler method is called on,
-		// regardless of whether the screen changes within the handler or event invocations.
-
-		if (screen != null) {
-			if (!ScreenMouseEvents.allowMouseClick(screen).invoker().allowMouseClick(screen, ctx)) {
-				// Set this press action as handled
-				return true;
-			}
-
-			ScreenMouseEvents.beforeMouseClick(screen).invoker().beforeMouseClick(screen, ctx);
-		}
-
-		boolean result = operation.call(screen, ctx, doubleClick);
-
-		if (screen != null) {
-			result |= ScreenMouseEvents.afterMouseClick(screen).invoker().afterMouseClick(screen, ctx, result);
-		}
-
-		return result;
-	}
-
-	@WrapOperation(method = "onButton", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;mouseReleased(Lnet/minecraft/client/input/MouseButtonEvent;)Z"))
-	private boolean invokeMousePressedEvents(Screen screen, MouseButtonEvent ctx, Operation operation) {
-		// The screen passed to events is the same as the screen the handler method is called on,
-		// regardless of whether the screen changes within the handler or event invocations.
-
-		if (screen != null) {
-			if (!ScreenMouseEvents.allowMouseRelease(screen).invoker().allowMouseRelease(screen, ctx)) {
-				// Set this release action as handled
-				return true;
-			}
-
-			ScreenMouseEvents.beforeMouseRelease(screen).invoker().beforeMouseRelease(screen, ctx);
-		}
-
-		boolean result = operation.call(screen, ctx);
-
-		if (screen != null) {
-			result |= ScreenMouseEvents.afterMouseRelease(screen).invoker().afterMouseRelease(screen, ctx, result);
-		}
-
-		return result;
-	}
-
-	@WrapOperation(method = "handleAccumulatedMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;mouseDragged(Lnet/minecraft/client/input/MouseButtonEvent;DD)Z"))
-	private boolean invokeMouseDragEvents(Screen screen, MouseButtonEvent ctx, double horizontalAmount, double verticalAmount, Operation operation) {
-		// The screen passed to events is the same as the screen the handler method is called on,
-		// regardless of whether the screen changes within the handler or event invocations.
-
-		if (screen != null) {
-			if (!ScreenMouseEvents.allowMouseDrag(screen).invoker().allowMouseDrag(screen, ctx, horizontalAmount, verticalAmount)) {
-				// Set this drag action as handled
-				return true;
-			}
-
-			ScreenMouseEvents.beforeMouseDrag(screen).invoker().beforeMouseDrag(screen, ctx, horizontalAmount, verticalAmount);
-		}
-
-		boolean result = operation.call(screen, ctx, horizontalAmount, verticalAmount);
-
-		if (screen != null) {
-			result |= ScreenMouseEvents.afterMouseDrag(screen).invoker().afterMouseDrag(screen, ctx, horizontalAmount, verticalAmount, result);
-		}
-
-		return result;
-	}
-
-	@WrapOperation(method = "onScroll", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;mouseScrolled(DDDD)Z"))
-	private boolean invokeMouseScrollEvents(Screen screen, double mouseX, double mouseY, double horizontalAmount, double verticalAmount, Operation operation) {
-		// The screen passed to events is the same as the screen the handler method is called on,
-		// regardless of whether the screen changes within the handler or event invocations.
-
-		if (screen != null) {
-			if (!ScreenMouseEvents.allowMouseScroll(screen).invoker().allowMouseScroll(screen, mouseX, mouseY, horizontalAmount, verticalAmount)) {
-				// Set this scroll action as handled
-				return true;
-			}
-
-			ScreenMouseEvents.beforeMouseScroll(screen).invoker().beforeMouseScroll(screen, mouseX, mouseY, horizontalAmount, verticalAmount);
-		}
-
-		boolean result = operation.call(screen, mouseX, mouseY, horizontalAmount, verticalAmount);
-
-		if (screen != null) {
-			result |= ScreenMouseEvents.afterMouseScroll(screen).invoker().afterMouseScroll(screen, mouseX, mouseY, horizontalAmount, verticalAmount, result);
-		}
-
-		return result;
-	}
-}
diff --git a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/ScreenMixin.java b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/ScreenMixin.java
index dec0e45e6b..bb6402b489 100644
--- a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/ScreenMixin.java
+++ b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/ScreenMixin.java
@@ -33,6 +33,7 @@
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarratableEntry;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenKeyboardEvents;
@@ -42,7 +43,7 @@
 import net.fabricmc.fabric.impl.client.screen.ScreenEventFactory;
 import net.fabricmc.fabric.impl.client.screen.ScreenExtensions;
 
-@Mixin(Screen.class)
+@Mixin(value = Screen.class, priority = 500)
 abstract class ScreenMixin implements ScreenExtensions {
 	@Shadow
 	@Final
@@ -55,7 +56,7 @@ abstract class ScreenMixin implements ScreenExtensions {
 	private List renderables;
 
 	@Unique
-	private ButtonList fabricButtons;
+	private List fabricButtons;
 	@Unique
 	private Event removeEvent;
 	@Unique
@@ -63,11 +64,13 @@ abstract class ScreenMixin implements ScreenExtensions {
 	@Unique
 	private Event afterTickEvent;
 	@Unique
-	private Event beforeRenderEvent;
+	private Event beforeExtractEvent;
 	@Unique
 	private Event afterBackgroundEvent;
 	@Unique
-	private Event afterRenderEvent;
+	private Event afterForegroundEvent;
+	@Unique
+	private Event afterExtractEvent;
 
 	// Keyboard
 	@Unique
@@ -82,6 +85,12 @@ abstract class ScreenMixin implements ScreenExtensions {
 	private Event beforeKeyReleaseEvent;
 	@Unique
 	private Event afterKeyReleaseEvent;
+	@Unique
+	private Event allowCharTypeEvent;
+	@Unique
+	private Event beforeCharTypeEvent;
+	@Unique
+	private Event afterCharTypeEvent;
 
 	// Mouse
 	@Unique
@@ -110,10 +119,17 @@ abstract class ScreenMixin implements ScreenExtensions {
 	private Event afterMouseScrollEvent;
 
 	@Inject(method = "extractRenderStateWithTooltipAndSubtitles", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;extractBackground(Lnet/minecraft/client/gui/GuiGraphicsExtractor;IIF)V", shift = At.Shift.AFTER))
-	public final void extractWithTooltip(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float deltaTicks, CallbackInfo ci) {
+	public final void extractBackground(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float deltaTicks, CallbackInfo ci) {
 		ScreenEvents.afterBackground(((Screen) (Object) this)).invoker().afterBackground((Screen) (Object) this, graphics, mouseX, mouseY, deltaTicks);
 	}
 
+	@Inject(method = "extractRenderStateWithTooltipAndSubtitles", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;extractRenderState(Lnet/minecraft/client/gui/GuiGraphicsExtractor;IIF)V", shift = At.Shift.AFTER))
+	public final void extractForeground(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float deltaTicks, CallbackInfo ci) {
+		if (!(((Object) this) instanceof AbstractContainerScreen)) {
+			ScreenEvents.afterForeground(((Screen) (Object) this)).invoker().afterForeground((Screen) (Object) this, graphics, mouseX, mouseY, deltaTicks);
+		}
+	}
+
 	@Inject(method = "init(II)V", at = @At("HEAD"))
 	private void beforeInitScreen(int width, int height, CallbackInfo ci) {
 		beforeInit(width, height);
@@ -139,9 +155,10 @@ private void beforeInit(int width, int height) {
 		// All elements are repopulated on the screen, so we need to reinitialize all events
 		this.fabricButtons = null;
 		this.removeEvent = ScreenEventFactory.createRemoveEvent();
-		this.beforeRenderEvent = ScreenEventFactory.createBeforeRenderEvent();
+		this.beforeExtractEvent = ScreenEventFactory.createBeforeExtractEvent();
 		this.afterBackgroundEvent = ScreenEventFactory.createAfterBackgroundEvent();
-		this.afterRenderEvent = ScreenEventFactory.createAfterRenderEvent();
+		this.afterForegroundEvent = ScreenEventFactory.createAfterForegroundEvent();
+		this.afterExtractEvent = ScreenEventFactory.createAfterExtractEvent();
 		this.beforeTickEvent = ScreenEventFactory.createBeforeTickEvent();
 		this.afterTickEvent = ScreenEventFactory.createAfterTickEvent();
 
@@ -152,6 +169,9 @@ private void beforeInit(int width, int height) {
 		this.allowKeyReleaseEvent = ScreenEventFactory.createAllowKeyReleaseEvent();
 		this.beforeKeyReleaseEvent = ScreenEventFactory.createBeforeKeyReleaseEvent();
 		this.afterKeyReleaseEvent = ScreenEventFactory.createAfterKeyReleaseEvent();
+		this.allowCharTypeEvent = ScreenEventFactory.createAllowCharTypeEvent();
+		this.beforeCharTypeEvent = ScreenEventFactory.createBeforeCharTypeEvent();
+		this.afterCharTypeEvent = ScreenEventFactory.createAfterCharTypeEvent();
 
 		// Mouse
 		this.allowMouseClickEvent = ScreenEventFactory.createAllowMouseClickEvent();
@@ -210,8 +230,8 @@ public Event fabric_getAfterTickEvent() {
 	}
 
 	@Override
-	public Event fabric_getBeforeRenderEvent() {
-		return ensureEventsAreInitialized(this.beforeRenderEvent);
+	public Event fabric_getBeforeExtractEvent() {
+		return ensureEventsAreInitialized(this.beforeExtractEvent);
 	}
 
 	@Override
@@ -220,8 +240,13 @@ public Event fabric_getAfterBackgroundEvent() {
 	}
 
 	@Override
-	public Event fabric_getAfterRenderEvent() {
-		return ensureEventsAreInitialized(this.afterRenderEvent);
+	public Event fabric_getAfterForegroundEvent() {
+		return ensureEventsAreInitialized(this.afterForegroundEvent);
+	}
+
+	@Override
+	public Event fabric_getAfterExtractEvent() {
+		return ensureEventsAreInitialized(this.afterExtractEvent);
 	}
 
 	// Keyboard
@@ -256,6 +281,21 @@ public Event fabric_getAfterKeyReleaseEven
 		return ensureEventsAreInitialized(this.afterKeyReleaseEvent);
 	}
 
+	@Override
+	public Event fabric_getAllowCharTypeEvent() {
+		return ensureEventsAreInitialized(this.allowCharTypeEvent);
+	}
+
+	@Override
+	public Event fabric_getBeforeCharTypeEvent() {
+		return ensureEventsAreInitialized(this.beforeCharTypeEvent);
+	}
+
+	@Override
+	public Event fabric_getAfterCharTypeEvent() {
+		return ensureEventsAreInitialized(this.afterCharTypeEvent);
+	}
+
 	// Mouse
 
 	@Override
diff --git a/fabric-screen-api-v1/src/client/resources/fabric-screen-api-v1.mixins.json b/fabric-screen-api-v1/src/client/resources/fabric-screen-api-v1.mixins.json
index 9d3e7ab7d2..fb6a05d11d 100644
--- a/fabric-screen-api-v1/src/client/resources/fabric-screen-api-v1.mixins.json
+++ b/fabric-screen-api-v1/src/client/resources/fabric-screen-api-v1.mixins.json
@@ -2,10 +2,12 @@
   "required": true,
   "package": "net.fabricmc.fabric.mixin.screen",
   "compatibilityLevel": "JAVA_25",
-  "client": [
-    "GameRendererMixin",
+  "mixins": [
     "AbstractContainerScreenMixin",
+    "AbstractRecipeBookScreenMixin",
+    "GuiMixin",
     "MinecraftMixin",
+    "ScreenAccessor",
     "ScreenMixin"
   ],
   "injectors": {
@@ -13,10 +15,5 @@
   },
   "overwrites": {
     "requireAnnotations": true
-  },
-  "mixins": [
-    "KeyboardHandlerMixin",
-    "MouseHandlerMixin",
-    "ScreenAccessor"
-  ]
+  }
 }
diff --git a/fabric-screen-api-v1/src/test/java/net/fabricmc/fabric/test/screen/unittests/ButtonListTests.java b/fabric-screen-api-v1/src/test/java/net/fabricmc/fabric/test/screen/unittests/ButtonListTests.java
new file mode 100644
index 0000000000..42f5479445
--- /dev/null
+++ b/fabric-screen-api-v1/src/test/java/net/fabricmc/fabric/test/screen/unittests/ButtonListTests.java
@@ -0,0 +1,215 @@
+/*
+ * 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.screen.unittests;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.CommonComponents;
+
+import net.fabricmc.fabric.api.client.screen.v1.Screens;
+
+public class ButtonListTests {
+	@Test
+	public void testSize() {
+		List widgets = Screens.getWidgets(screen());
+		assertEquals(7, widgets.size());
+	}
+
+	@Test
+	public void testAdd() {
+		List widgets = Screens.getWidgets(screen());
+		int size = widgets.size();
+		Button button = button();
+		widgets.add(button);
+		assertEquals(size, widgets.indexOf(button));
+		assertEquals(size + 1, widgets.size());
+	}
+
+	@Test
+	public void testAddBeforeRenderable() {
+		List widgets = Screens.getWidgets(screen());
+		int size = widgets.size();
+		Button button = button();
+		widgets.add(0, button);
+		assertEquals(0, widgets.indexOf(button));
+		assertEquals(size + 1, widgets.size());
+	}
+
+	@Test
+	public void testAddAtRenderable() {
+		List widgets = Screens.getWidgets(screen());
+		int size = widgets.size();
+		Button button = button();
+		widgets.add(1, button);
+		assertEquals(1, widgets.indexOf(button));
+		assertEquals(size + 1, widgets.size());
+	}
+
+	@Test
+	public void testAddAfterRenderable() {
+		List widgets = Screens.getWidgets(screen());
+		int size = widgets.size();
+		Button button = button();
+		widgets.add(2, button);
+		assertEquals(2, widgets.indexOf(button));
+		assertEquals(size + 1, widgets.size());
+	}
+
+	@Test
+	public void testRemove() {
+		List widgets = Screens.getWidgets(screen());
+		int size = widgets.size();
+		Button button = button();
+		widgets.add(button);
+		assertEquals(size, widgets.indexOf(button));
+		assertEquals(size + 1, widgets.size());
+		widgets.remove(button);
+		assertEquals(size, widgets.size());
+	}
+
+	@Test
+	public void testRemoveBeforeRenderable() {
+		List widgets = Screens.getWidgets(screen());
+		int size = widgets.size();
+		Button button = button();
+		widgets.add(0, button);
+		assertEquals(0, widgets.indexOf(button));
+		assertEquals(size + 1, widgets.size());
+		widgets.remove(button);
+		assertEquals(-1, widgets.indexOf(button));
+		assertEquals(size, widgets.size());
+	}
+
+	@Test
+	public void testRemoveAtRenderable() {
+		List widgets = Screens.getWidgets(screen());
+		int size = widgets.size();
+		Button button = button();
+		widgets.add(1, button);
+		assertEquals(1, widgets.indexOf(button));
+		assertEquals(size + 1, widgets.size());
+		widgets.remove(button);
+		assertEquals(-1, widgets.indexOf(button));
+		assertEquals(size, widgets.size());
+	}
+
+	@Test
+	public void testRemoveAfterRenderable() {
+		List widgets = Screens.getWidgets(screen());
+		int size = widgets.size();
+		Button button = button();
+		widgets.add(2, button);
+		assertEquals(2, widgets.indexOf(button));
+		assertEquals(size + 1, widgets.size());
+		widgets.remove(button);
+		assertEquals(-1, widgets.indexOf(button));
+		assertEquals(size, widgets.size());
+	}
+
+	@Test
+	public void testRemoveIndex() {
+		List widgets = Screens.getWidgets(screen());
+		int size = widgets.size();
+		Button button = button();
+		widgets.add(size, button);
+		assertEquals(size, widgets.indexOf(button));
+		assertEquals(size + 1, widgets.size());
+		widgets.remove(size);
+		assertEquals(size, widgets.size());
+	}
+
+	@Test
+	public void testRemoveIndexBeforeRenderable() {
+		List widgets = Screens.getWidgets(screen());
+		int size = widgets.size();
+		Button button = button();
+		widgets.add(0, button);
+		assertEquals(0, widgets.indexOf(button));
+		assertEquals(size + 1, widgets.size());
+		widgets.remove(0);
+		assertEquals(-1, widgets.indexOf(button));
+		assertEquals(size, widgets.size());
+	}
+
+	@Test
+	public void testRemoveIndexAtRenderable() {
+		List widgets = Screens.getWidgets(screen());
+		int size = widgets.size();
+		Button button = button();
+		widgets.add(1, button);
+		assertEquals(1, widgets.indexOf(button));
+		assertEquals(size + 1, widgets.size());
+		widgets.remove(1);
+		assertEquals(-1, widgets.indexOf(button));
+		assertEquals(size, widgets.size());
+	}
+
+	@Test
+	public void testRemoveIndexAfterRenderable() {
+		List widgets = Screens.getWidgets(screen());
+		int size = widgets.size();
+		Button button = button();
+		widgets.add(2, button);
+		assertEquals(2, widgets.indexOf(button));
+		assertEquals(size + 1, widgets.size());
+		widgets.remove(2);
+		assertEquals(-1, widgets.indexOf(button));
+		assertEquals(size, widgets.size());
+	}
+
+	private static Screen screen() {
+		// There must be more Button instances added via Screen::addRenderableOnly than via Screen::addWidget to properly test reliance on the backing Screen#renderables list.
+		return new Screen(null, null, CommonComponents.EMPTY) {
+			{
+				// Present in renderables: true, present in children: true, present in ButtonList: true
+				this.addRenderableWidget(button());
+				// Present in renderables: true, present in children: false, present in ButtonList: true
+				this.addRenderableOnly(button());
+				// Present in renderables: true, present in children: false, present in ButtonList: false (not an AbstractWidget)
+				this.addRenderableOnly((graphics, mouseX, mouseY, a) -> {
+					// NO-OP
+				});
+				// Present in renderables: false, present in children: true, present in ButtonList: false
+				this.addWidget(button());
+				// Present in renderables: false, present in children: true, present in ButtonList: false
+				this.addWidget(button());
+				// Present in renderables: true, present in children: true, present in ButtonList: true
+				this.addRenderableWidget(button());
+				// Present in renderables: true, present in children: false, present in ButtonList: true
+				this.addRenderableOnly(button());
+				// Present in renderables: true, present in children: true, present in ButtonList: true
+				this.addRenderableWidget(button());
+				// Present in renderables: true, present in children: true, present in ButtonList: true
+				this.addRenderableWidget(button());
+				// Present in renderables: true, present in children: false, present in ButtonList: true
+				this.addRenderableOnly(button());
+			}
+		};
+	}
+
+	private static Button button() {
+		return Button.builder(CommonComponents.EMPTY, _ -> {
+		}).build();
+	}
+}
diff --git a/fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/ScreenTests.java b/fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/ScreenTests.java
index 64cc10b2e1..3d26da65e1 100644
--- a/fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/ScreenTests.java
+++ b/fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/ScreenTests.java
@@ -78,36 +78,48 @@ private void afterInitScreen(Minecraft client, Screen screen, int windowWidth, i
 					.findAny()
 					.orElseThrow(() -> new AssertionError("Failed to find the \"Stop Sound\" button in the screen's elements"));
 
-			ScreenKeyboardEvents.allowKeyPress(screen).register((_screen, context) -> {
-				LOGGER.info("After Pressed, Context: {}", context);
+			ScreenKeyboardEvents.allowKeyPress(screen).register((_, event) -> {
+				LOGGER.info("Allow Key Press, Event: {}", event);
 				return true; // Let actions continue
 			});
 
-			ScreenKeyboardEvents.afterKeyPress(screen).register((_screen, context) -> {
-				LOGGER.warn("Pressed, Context: {}", context);
+			ScreenKeyboardEvents.afterKeyPress(screen).register((_, event) -> {
+				LOGGER.warn("After Key Press, Event: {}", event);
+			});
+
+			ScreenKeyboardEvents.allowCharType(screen).register((_, event) -> {
+				LOGGER.warn("Allow Char Type, Event: {}, Character: {}", event, event.codepointAsString());
+				return true;
 			});
 		} else if (screen instanceof CreativeModeInventoryScreen) {
 			Screens.getWidgets(screen).add(new TestButton());
 		} else if (screen instanceof GrindstoneScreen) {
 			// Register render event to draw an icon on the screen
 			// Expected result: the icon is drawn BEHIND both the container screen interface and the darkened background, text, items, the carried item, tooltips, etc.
-			ScreenEvents.beforeExtract(screen).register((_screen, graphics, mouseX, mouseY, tickDelta) -> {
+			ScreenEvents.beforeExtract(screen).register((_, graphics, mouseX, mouseY, tickDelta) -> {
 				// Render an armor icon to test
-				graphics.blitSprite(RenderPipelines.GUI_TEXTURED, ScreenTests.ARMOR_FULL_TEXTURE, (screen.width / 2) - 88 - 10, (screen.height / 2) - 34, 20, 20);
+				graphics.blitSprite(RenderPipelines.GUI_TEXTURED, ScreenTests.ARMOR_FULL_TEXTURE, (screen.width / 2) + 88 - 15, (screen.height / 2) - 34, 20, 20);
 			});
 
 			// Register render event to draw an icon on the screen
 			// Expected result: the icon is drawn ABOVE both the container screen interface and the darkened background, but still BEHIND text, items, the carried item, tooltips, etc.
-			ScreenEvents.afterBackground(screen).register((_screen, graphics, mouseX, mouseY, tickDelta) -> {
+			ScreenEvents.afterBackground(screen).register((_, graphics, mouseX, mouseY, tickDelta) -> {
+				// Render an armor icon to test
+				graphics.blitSprite(RenderPipelines.GUI_TEXTURED, ScreenTests.ARMOR_FULL_TEXTURE, (screen.width / 2) + 88 - 15, (screen.height / 2) - 10, 20, 20);
+			});
+
+			// Register render event to draw an icon on the screen
+			// Expected result: the icon is drawn ABOVE both the container screen interface and the darkened background, text, items, but still BEHIND the carried item, tooltips, etc.
+			ScreenEvents.afterForeground(screen).register((_, graphics, mouseX, mouseY, tickDelta) -> {
 				// Render an armor icon to test
-				graphics.blitSprite(RenderPipelines.GUI_TEXTURED, ScreenTests.ARMOR_FULL_TEXTURE, (screen.width / 2) - 88 - 10, (screen.height / 2) - 10, 20, 20);
+				graphics.blitSprite(RenderPipelines.GUI_TEXTURED, ScreenTests.ARMOR_FULL_TEXTURE, (screen.width / 2) + 88 - 15, (screen.height / 2) + 14, 20, 20);
 			});
 
 			// Register render event to draw an icon on the screen
 			// Expected result: the icon is drawn ABOVE everything, including the background, container screen interface, text, items, the carried item, tooltips, etc.
-			ScreenEvents.afterExtract(screen).register((_screen, graphics, mouseX, mouseY, tickDelta) -> {
+			ScreenEvents.afterExtract(screen).register((_, graphics, mouseX, mouseY, tickDelta) -> {
 				// Render an armor icon to test
-				graphics.blitSprite(RenderPipelines.GUI_TEXTURED, ScreenTests.ARMOR_FULL_TEXTURE, (screen.width / 2) - 88 - 10, (screen.height / 2) + 14, 20, 20);
+				graphics.blitSprite(RenderPipelines.GUI_TEXTURED, ScreenTests.ARMOR_FULL_TEXTURE, (screen.width / 2) + 88 - 15, (screen.height / 2) + 38, 20, 20);
 			});
 		}
 	}
diff --git a/fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/SoundButton.java b/fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/SoundButton.java
index ceacb8590d..ffe48db255 100644
--- a/fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/SoundButton.java
+++ b/fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/SoundButton.java
@@ -21,6 +21,7 @@
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.network.chat.Component;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.util.RandomSource;
@@ -29,9 +30,9 @@ class SoundButton extends Button.Plain {
 	private static final RandomSource RANDOM = RandomSource.create();
 
 	SoundButton(int x, int y, int width, int height) {
-		super(x, y, width, height, net.minecraft.network.chat.Component.nullToEmpty("Sound Button"), ctx -> {
+		super(x, y, width, height, Component.nullToEmpty("Sound Button"), _ -> {
 			final SoundEvent event = BuiltInRegistries.SOUND_EVENT.getRandom(RANDOM).map(Holder::value).orElse(SoundEvents.GENERIC_EXPLODE.value());
 			Minecraft.getInstance().getSoundManager().play(SimpleSoundInstance.forUI(event, 1.0F, 1.0F));
-		}, null);
+		}, Button.DEFAULT_NARRATION);
 	}
 }
diff --git a/fabric-serialization-api-v1/src/main/java/net/fabricmc/fabric/mixin/serialization/ValueInputExtensionMixin.java b/fabric-serialization-api-v1/src/main/java/net/fabricmc/fabric/mixin/serialization/ValueInputExtensionMixin.java
new file mode 100644
index 0000000000..5a8b271622
--- /dev/null
+++ b/fabric-serialization-api-v1/src/main/java/net/fabricmc/fabric/mixin/serialization/ValueInputExtensionMixin.java
@@ -0,0 +1,10 @@
+package net.fabricmc.fabric.mixin.serialization;
+
+import net.fabricmc.fabric.api.serialization.v1.value.FabricValueInput;
+
+import net.neoforged.neoforge.common.extensions.ValueInputExtension;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(ValueInputExtension.class)
+public interface ValueInputExtensionMixin extends FabricValueInput {
+}
diff --git a/fabric-serialization-api-v1/src/main/resources/fabric-serialization-api-v1.mixins.json b/fabric-serialization-api-v1/src/main/resources/fabric-serialization-api-v1.mixins.json
index 9c8101feae..b5366ae360 100644
--- a/fabric-serialization-api-v1/src/main/resources/fabric-serialization-api-v1.mixins.json
+++ b/fabric-serialization-api-v1/src/main/resources/fabric-serialization-api-v1.mixins.json
@@ -6,7 +6,8 @@
     "TagValueInputMixin",
     "TagValueOutputMixin",
     "ValueInputMixin",
-    "ValueOutputMixin"
+    "ValueOutputMixin",
+    "ValueInputExtensionMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-serialization-api-v1/src/test/java/net/fabricmc/fabric/test/serialization/DelegateValueInput.java b/fabric-serialization-api-v1/src/test/java/net/fabricmc/fabric/test/serialization/DelegateValueInput.java
index 292737666c..e519e530bf 100644
--- a/fabric-serialization-api-v1/src/test/java/net/fabricmc/fabric/test/serialization/DelegateValueInput.java
+++ b/fabric-serialization-api-v1/src/test/java/net/fabricmc/fabric/test/serialization/DelegateValueInput.java
@@ -17,6 +17,7 @@
 package net.fabricmc.fabric.test.serialization;
 
 import java.util.Optional;
+import java.util.Set;
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
@@ -132,4 +133,9 @@ public Optional getIntArray(String key) {
 	public HolderLookup.Provider lookup() {
 		return input.lookup();
 	}
+
+	@Override
+	public Set keySet() {
+		return ValueInput.super.keySet();
+	}
 }
diff --git a/fabric-sound-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/sound/SoundEngineMixin.java b/fabric-sound-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/sound/SoundEngineMixin.java
deleted file mode 100644
index c3b6aa0a14..0000000000
--- a/fabric-sound-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/sound/SoundEngineMixin.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.mixin.client.sound;
-
-import java.util.concurrent.CompletableFuture;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import net.minecraft.client.resources.sounds.SoundInstance;
-import net.minecraft.client.sounds.SoundBufferLibrary;
-import net.minecraft.client.sounds.SoundEngine;
-import net.minecraft.resources.Identifier;
-
-@Mixin(SoundEngine.class)
-public class SoundEngineMixin {
-	@Redirect(
-			method = "play(Lnet/minecraft/client/resources/sounds/SoundInstance;)Lnet/minecraft/client/sounds/SoundEngine$PlayResult;",
-			at = @At(
-					value = "INVOKE",
-					target = "Lnet/minecraft/client/sounds/SoundBufferLibrary;getStream(Lnet/minecraft/resources/Identifier;Z)Ljava/util/concurrent/CompletableFuture;"
-			)
-	)
-	private CompletableFuture getStream(SoundBufferLibrary library, Identifier id, boolean looping, SoundInstance sound) {
-		return sound.getAudioStream(library, id, looping);
-	}
-}
diff --git a/fabric-sound-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/sound/SoundInstanceMixin.java b/fabric-sound-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/sound/SoundInstanceMixin.java
index 76edd3560d..616250e243 100644
--- a/fabric-sound-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/sound/SoundInstanceMixin.java
+++ b/fabric-sound-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/sound/SoundInstanceMixin.java
@@ -16,12 +16,24 @@
 
 package net.fabricmc.fabric.mixin.client.sound;
 
+import java.util.concurrent.CompletableFuture;
+
 import org.spongepowered.asm.mixin.Mixin;
 
+import net.minecraft.client.resources.sounds.Sound;
 import net.minecraft.client.resources.sounds.SoundInstance;
+import net.minecraft.client.sounds.AudioStream;
+import net.minecraft.client.sounds.SoundBufferLibrary;
 
 import net.fabricmc.fabric.api.client.sound.v1.FabricSoundInstance;
 
+import org.spongepowered.asm.mixin.Overwrite;
+
 @Mixin(SoundInstance.class)
 public interface SoundInstanceMixin extends FabricSoundInstance {
+	// Override the Neo method in SoundInstance
+	@Overwrite
+	default CompletableFuture getStream(SoundBufferLibrary soundBuffers, Sound sound, boolean looping) {
+		return getAudioStream(soundBuffers, sound.getPath(), looping);
+	}
 }
diff --git a/fabric-sound-api-v1/src/client/resources/fabric-sound-api-v1.mixins.json b/fabric-sound-api-v1/src/client/resources/fabric-sound-api-v1.mixins.json
index 1407ed7891..c71ef10677 100644
--- a/fabric-sound-api-v1/src/client/resources/fabric-sound-api-v1.mixins.json
+++ b/fabric-sound-api-v1/src/client/resources/fabric-sound-api-v1.mixins.json
@@ -3,8 +3,7 @@
   "package": "net.fabricmc.fabric.mixin.client.sound",
   "compatibilityLevel": "JAVA_25",
   "client": [
-    "SoundInstanceMixin",
-    "SoundEngineMixin"
+    "SoundInstanceMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-tag-api-v1/README.md b/fabric-tag-api-v1/README.md
index b2b4c3dfa2..2d31c10e13 100644
--- a/fabric-tag-api-v1/README.md
+++ b/fabric-tag-api-v1/README.md
@@ -15,3 +15,15 @@ not `minecraft`.
 The JSON format of tag alias groups is an object with a `tags` list containing plain tag IDs.
 
 See the module javadoc for more information about tag aliases.
+
+## Tag entry removals
+
+*Tag entry removals* may be used to remove entries from a tag.
+
+These may be used to remove values from gameplay facing tags, to exclude specific entries from
+referenced tags from being applied via a tag's `values` field, or to just remove unwanted values.
+
+All tag files contain an additional field: `fabric:remove`, which is an array of entries you
+wish to remove, following the same syntax as the `values` field.
+
+See the module javadoc for more information about tag entry removals.
diff --git a/fabric-tag-api-v1/build.gradle b/fabric-tag-api-v1/build.gradle
index 4f353249fe..ce5741d79c 100644
--- a/fabric-tag-api-v1/build.gradle
+++ b/fabric-tag-api-v1/build.gradle
@@ -11,6 +11,7 @@ moduleDependencies(project, [
 
 testDependencies(project, [
 	':fabric-convention-tags-v2',
+	':fabric-client-gametest-api-v1',
 	':fabric-lifecycle-events-v1',
 	':fabric-resource-loader-v1',
 ])
diff --git a/fabric-tag-api-v1/src/client/java/net/fabricmc/fabric/impl/tag/client/ClientTagsImpl.java b/fabric-tag-api-v1/src/client/java/net/fabricmc/fabric/impl/tag/client/ClientTagsImpl.java
index caa83f1ca2..19afb523b1 100644
--- a/fabric-tag-api-v1/src/client/java/net/fabricmc/fabric/impl/tag/client/ClientTagsImpl.java
+++ b/fabric-tag-api-v1/src/client/java/net/fabricmc/fabric/impl/tag/client/ClientTagsImpl.java
@@ -27,6 +27,7 @@
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.tags.TagKey;
 
@@ -61,13 +62,19 @@ private static  boolean isInWithLocalFallback(TagKey tagKey, Holder hol
 		}
 
 		// Recursively search the entries contained with the tag
-		ClientTagsLoader.LoadedTag wt = ClientTagsImpl.getOrCreatePartiallySyncedTag(tagKey);
+		ClientTagsLoader.LoadedTag loadedTag = ClientTagsImpl.getOrCreatePartiallySyncedTag(tagKey);
 
-		if (wt.immediateChildIds().contains(holder.unwrapKey().get().identifier())) {
+		Identifier id = holder.unwrapKey().get().identifier();
+
+		if (loadedTag.removeIds().contains(id)) {
+			return false;
+		}
+
+		if (loadedTag.immediateChildIds().contains(id)) {
 			return true;
 		}
 
-		for (TagKey key : wt.immediateChildTags()) {
+		for (TagKey key : loadedTag.immediateChildTags()) {
 			if (isInWithLocalFallback((TagKey) key, holder, checked)) {
 				return true;
 			}
diff --git a/fabric-tag-api-v1/src/client/java/net/fabricmc/fabric/impl/tag/client/ClientTagsLoader.java b/fabric-tag-api-v1/src/client/java/net/fabricmc/fabric/impl/tag/client/ClientTagsLoader.java
index 1d76d46ea9..8507f9eeef 100644
--- a/fabric-tag-api-v1/src/client/java/net/fabricmc/fabric/impl/tag/client/ClientTagsLoader.java
+++ b/fabric-tag-api-v1/src/client/java/net/fabricmc/fabric/impl/tag/client/ClientTagsLoader.java
@@ -51,7 +51,8 @@ public class ClientTagsLoader {
 	 * Parsing based on {@link net.minecraft.tags.TagLoader#load(net.minecraft.server.packs.resources.ResourceManager)}
 	 */
 	public static LoadedTag loadTag(TagKey tagKey) {
-		var tags = new HashSet();
+		var values = new HashSet();
+		var remove = new HashSet();
 		HashSet tagFiles = getTagFiles(tagKey.registry(), tagKey.location());
 
 		for (Path tagPath : tagFiles) {
@@ -62,23 +63,25 @@ public static LoadedTag loadTag(TagKey tagKey) {
 
 				if (maybeTagFile != null) {
 					if (maybeTagFile.replace()) {
-						tags.clear();
+						values.clear();
+						remove.clear();
 					}
 
-					tags.addAll(maybeTagFile.entries());
+					values.addAll(maybeTagFile.entries());
+					remove.addAll(maybeTagFile.remove());
 				}
 			} catch (IOException e) {
-				LOGGER.error("Error loading tag: " + tagKey, e);
+				LOGGER.error("Error loading tag: {}", tagKey, e);
 			}
 		}
 
 		HashSet completeIds = new HashSet<>();
+		HashSet removeIds = new HashSet<>();
 		HashSet immediateChildIds = new HashSet<>();
 		HashSet> immediateChildTags = new HashSet<>();
 
-		for (TagEntry tagEntry : tags) {
-			tagEntry.build(new TagEntry.Lookup<>() {
-				@Nullable
+		for (TagEntry tagEntry : values) {
+			tagEntry.build(new TagEntry.Lookup() {
 				@Override
 				public Identifier element(Identifier id, boolean required) {
 					immediateChildIds.add(id);
@@ -92,17 +95,46 @@ public Collection tag(Identifier id) {
 					immediateChildTags.add(tag);
 					return ClientTagsImpl.getOrCreatePartiallySyncedTag(tag).completeIds;
 				}
-			}, completeIds::add);
+			}, id -> {
+				removeIds.remove(id);
+				completeIds.add(id);
+			});
+		}
+
+		for (TagEntry removeEntry : remove) {
+			removeEntry.build(new TagEntry.Lookup() {
+				@Override
+				public Identifier element(Identifier id, boolean required) {
+					return id;
+				}
+
+				@Nullable
+				@Override
+				public Collection tag(Identifier id) {
+					TagKey tag = TagKey.create(tagKey.registry(), id);
+					return ClientTagsImpl.getOrCreatePartiallySyncedTag(tag).removeIds;
+				}
+			}, id -> {
+				completeIds.remove(id);
+				removeIds.add(id);
+			});
 		}
 
 		// Ensure that the tag does not refer to itself
 		immediateChildTags.remove(tagKey);
 
-		return new LoadedTag(Collections.unmodifiableSet(completeIds), Collections.unmodifiableSet(immediateChildTags),
-				Collections.unmodifiableSet(immediateChildIds));
+		return new LoadedTag(
+				Collections.unmodifiableSet(completeIds),
+				Collections.unmodifiableSet(removeIds),
+				Collections.unmodifiableSet(immediateChildTags),
+				Collections.unmodifiableSet(immediateChildIds)
+		);
 	}
 
-	public record LoadedTag(Set completeIds, Set> immediateChildTags, Set immediateChildIds) {
+	public record LoadedTag(Set completeIds,
+							Set removeIds,
+							Set> immediateChildTags,
+							Set immediateChildIds) {
 	}
 
 	/**
diff --git a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/AttachmentSyncException.java b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/api/tag/v1/FabricTagFile.java
similarity index 61%
rename from fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/AttachmentSyncException.java
rename to fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/api/tag/v1/FabricTagFile.java
index 069be20925..8db2e6e6b7 100644
--- a/fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/AttachmentSyncException.java
+++ b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/api/tag/v1/FabricTagFile.java
@@ -14,19 +14,20 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.attachment.sync;
+package net.fabricmc.fabric.api.tag.v1;
 
-import net.minecraft.network.chat.Component;
+import java.util.List;
 
-public class AttachmentSyncException extends Exception {
-	private final Component component;
+import net.minecraft.tags.TagEntry;
 
-	public AttachmentSyncException(Component component) {
-		super(component.getString());
-		this.component = component;
-	}
-
-	public Component getComponent() {
-		return component;
+/**
+ * Fabric-provided extensions for the {@link net.minecraft.tags.TagFile} class.
+ */
+public interface FabricTagFile {
+	/**
+	 * A list of entries defined via the {@code fabric:remove} field.
+	 */
+	default List remove() {
+		throw new AssertionError("Implemented via mixin");
 	}
 }
diff --git a/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/api/tag/v1/package-info.java b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/api/tag/v1/package-info.java
index 6c4bfa6f94..416dff2643 100644
--- a/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/api/tag/v1/package-info.java
+++ b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/api/tag/v1/package-info.java
@@ -17,7 +17,7 @@
 /**
  * The Fabric Tag API for working with {@linkplain net.minecraft.tags.TagKey tags}.
  *
- * 
    Aliasing tags
    
+ * 
    Aliasing tags
    
  * Tag alias groups are lists of tags that refer to the same set of registry entries.
  * The contained tags will be linked together and get the combined set of entries
  * of all the aliased tags in a group.
@@ -33,7 +33,7 @@
  * 
    If multiple tag alias groups include a tag, the groups will be combined and each tag will be an alias
  * for the same contents.
  *
- * 
    Tag aliases in the {@code c} namespace
    
+ * 
    Tag aliases in the {@code c} namespace
    
  *
  * 
    For the names of shared {@code c} tag alias groups, it's important that you use a short and descriptive name.
  * A good way to do this is reusing the name of a contained {@code c} tag that follows the naming conventions.
@@ -48,6 +48,21 @@
  * in your tag file directly. That way, data packs can modify your tag separately. Tag aliases make their contained
  * tags almost fully indistinguishable since they get the exact same content, and you have to override the alias group
  * in a higher-priority data pack to unlink them.
+ *
+ * 
    Removing entries from tags
    
+ * Tag entry removals may be used to remove entries from a tag.
+ *
+ * 
    These may be used to remove values from gameplay facing tags, to exclude specific entries from
+ * referenced tags from being applied via a tag's {@linkplain net.minecraft.tags.TagFile#entries() values}
+ * field, or to just remove unwanted values.
+ *
+ * 
    All tag files contain an additional field: {@code fabric:remove} which is an array of entries
+ * you wish to remove, following the same syntax as the {@code values} field.
+ *
+ * 
    Entries within the {@code fabric:remove} field are handled after all of the current file's values are added to the tag.
+ * These entries should never be required, meaning they will never throw exceptions if not present in the associated registry.
+ *
+ * 
    Tag entries may always be added back by data packs that load after the pack that removes the respective value(s).
  */
 @NullMarked
 package net.fabricmc.fabric.api.tag.v1;
diff --git a/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/impl/tag/CodecUtil.java b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/impl/tag/CodecUtil.java
new file mode 100644
index 0000000000..7628bd8297
--- /dev/null
+++ b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/impl/tag/CodecUtil.java
@@ -0,0 +1,36 @@
+package net.fabricmc.fabric.impl.tag;
+
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.MapLike;
+import com.mojang.serialization.RecordBuilder;
+
+import java.util.Arrays;
+import java.util.stream.Stream;
+
+public class CodecUtil {
+	public static  MapCodec aliasedField(Codec codec, T defaultValue,
+	                                           String canonical, String... aliases) {
+		return new MapCodec<>() {
+			@Override
+			public  DataResult decode(DynamicOps ops, MapLike input) {
+				O value = input.get(canonical);
+				for (int j = 0; value == null && j < aliases.length; j++)
+					value = input.get(aliases[j]);
+				return value == null ? DataResult.success(defaultValue) : codec.parse(ops, value);
+			}
+
+			@Override
+			public  RecordBuilder encode(T input, DynamicOps ops, RecordBuilder prefix) {
+				return prefix.add(canonical, codec.encodeStart(ops, input));
+			}
+
+			@Override
+			public  Stream keys(DynamicOps ops) {
+				return Stream.concat(Stream.of(canonical), Arrays.stream(aliases)).map(ops::createString);
+			}
+		};
+	}
+}
diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/BiomeSourceAccess.java b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/impl/tag/TagFileHooks.java
similarity index 76%
rename from fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/BiomeSourceAccess.java
rename to fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/impl/tag/TagFileHooks.java
index d529654d7c..04e9e465d0 100644
--- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/BiomeSourceAccess.java
+++ b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/impl/tag/TagFileHooks.java
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.biome;
+package net.fabricmc.fabric.impl.tag;
 
-public interface BiomeSourceAccess {
-	boolean fabric_shouldModifyBiomeEntries();
+import java.util.List;
 
-	void fabric_setModifyBiomeEntries(boolean modifyBiomeEntries);
+import net.minecraft.tags.TagEntry;
+
+public interface TagFileHooks {
+	void fabric_setRemove(List remove);
 }
diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/FabricTagBuilder.java b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/impl/tag/TagRemovalInternals.java
similarity index 77%
rename from fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/FabricTagBuilder.java
rename to fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/impl/tag/TagRemovalInternals.java
index da9569e4de..b4964a273b 100644
--- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/FabricTagBuilder.java
+++ b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/impl/tag/TagRemovalInternals.java
@@ -14,14 +14,10 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.datagen;
+package net.fabricmc.fabric.impl.tag;
 
 import net.minecraft.resources.Identifier;
 
-public interface FabricTagBuilder {
-	void fabric_setReplace(boolean replace);
-
-	boolean fabric_isReplaced();
-
-	void fabric_forceAddTag(Identifier tag);
+public class TagRemovalInternals {
+	public static final ScopedValue TAG_ID_SCOPED_VALUE = ScopedValue.newInstance();
 }
diff --git a/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/MappedRegistryMixin.java b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/MappedRegistryMixin.java
index 2e30b95009..864c859eef 100644
--- a/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/MappedRegistryMixin.java
+++ b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/MappedRegistryMixin.java
@@ -92,12 +92,12 @@ public void fabric_applyPendingTagAliases() {
 					entries.addAll(entryList.contents);
 				} else {
 					LOGGER.info("[Fabric] Creating a new empty tag {} for unknown tag used in a tag alias group in {}", tag.location(), tag.registry().identifier());
-					Map, HolderSet.Named> tagMap = ((SimpleRegistryTagLookup2Accessor) allTags).fabric_getTagMap();
+					Map, HolderSet.Named> tagMap = ((MappedRegistryTagSet2Accessor) allTags).fabric_getTagMap();
 
 					if (!(tagMap instanceof HashMap)) {
 						// Unfreeze the backing map.
 						tagMap = new HashMap<>(tagMap);
-						((SimpleRegistryTagLookup2Accessor) allTags).fabric_setTagMap(tagMap);
+						((MappedRegistryTagSet2Accessor) allTags).fabric_setTagMap(tagMap);
 					}
 
 					tagMap.put((TagKey) tag, createTag((TagKey) tag));
diff --git a/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/SimpleRegistryTagLookup2Accessor.java b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/MappedRegistryTagSet2Accessor.java
similarity index 95%
rename from fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/SimpleRegistryTagLookup2Accessor.java
rename to fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/MappedRegistryTagSet2Accessor.java
index 31c6e5698e..6c1d7c7bf1 100644
--- a/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/SimpleRegistryTagLookup2Accessor.java
+++ b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/MappedRegistryTagSet2Accessor.java
@@ -26,7 +26,7 @@
 import net.minecraft.tags.TagKey;
 
 @Mixin(targets = "net.minecraft.core.MappedRegistry$TagSet$2")
-public interface SimpleRegistryTagLookup2Accessor {
+public interface MappedRegistryTagSet2Accessor {
 	@Accessor("val$tags")
 	Map, HolderSet.Named> fabric_getTagMap();
 
diff --git a/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/ReloadableServerResourcesMixin.java b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/ReloadableServerResourcesMixin.java
index f45f05bbfb..bc1dff3473 100644
--- a/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/ReloadableServerResourcesMixin.java
+++ b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/ReloadableServerResourcesMixin.java
@@ -44,8 +44,8 @@ abstract class ReloadableServerResourcesMixin {
 	private LayeredRegistryAccess dynamicRegistriesByType;
 
 	@Inject(method = "", at = @At("RETURN"))
-	private void storeDynamicRegistries(LayeredRegistryAccess dynamicRegistries, HolderLookup.Provider loadingContext, FeatureFlagSet enabledFeatures, Commands.CommandSelection commandSelection, List postponedTags, PermissionSet functionCompilationPermissions, List newComponents, CallbackInfo ci) {
-		dynamicRegistriesByType = dynamicRegistries;
+	private void storeDynamicRegistries(LayeredRegistryAccess fullLayers, HolderLookup.Provider loadingContext, FeatureFlagSet enabledFeatures, Commands.CommandSelection commandSelection, List postponedTags, PermissionSet functionCompilationPermissions, List newComponents, CallbackInfo ci) {
+		dynamicRegistriesByType = fullLayers;
 	}
 
 	@Inject(method = "updateComponentsAndStaticRegistryTags", at = @At("RETURN"))
diff --git a/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/TagFileMixin.java b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/TagFileMixin.java
new file mode 100644
index 0000000000..9ad301a629
--- /dev/null
+++ b/fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/TagFileMixin.java
@@ -0,0 +1,48 @@
+/*
+ * 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.mixin.tag;
+
+import java.util.List;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.mojang.serialization.MapCodec;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Slice;
+
+import net.minecraft.tags.TagEntry;
+import net.minecraft.tags.TagFile;
+
+import net.fabricmc.fabric.api.tag.v1.FabricTagFile;
+import net.fabricmc.fabric.impl.tag.CodecUtil;
+
+@Mixin(TagFile.class)
+class TagFileMixin implements FabricTagFile {
+	@ModifyExpressionValue(
+			method = "lambda$static$0",
+			at = @At(
+					value = "INVOKE",
+					target = "Lcom/mojang/serialization/Codec;optionalFieldOf(Ljava/lang/String;Ljava/lang/Object;)Lcom/mojang/serialization/MapCodec;"
+			),
+			slice = @Slice(
+					from = @At(value = "CONSTANT", args = "stringValue=remove")
+			)
+	)
+	private static MapCodec> modifyCodec(MapCodec> original) {
+		return CodecUtil.aliasedField(TagEntry.CODEC.listOf(), List.of(), "remove", "fabric:remove");
+	}
+}
diff --git a/fabric-tag-api-v1/src/main/resources/fabric-tag-api-v1.classtweaker b/fabric-tag-api-v1/src/main/resources/fabric-tag-api-v1.classtweaker
index 321500559c..6ff4861f2b 100644
--- a/fabric-tag-api-v1/src/main/resources/fabric-tag-api-v1.classtweaker
+++ b/fabric-tag-api-v1/src/main/resources/fabric-tag-api-v1.classtweaker
@@ -1,3 +1,5 @@
 classTweaker	v1	official
 accessible	class	net/minecraft/core/MappedRegistry$TagSet
+accessible  class   net/minecraft/tags/TagLoader$SortingEntry
 accessible	field	net/minecraft/core/HolderSet$Named	contents	Ljava/util/List;
+transitive-inject-interface	net/minecraft/tags/TagFile	net/fabricmc/fabric/api/tag/v1/FabricTagFile
diff --git a/fabric-tag-api-v1/src/main/resources/fabric-tag-api-v1.mixins.json b/fabric-tag-api-v1/src/main/resources/fabric-tag-api-v1.mixins.json
index 1c34118187..f6f650a40f 100644
--- a/fabric-tag-api-v1/src/main/resources/fabric-tag-api-v1.mixins.json
+++ b/fabric-tag-api-v1/src/main/resources/fabric-tag-api-v1.mixins.json
@@ -6,8 +6,9 @@
     "MappedRegistry2Mixin",
     "MappedRegistry3Mixin",
     "MappedRegistryMixin",
+    "MappedRegistryTagSet2Accessor",
     "ReloadableServerResourcesMixin",
-    "SimpleRegistryTagLookup2Accessor",
+    "TagFileMixin",
     "TagLoaderMixin"
   ],
   "injectors": {
diff --git a/fabric-tag-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/TagAliasTest.java b/fabric-tag-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/TagAliasTest.java
deleted file mode 100644
index ee7c5f77be..0000000000
--- a/fabric-tag-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/TagAliasTest.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * 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.tag;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.minecraft.core.HolderGetter;
-import net.minecraft.core.HolderLookup;
-import net.minecraft.core.HolderSet;
-import net.minecraft.core.Registry;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.Identifier;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.tags.TagKey;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.Biomes;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.storage.loot.LootTable;
-
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.event.lifecycle.v1.CommonLifecycleEvents;
-
-public final class TagAliasTest implements ModInitializer {
-	private static final Logger LOGGER = LoggerFactory.getLogger(TagAliasTest.class);
-
-	// Test 1: Alias two non-empty tags
-	public static final TagKey GEMS = tagKey(Registries.ITEM, "gems");
-	public static final TagKey EXPENSIVE_ROCKS = tagKey(Registries.ITEM, "expensive_rocks");
-
-	// Test 2: Alias a non-empty tag and an empty tag
-	public static final TagKey REDSTONE_DUSTS = tagKey(Registries.ITEM, "redstone_dusts");
-	public static final TagKey REDSTONE_POWDERS = tagKey(Registries.ITEM, "redstone_powders");
-
-	// Test 3: Alias a non-empty tag and a missing tag
-	public static final TagKey BEETROOTS = tagKey(Registries.ITEM, "beetroots");
-	public static final TagKey MISSING_BEETROOTS = tagKey(Registries.ITEM, "missing_beetroots");
-
-	// Test 4: Given tags A, B, C, make alias groups A+B and B+C. They should get merged.
-	public static final TagKey BRICK_BLOCKS = tagKey(Registries.BLOCK, "brick_blocks");
-	public static final TagKey MORE_BRICK_BLOCKS = tagKey(Registries.BLOCK, "more_brick_blocks");
-	public static final TagKey BRICKS = tagKey(Registries.BLOCK, "bricks");
-
-	// Test 5: Merge tags from a world generation dynamic registry
-	public static final TagKey CLASSIC_BIOMES = tagKey(Registries.BIOME, "classic");
-	public static final TagKey TRADITIONAL_BIOMES = tagKey(Registries.BIOME, "traditional");
-
-	// Test 6: Merge tags from a reloadable registry
-	public static final TagKey NETHER_BRICKS_1 = tagKey(Registries.LOOT_TABLE, "nether_bricks_1");
-	public static final TagKey NETHER_BRICKS_2 = tagKey(Registries.LOOT_TABLE, "nether_bricks_2");
-
-	private static  TagKey tagKey(ResourceKey> registryRef, String name) {
-		return TagKey.create(registryRef, Identifier.fromNamespaceAndPath("fabric-tag-api-v1-testmod", name));
-	}
-
-	@Override
-	public void onInitialize() {
-		CommonLifecycleEvents.TAGS_LOADED.register((registries, client) -> {
-			LOGGER.info("Running tag alias tests on the {}...", client ? "client" : "server");
-
-			assertTagContent(registries, List.of(GEMS, EXPENSIVE_ROCKS), TagAliasTest::getItemKey,
-					Items.DIAMOND, Items.EMERALD);
-			assertTagContent(registries, List.of(REDSTONE_DUSTS, REDSTONE_POWDERS), TagAliasTest::getItemKey,
-					Items.REDSTONE);
-			assertTagContent(registries, List.of(BEETROOTS, MISSING_BEETROOTS), TagAliasTest::getItemKey,
-					Items.BEETROOT);
-			assertTagContent(registries, List.of(BRICK_BLOCKS, MORE_BRICK_BLOCKS, BRICKS), TagAliasTest::getBlockKey,
-					Blocks.BRICKS, Blocks.STONE_BRICKS, Blocks.NETHER_BRICKS, Blocks.RED_NETHER_BRICKS);
-			assertTagContent(registries, List.of(CLASSIC_BIOMES, TRADITIONAL_BIOMES),
-					Biomes.PLAINS, Biomes.DESERT);
-
-			// The loot table registry isn't synced to the client.
-			if (!client) {
-				assertTagContent(registries, List.of(NETHER_BRICKS_1, NETHER_BRICKS_2),
-						Blocks.NETHER_BRICKS.getLootTable().orElseThrow(),
-						Blocks.RED_NETHER_BRICKS.getLootTable().orElseThrow());
-			}
-
-			LOGGER.info("Tag alias tests completed successfully!");
-		});
-	}
-
-	private static ResourceKey getBlockKey(Block block) {
-		return block.builtInRegistryHolder().key();
-	}
-
-	private static ResourceKey getItemKey(Item item) {
-		return item.builtInRegistryHolder().key();
-	}
-
-	@SafeVarargs
-	private static  void assertTagContent(HolderLookup.Provider registries, List> tags, Function> keyExtractor, T... expected) {
-		Set> keys = Arrays.stream(expected)
-				.map(keyExtractor)
-				.collect(Collectors.toSet());
-		assertTagContent(registries, tags, keys);
-	}
-
-	@SafeVarargs
-	private static  void assertTagContent(HolderLookup.Provider registries, List> tags, ResourceKey... expected) {
-		assertTagContent(registries, tags, Set.of(expected));
-	}
-
-	private static  void assertTagContent(HolderLookup.Provider registries, List> tags, Set> expected) {
-		HolderGetter lookup = registries.lookupOrThrow(tags.getFirst().registry());
-
-		for (TagKey tag : tags) {
-			HolderSet.Named tagEntryList = lookup.getOrThrow(tag);
-			Set> actual = tagEntryList.contents
-					.stream()
-					.map(entry -> entry.unwrapKey().orElseThrow())
-					.collect(Collectors.toSet());
-
-			if (!actual.equals(expected)) {
-				throw new AssertionError("Expected tag %s to have contents %s, but it had %s instead"
-						.formatted(tag, expected, actual));
-			}
-		}
-
-		LOGGER.info("Tags {} / {} were successfully aliased together", tags.getFirst().registry().identifier(), tags.stream()
-				.map(TagKey::location)
-				.map(Identifier::toString)
-				.collect(Collectors.joining(", ")));
-	}
-}
diff --git a/fabric-tag-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/TagAliasTests.java b/fabric-tag-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/TagAliasTests.java
new file mode 100644
index 0000000000..512c17d2d5
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/TagAliasTests.java
@@ -0,0 +1,122 @@
+/*
+ * 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.tag;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import net.minecraft.core.HolderLookup;
+import net.minecraft.core.Registry;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.Biomes;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.storage.loot.LootTable;
+
+import net.fabricmc.fabric.api.gametest.v1.GameTest;
+
+public final class TagAliasTests {
+	private static final Logger LOGGER = LoggerFactory.getLogger(TagAliasTests.class);
+
+	// Test 1: Alias two non-empty tags
+	public static final TagKey GEMS = tagKey(Registries.ITEM, "gems");
+	public static final TagKey EXPENSIVE_ROCKS = tagKey(Registries.ITEM, "expensive_rocks");
+
+	// Test 2: Alias a non-empty tag and an empty tag
+	public static final TagKey REDSTONE_DUSTS = tagKey(Registries.ITEM, "redstone_dusts");
+	public static final TagKey REDSTONE_POWDERS = tagKey(Registries.ITEM, "redstone_powders");
+
+	// Test 3: Alias a non-empty tag and a missing tag
+	public static final TagKey BEETROOTS = tagKey(Registries.ITEM, "beetroots");
+	public static final TagKey MISSING_BEETROOTS = tagKey(Registries.ITEM, "missing_beetroots");
+
+	// Test 4: Given tags A, B, C, make alias groups A+B and B+C. They should get merged.
+	public static final TagKey BRICK_BLOCKS = tagKey(Registries.BLOCK, "brick_blocks");
+	public static final TagKey MORE_BRICK_BLOCKS = tagKey(Registries.BLOCK, "more_brick_blocks");
+	public static final TagKey BRICKS = tagKey(Registries.BLOCK, "bricks");
+
+	// Test 5: Merge tags from a world generation dynamic registry
+	public static final TagKey CLASSIC_BIOMES = tagKey(Registries.BIOME, "classic");
+	public static final TagKey TRADITIONAL_BIOMES = tagKey(Registries.BIOME, "traditional");
+
+	// Test 6: Merge tags from a reloadable registry
+	public static final TagKey NETHER_BRICKS_1 = tagKey(Registries.LOOT_TABLE, "nether_bricks_1");
+	public static final TagKey NETHER_BRICKS_2 = tagKey(Registries.LOOT_TABLE, "nether_bricks_2");
+
+	private static  TagKey tagKey(ResourceKey> registryRef, String name) {
+		return TagKey.create(registryRef, Identifier.fromNamespaceAndPath("fabric-tag-api-v1-testmod", name));
+	}
+
+	@GameTest
+	public void nonEmptyTagAlias(GameTestHelper helper) {
+		RegistryAccess registries = helper.getLevel().registryAccess();
+		TagTestUtils.assertTagContent(helper, LOGGER, "Tags {} / {} were successfully aliased together", registries, List.of(GEMS, EXPENSIVE_ROCKS), TagTestUtils::getItemKey,
+				Items.DIAMOND, Items.EMERALD);
+		helper.succeed();
+	}
+
+	@GameTest
+	public void nonEmptyAndEmptyTagAlias(GameTestHelper helper) {
+		RegistryAccess registries = helper.getLevel().registryAccess();
+		TagTestUtils.assertTagContent(helper, LOGGER, "Tags {} / {} were successfully aliased together", registries, List.of(REDSTONE_DUSTS, REDSTONE_POWDERS), TagTestUtils::getItemKey,
+				Items.REDSTONE);
+		helper.succeed();
+	}
+
+	@GameTest
+	public void nonEmptyAndMissingTagAlias(GameTestHelper helper) {
+		RegistryAccess registries = helper.getLevel().registryAccess();
+		TagTestUtils.assertTagContent(helper, LOGGER, "Tags {} / {} were successfully aliased together", registries, List.of(BEETROOTS, MISSING_BEETROOTS), TagTestUtils::getItemKey,
+				Items.BEETROOT);
+		helper.succeed();
+	}
+
+	@GameTest
+	public void abcTagAlias(GameTestHelper helper) {
+		RegistryAccess registries = helper.getLevel().registryAccess();
+		TagTestUtils.assertTagContent(helper, LOGGER, "Tags {} / {} were successfully aliased together", registries, List.of(BRICK_BLOCKS, MORE_BRICK_BLOCKS, BRICKS), TagTestUtils::getBlockKey,
+				Blocks.BRICKS, Blocks.STONE_BRICKS, Blocks.NETHER_BRICKS, Blocks.RED_NETHER_BRICKS);
+		helper.succeed();
+	}
+
+	@GameTest
+	public void worldGenDynamicRegistryTagAlias(GameTestHelper helper) {
+		RegistryAccess registries = helper.getLevel().registryAccess();
+		TagTestUtils.assertTagContent(helper, LOGGER, "Tags {} / {} were successfully aliased together", registries, List.of(CLASSIC_BIOMES, TRADITIONAL_BIOMES),
+				Biomes.PLAINS, Biomes.DESERT);
+		helper.succeed();
+	}
+
+	@GameTest
+	public void reloadableRegistryTagAlias(GameTestHelper helper) {
+		HolderLookup.Provider registries = helper.getLevel().getServer().reloadableRegistries().lookup();
+		TagTestUtils.assertTagContent(helper, LOGGER, "Tags {} / {} were successfully aliased together", registries, List.of(NETHER_BRICKS_1, NETHER_BRICKS_2),
+				Blocks.NETHER_BRICKS.getLootTable().orElseThrow(),
+				Blocks.RED_NETHER_BRICKS.getLootTable().orElseThrow());
+		helper.succeed();
+	}
+}
diff --git a/fabric-tag-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/TagEntryRemovalTests.java b/fabric-tag-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/TagEntryRemovalTests.java
new file mode 100644
index 0000000000..46a89a6e5a
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/TagEntryRemovalTests.java
@@ -0,0 +1,116 @@
+/*
+ * 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.tag;
+
+import static net.fabricmc.fabric.test.tag.TagTestUtils.tagKey;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.item.enchantment.Enchantment;
+import net.minecraft.world.item.enchantment.Enchantments;
+import net.minecraft.world.item.trading.VillagerTrade;
+
+import net.fabricmc.fabric.api.gametest.v1.GameTest;
+
+public final class TagEntryRemovalTests {
+	private static final Logger LOGGER = LoggerFactory.getLogger(TagEntryRemovalTests.class);
+
+	private static final TagKey TEST_ENCHANTMENT_TAG = tagKey(Registries.ENCHANTMENT, "all_enchantments_without_durability_enchantments");
+	private static final TagKey TEST_ITEM_TAG = tagKey(Registries.ITEM, "snowballs_without_bricks");
+	private static final TagKey TEST_VILLAGER_TRADE_TAG = tagKey(Registries.VILLAGER_TRADE, "test");
+
+	@GameTest
+	public void snowballsWithoutBricksOnlyContainsSnowballs(GameTestHelper helper) {
+		RegistryAccess registries = helper.getLevel().registryAccess();
+		TagTestUtils.assertTagContent(
+				helper,
+				LOGGER,
+				"Tag {} / {} contains expected entries",
+				registries,
+				List.of(TEST_ITEM_TAG),
+				TagTestUtils::getItemKey,
+				Items.SNOWBALL
+		);
+		helper.succeed();
+	}
+
+	@GameTest
+	public void snowballsWithoutBricksDoesNotContainBricks(GameTestHelper helper) {
+		RegistryAccess registries = helper.getLevel().registryAccess();
+		TagTestUtils.assertThrows(
+				helper,
+				() -> TagTestUtils.assertInTag(
+						helper,
+						LOGGER,
+						"",
+						registries,
+						List.of(TEST_ITEM_TAG),
+						TagTestUtils::getItemKey,
+						Items.BRICK
+				),
+				"Expected %s not to contain bricks".formatted(TEST_ITEM_TAG)
+		);
+		helper.succeed();
+	}
+
+	@GameTest
+	public void snowballsWithoutBricksDoesNotContainNetherBrick(GameTestHelper helper) {
+		RegistryAccess registries = helper.getLevel().registryAccess();
+		TagTestUtils.assertThrows(
+				helper,
+				() -> TagTestUtils.assertInTag(
+						helper,
+						LOGGER,
+						"",
+						registries,
+						List.of(TEST_ITEM_TAG),
+						TagTestUtils::getItemKey,
+						Items.NETHER_BRICK
+				),
+				"Expected %s not to contain nether bricks".formatted(TEST_ITEM_TAG)
+		);
+		helper.succeed();
+	}
+
+	@GameTest
+	public void allEnchantmentTagsWithoutDurabilityEnchantmentsDoesNotContainUnbreakingOrMending(GameTestHelper helper) {
+		RegistryAccess registries = helper.getLevel().registryAccess();
+		TagTestUtils.assertThrows(
+				helper,
+				() -> TagTestUtils.assertInTag(
+						helper,
+						LOGGER,
+						"",
+						registries,
+						List.of(TEST_ENCHANTMENT_TAG),
+						Enchantments.UNBREAKING,
+						Enchantments.MENDING
+				),
+				"Expected %s not to contain Unbreaking or Mending".formatted(TEST_ENCHANTMENT_TAG)
+		);
+		helper.succeed();
+	}
+}
diff --git a/fabric-tag-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/TagTest.java b/fabric-tag-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/TagTest.java
new file mode 100644
index 0000000000..7d159340b9
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/TagTest.java
@@ -0,0 +1,45 @@
+/*
+ * 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.tag;
+
+import net.minecraft.resources.Identifier;
+
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.resource.v1.ResourceLoader;
+import net.fabricmc.fabric.api.resource.v1.pack.PackActivationType;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
+
+public class TagTest implements ModInitializer {
+	public static final String MOD_ID = "fabric-tag-api-v1-testmod";
+
+	public static final Identifier REMOVE_AND_ADD_TEST_PACK_ID = Identifier.fromNamespaceAndPath(MOD_ID, "remove_and_add_test");
+	public static final Identifier NON_PRESENT_REMOVAL_PACK_ID = Identifier.fromNamespaceAndPath(MOD_ID, "non_present_removal");
+
+	@Override
+	public void onInitialize() {
+		final ModContainer container = FabricLoader.getInstance().getModContainer(MOD_ID).get();
+
+		if (!ResourceLoader.registerBuiltinPack(REMOVE_AND_ADD_TEST_PACK_ID, container, PackActivationType.NORMAL)) {
+			throw new IllegalStateException("Could not register '%s' built-in resource pack.".formatted(REMOVE_AND_ADD_TEST_PACK_ID));
+		}
+
+		if (!ResourceLoader.registerBuiltinPack(NON_PRESENT_REMOVAL_PACK_ID, container, PackActivationType.NORMAL)) {
+			throw new IllegalStateException("Could not register '%s' built-in resource pack.".formatted(NON_PRESENT_REMOVAL_PACK_ID));
+		}
+	}
+}
diff --git a/fabric-tag-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/TagTestUtils.java b/fabric-tag-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/TagTestUtils.java
new file mode 100644
index 0000000000..c6633a6f6b
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/TagTestUtils.java
@@ -0,0 +1,142 @@
+/*
+ * 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.tag;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.function.FailableRunnable;
+import org.slf4j.Logger;
+
+import net.minecraft.core.HolderLookup;
+import net.minecraft.core.HolderSet;
+import net.minecraft.core.Registry;
+import net.minecraft.gametest.framework.GameTestAssertException;
+import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
+
+public class TagTestUtils {
+	public static  ResourceKey resourceKey(ResourceKey> registryRef, String name) {
+		return ResourceKey.create(registryRef, Identifier.fromNamespaceAndPath(TagTest.MOD_ID, name));
+	}
+
+	public static  TagKey tagKey(ResourceKey> registryRef, String name) {
+		return TagKey.create(registryRef, Identifier.fromNamespaceAndPath(TagTest.MOD_ID, name));
+	}
+
+	public static ResourceKey getBlockKey(Block block) {
+		return block.builtInRegistryHolder().key();
+	}
+
+	public static ResourceKey getItemKey(Item item) {
+		return item.builtInRegistryHolder().key();
+	}
+
+	static void assertThrows(GameTestHelper helper, FailableRunnable action, String message) {
+		boolean threw = false;
+
+		try {
+			action.run();
+		} catch (GameTestAssertException err) {
+			threw = true;
+		}
+
+		if (!threw) {
+			throw helper.assertionException(message);
+		}
+	}
+
+	@SafeVarargs
+	static  void assertInTag(GameTestHelper helper, Logger logger, String successFmtStr, HolderLookup.Provider registries, List> tags, Function> keyExtractor, T... expected) throws GameTestAssertException {
+		assertInTag(helper, logger, successFmtStr, registries, tags, Arrays.stream(expected).map(keyExtractor).collect(Collectors.toSet()));
+	}
+
+	@SafeVarargs
+	static  void assertInTag(GameTestHelper helper, Logger logger, String successFmtStr, HolderLookup.Provider registries, List> tags, ResourceKey... expected) throws GameTestAssertException {
+		assertInTag(helper, logger, successFmtStr, registries, tags, Set.of(expected));
+	}
+
+	static  void assertInTag(GameTestHelper helper, Logger logger, String successFmtStr, HolderLookup.Provider registries, List> tags, Set> expected) throws GameTestAssertException {
+		HolderLookup lookup = registries.lookupOrThrow(tags.getFirst().registry());
+
+		for (TagKey tag : tags) {
+			HolderSet.Named holderSet = lookup.getOrThrow(tag);
+			Set> actual = holderSet.contents
+					.stream()
+					.map(entry -> entry.unwrapKey().orElseThrow())
+					.collect(Collectors.toSet());
+
+			for (ResourceKey key : expected) {
+				if (!actual.contains(key)) {
+					throw helper.assertionException("Expected to find %s in %s, but it was not found!",
+							key, tag.location());
+				}
+			}
+		}
+
+		if (!successFmtStr.isBlank()) {
+			logger.info(successFmtStr, tags.getFirst().registry().identifier(), expected.stream()
+					.map(ResourceKey::identifier)
+					.map(Identifier::toString)
+					.collect(Collectors.joining(", ")));
+		}
+	}
+
+	@SafeVarargs
+	static  void assertTagContent(GameTestHelper helper, Logger logger, String successFmtStr, HolderLookup.Provider registries, List> tags, Function> keyExtractor, T... expected) throws GameTestAssertException {
+		Set> keys = Arrays.stream(expected)
+				.map(keyExtractor)
+				.collect(Collectors.toSet());
+		assertTagContent(helper, logger, successFmtStr, registries, tags, keys);
+	}
+
+	@SafeVarargs
+	static  void assertTagContent(GameTestHelper helper, Logger logger, String successFmtStr, HolderLookup.Provider registries, List> tags, ResourceKey... expected) throws GameTestAssertException {
+		assertTagContent(helper, logger, successFmtStr, registries, tags, Set.of(expected));
+	}
+
+	static  void assertTagContent(GameTestHelper helper, Logger logger, String successFmtStr, HolderLookup.Provider registries, List> tags, Set> expected) throws GameTestAssertException {
+		HolderLookup lookup = registries.lookupOrThrow(tags.getFirst().registry());
+
+		for (TagKey tag : tags) {
+			HolderSet.Named holderSet = lookup.getOrThrow(tag);
+			Set> actual = holderSet.contents
+					.stream()
+					.map(entry -> entry.unwrapKey().orElseThrow())
+					.collect(Collectors.toSet());
+
+			if (!actual.equals(expected)) {
+				throw helper.assertionException("Expected tag %s to have contents %s, but it had %s instead",
+						tag, expected, actual);
+			}
+		}
+
+		if (!successFmtStr.isBlank()) {
+			logger.info(successFmtStr, tags.getFirst().registry().identifier(), tags.stream()
+					.map(TagKey::location)
+					.map(Identifier::toString)
+					.collect(Collectors.joining(", ")));
+		}
+	}
+}
diff --git a/fabric-tag-api-v1/src/testmod/resources/assets/fabric-tag-api-v1-testmod/lang/en_us.json b/fabric-tag-api-v1/src/testmod/resources/assets/fabric-tag-api-v1-testmod/lang/en_us.json
index 27b1bf080d..720f4f6ad4 100644
--- a/fabric-tag-api-v1/src/testmod/resources/assets/fabric-tag-api-v1-testmod/lang/en_us.json
+++ b/fabric-tag-api-v1/src/testmod/resources/assets/fabric-tag-api-v1-testmod/lang/en_us.json
@@ -3,11 +3,13 @@
   "tag.block.fabric-tag-api-v1-testmod.bricks": "Bricks",
   "tag.block.fabric-tag-api-v1-testmod.more_brick_blocks": "More Brick Blocks",
   "tag.item.fabric-tag-api-v1-testmod.beetroots": "Beetroots",
+  "tag.item.fabric-tag-api-v1-testmod.bricks": "Bricks",
   "tag.item.fabric-tag-api-v1-testmod.expensive_rocks": "Expensive Rocks",
   "tag.item.fabric-tag-api-v1-testmod.gems": "Gems",
   "tag.item.fabric-tag-api-v1-testmod.missing_beetroots": "Missing Beetroots",
   "tag.item.fabric-tag-api-v1-testmod.redstone_dusts": "Redstone Dusts",
   "tag.item.fabric-tag-api-v1-testmod.redstone_powders": "Redstone Powders",
+  "tag.item.fabric-tag-api-v1-testmod.snowballs_without_bricks": "Snowballs Without Bricks",
   "tag.loot_table.fabric-tag-api-v1-testmod.nether_bricks_1": "Nether Bricks 1",
   "tag.loot_table.fabric-tag-api-v1-testmod.nether_bricks_2": "Nether Bricks 2",
   "tag.worldgen.biome.fabric-tag-api-v1-testmod.classic": "Classic",
diff --git a/fabric-tag-api-v1/src/testmod/resources/data/fabric-tag-api-v1-testmod/tags/enchantment/all_enchantments_without_durability_enchantments.json b/fabric-tag-api-v1/src/testmod/resources/data/fabric-tag-api-v1-testmod/tags/enchantment/all_enchantments_without_durability_enchantments.json
new file mode 100644
index 0000000000..be59c0d2d8
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmod/resources/data/fabric-tag-api-v1-testmod/tags/enchantment/all_enchantments_without_durability_enchantments.json
@@ -0,0 +1,11 @@
+{
+  "replace": false,
+  "values": [
+    "#minecraft:non_treasure",
+    "#minecraft:treasure"
+  ],
+  "fabric:remove": [
+    "minecraft:mending",
+    "minecraft:unbreaking"
+  ]
+}
diff --git a/fabric-tag-api-v1/src/testmod/resources/data/fabric-tag-api-v1-testmod/tags/item/bricks.json b/fabric-tag-api-v1/src/testmod/resources/data/fabric-tag-api-v1-testmod/tags/item/bricks.json
new file mode 100644
index 0000000000..1ceab8cb97
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmod/resources/data/fabric-tag-api-v1-testmod/tags/item/bricks.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "nether_brick"
+  ]
+}
diff --git a/fabric-tag-api-v1/src/testmod/resources/data/fabric-tag-api-v1-testmod/tags/item/snowballs_without_bricks.json b/fabric-tag-api-v1/src/testmod/resources/data/fabric-tag-api-v1-testmod/tags/item/snowballs_without_bricks.json
new file mode 100644
index 0000000000..a218cf357e
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmod/resources/data/fabric-tag-api-v1-testmod/tags/item/snowballs_without_bricks.json
@@ -0,0 +1,12 @@
+{
+  "replace": false,
+  "fabric:remove": [
+    "brick",
+    "#fabric-tag-api-v1-testmod:bricks"
+  ],
+  "values": [
+    "snowball",
+    "brick",
+    "nether_brick"
+  ]
+}
diff --git a/fabric-tag-api-v1/src/testmod/resources/data/minecraft/tags/item/happy_ghast_food.json b/fabric-tag-api-v1/src/testmod/resources/data/minecraft/tags/item/happy_ghast_food.json
new file mode 100644
index 0000000000..29006ba68b
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmod/resources/data/minecraft/tags/item/happy_ghast_food.json
@@ -0,0 +1,7 @@
+{
+  "replace": false,
+  "values": [],
+  "fabric:remove": [
+    "minecraft:snowball"
+  ]
+}
diff --git a/fabric-tag-api-v1/src/testmod/resources/fabric.mod.json b/fabric-tag-api-v1/src/testmod/resources/fabric.mod.json
index e99ea63ed9..8d48a9b099 100644
--- a/fabric-tag-api-v1/src/testmod/resources/fabric.mod.json
+++ b/fabric-tag-api-v1/src/testmod/resources/fabric.mod.json
@@ -10,10 +10,17 @@
   },
   "entrypoints": {
     "main": [
-      "net.fabricmc.fabric.test.tag.TagAliasTest"
+      "net.fabricmc.fabric.test.tag.TagTest"
     ],
     "client": [
       "net.fabricmc.fabric.test.tag.client.v1.ClientTagTest"
+    ],
+    "fabric-gametest": [
+      "net.fabricmc.fabric.test.tag.TagAliasTests",
+      "net.fabricmc.fabric.test.tag.TagEntryRemovalTests"
+    ],
+    "fabric-client-gametest": [
+      "net.fabricmc.fabric.test.tag.client.v1.ClientTagGameTests"
     ]
   }
 }
diff --git a/fabric-tag-api-v1/src/testmod/resources/resourcepacks/non_present_removal/data/fabric-tag-api-v1-testmod/tags/item/non_present_removal.json b/fabric-tag-api-v1/src/testmod/resources/resourcepacks/non_present_removal/data/fabric-tag-api-v1-testmod/tags/item/non_present_removal.json
new file mode 100644
index 0000000000..d164cb981c
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmod/resources/resourcepacks/non_present_removal/data/fabric-tag-api-v1-testmod/tags/item/non_present_removal.json
@@ -0,0 +1,8 @@
+{
+  "replace": false,
+  "values": [
+  ],
+  "fabric:remove": [
+    "fabric-tag-api-v1-testmod:non_present"
+  ]
+}
diff --git a/fabric-tag-api-v1/src/testmod/resources/resourcepacks/non_present_removal/pack.mcmeta b/fabric-tag-api-v1/src/testmod/resources/resourcepacks/non_present_removal/pack.mcmeta
new file mode 100644
index 0000000000..31db4d7f1c
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmod/resources/resourcepacks/non_present_removal/pack.mcmeta
@@ -0,0 +1,7 @@
+{
+  "pack": {
+    "min_format": 101,
+    "max_format": 101,
+    "description": "Test Non Present Remove Values In Tags"
+  }
+}
diff --git a/fabric-tag-api-v1/src/testmod/resources/resourcepacks/remove_and_add_test/data/minecraft/tags/item/happy_ghast_food.json b/fabric-tag-api-v1/src/testmod/resources/resourcepacks/remove_and_add_test/data/minecraft/tags/item/happy_ghast_food.json
new file mode 100644
index 0000000000..57c938e165
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmod/resources/resourcepacks/remove_and_add_test/data/minecraft/tags/item/happy_ghast_food.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:snowball"
+  ]
+}
diff --git a/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/test2/pack.mcmeta b/fabric-tag-api-v1/src/testmod/resources/resourcepacks/remove_and_add_test/pack.mcmeta
similarity index 58%
rename from fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/test2/pack.mcmeta
rename to fabric-tag-api-v1/src/testmod/resources/resourcepacks/remove_and_add_test/pack.mcmeta
index bd0d5ce811..534d2148ef 100644
--- a/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/test2/pack.mcmeta
+++ b/fabric-tag-api-v1/src/testmod/resources/resourcepacks/remove_and_add_test/pack.mcmeta
@@ -1,6 +1,7 @@
 {
   "pack": {
-    "pack_format": 9,
+    "min_format": 101,
+    "max_format": 101,
     "description": "Test Dirt in SwordEfficient"
   }
-}
\ No newline at end of file
+}
diff --git a/fabric-tag-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagGameTests.java b/fabric-tag-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagGameTests.java
new file mode 100644
index 0000000000..d898fbbcff
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagGameTests.java
@@ -0,0 +1,268 @@
+/*
+ * 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.tag.client.v1;
+
+import static net.fabricmc.fabric.test.tag.TagTestUtils.resourceKey;
+import static net.fabricmc.fabric.test.tag.TagTestUtils.tagKey;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.core.HolderSet;
+import net.minecraft.core.Registry;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.tags.ItemTags;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.biome.Biomes;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+
+import net.fabricmc.fabric.api.client.gametest.v1.FabricClientGameTest;
+import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext;
+import net.fabricmc.fabric.api.client.gametest.v1.context.TestDedicatedServerConnection;
+import net.fabricmc.fabric.api.client.gametest.v1.context.TestDedicatedServerContext;
+import net.fabricmc.fabric.api.client.gametest.v1.context.TestSingleplayerContext;
+import net.fabricmc.fabric.api.tag.client.v1.ClientTags;
+import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags;
+import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags;
+import net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags;
+import net.fabricmc.fabric.test.tag.TagTest;
+import net.fabricmc.fabric.test.tag.TagTestUtils;
+
+public class ClientTagGameTests implements FabricClientGameTest {
+	private static final Logger LOGGER = LoggerFactory.getLogger(ClientTagGameTests.class);
+
+	private static final TagKey REMOVAL_TEST_TAG = tagKey(Registries.BLOCK, "dirt_and_mud_with_client_exclusions");
+	private static final TagKey READD_MELONS_TEST_TAG = tagKey(Registries.BLOCK, "readd_melons");
+	private static final TagKey HAPPY_GHAST_FOOD_TAG = ItemTags.HAPPY_GHAST_FOOD;
+
+	private static final TagKey NON_PRESENT_REMOVAL_TAG = tagKey(Registries.ITEM, "non_present_removal");
+	private static final ResourceKey NON_PRESENT_ITEM = resourceKey(Registries.ITEM, "non_present");
+
+	@Override
+	public void runTest(ClientGameTestContext context) {
+		context.runOnClient(ClientTagGameTests::clientTagTests);
+		context.runOnClient(ClientTagGameTests::clientTagRemovalTests);
+
+		try (
+				TestSingleplayerContext singleplayerContext = context.worldBuilder()
+						.create()
+		) {
+			context.runOnClient(ClientTagGameTests::clientTagSingleplayerTests);
+		}
+
+		try (
+				TestSingleplayerContext singleplayerContext = context.worldBuilder()
+						.create()
+		) {
+			singleplayerContext.getServer().runOnServer(ClientTagGameTests::removeValuesAreOptionalTests);
+		} catch (IllegalStateException ex) {
+			throw new AssertionError("Did not consider '%s' remove entry as an optional entry in tag '%s'"
+					.formatted(NON_PRESENT_ITEM.identifier(), NON_PRESENT_REMOVAL_TAG.location()));
+		}
+
+		try (
+				TestDedicatedServerContext serverContext = context.worldBuilder()
+						.createServer()
+		) {
+			serverContext.runOnServer(server -> ClientTagGameTests.removePackAndReload(server, ClientTagTest.BUILT_IN_PACK_ID));
+
+			try (TestDedicatedServerConnection connection = serverContext.connect()) {
+//				context.runOnClient(ClientTagGameTests::clientTagDedicatedServerTests);
+				serverContext.runOnServer(ClientTagGameTests::reloadAndAddServerTagTests);
+			}
+		}
+
+		try (
+				TestDedicatedServerContext serverContext = context.worldBuilder()
+						.createServer()
+		) {
+			try (TestDedicatedServerConnection connection = serverContext.connect()) {
+				serverContext.runOnServer(ClientTagGameTests::reAddRemovedValueTests);
+			}
+		}
+	}
+
+	private static void clientTagTests(Minecraft client) {
+		if (ClientTags.getOrCreateLocalTag(ConventionalEnchantmentTags.INCREASE_BLOCK_DROPS) == null) {
+			throw new AssertionError("Expected to load c:increase_block_drops, but it was not found!");
+		}
+
+		ClientTagTestUtils.assertInWithLocalFallback(LOGGER, "Client tag {} contains the expected entries {}", ConventionalBlockTags.ORES, TagTestUtils::getBlockKey, Blocks.DIAMOND_ORE);
+
+		ClientTagTestUtils.assertThrows(
+				() -> ClientTagTestUtils.assertInWithLocalFallback(LOGGER, "", ConventionalBlockTags.ORES, TagTestUtils::getBlockKey, Blocks.DIAMOND_BLOCK),
+				"Did not expect to find %s in %s, but it was found!"
+						.formatted(Blocks.DIAMOND_BLOCK.builtInRegistryHolder().key().identifier(), ConventionalBlockTags.ORES.location())
+		);
+
+		ClientTagTestUtils.assertInLocal(LOGGER, "Client tag {} contains the expected entries {}", ConventionalBiomeTags.IS_FOREST, Biomes.FOREST);
+
+		// Success!
+		LOGGER.info("The tests for client tags passed!");
+	}
+
+	private static void clientTagRemovalTests(Minecraft client) {
+		ClientTagTestUtils.assertThrows(
+				() -> ClientTagTestUtils.assertInWithLocalFallback(LOGGER, "", REMOVAL_TEST_TAG, TagTestUtils::getBlockKey, Blocks.DIRT),
+				"Did not expect to find %s in %s, but it was found!"
+						.formatted(Blocks.DIRT.builtInRegistryHolder().key().identifier(), REMOVAL_TEST_TAG.location())
+		);
+
+		ClientTagTestUtils.assertThrows(
+				() -> ClientTagTestUtils.assertInWithLocalFallback(LOGGER, "", REMOVAL_TEST_TAG, TagTestUtils::getBlockKey, Blocks.MUD),
+				"Did not expect to find %s in %s, but it was found!"
+						.formatted(Blocks.MUD.builtInRegistryHolder().key().identifier(), REMOVAL_TEST_TAG.location())
+		);
+
+		ClientTagTestUtils.assertInWithLocalFallback(LOGGER, "", REMOVAL_TEST_TAG, TagTestUtils::getBlockKey, Blocks.ROOTED_DIRT);
+
+		ClientTagTestUtils.assertInWithLocalFallback(LOGGER, "", REMOVAL_TEST_TAG, TagTestUtils::getBlockKey, Blocks.MUDDY_MANGROVE_ROOTS);
+
+		// Success!
+		LOGGER.info("The tests for client tag entry removals passed!");
+	}
+
+	private static void clientTagSingleplayerTests(Minecraft client) {
+		ClientTagTestUtils.assertInWithLocalFallback(LOGGER, "Client tag {} contains the expected entries {}", BlockTags.SWORD_EFFICIENT, TagTestUtils::getBlockKey, Blocks.DIRT);
+		ClientTagTestUtils.assertThrows(
+				() -> ClientTagTestUtils.assertInWithLocalFallback(LOGGER, "", BlockTags.SWORD_EFFICIENT, TagTestUtils::getBlockKey, Blocks.COCOA),
+				"Did not expect to find %s in %s, but it was found!"
+						.formatted(Blocks.COCOA.builtInRegistryHolder().key().identifier(), BlockTags.SWORD_EFFICIENT.location())
+		);
+
+		// Success!
+		LOGGER.info("The tests for singleplayer client tags passed!");
+	}
+
+	private static void clientTagDedicatedServerTests(Minecraft client) {
+		// minecraft:sword_efficient should NOT exist on dirt the client context (can be confirmed with F3 on a dirt block),
+		// but the this test should pass as minecraft:sword_efficient will contain dirt on the server context
+		ClientTagTestUtils.assertThrows(
+				() -> ClientTagTestUtils.assertInWithLocalFallback(LOGGER, "", BlockTags.SWORD_EFFICIENT, TagTestUtils::getBlockKey, Blocks.DIRT),
+				"Did not expect to find %s in %s, but it was found!"
+						.formatted(Blocks.DIRT.builtInRegistryHolder().key().identifier(), BlockTags.SWORD_EFFICIENT.location())
+		);
+		ClientTagTestUtils.assertInWithLocalFallback(LOGGER, "Client tag {} contains the expected entries {}", BlockTags.SWORD_EFFICIENT, TagTestUtils::getBlockKey, Blocks.COCOA);
+
+		// Success!
+		LOGGER.info("The tests for dedicated client tags passed!");
+	}
+
+	private static void removeValuesAreOptionalTests(MinecraftServer server) {
+		// Because this is a new world, we can get away with just adding the pack to the server once, no removals needed.
+		addPackAndReload(server, TagTest.NON_PRESENT_REMOVAL_PACK_ID);
+		// Success!
+		LOGGER.info("The tests for remove entries being defaulted to optional in tags passed!");
+	}
+
+	private static void reloadAndAddServerTagTests(MinecraftServer server) {
+		// fabric-tag-api-v1-testmod:add_back_melon is assumed to not exist on the server whilst the pack is removed for this test.
+		// Client tags are only read from the root data directory in the JAR, so you are unable to modify their values using built-in packs.
+		removeThenTestMelonInReAddMelonsTestTag(server);
+		addThenTestMelonInReAddMelonsTestTag(server);
+		removeThenTestMelonInReAddMelonsTestTag(server);
+
+		// Success!
+		LOGGER.info("The tests for adding tags to the server passed!");
+	}
+
+	private static void reAddRemovedValueTests(MinecraftServer server) {
+		// Run this hook to make sure that failed runs with the 'remove_and_add_test' data pack do not error due to having it enabled.
+		removeThenTestSnowballInHappyGhastFood(server);
+		addThenTestSnowballInHappyGhastFood(server);
+		// Remove it again to make sure that we have a default state for other tests.
+		removeThenTestSnowballInHappyGhastFood(server);
+
+		LOGGER.info("The tests for re-adding removed tag values passed!");
+	}
+
+	private static void removeThenTestMelonInReAddMelonsTestTag(MinecraftServer server) {
+		removePackAndReload(server, ClientTagTest.ADD_BACK_MELON_PACK_ID);
+		ClientTagTestUtils.assertThrows(
+				() -> ClientTagTestUtils.assertInWithLocalFallback(
+						LOGGER,
+						"",
+						READD_MELONS_TEST_TAG,
+						TagTestUtils::getBlockKey,
+						Blocks.MELON
+				),
+				"Did not expect to find %s in %s, but it was found!"
+						.formatted(Blocks.MELON.builtInRegistryHolder().key().identifier(), BlockTags.SWORD_EFFICIENT.location())
+		);
+	}
+
+	private static void addThenTestMelonInReAddMelonsTestTag(MinecraftServer server) {
+		addPackAndReload(server, ClientTagTest.ADD_BACK_MELON_PACK_ID);
+		ClientTagTestUtils.assertInWithLocalFallback(
+				LOGGER,
+				"",
+				READD_MELONS_TEST_TAG,
+				TagTestUtils::getBlockKey,
+				Blocks.MELON
+		);
+	}
+
+	private static void removeThenTestSnowballInHappyGhastFood(MinecraftServer server) {
+		removePackAndReload(server, TagTest.REMOVE_AND_ADD_TEST_PACK_ID);
+		RegistryAccess registries = server.registryAccess();
+		ClientTagTestUtils.assertThrows(
+				() -> assertSnowballInHappyGhastFood(registries),
+				"Expected %s not to contain snowball after removing pack".formatted(HAPPY_GHAST_FOOD_TAG)
+		);
+	}
+
+	private static void addThenTestSnowballInHappyGhastFood(MinecraftServer server) {
+		addPackAndReload(server, TagTest.REMOVE_AND_ADD_TEST_PACK_ID);
+		assertSnowballInHappyGhastFood(server.registryAccess());
+		LOGGER.info("Tag {} contains snowball after adding pack", HAPPY_GHAST_FOOD_TAG);
+	}
+
+	private static void assertSnowballInHappyGhastFood(RegistryAccess registries) {
+		Registry lookup = registries.lookupOrThrow(Registries.ITEM);
+		HolderSet.Named holderSet = lookup.getOrThrow(HAPPY_GHAST_FOOD_TAG);
+		boolean contains = holderSet.stream().anyMatch(h -> h.value() == Items.SNOWBALL);
+
+		if (!contains) {
+			throw new AssertionError("Expected %s to contain snowball".formatted(HAPPY_GHAST_FOOD_TAG));
+		}
+	}
+
+	private static void addPackAndReload(MinecraftServer server, Identifier packId) {
+		server.getPackRepository().addPack(packId.toString());
+		ClientTagTestUtils.reloadResources(
+				server,
+				() -> new AssertionError("Failed to reload after removing '%s' data pack".formatted(ClientTagTest.ADD_BACK_MELON_PACK_ID))
+		);
+	}
+
+	private static void removePackAndReload(MinecraftServer server, Identifier packId) {
+		server.getPackRepository().removePack(packId.toString());
+		ClientTagTestUtils.reloadResources(
+				server,
+				() -> new AssertionError("Failed to reload after removing '%s' data pack".formatted(ClientTagTest.ADD_BACK_MELON_PACK_ID))
+		);
+	}
+}
diff --git a/fabric-tag-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java b/fabric-tag-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java
index 1bb80eaf79..1eb7923fbf 100644
--- a/fabric-tag-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java
+++ b/fabric-tag-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java
@@ -16,76 +16,35 @@
 
 package net.fabricmc.fabric.test.tag.client.v1;
 
+import static net.fabricmc.fabric.test.tag.TagTest.MOD_ID;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.Identifier;
-import net.minecraft.tags.TagKey;
-import net.minecraft.world.level.biome.Biomes;
-import net.minecraft.world.level.block.Blocks;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.resource.v1.ResourceLoader;
 import net.fabricmc.fabric.api.resource.v1.pack.PackActivationType;
-import net.fabricmc.fabric.api.tag.client.v1.ClientTags;
-import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags;
-import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags;
-import net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 
 public class ClientTagTest implements ClientModInitializer {
 	private static final Logger LOGGER = LoggerFactory.getLogger(ClientTagTest.class);
-	private static final String MOD_ID = "fabric-tag-api-v1-testmod";
+
+	protected static final Identifier BUILT_IN_PACK_ID = Identifier.fromNamespaceAndPath(MOD_ID, "test");
+	protected static final Identifier ADD_BACK_MELON_PACK_ID = Identifier.fromNamespaceAndPath(MOD_ID, "add_back_melon");
 
 	@Override
 	public void onInitializeClient() {
 		final ModContainer container = FabricLoader.getInstance().getModContainer(MOD_ID).get();
 
-		if (!ResourceLoader.registerBuiltinPack(Identifier.fromNamespaceAndPath(MOD_ID, "test2"),
-				container, PackActivationType.ALWAYS_ENABLED)) {
-			throw new IllegalStateException("Could not register built-in resource pack.");
+		if (!ResourceLoader.registerBuiltinPack(BUILT_IN_PACK_ID, container, PackActivationType.ALWAYS_ENABLED)) {
+			throw new IllegalStateException("Could not register '%s' built-in resource pack.".formatted(BUILT_IN_PACK_ID));
 		}
 
-		ClientLifecycleEvents.CLIENT_STARTED.register(client -> {
-			if (ClientTags.getOrCreateLocalTag(ConventionalEnchantmentTags.INCREASE_BLOCK_DROPS) == null) {
-				throw new AssertionError("Expected to load c:fortune, but it was not found!");
-			}
-
-			if (!ClientTags.isInWithLocalFallback(ConventionalBlockTags.ORES, Blocks.DIAMOND_ORE)) {
-				throw new AssertionError("Expected to find diamond ore in c:ores, but it was not found!");
-			}
-
-			if (ClientTags.isInWithLocalFallback(ConventionalBlockTags.ORES, Blocks.DIAMOND_BLOCK)) {
-				throw new AssertionError("Did not expect to find diamond block in c:ores, but it was found!");
-			}
-
-			if (!ClientTags.isInLocal(ConventionalBiomeTags.IS_FOREST, Biomes.FOREST)) {
-				throw new AssertionError("Expected to find forest in c:forest, but it was not found!");
-			}
-
-			if (ClientTags.isInWithLocalFallback(TagKey.create(BuiltInRegistries.BLOCK.key(),
-					Identifier.fromNamespaceAndPath("fabric", "sword_efficient")), Blocks.DIRT)) {
-				throw new AssertionError("Expected not to find dirt in fabric:sword_efficient, but it was found!");
-			}
-
-			// Success!
-			LOGGER.info("The tests for client tags passed!");
-		});
-
-		if (true) return;
-
-		// This should be tested on a server with the datapack from the builtin resourcepack.
-		// That is, fabric:sword_efficient should NOT exist on the server (can be confirmed with F3 on a dirt block),
-		// but the this test should pass as minecraft:sword_efficient will contain dirt on the server
-		ClientTickEvents.END_LEVEL_TICK.register(client -> {
-			if (!ClientTags.isInWithLocalFallback(TagKey.create(BuiltInRegistries.BLOCK.key(),
-					Identifier.fromNamespaceAndPath("fabric", "sword_efficient")), Blocks.DIRT)) {
-				throw new AssertionError("Expected to find dirt in fabric:sword_efficient, but it was not found!");
-			}
-		});
+		if (!ResourceLoader.registerBuiltinPack(ADD_BACK_MELON_PACK_ID, container, PackActivationType.NORMAL)) {
+			throw new IllegalStateException("Could not register '%s' built-in resource pack.".formatted(ADD_BACK_MELON_PACK_ID));
+		}
 	}
 }
diff --git a/fabric-tag-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTestUtils.java b/fabric-tag-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTestUtils.java
new file mode 100644
index 0000000000..48c5b5e407
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTestUtils.java
@@ -0,0 +1,115 @@
+/*
+ * 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.tag.client.v1;
+
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.function.FailableRunnable;
+import org.slf4j.Logger;
+
+import net.minecraft.core.Holder;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.tags.TagKey;
+
+import net.fabricmc.fabric.api.tag.client.v1.ClientTags;
+import net.fabricmc.fabric.impl.tag.client.ClientTagsImpl;
+
+public class ClientTagTestUtils {
+	@SafeVarargs
+	static  void assertInWithLocalFallback(Logger logger, String successFmtStr, TagKey tag, Function> keyExtractor, T... expected) {
+		assertInWithLocalFallback(logger, successFmtStr, tag, Arrays.stream(expected)
+				.map(value -> ClientTagsImpl.getHolder(tag, value).orElseThrow())
+				.collect(Collectors.toSet()));
+	}
+
+	@SafeVarargs
+	static  void assertInWithLocalFallback(Logger logger, String successFmtStr, TagKey tag, ResourceKey... expected) {
+		assertInWithLocalFallback(logger, successFmtStr, tag, Arrays.stream(expected)
+				.map(key -> {
+					Registry registry = ClientTagsImpl.getRegistry(tag).orElseThrow();
+					return registry.getOrThrow(key);
+				}).collect(Collectors.toSet()));
+	}
+
+	static  void assertInWithLocalFallback(Logger logger, String successFmtStr, TagKey tag, Set> expected) {
+		for (Holder holder : expected) {
+			if (!ClientTags.isInWithLocalFallback(tag, holder)) {
+				throw new AssertionError("Expected to find %s in %s, but it was not found!"
+						.formatted(holder.unwrapKey().orElseThrow().identifier(), tag.location()));
+			}
+		}
+
+		if (!successFmtStr.isBlank()) {
+			logger.info(successFmtStr, tag, expected.stream()
+					.map(Holder::unwrapKey)
+					.filter(Optional::isPresent)
+					.map(Optional::get)
+					.map(ResourceKey::identifier)
+					.map(Identifier::toString)
+					.collect(Collectors.joining(", ")));
+		}
+	}
+
+	@SafeVarargs
+	static  void assertInLocal(Logger logger, String successFmtStr, TagKey tag, ResourceKey... expected) {
+		assertInLocal(logger, successFmtStr, tag, Set.of(expected));
+	}
+
+	static  void assertInLocal(Logger logger, String successFmtStr, TagKey tag, Set> expected) {
+		for (ResourceKey key : expected) {
+			if (!ClientTags.isInLocal(tag, key)) {
+				throw new AssertionError("Expected to find %s in %s, but it was not found!"
+						.formatted(key.identifier(), tag.location()));
+			}
+		}
+
+		if (!successFmtStr.isBlank()) {
+			logger.info(successFmtStr, tag, expected.stream()
+					.map(ResourceKey::identifier)
+					.map(Identifier::toString)
+					.collect(Collectors.joining(", ")));
+		}
+	}
+
+	static void assertThrows(FailableRunnable action, String message) {
+		boolean threw = false;
+
+		try {
+			action.run();
+		} catch (AssertionError err) {
+			threw = true;
+		}
+
+		if (!threw) {
+			throw new AssertionError(message);
+		}
+	}
+
+	static void reloadResources(MinecraftServer server, Supplier onException) {
+		server.reloadResources(server.getPackRepository().getSelectedIds()).exceptionally((throwable) -> {
+			throw onException.get();
+		});
+	}
+}
diff --git a/fabric-tag-api-v1/src/testmodClient/resources/data/fabric-tag-api-v1-testmod/tags/block/dirt_and_mud_with_client_exclusions.json b/fabric-tag-api-v1/src/testmodClient/resources/data/fabric-tag-api-v1-testmod/tags/block/dirt_and_mud_with_client_exclusions.json
new file mode 100644
index 0000000000..5f53899e2f
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmodClient/resources/data/fabric-tag-api-v1-testmod/tags/block/dirt_and_mud_with_client_exclusions.json
@@ -0,0 +1,17 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "#minecraft:dirt",
+      "required": false
+    },
+    {
+      "id": "#minecraft:mud",
+      "required": false
+    }
+  ],
+  "fabric:remove": [
+    "minecraft:dirt",
+    "minecraft:mud"
+  ]
+}
diff --git a/fabric-tag-api-v1/src/testmodClient/resources/data/fabric-tag-api-v1-testmod/tags/block/readd_melons.json b/fabric-tag-api-v1/src/testmodClient/resources/data/fabric-tag-api-v1-testmod/tags/block/readd_melons.json
new file mode 100644
index 0000000000..806471cc67
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmodClient/resources/data/fabric-tag-api-v1-testmod/tags/block/readd_melons.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:melon"
+  ]
+}
diff --git a/fabric-tag-api-v1/src/testmodClient/resources/data/fabric/tags/block/sword_efficient.json b/fabric-tag-api-v1/src/testmodClient/resources/data/fabric/tags/block/sword_efficient.json
deleted file mode 100644
index 2974a7894a..0000000000
--- a/fabric-tag-api-v1/src/testmodClient/resources/data/fabric/tags/block/sword_efficient.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    {
-      "id": "#fabric:mineable/sword",
-      "required": false
-    },
-    {
-      "id": "#minecraft:sword_efficient",
-      "required": false
-    },
-    {
-      "id": "minecraft:bamboo",
-      "required": false
-    },
-    {
-      "id": "minecraft:cobweb",
-      "required": false
-    },
-    {
-      "id": "minecraft:bamboo_sapling",
-      "required": false
-    }
-  ]
-}
\ No newline at end of file
diff --git a/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/add_back_melon/data/fabric-tag-api-v1-testmod/tags/block/readd_melons.json b/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/add_back_melon/data/fabric-tag-api-v1-testmod/tags/block/readd_melons.json
new file mode 100644
index 0000000000..75c519cebe
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/add_back_melon/data/fabric-tag-api-v1-testmod/tags/block/readd_melons.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "#minecraft:sword_efficient"
+  ]
+}
diff --git a/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/add_back_melon/pack.mcmeta b/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/add_back_melon/pack.mcmeta
new file mode 100644
index 0000000000..cae67b7e7e
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/add_back_melon/pack.mcmeta
@@ -0,0 +1,7 @@
+{
+  "pack": {
+    "min_format": 101,
+    "max_format": 101,
+    "description": "Add melon tag to server"
+  }
+}
diff --git a/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/test/data/fabric-tag-api-v1-testmod/tags/block/readd_melons.json b/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/test/data/fabric-tag-api-v1-testmod/tags/block/readd_melons.json
new file mode 100644
index 0000000000..5a6d125eec
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/test/data/fabric-tag-api-v1-testmod/tags/block/readd_melons.json
@@ -0,0 +1,9 @@
+{
+  "replace": false,
+  "values": [
+    "#minecraft:sword_efficient"
+  ],
+  "fabric:remove": [
+    "minecraft:melon"
+  ]
+}
diff --git a/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/test2/data/minecraft/tags/block/sword_efficient.json b/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/test/data/minecraft/tags/block/sword_efficient.json
similarity index 72%
rename from fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/test2/data/minecraft/tags/block/sword_efficient.json
rename to fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/test/data/minecraft/tags/block/sword_efficient.json
index bc9980aeca..9fbaca76d4 100644
--- a/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/test2/data/minecraft/tags/block/sword_efficient.json
+++ b/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/test/data/minecraft/tags/block/sword_efficient.json
@@ -6,5 +6,8 @@
             "id": "",
             "required": false
         }
+    ],
+    "fabric:remove": [
+      "minecraft:cocoa"
     ]
-}
\ No newline at end of file
+}
diff --git a/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/test/pack.mcmeta b/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/test/pack.mcmeta
new file mode 100644
index 0000000000..534d2148ef
--- /dev/null
+++ b/fabric-tag-api-v1/src/testmodClient/resources/resourcepacks/test/pack.mcmeta
@@ -0,0 +1,7 @@
+{
+  "pack": {
+    "min_format": 101,
+    "max_format": 101,
+    "description": "Test Dirt in SwordEfficient"
+  }
+}
diff --git a/fabric-transfer-api-v1/build.gradle b/fabric-transfer-api-v1/build.gradle
index 11be313e00..2e27358dcb 100644
--- a/fabric-transfer-api-v1/build.gradle
+++ b/fabric-transfer-api-v1/build.gradle
@@ -5,12 +5,13 @@ moduleDependencies(project, [
 	'fabric-api-lookup-api-v1',
 	'fabric-lifecycle-events-v1',
 	// transitive dependency of API Lookup
-	'fabric-rendering-fluids-v1',
+	'fabric-rendering-fluids-v1'
 ])
 
 testDependencies(project, [
 	':fabric-object-builder-api-v1',
 	':fabric-rendering-v1',
 	':fabric-resource-loader-v1',
-	':fabric-command-api-v2'
+	':fabric-command-api-v2',
+	':internal:ffapi-fluid-types'
 ])
diff --git a/fabric-transfer-api-v1/src/client/java/net/fabricmc/fabric/api/transfer/v1/client/fluid/FluidVariantRendering.java b/fabric-transfer-api-v1/src/client/java/net/fabricmc/fabric/api/transfer/v1/client/fluid/FluidVariantRendering.java
index 002672bcd2..a079ebd33c 100644
--- a/fabric-transfer-api-v1/src/client/java/net/fabricmc/fabric/api/transfer/v1/client/fluid/FluidVariantRendering.java
+++ b/fabric-transfer-api-v1/src/client/java/net/fabricmc/fabric/api/transfer/v1/client/fluid/FluidVariantRendering.java
@@ -29,6 +29,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.material.Fluid;
+import net.minecraft.world.level.material.Fluids;
 
 import net.fabricmc.fabric.api.lookup.v1.custom.ApiProviderMap;
 import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
@@ -41,6 +42,22 @@ public final class FluidVariantRendering {
 	private static final ApiProviderMap HANDLERS = ApiProviderMap.create();
 	private static final FluidVariantRenderHandler DEFAULT_HANDLER = new FluidVariantRenderHandler() { };
 
+	static {
+		var waterRenderHandler = new FluidVariantRenderHandler() {
+			@Override
+			public int getColor(FluidVariant fluidVariant, @Nullable BlockAndTintGetter level, @Nullable BlockPos pos) {
+				if (level == null || pos == null) {
+					return 0xFF3F76E4;
+				}
+
+				return FluidVariantRenderHandler.super.getColor(fluidVariant, level, pos);
+			}
+		};
+
+		register(Fluids.WATER, waterRenderHandler);
+		register(Fluids.FLOWING_WATER, waterRenderHandler);
+	}
+
 	private FluidVariantRendering () {
 	}
 
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/fluid/FluidStorage.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/fluid/FluidStorage.java
index e14fbe4397..b079f90d2d 100644
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/fluid/FluidStorage.java
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/fluid/FluidStorage.java
@@ -16,6 +16,8 @@
 
 package net.fabricmc.fabric.api.transfer.v1.fluid;
 
+import net.fabricmc.fabric.impl.transfer.compat.TransferApiNeoCompat;
+
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.core.Direction;
@@ -42,7 +44,6 @@
 import net.fabricmc.fabric.impl.transfer.fluid.CombinedProvidersImpl;
 import net.fabricmc.fabric.impl.transfer.fluid.EmptyBucketStorage;
 import net.fabricmc.fabric.impl.transfer.fluid.WaterPotionStorage;
-import net.fabricmc.fabric.mixin.transfer.BucketItemAccessor;
 
 /**
  * Access to {@link Storage Storage<FluidVariant>} instances.
@@ -132,22 +133,22 @@ private FluidStorage() {
 		CauldronFluidContent.getForFluid(Fluids.WATER);
 
 		// Support for SidedStorageBlockEntity.
-		FluidStorage.SIDED.registerFallback((level, pos, state, blockEntity, direction) -> {
+		FluidStorage.SIDED.registerFallback(TransferApiNeoCompat.wrapProviderSafely((level, pos, state, blockEntity, direction) -> {
 			if (blockEntity instanceof SidedStorageBlockEntity sidedStorageBlockEntity) {
 				return sidedStorageBlockEntity.getFluidStorage(direction);
 			}
 
 			return null;
-		});
+		}));
 
 		// Register combined fallback
-		FluidStorage.ITEM.registerFallback((stack, context) -> GENERAL_COMBINED_PROVIDER.invoker().find(context));
+		FluidStorage.ITEM.registerFallback(TransferApiNeoCompat.wrapProviderSafely((stack, context) -> GENERAL_COMBINED_PROVIDER.invoker().find(context)));
 		// Register empty bucket storage
 		combinedItemApiProvider(Items.BUCKET).register(EmptyBucketStorage::new);
 		// Register full bucket storage
 		GENERAL_COMBINED_PROVIDER.register(context -> {
 			if (context.getItemVariant().getItem() instanceof BucketItem bucketItem) {
-				Fluid bucketFluid = ((BucketItemAccessor) bucketItem).fabric_getContent();
+				Fluid bucketFluid = bucketItem.getContent();
 
 				// Make sure the mapping is bidirectional.
 				if (bucketFluid != null && bucketFluid.getBucket() == bucketItem) {
@@ -167,5 +168,7 @@ private FluidStorage() {
 		});
 		// Register water potion storage
 		combinedItemApiProvider(Items.POTION).register(WaterPotionStorage::find);
+
+		TransferApiNeoCompat.registerTransferApiFluidNeoBridge();
 	}
 }
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/fluid/FluidVariantAttributes.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/fluid/FluidVariantAttributes.java
index dcd4336a3f..888e4d99f4 100644
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/fluid/FluidVariantAttributes.java
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/fluid/FluidVariantAttributes.java
@@ -40,7 +40,7 @@
  */
 public final class FluidVariantAttributes {
 	private static final ApiProviderMap HANDLERS = ApiProviderMap.create();
-	private static final FluidVariantAttributeHandler DEFAULT_HANDLER = new FluidVariantAttributeHandler() { };
+	public static final FluidVariantAttributeHandler DEFAULT_HANDLER = new FluidVariantAttributeHandler() { };
 	private static volatile boolean coloredVanillaFluidNames = false;
 
 	private FluidVariantAttributes() {
@@ -50,6 +50,10 @@ private FluidVariantAttributes() {
 	 * Register an attribute handler for the passed fluid.
 	 */
 	public static void register(Fluid fluid, FluidVariantAttributeHandler handler) {
+		registerInternal(fluid, handler);
+	}
+
+	private static void registerInternal(Fluid fluid, FluidVariantAttributeHandler handler) {
 		if (HANDLERS.putIfAbsent(fluid, handler) != null) {
 			throw new IllegalArgumentException("Duplicate handler registration for fluid " + fluid);
 		}
@@ -163,7 +167,7 @@ public static boolean isLighterThanAir(FluidVariant variant) {
 	}
 
 	static {
-		register(Fluids.WATER, new FluidVariantAttributeHandler() {
+		registerInternal(Fluids.WATER, new FluidVariantAttributeHandler() {
 			@Override
 			public Component getName(FluidVariant fluidVariant) {
 				if (coloredVanillaFluidNames) {
@@ -178,7 +182,7 @@ public Optional getEmptySound(FluidVariant variant) {
 				return Optional.of(SoundEvents.BUCKET_EMPTY);
 			}
 		});
-		register(Fluids.LAVA, new FluidVariantAttributeHandler() {
+		registerInternal(Fluids.LAVA, new FluidVariantAttributeHandler() {
 			@Override
 			public Component getName(FluidVariant fluidVariant) {
 				if (coloredVanillaFluidNames) {
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/ContainerStorage.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/ContainerStorage.java
index cc14debc5f..33446c49a3 100644
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/ContainerStorage.java
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/ContainerStorage.java
@@ -19,6 +19,8 @@
 import java.util.List;
 import java.util.Objects;
 
+import net.fabricmc.fabric.impl.transfer.compat.FabricContainerStorage;
+
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.UnmodifiableView;
 import org.jspecify.annotations.Nullable;
@@ -32,7 +34,6 @@
 import net.fabricmc.fabric.api.transfer.v1.storage.SlottedStorage;
 import net.fabricmc.fabric.api.transfer.v1.storage.base.CombinedStorage;
 import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
-import net.fabricmc.fabric.impl.transfer.item.ContainerStorageImpl;
 
 /**
  * An implementation of {@code Storage} for vanilla's {@link Container}, {@link WorldlyContainer} and {@link Inventory}.
@@ -59,7 +60,7 @@ public interface ContainerStorage extends SlottedStorage {
 	 */
 	static ContainerStorage of(Container container, @Nullable Direction direction) {
 		Objects.requireNonNull(container, "Null container is not supported.");
-		return ContainerStorageImpl.of(container, direction);
+		return FabricContainerStorage.of(container, direction);
 	}
 
 	/**
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/ItemStorage.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/ItemStorage.java
index 561479ab71..adcb43ee23 100644
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/ItemStorage.java
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/ItemStorage.java
@@ -26,8 +26,6 @@
 import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.WorldlyContainer;
 import net.minecraft.world.WorldlyContainerHolder;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.ChestBlock;
 import net.minecraft.world.level.block.entity.ChestBlockEntity;
 
@@ -40,9 +38,7 @@
 import net.fabricmc.fabric.api.transfer.v1.storage.base.CombinedSlottedStorage;
 import net.fabricmc.fabric.api.transfer.v1.storage.base.CombinedStorage;
 import net.fabricmc.fabric.api.transfer.v1.storage.base.SidedStorageBlockEntity;
-import net.fabricmc.fabric.impl.transfer.item.BundleContentsStorage;
-import net.fabricmc.fabric.impl.transfer.item.ComposterWrapper;
-import net.fabricmc.fabric.impl.transfer.item.ItemContainerContentsStorage;
+import net.fabricmc.fabric.impl.transfer.compat.TransferApiNeoCompat;
 import net.fabricmc.fabric.mixin.transfer.CompoundContainerAccessor;
 
 /**
@@ -99,20 +95,17 @@ private ItemStorage() {
 	}
 
 	static {
-		// Composter support.
-		ItemStorage.SIDED.registerForBlocks((level, pos, state, blockEntity, direction) -> ComposterWrapper.get(level, pos, direction), Blocks.COMPOSTER);
-
 		// Support for SidedStorageBlockEntity.
-		ItemStorage.SIDED.registerFallback((level, pos, state, blockEntity, direction) -> {
+		ItemStorage.SIDED.registerFallback(TransferApiNeoCompat.wrapProviderSafely((level, pos, state, blockEntity, direction) -> {
 			if (blockEntity instanceof SidedStorageBlockEntity sidedStorageBlockEntity) {
 				return sidedStorageBlockEntity.getItemStorage(direction);
 			}
 
 			return null;
-		});
+		}));
 
 		// Register container fallback.
-		ItemStorage.SIDED.registerFallback((level, pos, state, blockEntity, direction) -> {
+		ItemStorage.SIDED.registerFallback(TransferApiNeoCompat.wrapProviderSafely((level, pos, state, blockEntity, direction) -> {
 			Container containerToWrap = null;
 
 			if (state.getBlock() instanceof WorldlyContainerHolder provider) {
@@ -142,48 +135,8 @@ private ItemStorage() {
 			}
 
 			return containerToWrap != null ? ContainerStorage.of(containerToWrap, direction) : null;
-		});
-
-		ItemStorage.ITEM.registerForItems(
-				(itemStack, context) -> new ItemContainerContentsStorage(context, 27),
-				Items.SHULKER_BOX,
-				Items.WHITE_SHULKER_BOX,
-				Items.ORANGE_SHULKER_BOX,
-				Items.MAGENTA_SHULKER_BOX,
-				Items.LIGHT_BLUE_SHULKER_BOX,
-				Items.YELLOW_SHULKER_BOX,
-				Items.LIME_SHULKER_BOX,
-				Items.PINK_SHULKER_BOX,
-				Items.GRAY_SHULKER_BOX,
-				Items.LIGHT_GRAY_SHULKER_BOX,
-				Items.CYAN_SHULKER_BOX,
-				Items.PURPLE_SHULKER_BOX,
-				Items.BLUE_SHULKER_BOX,
-				Items.BROWN_SHULKER_BOX,
-				Items.GREEN_SHULKER_BOX,
-				Items.RED_SHULKER_BOX,
-				Items.BLACK_SHULKER_BOX
-		);
-
-		ItemStorage.ITEM.registerForItems(
-				(itemStack, context) -> new BundleContentsStorage(context),
-				Items.BUNDLE,
-				Items.WHITE_BUNDLE,
-				Items.ORANGE_BUNDLE,
-				Items.MAGENTA_BUNDLE,
-				Items.LIGHT_BLUE_BUNDLE,
-				Items.YELLOW_BUNDLE,
-				Items.LIME_BUNDLE,
-				Items.PINK_BUNDLE,
-				Items.GRAY_BUNDLE,
-				Items.LIGHT_GRAY_BUNDLE,
-				Items.CYAN_BUNDLE,
-				Items.PURPLE_BUNDLE,
-				Items.BLUE_BUNDLE,
-				Items.BROWN_BUNDLE,
-				Items.GREEN_BUNDLE,
-				Items.RED_BUNDLE,
-				Items.BLACK_BUNDLE
-		);
+		}));
+
+		TransferApiNeoCompat.registerTransferApiItemNeoBridge();
 	}
 }
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/PlayerInventoryStorage.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/PlayerInventoryStorage.java
index 908c8afac3..ad90b8611d 100644
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/PlayerInventoryStorage.java
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/PlayerInventoryStorage.java
@@ -16,6 +16,8 @@
 
 package net.fabricmc.fabric.api.transfer.v1.item;
 
+import net.fabricmc.fabric.impl.transfer.compat.FabricPlayerInventoryStorage;
+
 import org.jetbrains.annotations.ApiStatus;
 
 import net.minecraft.world.InteractionHand;
@@ -54,7 +56,7 @@ static PlayerInventoryStorage of(Player player) {
 	 * Return an instance for the passed player inventory.
 	 */
 	static PlayerInventoryStorage of(Inventory playerInventory) {
-		return (PlayerInventoryStorage) ContainerStorage.of(playerInventory, null);
+		return FabricPlayerInventoryStorage.of(playerInventory);
 	}
 
 	/**
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/transaction/Transaction.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/transaction/Transaction.java
index 742058ea8f..403fd62c0b 100644
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/transaction/Transaction.java
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/transaction/Transaction.java
@@ -16,11 +16,12 @@
 
 package net.fabricmc.fabric.api.transfer.v1.transaction;
 
+import net.fabricmc.fabric.impl.transfer.transaction.NeoTransactions;
+
 import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.Nullable;
 
 import net.fabricmc.fabric.api.transfer.v1.transaction.base.SnapshotParticipant;
-import net.fabricmc.fabric.impl.transfer.transaction.TransactionManagerImpl;
 
 /**
  * A global operation where participants guarantee atomicity: either the whole operation succeeds,
@@ -82,7 +83,7 @@ public interface Transaction extends AutoCloseable, TransactionContext {
 	 * @throws IllegalStateException If a transaction is already active on the current thread.
 	 */
 	static Transaction openOuter() {
-		return TransactionManagerImpl.MANAGERS.get().openOuter();
+		return NeoTransactions.openOuter();
 	}
 
 	/**
@@ -96,14 +97,14 @@ static boolean isOpen() {
 	 * @return The current lifecycle of the transaction stack on this thread.
 	 */
 	static Lifecycle getLifecycle() {
-		return TransactionManagerImpl.MANAGERS.get().getLifecycle();
+		return NeoTransactions.getLifecycle();
 	}
 
 	/**
 	 * Open a nested transaction if {@code maybeParent} is non-null, or an outer transaction if {@code maybeParent} is null.
 	 */
 	static Transaction openNested(@Nullable TransactionContext maybeParent) {
-		return maybeParent == null ? openOuter() : maybeParent.openNested();
+		return NeoTransactions.openNested(maybeParent);
 	}
 
 	/**
@@ -120,7 +121,7 @@ static Transaction openNested(@Nullable TransactionContext maybeParent) {
 	@Deprecated
 	@Nullable
 	static TransactionContext getCurrentUnsafe() {
-		return TransactionManagerImpl.MANAGERS.get().getCurrentUnsafe();
+		return NeoTransactions.getCurrentUnsafe();
 	}
 
 	/**
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricContainerStorage.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricContainerStorage.java
new file mode 100644
index 0000000000..65da63cb10
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricContainerStorage.java
@@ -0,0 +1,74 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import com.google.common.primitives.Ints;
+import net.neoforged.neoforge.transfer.ResourceHandler;
+import net.neoforged.neoforge.transfer.item.ItemResource;
+import net.neoforged.neoforge.transfer.item.VanillaContainerWrapper;
+import net.neoforged.neoforge.transfer.item.WorldlyContainerWrapper;
+import org.jetbrains.annotations.UnmodifiableView;
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.core.Direction;
+import net.minecraft.world.Container;
+import net.minecraft.world.WorldlyContainer;
+
+import net.fabricmc.fabric.api.transfer.v1.item.ContainerStorage;
+import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
+import net.fabricmc.fabric.api.transfer.v1.storage.StorageView;
+import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
+
+public class FabricContainerStorage implements ContainerStorage {
+	protected final ResourceHandler inner;
+	private final List> slots;
+
+	public FabricContainerStorage(ResourceHandler inner) {
+		this.inner = inner;
+
+		this.slots = new ArrayList<>();
+		for (int i = 0; i < inner.size(); i++) {
+			this.slots.add(new NeoItemSingleSlotStorage(inner, i));
+		}
+	}
+
+	public static ContainerStorage of(Container container, @Nullable Direction direction) {
+		if (container instanceof WorldlyContainer wc) {
+			return new FabricContainerStorage(new WorldlyContainerWrapper(wc, direction));
+		}
+		return new FabricContainerStorage(VanillaContainerWrapper.of(container));
+	}
+
+	@UnmodifiableView
+	@Override
+	public List> getSlots() {
+		return Collections.unmodifiableList(this.slots);
+	}
+
+	@Override
+	public long insert(ItemVariant resource, long maxAmount, TransactionContext transaction) {
+		return this.inner.insert(
+				TransferCompatUtil.toResource(resource),
+				Ints.saturatedCast(maxAmount),
+				TransferCompatUtil.toNeoCtx(transaction)
+		);
+	}
+
+	@Override
+	public long extract(ItemVariant resource, long maxAmount, TransactionContext transaction) {
+		return this.inner.extract(
+				TransferCompatUtil.toResource(resource),
+				Ints.saturatedCast(maxAmount),
+				TransferCompatUtil.toNeoCtx(transaction)
+		);
+	}
+
+	@Override
+	public Iterator> iterator() {
+		return (Iterator) this.slots.iterator();
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricFluidResourceHandler.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricFluidResourceHandler.java
new file mode 100644
index 0000000000..2fa4e08d48
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricFluidResourceHandler.java
@@ -0,0 +1,80 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import net.neoforged.neoforge.transfer.ResourceHandler;
+import net.neoforged.neoforge.transfer.fluid.FluidResource;
+import net.neoforged.neoforge.transfer.transaction.TransactionContext;
+
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
+import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
+import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil;
+import net.fabricmc.fabric.api.transfer.v1.storage.StorageView;
+
+public class FabricFluidResourceHandler implements ResourceHandler {
+	private final Storage inner;
+	private final Int2ObjectMap> slots;
+
+	public FabricFluidResourceHandler(Storage inner) {
+		this.inner = inner;
+
+		this.slots = new Int2ObjectOpenHashMap<>();
+		int i = 0;
+		for (StorageView view : inner) {
+			slots.put(i++, view);
+		}
+	}
+
+	@Override
+	public int size() {
+		return Math.max(slots.size(), 1);
+	}
+
+	@Override
+	public FluidResource getResource(int index) {
+		if (index >= slots.size()) return FluidResource.EMPTY;
+		return TransferCompatUtil.toResource(slots.get(index).getResource());
+	}
+
+	@Override
+	public long getAmountAsLong(int index) {
+		if (index >= slots.size()) return 0;
+		return TransferCompatUtil.toNeoBucketLong(slots.get(index).getAmount());
+	}
+
+	@Override
+	public long getCapacityAsLong(int index, FluidResource resource) {
+		if (index >= slots.size()) return 0;
+		return TransferCompatUtil.toNeoBucketLong(slots.get(index).getCapacity());
+	}
+
+	@Override
+	public boolean isValid(int index, FluidResource resource) {
+		return StorageUtil.simulateInsert(
+				this.inner,
+				TransferCompatUtil.toVariant(resource),
+				1,
+				null
+		) > 0;
+	}
+
+	@Override
+	public int insert(int index, FluidResource resource, int amount, TransactionContext transaction) {
+		long inserted = this.inner.insert(
+				TransferCompatUtil.toVariant(resource),
+				TransferCompatUtil.toFabricBucket(amount),
+				TransferCompatUtil.toFabricCtx(transaction)
+		);
+		return TransferCompatUtil.toNeoBucket(inserted);
+	}
+
+	@Override
+	public int extract(int index, FluidResource resource, int amount, TransactionContext transaction) {
+		long extracted = this.inner.extract(
+				TransferCompatUtil.toVariant(resource),
+				TransferCompatUtil.toFabricBucket(amount),
+				TransferCompatUtil.toFabricCtx(transaction)
+		);
+		return TransferCompatUtil.toNeoBucket(extracted);
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricItemAccess.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricItemAccess.java
new file mode 100644
index 0000000000..f680952530
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricItemAccess.java
@@ -0,0 +1,48 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import com.google.common.primitives.Ints;
+import net.neoforged.neoforge.transfer.access.ItemAccess;
+import net.neoforged.neoforge.transfer.item.ItemResource;
+import net.neoforged.neoforge.transfer.transaction.TransactionContext;
+
+import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext;
+
+public class FabricItemAccess implements ItemAccess {
+	private final ContainerItemContext inner;
+
+	public FabricItemAccess(ContainerItemContext inner) {
+		this.inner = inner;
+	}
+
+	@Override
+	public ItemResource getResource() {
+		return TransferCompatUtil.toResource(this.inner.getItemVariant());
+	}
+
+	@Override
+	public int getAmount() {
+		return Ints.saturatedCast(this.inner.getAmount());
+	}
+
+	@Override
+	public int insert(ItemResource resource, int amount, TransactionContext transaction) {
+		return Ints.saturatedCast(
+				this.inner.insert(
+						TransferCompatUtil.toVariant(resource),
+						amount,
+						TransferCompatUtil.toFabricCtx(transaction)
+				)
+		);
+	}
+
+	@Override
+	public int extract(ItemResource resource, int amount, TransactionContext transaction) {
+		return Ints.saturatedCast(
+				this.inner.extract(
+						TransferCompatUtil.toVariant(resource),
+						amount,
+						TransferCompatUtil.toFabricCtx(transaction)
+				)
+		);
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricItemResourceHandler.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricItemResourceHandler.java
new file mode 100644
index 0000000000..23fa5acd30
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricItemResourceHandler.java
@@ -0,0 +1,83 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import com.google.common.primitives.Ints;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import net.neoforged.neoforge.transfer.ResourceHandler;
+import net.neoforged.neoforge.transfer.item.ItemResource;
+import net.neoforged.neoforge.transfer.transaction.TransactionContext;
+
+import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
+import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
+import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil;
+import net.fabricmc.fabric.api.transfer.v1.storage.StorageView;
+
+public class FabricItemResourceHandler implements ResourceHandler {
+	private final Storage inner;
+	private final Int2ObjectMap> slots;
+
+	public FabricItemResourceHandler(Storage inner) {
+		this.inner = inner;
+
+		this.slots = new Int2ObjectOpenHashMap<>();
+		int i = 0;
+		for (StorageView view : inner) {
+			slots.put(i++, view);
+		}
+	}
+
+	@Override
+	public int size() {
+		return Math.max(slots.size(), 1);
+	}
+
+	@Override
+	public ItemResource getResource(int index) {
+		if (index >= slots.size()) return ItemResource.EMPTY;
+		return TransferCompatUtil.toResource(slots.get(index).getResource());
+	}
+
+	@Override
+	public long getAmountAsLong(int index) {
+		if (index >= slots.size()) return 0;
+		return slots.get(index).getAmount();
+	}
+
+	@Override
+	public long getCapacityAsLong(int index, ItemResource resource) {
+		if (index >= slots.size()) return 0;
+		return slots.get(index).getCapacity();
+	}
+
+	@Override
+	public boolean isValid(int index, ItemResource resource) {
+		return StorageUtil.simulateInsert(
+				this.inner,
+				TransferCompatUtil.toVariant(resource),
+				resource.getMaxStackSize(),
+				null
+		) > 0;
+	}
+
+	@Override
+	public int insert(int index, ItemResource resource, int amount, TransactionContext transaction) {
+		return Ints.saturatedCast(
+				this.inner.insert(
+						TransferCompatUtil.toVariant(resource),
+						amount,
+						TransferCompatUtil.toFabricCtx(transaction)
+				)
+		);
+	}
+
+	@Override
+	public int extract(int index, ItemResource resource, int amount, TransactionContext transaction) {
+		return Ints.saturatedCast(
+				this.inner.extract(
+						TransferCompatUtil.toVariant(resource),
+						amount,
+						TransferCompatUtil.toFabricCtx(transaction)
+				)
+		);
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricPlayerInventoryStorage.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricPlayerInventoryStorage.java
new file mode 100644
index 0000000000..5ffc2d5639
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricPlayerInventoryStorage.java
@@ -0,0 +1,46 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import com.google.common.primitives.Ints;
+import net.neoforged.neoforge.transfer.ResourceHandler;
+import net.neoforged.neoforge.transfer.item.ItemResource;
+import net.neoforged.neoforge.transfer.item.PlayerInventoryWrapper;
+
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.player.Inventory;
+
+import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
+import net.fabricmc.fabric.api.transfer.v1.item.PlayerInventoryStorage;
+import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
+
+public class FabricPlayerInventoryStorage extends FabricContainerStorage implements PlayerInventoryStorage {
+
+	public FabricPlayerInventoryStorage(ResourceHandler inner) {
+		super(inner);
+	}
+
+	public static PlayerInventoryStorage of(Inventory inventory) {
+		return new FabricPlayerInventoryStorage(PlayerInventoryWrapper.of(inventory));
+	}
+
+	@Override
+	public long offer(ItemVariant resource, long amount, TransactionContext tx) {
+		return this.insert(resource, amount, tx);
+	}
+
+	@Override
+	public void drop(ItemVariant variant, long amount, boolean throwRandomly, boolean retainOwnership, TransactionContext transaction) {
+		((PlayerInventoryWrapper) this.inner).drop(
+				TransferCompatUtil.toResource(variant),
+				Ints.checkedCast(amount),
+				throwRandomly,
+				retainOwnership,
+				TransferCompatUtil.toNeoCtx(transaction)
+		);
+	}
+
+	@Override
+	public SingleSlotStorage getHandSlot(InteractionHand hand) {
+		return new NeoItemSingleSlotStorage(((PlayerInventoryWrapper) this.inner).getHandSlot(hand), 0);
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricPlayerItemAccess.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricPlayerItemAccess.java
new file mode 100644
index 0000000000..434454e17a
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricPlayerItemAccess.java
@@ -0,0 +1,7 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import net.neoforged.neoforge.transfer.item.PlayerInventoryWrapper;
+
+public interface FabricPlayerItemAccess {
+	PlayerInventoryWrapper getInventoryWrapper();
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricSlottedFluidResourceHandler.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricSlottedFluidResourceHandler.java
new file mode 100644
index 0000000000..463012af26
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricSlottedFluidResourceHandler.java
@@ -0,0 +1,67 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import net.neoforged.neoforge.transfer.ResourceHandler;
+import net.neoforged.neoforge.transfer.fluid.FluidResource;
+import net.neoforged.neoforge.transfer.transaction.TransactionContext;
+
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
+import net.fabricmc.fabric.api.transfer.v1.storage.SlottedStorage;
+import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil;
+
+public class FabricSlottedFluidResourceHandler implements ResourceHandler {
+	private final SlottedStorage inner;
+
+	public FabricSlottedFluidResourceHandler(SlottedStorage inner) {
+		this.inner = inner;
+	}
+
+	@Override
+	public int size() {
+		return this.inner.getSlotCount();
+	}
+
+	@Override
+	public FluidResource getResource(int index) {
+		return TransferCompatUtil.toResource(this.inner.getSlot(index).getResource());
+	}
+
+	@Override
+	public long getAmountAsLong(int index) {
+		return TransferCompatUtil.toNeoBucketLong(this.inner.getSlot(index).getAmount());
+	}
+
+	@Override
+	public long getCapacityAsLong(int index, FluidResource resource) {
+		return TransferCompatUtil.toNeoBucketLong(this.inner.getSlot(index).getCapacity());
+	}
+
+	@Override
+	public boolean isValid(int index, FluidResource resource) {
+		return StorageUtil.simulateInsert(
+				this.inner.getSlot(index),
+				TransferCompatUtil.toVariant(resource),
+				1,
+				null
+		) > 0;
+	}
+
+	@Override
+	public int insert(int index, FluidResource resource, int amount, TransactionContext transaction) {
+		long inserted = this.inner.getSlot(index).insert(
+				TransferCompatUtil.toVariant(resource),
+				TransferCompatUtil.toFabricBucket(amount),
+				TransferCompatUtil.toFabricCtx(transaction)
+		);
+		return TransferCompatUtil.toNeoBucket(inserted);
+	}
+
+	@Override
+	public int extract(int index, FluidResource resource, int amount, TransactionContext transaction) {
+		long extracted = this.inner.getSlot(index).extract(
+				TransferCompatUtil.toVariant(resource),
+				TransferCompatUtil.toFabricBucket(amount),
+				TransferCompatUtil.toFabricCtx(transaction)
+		);
+		return TransferCompatUtil.toNeoBucket(extracted);
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricSlottedItemResourceHandler.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricSlottedItemResourceHandler.java
new file mode 100644
index 0000000000..a0a763bc09
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricSlottedItemResourceHandler.java
@@ -0,0 +1,70 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import com.google.common.primitives.Ints;
+import net.neoforged.neoforge.transfer.ResourceHandler;
+import net.neoforged.neoforge.transfer.item.ItemResource;
+import net.neoforged.neoforge.transfer.transaction.TransactionContext;
+
+import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
+import net.fabricmc.fabric.api.transfer.v1.storage.SlottedStorage;
+import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil;
+
+public class FabricSlottedItemResourceHandler implements ResourceHandler {
+	private final SlottedStorage inner;
+
+	public FabricSlottedItemResourceHandler(SlottedStorage inner) {
+		this.inner = inner;
+	}
+
+	@Override
+	public int size() {
+		return this.inner.getSlotCount();
+	}
+
+	@Override
+	public ItemResource getResource(int index) {
+		return TransferCompatUtil.toResource(this.inner.getSlot(index).getResource());
+	}
+
+	@Override
+	public long getAmountAsLong(int index) {
+		return this.inner.getSlot(index).getAmount();
+	}
+
+	@Override
+	public long getCapacityAsLong(int index, ItemResource resource) {
+		return this.inner.getSlot(index).getCapacity();
+	}
+
+	@Override
+	public boolean isValid(int index, ItemResource resource) {
+		return StorageUtil.simulateInsert(
+				this.inner.getSlot(index),
+				TransferCompatUtil.toVariant(resource),
+				resource.getMaxStackSize(),
+				null
+		) > 0;
+	}
+
+	@Override
+	public int insert(int index, ItemResource resource, int amount, TransactionContext transaction) {
+		return Ints.saturatedCast(
+				this.inner.getSlot(index).insert(
+						TransferCompatUtil.toVariant(resource),
+						amount,
+						TransferCompatUtil.toFabricCtx(transaction)
+				)
+		);
+	}
+
+	@Override
+	public int extract(int index, ItemResource resource, int amount, TransactionContext transaction) {
+		return Ints.saturatedCast(
+				this.inner.getSlot(index).extract(
+						TransferCompatUtil.toVariant(resource),
+						amount,
+						TransferCompatUtil.toFabricCtx(transaction)
+				)
+		);
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricTransaction.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricTransaction.java
new file mode 100644
index 0000000000..6759cff900
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricTransaction.java
@@ -0,0 +1,7 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext.CloseCallback;
+
+public interface FabricTransaction {
+	void addCloseCallback(CloseCallback closeCallback);
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricTransactionManager.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricTransactionManager.java
new file mode 100644
index 0000000000..b781d3bade
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FabricTransactionManager.java
@@ -0,0 +1,7 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext.OuterCloseCallback;
+
+public interface FabricTransactionManager {
+	void addOuterCloseCallback(OuterCloseCallback outerCloseCallback);
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/ItemAccessSingleSlotStorage.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/ItemAccessSingleSlotStorage.java
new file mode 100644
index 0000000000..e4698858fc
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/ItemAccessSingleSlotStorage.java
@@ -0,0 +1,54 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import com.google.common.primitives.Ints;
+import net.neoforged.neoforge.transfer.access.ItemAccess;
+
+import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
+import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
+
+public class ItemAccessSingleSlotStorage implements SingleSlotStorage {
+	private final ItemAccess inner;
+
+	public ItemAccessSingleSlotStorage(ItemAccess inner) {
+		this.inner = inner;
+	}
+
+	@Override
+	public long insert(ItemVariant resource, long maxAmount, TransactionContext transaction) {
+		return this.inner.insert(
+				TransferCompatUtil.toResource(resource),
+				Ints.saturatedCast(maxAmount),
+				TransferCompatUtil.toNeoCtx(transaction)
+		);
+	}
+
+	@Override
+	public long extract(ItemVariant resource, long maxAmount, TransactionContext transaction) {
+		return this.inner.extract(
+				TransferCompatUtil.toResource(resource),
+				Ints.saturatedCast(maxAmount),
+				TransferCompatUtil.toNeoCtx(transaction)
+		);
+	}
+
+	@Override
+	public boolean isResourceBlank() {
+		return this.inner.getResource().isEmpty();
+	}
+
+	@Override
+	public ItemVariant getResource() {
+		return TransferCompatUtil.toVariant(this.inner.getResource());
+	}
+
+	@Override
+	public long getAmount() {
+		return this.inner.getAmount();
+	}
+
+	@Override
+	public long getCapacity() {
+		return this.inner.getResource().getMaxStackSize();
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/NeoContainerItemContext.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/NeoContainerItemContext.java
new file mode 100644
index 0000000000..a1eb0ff9ca
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/NeoContainerItemContext.java
@@ -0,0 +1,76 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.google.common.primitives.Ints;
+import net.neoforged.neoforge.transfer.access.ItemAccess;
+import org.jetbrains.annotations.UnmodifiableView;
+import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext;
+import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
+import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
+
+public class NeoContainerItemContext implements ContainerItemContext {
+	private final ItemAccess inner;
+
+	public NeoContainerItemContext(ItemAccess inner) {
+		this.inner = inner;
+	}
+
+	@Override
+	public SingleSlotStorage getMainSlot() {
+		return new ItemAccessSingleSlotStorage(this.inner);
+	}
+
+	@Override
+	public long insertOverflow(ItemVariant itemVariant, long maxAmount, TransactionContext transactionContext) {
+		return insert(itemVariant, maxAmount, transactionContext);
+	}
+
+	@Override
+	@UnmodifiableView
+	public List> getAdditionalSlots() {
+		if (this.inner instanceof FabricPlayerItemAccess ac) {
+			return new FabricContainerStorage(ac.getInventoryWrapper()).getSlots();
+		}
+		return Collections.emptyList();
+	}
+
+	@Override
+	public ItemVariant getItemVariant() {
+		return TransferCompatUtil.toVariant(this.inner.getResource());
+	}
+
+	@Override
+	public long getAmount() {
+		return this.inner.getAmount();
+	}
+
+	@Override
+	public long insert(ItemVariant itemVariant, long maxAmount, TransactionContext transaction) {
+		return this.inner.insert(
+				TransferCompatUtil.toResource(itemVariant),
+				Ints.saturatedCast(maxAmount),
+				TransferCompatUtil.toNeoCtx(transaction)
+		);
+	}
+
+	@Override
+	public long extract(ItemVariant itemVariant, long maxAmount, TransactionContext transaction) {
+		return this.inner.extract(
+				TransferCompatUtil.toResource(itemVariant),
+				Ints.saturatedCast(maxAmount),
+				TransferCompatUtil.toNeoCtx(transaction)
+		);
+	}
+
+	@Override
+	public long exchange(ItemVariant newVariant, long maxAmount, TransactionContext transaction) {
+		return this.inner.exchange(
+				TransferCompatUtil.toResource(newVariant),
+				Ints.saturatedCast(maxAmount),
+				TransferCompatUtil.toNeoCtx(transaction)
+		);
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/NeoFluidSingleSlotStorage.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/NeoFluidSingleSlotStorage.java
new file mode 100644
index 0000000000..3973f21486
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/NeoFluidSingleSlotStorage.java
@@ -0,0 +1,63 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import com.google.common.primitives.Ints;
+import net.neoforged.neoforge.transfer.ResourceHandler;
+import net.neoforged.neoforge.transfer.fluid.FluidResource;
+
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
+import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
+
+public class NeoFluidSingleSlotStorage implements SingleSlotStorage {
+	private final ResourceHandler inner;
+	private final int slot;
+
+	public NeoFluidSingleSlotStorage(ResourceHandler inner, int slot) {
+		this.inner = inner;
+		this.slot = slot;
+	}
+
+	@Override
+	public long insert(FluidVariant resource, long maxAmount, TransactionContext transaction) {
+		return Ints.saturatedCast(
+				this.inner.insert(
+						this.slot,
+						TransferCompatUtil.toResource(resource),
+						TransferCompatUtil.toNeoBucket(maxAmount),
+						TransferCompatUtil.toNeoCtx(transaction)
+				)
+		);
+	}
+
+	@Override
+	public long extract(FluidVariant resource, long maxAmount, TransactionContext transaction) {
+		return Ints.saturatedCast(
+				this.inner.extract(
+						this.slot,
+						TransferCompatUtil.toResource(resource),
+						TransferCompatUtil.toNeoBucket(maxAmount),
+						TransferCompatUtil.toNeoCtx(transaction)
+				)
+		);
+	}
+
+	@Override
+	public boolean isResourceBlank() {
+		return this.inner.getResource(this.slot).isEmpty();
+	}
+
+	@Override
+	public FluidVariant getResource() {
+		return TransferCompatUtil.toVariant(this.inner.getResource(this.slot));
+	}
+
+	@Override
+	public long getAmount() {
+		return TransferCompatUtil.toFabricBucketLong(this.inner.getAmountAsLong(this.slot));
+	}
+
+	@Override
+	public long getCapacity() {
+		return TransferCompatUtil.toFabricBucketLong(this.inner.getCapacityAsLong(this.slot, this.inner.getResource(this.slot)));
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/NeoFluidSlottedStorage.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/NeoFluidSlottedStorage.java
new file mode 100644
index 0000000000..9f3685b14c
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/NeoFluidSlottedStorage.java
@@ -0,0 +1,59 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import net.neoforged.neoforge.transfer.ResourceHandler;
+import net.neoforged.neoforge.transfer.fluid.FluidResource;
+
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
+import net.fabricmc.fabric.api.transfer.v1.storage.SlottedStorage;
+import net.fabricmc.fabric.api.transfer.v1.storage.StorageView;
+import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
+
+public class NeoFluidSlottedStorage implements SlottedStorage {
+	private final ResourceHandler inner;
+
+	public NeoFluidSlottedStorage(ResourceHandler inner) {
+		this.inner = inner;
+	}
+
+	@Override
+	public int getSlotCount() {
+		return this.inner.size();
+	}
+
+	@Override
+	public SingleSlotStorage getSlot(int slot) {
+		return new NeoFluidSingleSlotStorage(this.inner, slot);
+	}
+
+	@Override
+	public long insert(FluidVariant resource, long maxAmount, TransactionContext transaction) {
+		return this.inner.insert(
+				TransferCompatUtil.toResource(resource),
+				TransferCompatUtil.toNeoBucket(maxAmount),
+				TransferCompatUtil.toNeoCtx(transaction)
+		);
+	}
+
+	@Override
+	public long extract(FluidVariant resource, long maxAmount, TransactionContext transaction) {
+		return this.inner.extract(
+				TransferCompatUtil.toResource(resource),
+				TransferCompatUtil.toNeoBucket(maxAmount),
+				TransferCompatUtil.toNeoCtx(transaction)
+		);
+	}
+
+	@Override
+	public Iterator> iterator() {
+		List> views = new ArrayList<>();
+		for (int i = 0; i < this.inner.size(); i++) {
+			views.add(new NeoFluidSingleSlotStorage(this.inner, i));
+		}
+		return views.iterator();
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/NeoItemSingleSlotStorage.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/NeoItemSingleSlotStorage.java
new file mode 100644
index 0000000000..6ee4310f26
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/NeoItemSingleSlotStorage.java
@@ -0,0 +1,59 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import com.google.common.primitives.Ints;
+import net.neoforged.neoforge.transfer.ResourceHandler;
+import net.neoforged.neoforge.transfer.item.ItemResource;
+
+import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
+import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
+
+public class NeoItemSingleSlotStorage implements SingleSlotStorage {
+	private final ResourceHandler inner;
+	private final int slot;
+
+	public NeoItemSingleSlotStorage(ResourceHandler inner, int slot) {
+		this.inner = inner;
+		this.slot = slot;
+	}
+
+	@Override
+	public long insert(ItemVariant resource, long maxAmount, TransactionContext transaction) {
+		return this.inner.insert(
+				this.slot,
+				TransferCompatUtil.toResource(resource),
+				Ints.saturatedCast(maxAmount),
+				TransferCompatUtil.toNeoCtx(transaction)
+		);
+	}
+
+	@Override
+	public long extract(ItemVariant resource, long maxAmount, TransactionContext transaction) {
+		return this.inner.extract(
+				this.slot,
+				TransferCompatUtil.toResource(resource),
+				Ints.saturatedCast(maxAmount),
+				TransferCompatUtil.toNeoCtx(transaction)
+		);
+	}
+
+	@Override
+	public boolean isResourceBlank() {
+		return this.inner.getResource(this.slot).isEmpty();
+	}
+
+	@Override
+	public ItemVariant getResource() {
+		return TransferCompatUtil.toVariant(this.inner.getResource(this.slot));
+	}
+
+	@Override
+	public long getAmount() {
+		return this.inner.getAmountAsLong(this.slot);
+	}
+
+	@Override
+	public long getCapacity() {
+		return this.inner.getCapacityAsLong(this.slot, this.inner.getResource(this.slot));
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/NeoItemSlottedStorage.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/NeoItemSlottedStorage.java
new file mode 100644
index 0000000000..595bddbf08
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/NeoItemSlottedStorage.java
@@ -0,0 +1,60 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import com.google.common.primitives.Ints;
+import net.neoforged.neoforge.transfer.ResourceHandler;
+import net.neoforged.neoforge.transfer.item.ItemResource;
+
+import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
+import net.fabricmc.fabric.api.transfer.v1.storage.SlottedStorage;
+import net.fabricmc.fabric.api.transfer.v1.storage.StorageView;
+import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
+
+public class NeoItemSlottedStorage implements SlottedStorage {
+	private final ResourceHandler inner;
+
+	public NeoItemSlottedStorage(ResourceHandler inner) {
+		this.inner = inner;
+	}
+
+	@Override
+	public int getSlotCount() {
+		return this.inner.size();
+	}
+
+	@Override
+	public SingleSlotStorage getSlot(int slot) {
+		return new NeoItemSingleSlotStorage(this.inner, slot);
+	}
+
+	@Override
+	public long insert(ItemVariant resource, long maxAmount, TransactionContext transaction) {
+		return this.inner.insert(
+				TransferCompatUtil.toResource(resource),
+				Ints.saturatedCast(maxAmount),
+				TransferCompatUtil.toNeoCtx(transaction)
+		);
+	}
+
+	@Override
+	public long extract(ItemVariant resource, long maxAmount, TransactionContext transaction) {
+		return this.inner.extract(
+				TransferCompatUtil.toResource(resource),
+				Ints.saturatedCast(maxAmount),
+				TransferCompatUtil.toNeoCtx(transaction)
+		);
+	}
+
+	@Override
+	public Iterator> iterator() {
+		List> views = new ArrayList<>();
+		for (int i = 0; i < this.inner.size(); i++) {
+			views.add(new NeoItemSingleSlotStorage(this.inner, i));
+		}
+		return views.iterator();
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/TransferApiNeoCompat.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/TransferApiNeoCompat.java
new file mode 100644
index 0000000000..21d8d964b5
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/TransferApiNeoCompat.java
@@ -0,0 +1,246 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import com.google.common.base.Suppliers;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.capabilities.BlockCapability;
+import net.neoforged.neoforge.capabilities.Capabilities;
+import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
+import net.neoforged.neoforge.transfer.ResourceHandler;
+import net.neoforged.neoforge.transfer.fluid.FluidResource;
+import net.neoforged.neoforge.transfer.item.ItemResource;
+import org.sinytra.fabric.transfer_api.generated.GeneratedEntryPoint;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.material.Fluid;
+
+import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup;
+import net.fabricmc.fabric.api.lookup.v1.item.ItemApiLookup;
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage;
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
+import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage;
+import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
+import net.fabricmc.fabric.api.transfer.v1.storage.SlottedStorage;
+import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
+
+@EventBusSubscriber(modid = GeneratedEntryPoint.MOD_ID)
+public class TransferApiNeoCompat {
+	private static final Map, Supplier> CAPS = new HashMap<>();
+	/**
+	 * This lock has two purposes: avoiding recursive calls between {@link net.minecraft.world.level.Level#getCapability(BlockCapability, BlockPos, Object)}}
+	 * and {@link BlockApiLookup#find(net.minecraft.world.level.Level, BlockPos, net.minecraft.world.level.block.state.BlockState, net.minecraft.world.level.block.entity.BlockEntity, Object) find} as well as influencing the
+	 * behavior of {@code find} if it was called from {@code getCapability}.
+	 * 
    
+	 * The recursive calls occur because our capabilities providers need to access the block lookup API to check if they
+	 * should provide a capability (for Fabric from Neo compat), but the block lookup API needs to query the
+	 * capabilities (for Neo from Fabric compat). This lock is set immediately before one API calls the other, which
+	 * then disables the call from the other API to the first, breaking the recursion.
+	 * 
    
+	 * Additionally, this lock is used to conditionally disable some of the block lookup API's fallback providers, if
+	 * they got invoked by a capability provider. This is needed because Fabric has fallback providers for many Vanilla
+	 * things, but Neo already implements their own compat for those.
+	 */
+	public static final ThreadLocal COMPUTING_CAPABILITY_LOCK = ThreadLocal.withInitial(() -> false);
+
+	public static final ThreadLocal WAS_ABORTED = ThreadLocal.withInitial(() -> null);
+
+	@SuppressWarnings("unchecked")
+	@SubscribeEvent
+	private static void onAttachBlockEntityCapabilities(RegisterCapabilitiesEvent event) {
+		for (Block type : BuiltInRegistries.BLOCK) {
+			event.registerBlock(
+					Capabilities.Item.BLOCK,
+					(level, pos, state, blockEntity, context) -> {
+						if (!COMPUTING_CAPABILITY_LOCK.get() && (blockEntity == null || blockEntity.hasLevel())) {
+							COMPUTING_CAPABILITY_LOCK.set(true);
+							Storage storage = ItemStorage.SIDED.find(level, pos, state, blockEntity, context);
+							COMPUTING_CAPABILITY_LOCK.set(false);
+
+							if (storage != null) {
+								Supplier> supplier = (Supplier>)
+										CAPS.computeIfAbsent(storage, s ->
+												Suppliers.memoize(() ->
+														storage instanceof SlottedStorage slotted
+																? new FabricSlottedItemResourceHandler(slotted)
+																: new FabricItemResourceHandler(storage)
+												)
+										);
+								return supplier.get();
+							}
+						}
+						return null;
+					},
+					type
+			);
+		}
+
+		for (BlockEntityType type : BuiltInRegistries.BLOCK_ENTITY_TYPE) {
+			event.registerBlockEntity(
+					Capabilities.Fluid.BLOCK,
+					type,
+					(be, side) -> {
+						if (!COMPUTING_CAPABILITY_LOCK.get() && be.hasLevel()) {
+							COMPUTING_CAPABILITY_LOCK.set(true);
+							Storage storage = FluidStorage.SIDED.find(be.getLevel(), be.getBlockPos(), be.getBlockState(), be, side);
+							COMPUTING_CAPABILITY_LOCK.set(false);
+
+							if (storage != null) {
+								Supplier> supplier = (Supplier>)
+										CAPS.computeIfAbsent(storage, s ->
+												Suppliers.memoize(() ->
+														storage instanceof SlottedStorage slotted
+																? new FabricSlottedFluidResourceHandler(slotted)
+																: new FabricFluidResourceHandler(storage)
+												)
+										);
+								return supplier.get();
+							}
+						}
+						return null;
+					}
+			);
+		}
+
+		for (Item item : BuiltInRegistries.ITEM) {
+			event.registerItem(
+					Capabilities.Item.ITEM,
+					(stack, ctx) -> {
+						if (!COMPUTING_CAPABILITY_LOCK.get()) {
+							COMPUTING_CAPABILITY_LOCK.set(true);
+							Storage storage = ItemStorage.ITEM.find(stack, new NeoContainerItemContext(ctx));
+							COMPUTING_CAPABILITY_LOCK.set(false);
+
+							if (storage != null) {
+								Supplier> supplier = (Supplier>)
+										CAPS.computeIfAbsent(storage, s ->
+												Suppliers.memoize(() ->
+														storage instanceof SlottedStorage slotted
+																? new FabricSlottedItemResourceHandler(slotted)
+																: new FabricItemResourceHandler(storage)
+												)
+										);
+								return supplier.get();
+							}
+						}
+						return null;
+					},
+					item
+			);
+
+			event.registerItem(
+					Capabilities.Fluid.ITEM,
+					(stack, ctx) -> {
+						if (!COMPUTING_CAPABILITY_LOCK.get()) {
+							COMPUTING_CAPABILITY_LOCK.set(true);
+							Storage storage = FluidStorage.ITEM.find(stack, new NeoContainerItemContext(ctx));
+							COMPUTING_CAPABILITY_LOCK.set(false);
+
+							if (storage != null) {
+								Supplier> supplier = (Supplier>)
+										CAPS.computeIfAbsent(storage, s ->
+												Suppliers.memoize(() ->
+														storage instanceof SlottedStorage slotted
+																? new FabricSlottedFluidResourceHandler(slotted)
+																: new FabricFluidResourceHandler(storage)
+												)
+										);
+								return supplier.get();
+							}
+						}
+						return null;
+					},
+					item
+			);
+		}
+	}
+
+	public static void registerTransferApiFluidNeoBridge() {
+		FluidStorage.SIDED.registerFallback((level, pos, state, blockEntity, direction) -> {
+			if (!COMPUTING_CAPABILITY_LOCK.get()) {
+				COMPUTING_CAPABILITY_LOCK.set(true);
+				Storage storage = Optional.ofNullable(level.getCapability(Capabilities.Fluid.BLOCK, pos, state, blockEntity, direction))
+						.map(NeoFluidSlottedStorage::new)
+						.orElse(null);
+				COMPUTING_CAPABILITY_LOCK.set(false);
+				return storage;
+			}
+			return null;
+		});
+		FluidStorage.ITEM.registerFallback((stack, context) -> {
+			if (stack != null && !COMPUTING_CAPABILITY_LOCK.get()) {
+				COMPUTING_CAPABILITY_LOCK.set(true);
+				Storage storage = Optional.ofNullable(stack.getCapability(Capabilities.Fluid.ITEM, new FabricItemAccess(context)))
+						.map(NeoFluidSlottedStorage::new)
+						.orElse(null);
+				COMPUTING_CAPABILITY_LOCK.set(false);
+				return storage;
+			}
+			return null;
+		});
+	}
+
+	public static void registerTransferApiItemNeoBridge() {
+		ItemStorage.SIDED.registerFallback((level, pos, state, blockEntity, direction) -> {
+			if (!COMPUTING_CAPABILITY_LOCK.get()) {
+				COMPUTING_CAPABILITY_LOCK.set(true);
+				Storage storage = Optional.ofNullable(level.getCapability(Capabilities.Item.BLOCK, pos, state, blockEntity, direction))
+						.map(NeoItemSlottedStorage::new)
+						.orElse(null);
+				COMPUTING_CAPABILITY_LOCK.set(false);
+				return storage;
+			}
+			return null;
+		});
+		ItemStorage.ITEM.registerFallback((stack, ctx) -> {
+			if (!COMPUTING_CAPABILITY_LOCK.get()) {
+				COMPUTING_CAPABILITY_LOCK.set(true);
+				Storage storage = Optional.ofNullable(stack.getCapability(Capabilities.Item.ITEM, new FabricItemAccess(ctx)))
+						.map(NeoItemSlottedStorage::new)
+						.orElse(null);
+				COMPUTING_CAPABILITY_LOCK.set(false);
+				return storage;
+			}
+			return null;
+		});
+	}
+
+	public static  ItemApiLookup.ItemApiProvider wrapProviderSafely(ItemApiLookup.ItemApiProvider provider) {
+		return (a, b) -> {
+			if (COMPUTING_CAPABILITY_LOCK.get()) {
+				return null;
+			}
+			return provider.find(a, b);
+		};
+	}
+
+	public static  BlockApiLookup.BlockApiProvider wrapProviderSafely(BlockApiLookup.BlockApiProvider provider) {
+		return (world, pos, state, blockEntity, direction) -> {
+			if (COMPUTING_CAPABILITY_LOCK.get()) {
+				return null;
+			}
+			return provider.find(world, pos, state, blockEntity, direction);
+		};
+	}
+
+	public static boolean isInNeoTx() {
+		return COMPUTING_CAPABILITY_LOCK.get();
+	}
+
+	private static boolean definesCustomFluidType(Fluid fluid) {
+		try {
+			fluid.getFluidType();
+			return true;
+		} catch (RuntimeException e) {
+			return false;
+		}
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/TransferCompatUtil.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/TransferCompatUtil.java
new file mode 100644
index 0000000000..a021a28e05
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/TransferCompatUtil.java
@@ -0,0 +1,54 @@
+package net.fabricmc.fabric.impl.transfer.compat;
+
+import com.google.common.primitives.Ints;
+import net.neoforged.neoforge.fluids.FluidType;
+import net.neoforged.neoforge.transfer.fluid.FluidResource;
+import net.neoforged.neoforge.transfer.item.ItemResource;
+
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants;
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
+import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
+import net.fabricmc.fabric.impl.transfer.transaction.NeoTransactions;
+
+public final class TransferCompatUtil {
+	public static ItemResource toResource(ItemVariant variant) {
+		return ItemResource.of(variant.typeHolder(), variant.getComponentsPatch());
+	}
+
+	public static ItemVariant toVariant(ItemResource inner) {
+		return ItemVariant.of(inner.getItem(), inner.getComponentsPatch());
+	}
+
+	public static FluidResource toResource(FluidVariant variant) {
+		return FluidResource.of(variant.typeHolder(), variant.getComponentsPatch());
+	}
+
+	public static FluidVariant toVariant(FluidResource inner) {
+		return FluidVariant.of(inner.getFluid(), inner.getComponentsPatch());
+	}
+
+	public static TransactionContext toFabricCtx(net.neoforged.neoforge.transfer.transaction.TransactionContext inner) {
+		return NeoTransactions.wrap((net.neoforged.neoforge.transfer.transaction.Transaction) inner);
+	}
+
+	public static net.neoforged.neoforge.transfer.transaction.TransactionContext toNeoCtx(TransactionContext inner) {
+		return NeoTransactions.unwrapContext(inner);
+	}
+
+	public static int toNeoBucket(long amount) {
+		return (int) toNeoBucketLong(amount);
+	}
+
+	public static long toNeoBucketLong(long amount) {
+		return (long) (Ints.saturatedCast(amount) / (double) FluidConstants.BUCKET * FluidType.BUCKET_VOLUME);
+	}
+
+	public static int toFabricBucket(long amount) {
+		return (int) toFabricBucketLong(amount);
+	}
+
+	public static long toFabricBucketLong(long amount) {
+		return (long) (amount / (double) FluidType.BUCKET_VOLUME * FluidConstants.BUCKET);
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/CombinedProvidersImpl.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/CombinedProvidersImpl.java
index 0f8adb9e03..1224508f7a 100644
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/CombinedProvidersImpl.java
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/CombinedProvidersImpl.java
@@ -19,6 +19,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import net.fabricmc.fabric.impl.transfer.compat.TransferApiNeoCompat;
+
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.world.item.Item;
@@ -68,6 +70,10 @@ private static class Provider implements ItemApiLookup.ItemApiProvider find(ItemStack itemStack, ContainerItemContext context) {
+			if (TransferApiNeoCompat.isInNeoTx()) {
+				return null;
+			}
+
 			if (!context.getItemVariant().matches(itemStack)) {
 				String errorMessage = String.format(
 						"Query stack %s and ContainerItemContext variant %s don't match.",
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/EmptyBucketStorage.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/EmptyBucketStorage.java
index 2f35b35ce8..658d14611a 100644
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/EmptyBucketStorage.java
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/EmptyBucketStorage.java
@@ -19,6 +19,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import net.minecraft.world.item.BucketItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
 
@@ -31,7 +32,6 @@
 import net.fabricmc.fabric.api.transfer.v1.storage.base.BlankVariantView;
 import net.fabricmc.fabric.api.transfer.v1.storage.base.InsertionOnlyStorage;
 import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
-import net.fabricmc.fabric.mixin.transfer.BucketItemAccessor;
 
 /**
  * Storage implementation for empty buckets, accepting any fluid with a bidirectional fluid <-> bucket mapping.
@@ -53,7 +53,7 @@ public long insert(FluidVariant resource, long maxAmount, TransactionContext tra
 		Item fullBucket = resource.getFluid().getBucket();
 
 		// Make sure the resource is a correct fluid mapping: the fluid <-> bucket mapping must be bidirectional.
-		if (fullBucket instanceof BucketItemAccessor accessor && resource.isOf(accessor.fabric_getContent())) {
+		if (fullBucket instanceof BucketItem accessor && resource.isOf(accessor.getContent())) {
 			if (maxAmount >= FluidConstants.BUCKET) {
 				ItemVariant newVariant = ItemVariant.of(fullBucket, context.getItemVariant().getComponentsPatch());
 
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/BundleContentsStorage.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/BundleContentsStorage.java
deleted file mode 100644
index 4e13c5d5d4..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/BundleContentsStorage.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * 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.impl.transfer.item;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import com.mojang.serialization.DataResult;
-import org.apache.commons.lang3.math.Fraction;
-
-import net.minecraft.core.component.DataComponentPatch;
-import net.minecraft.core.component.DataComponents;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.ItemStackTemplate;
-import net.minecraft.world.item.component.BundleContents;
-
-import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext;
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
-import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
-import net.fabricmc.fabric.api.transfer.v1.storage.StoragePreconditions;
-import net.fabricmc.fabric.api.transfer.v1.storage.StorageView;
-import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
-import net.fabricmc.fabric.mixin.transfer.BundleContentsAccessor;
-
-public class BundleContentsStorage implements Storage {
-	private final ContainerItemContext ctx;
-	private final List slotCache = new ArrayList<>();
-	private List> slots = List.of();
-	private final Item originalItem;
-
-	public BundleContentsStorage(ContainerItemContext ctx) {
-		this.ctx = ctx;
-		this.originalItem = ctx.getItemVariant().getItem();
-	}
-
-	private boolean updateStack(DataComponentPatch patch, TransactionContext transaction) {
-		ItemVariant newVariant = ctx.getItemVariant().withComponents(patch);
-		return ctx.exchange(newVariant, 1, transaction) > 0;
-	}
-
-	@Override
-	public long insert(ItemVariant resource, long maxAmount, TransactionContext transaction) {
-		StoragePreconditions.notBlankNotNegative(resource, maxAmount);
-
-		if (!isStillValid()) return 0;
-
-		if (maxAmount > Integer.MAX_VALUE) maxAmount = Integer.MAX_VALUE;
-
-		ItemStack stack = resource.toStack((int) maxAmount);
-
-		if (!BundleContents.canItemBeInBundle(stack)) return 0;
-
-		var builder = new BundleContents.Mutable(bundleContents());
-
-		int inserted = builder.tryInsert(stack);
-
-		if (inserted == 0) return 0;
-
-		DataComponentPatch changes = DataComponentPatch.builder()
-				.set(DataComponents.BUNDLE_CONTENTS, builder.toImmutable())
-				.build();
-
-		if (!updateStack(changes, transaction)) return 0;
-
-		return inserted;
-	}
-
-	@Override
-	public long extract(ItemVariant resource, long maxAmount, TransactionContext transaction) {
-		StoragePreconditions.notNegative(maxAmount);
-
-		if (!isStillValid()) return 0;
-
-		updateSlotsIfNeeded();
-
-		long amount = 0;
-
-		for (StorageView slot : slots) {
-			amount += slot.extract(resource, maxAmount - amount, transaction);
-			if (amount == maxAmount) break;
-		}
-
-		return amount;
-	}
-
-	@Override
-	public Iterator> iterator() {
-		updateSlotsIfNeeded();
-
-		return slots.iterator();
-	}
-
-	private boolean isStillValid() {
-		return ctx.getItemVariant().getItem() == originalItem;
-	}
-
-	private void updateSlotsIfNeeded() {
-		int bundleSize = bundleContents().size();
-
-		if (slots.size() != bundleSize) {
-			while (bundleSize > slotCache.size()) {
-				slotCache.add(new BundleSlotWrapper(slotCache.size()));
-			}
-
-			slots = Collections.unmodifiableList(slotCache.subList(0, bundleSize));
-		}
-	}
-
-	BundleContents bundleContents() {
-		return ctx.getItemVariant().getComponents().getOrDefault(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY);
-	}
-
-	private class BundleSlotWrapper implements StorageView {
-		private final int index;
-
-		private BundleSlotWrapper(int index) {
-			this.index = index;
-		}
-
-		private ItemStack getStack() {
-			if (bundleContents().size() <= index) return ItemStack.EMPTY;
-
-			return bundleContents().items().get(index).create();
-		}
-
-		@Override
-		public long extract(ItemVariant resource, long maxAmount, TransactionContext transaction) {
-			StoragePreconditions.notNegative(maxAmount);
-
-			if (!BundleContentsStorage.this.isStillValid()) return 0;
-			if (bundleContents().size() <= index) return 0;
-			if (!resource.matches(getStack())) return 0;
-
-			var stacksCopy = new ArrayList<>(bundleContents().items());
-			ItemStackTemplate toSrink = stacksCopy.get(index);
-			int extracted = (int) Math.min(toSrink.count(), maxAmount);
-
-			if (toSrink.count() - extracted <= 1) {
-				stacksCopy.remove(index);
-			} else {
-				stacksCopy.set(index, new ItemStackTemplate(toSrink.item(), toSrink.count() - extracted, toSrink.components()));
-			}
-
-			DataComponentPatch changes = DataComponentPatch.builder()
-					.set(DataComponents.BUNDLE_CONTENTS, new BundleContents(stacksCopy))
-					.build();
-
-			if (!updateStack(changes, transaction)) return 0;
-
-			return extracted;
-		}
-
-		@Override
-		public boolean isResourceBlank() {
-			return getStack().isEmpty();
-		}
-
-		@Override
-		public ItemVariant getResource() {
-			return ItemVariant.of(getStack());
-		}
-
-		@Override
-		public long getAmount() {
-			return getStack().getCount();
-		}
-
-		@Override
-		public long getCapacity() {
-			Fraction remainingSpace = Fraction.ONE.subtract(getWeight(bundleContents().weight()));
-			int extraAllowed = Math.max(
-					remainingSpace.divideBy(getWeight(BundleContentsAccessor.getWeight(getStack()))).intValue(),
-					0
-			);
-			return getAmount() + extraAllowed;
-		}
-
-		private static Fraction getWeight(DataResult weight) {
-			return switch (weight) {
-			case DataResult.Success success -> success.value();
-			case DataResult.Error ignored -> Fraction.ONE;
-			};
-		}
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ComposterWrapper.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ComposterWrapper.java
deleted file mode 100644
index 411f9a1c04..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ComposterWrapper.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * 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.impl.transfer.item;
-
-import static net.minecraft.core.Direction.UP;
-
-import java.util.Map;
-
-import com.google.common.collect.MapMaker;
-import org.jspecify.annotations.Nullable;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.ComposterBlock;
-import net.minecraft.world.level.block.LevelEvent;
-import net.minecraft.world.level.block.state.BlockState;
-
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
-import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
-import net.fabricmc.fabric.api.transfer.v1.storage.StoragePreconditions;
-import net.fabricmc.fabric.api.transfer.v1.storage.base.ExtractionOnlyStorage;
-import net.fabricmc.fabric.api.transfer.v1.storage.base.InsertionOnlyStorage;
-import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
-import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
-import net.fabricmc.fabric.api.transfer.v1.transaction.base.SnapshotParticipant;
-import net.fabricmc.fabric.impl.transfer.DebugMessages;
-
-/**
- * Implementation of {@code Storage} for composters.
- */
-public class ComposterWrapper extends SnapshotParticipant {
-	// Record is used for convenient constructor, hashcode and equals implementations.
-	private record LevelLocation(Level level, BlockPos pos) {
-		private BlockState getBlockState() {
-			return level.getBlockState(pos);
-		}
-
-		private void setBlockState(BlockState state) {
-			level.setBlockAndUpdate(pos, state);
-		}
-
-		@Override
-		public String toString() {
-			return DebugMessages.forGlobalPos(level, pos);
-		}
-	}
-
-	// Weak values to make sure wrappers are cleaned up after use, thread-safe.
-	// The two storages strongly reference the containing wrapper, so we are alright with weak values.
-	private static final Map COMPOSTERS = new MapMaker().concurrencyLevel(1).weakValues().makeMap();
-
-	@Nullable
-	public static Storage get(Level level, BlockPos pos, @Nullable Direction direction) {
-		if (direction != null && direction.getAxis().isVertical()) {
-			LevelLocation location = new LevelLocation(level, pos.immutable());
-			ComposterWrapper composterWrapper = COMPOSTERS.computeIfAbsent(location, ComposterWrapper::new);
-			return direction == UP ? composterWrapper.upStorage : composterWrapper.downStorage;
-		} else {
-			return null;
-		}
-	}
-
-	private static final float DO_NOTHING = 0f;
-	private static final float EXTRACT_BONEMEAL = -1f;
-
-	private final LevelLocation location;
-	// -1 if bonemeal was extracted, otherwise the composter increase probability of the (pending) inserted item.
-	private Float increaseProbability = DO_NOTHING;
-	private final TopStorage upStorage = new TopStorage();
-	private final BottomStorage downStorage = new BottomStorage();
-
-	private ComposterWrapper(LevelLocation location) {
-		this.location = location;
-	}
-
-	@Override
-	protected Float createSnapshot() {
-		return increaseProbability;
-	}
-
-	@Override
-	protected void readSnapshot(Float snapshot) {
-		// Reset after unsuccessful commit.
-		increaseProbability = snapshot;
-	}
-
-	@Override
-	protected void onFinalCommit() {
-		// Apply pending action
-		if (increaseProbability == EXTRACT_BONEMEAL) {
-			// Mimic ComposterBlock#emptyComposter logic.
-			location.setBlockState(location.getBlockState().setValue(ComposterBlock.LEVEL, 0));
-			// Play the sound
-			location.level.playSound(null, location.pos, SoundEvents.COMPOSTER_EMPTY, SoundSource.BLOCKS, 1.0F, 1.0F);
-		} else if (increaseProbability > 0) {
-			BlockState state = location.getBlockState();
-			// Always increment on first insert (like vanilla).
-			boolean increaseSuccessful = state.getValue(ComposterBlock.LEVEL) == 0 || location.level.getRandom().nextDouble() < increaseProbability;
-
-			if (increaseSuccessful) {
-				// Mimic ComposterBlock#addToComposter logic.
-				int newLevel = state.getValue(ComposterBlock.LEVEL) + 1;
-				BlockState newState = state.setValue(ComposterBlock.LEVEL, newLevel);
-				location.setBlockState(newState);
-
-				if (newLevel == 7) {
-					location.level.scheduleTick(location.pos, state.getBlock(), 20);
-				}
-			}
-
-			location.level.levelEvent(LevelEvent.COMPOSTER_FILL, location.pos, increaseSuccessful ? 1 : 0);
-		}
-
-		// Reset after successful commit.
-		increaseProbability = DO_NOTHING;
-	}
-
-	private class TopStorage implements InsertionOnlyStorage {
-		@Override
-		public long insert(ItemVariant resource, long maxAmount, TransactionContext transaction) {
-			StoragePreconditions.notBlankNotNegative(resource, maxAmount);
-
-			// Check amount.
-			if (maxAmount < 1) return 0;
-			// Check that no action is scheduled.
-			if (increaseProbability != DO_NOTHING) return 0;
-			// Check that the composter can accept items.
-			if (location.getBlockState().getValue(ComposterBlock.LEVEL) >= 7) return 0;
-			// Check that the item is compostable.
-			float insertedIncreaseProbability = ComposterBlock.COMPOSTABLES.getFloat(resource.getItem());
-			if (insertedIncreaseProbability <= 0) return 0;
-
-			// Schedule insertion.
-			updateSnapshots(transaction);
-			increaseProbability = insertedIncreaseProbability;
-			return 1;
-		}
-
-		@Override
-		public String toString() {
-			return "ComposterWrapper[" + location + "/top]";
-		}
-	}
-
-	private class BottomStorage implements ExtractionOnlyStorage, SingleSlotStorage {
-		private static final ItemVariant BONE_MEAL = ItemVariant.of(Items.BONE_MEAL);
-
-		private boolean hasBoneMeal() {
-			// We only have bone meal if the level is 8 and no action was scheduled.
-			return increaseProbability == DO_NOTHING && location.getBlockState().getValue(ComposterBlock.LEVEL) == 8;
-		}
-
-		@Override
-		public long extract(ItemVariant resource, long maxAmount, TransactionContext transaction) {
-			StoragePreconditions.notBlankNotNegative(resource, maxAmount);
-
-			// Check amount.
-			if (maxAmount < 1) return 0;
-			// Check that the resource is bone meal.
-			if (!BONE_MEAL.equals(resource)) return 0;
-			// Check that there is bone meal to extract.
-			if (!hasBoneMeal()) return 0;
-
-			updateSnapshots(transaction);
-			increaseProbability = EXTRACT_BONEMEAL;
-			return 1;
-		}
-
-		@Override
-		public boolean isResourceBlank() {
-			return getResource().isBlank();
-		}
-
-		@Override
-		public ItemVariant getResource() {
-			return BONE_MEAL;
-		}
-
-		@Override
-		public long getAmount() {
-			return hasBoneMeal() ? 1 : 0;
-		}
-
-		@Override
-		public long getCapacity() {
-			return 1;
-		}
-
-		@Override
-		public String toString() {
-			return "ComposterWrapper[" + location + "/bottom]";
-		}
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ContainerSlotWrapper.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ContainerSlotWrapper.java
deleted file mode 100644
index e778148016..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ContainerSlotWrapper.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * 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.impl.transfer.item;
-
-import java.util.Objects;
-
-import org.jspecify.annotations.Nullable;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.component.DataComponentType;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.level.block.ChestBlock;
-import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
-import net.minecraft.world.level.block.entity.BrewingStandBlockEntity;
-import net.minecraft.world.level.block.entity.ChestBlockEntity;
-import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity;
-import net.minecraft.world.level.block.state.properties.ChestType;
-
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
-import net.fabricmc.fabric.api.transfer.v1.item.base.SingleStackStorage;
-import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
-import net.fabricmc.fabric.impl.transfer.DebugMessages;
-
-/**
- * A wrapper around a single slot of an inventory.
- * We must ensure that only one instance of this class exists for every inventory slot,
- * or the transaction logic will not work correctly.
- * This is handled by the Map in InventoryStorageImpl.
- */
-class ContainerSlotWrapper extends SingleStackStorage {
-	/**
-	 * The strong reference to the InventoryStorageImpl ensures that the weak value doesn't get GC'ed when individual slots are still being accessed.
-	 */
-	private final ContainerStorageImpl storage;
-	final int slot;
-	private final @Nullable SpecialLogicContainer specialContainer;
-	private ItemStack lastReleasedSnapshot = null;
-
-	ContainerSlotWrapper(ContainerStorageImpl storage, int slot) {
-		this.storage = storage;
-		this.slot = slot;
-		this.specialContainer = storage.container instanceof SpecialLogicContainer special ? special : null;
-	}
-
-	@Override
-	protected ItemStack getStack() {
-		return storage.container.getItem(slot);
-	}
-
-	@Override
-	protected void setStack(ItemStack stack) {
-		if (specialContainer == null) {
-			storage.container.setItem(slot, stack);
-		} else {
-			specialContainer.fabric_setSuppress(true);
-
-			try {
-				storage.container.setItem(slot, stack);
-			} finally {
-				specialContainer.fabric_setSuppress(false);
-			}
-		}
-	}
-
-	@Override
-	public long insert(ItemVariant insertedVariant, long maxAmount, TransactionContext transaction) {
-		if (!canInsert(slot, ((ItemVariantImpl) insertedVariant).getCachedStack())) {
-			return 0;
-		}
-
-		long ret = super.insert(insertedVariant, maxAmount, transaction);
-		if (specialContainer != null && ret > 0) specialContainer.fabric_onTransfer(slot, transaction);
-		return ret;
-	}
-
-	private boolean canInsert(int slot, ItemStack stack) {
-		if (storage.container instanceof ShulkerBoxBlockEntity shulker) {
-			// Shulkers override canInsert but not isValid.
-			return shulker.canPlaceItemThroughFace(slot, stack, null);
-		} else {
-			return storage.container.canPlaceItem(slot, stack);
-		}
-	}
-
-	@Override
-	public long extract(ItemVariant variant, long maxAmount, TransactionContext transaction) {
-		long ret = super.extract(variant, maxAmount, transaction);
-		if (specialContainer != null && ret > 0) specialContainer.fabric_onTransfer(slot, transaction);
-		return ret;
-	}
-
-	/**
-	 * Special cases because vanilla checks the current stack in the following functions (which it shouldn't):
-	 * 
      
-	 *     
    • {@link AbstractFurnaceBlockEntity#canPlaceItem(int, ItemStack)}.
      • 
-	 *     
    • {@link BrewingStandBlockEntity#canPlaceItem(int, ItemStack)}.
      • 
-	 * 
    
-	 */
-	@Override
-	public int getCapacity(ItemVariant variant) {
-		// Special case to limit buckets to 1 in furnace fuel inputs.
-		if (storage.container instanceof AbstractFurnaceBlockEntity && slot == 1 && variant.isOf(Items.BUCKET)) {
-			return 1;
-		}
-
-		// Special case to limit brewing stand "bottle inputs" to 1.
-		if (storage.container instanceof BrewingStandBlockEntity && slot < 3) {
-			return 1;
-		}
-
-		return Math.min(storage.container.getMaxStackSize(), ItemVariantImpl.getMaxStackSize(variant));
-	}
-
-	// We override updateSnapshots to also schedule a setChanged call for the backing inventory.
-	@Override
-	public void updateSnapshots(TransactionContext transaction) {
-		storage.setChangedParticipant.updateSnapshots(transaction);
-		super.updateSnapshots(transaction);
-
-		// For chests: also schedule a setChanged call for the other half
-		if (storage.container instanceof ChestBlockEntity chest && chest.getBlockState().getValue(ChestBlock.TYPE) != ChestType.SINGLE) {
-			BlockPos otherChestPos = chest.getBlockPos().relative(ChestBlock.getConnectedDirection(chest.getBlockState()));
-
-			if (chest.getLevel().getBlockEntity(otherChestPos) instanceof ChestBlockEntity otherChest) {
-				((ContainerStorageImpl) ContainerStorageImpl.of(otherChest, null)).setChangedParticipant.updateSnapshots(transaction);
-			}
-		}
-	}
-
-	@Override
-	protected void releaseSnapshot(ItemStack snapshot) {
-		lastReleasedSnapshot = snapshot;
-	}
-
-	@Override
-	protected void onFinalCommit() {
-		// Try to apply the change to the original stack
-		ItemStack original = lastReleasedSnapshot;
-		ItemStack currentStack = getStack();
-
-		if (storage.container instanceof SpecialLogicContainer specialLogicInv) {
-			specialLogicInv.fabric_onFinalCommit(slot, original, currentStack);
-		}
-
-		if (!original.isEmpty() && original.getItem() == currentStack.getItem()) {
-			// Components have changed, we need to copy the stack.
-			if (!Objects.equals(original.getComponentsPatch(), currentStack.getComponentsPatch())) {
-				// Remove all the existing components and copy the new ones on top.
-				for (DataComponentType type : original.getComponents().keySet()) {
-					original.set(type, null);
-				}
-
-				original.applyComponents(currentStack.getComponents());
-			}
-
-			// None is empty and the items and components match: just update the amount, and reuse the original stack.
-			original.setCount(currentStack.getCount());
-			setStack(original);
-		} else {
-			// Otherwise assume everything was taken from original so empty it.
-			original.setCount(0);
-		}
-	}
-
-	@Override
-	public String toString() {
-		return "ContainerSlotWrapper[%s#%d]".formatted(DebugMessages.forInventory(storage.container), slot);
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ContainerStorageImpl.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ContainerStorageImpl.java
deleted file mode 100644
index 7370c00856..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ContainerStorageImpl.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * 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.impl.transfer.item;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.MapMaker;
-import org.jspecify.annotations.Nullable;
-
-import net.minecraft.core.Direction;
-import net.minecraft.world.Container;
-import net.minecraft.world.WorldlyContainer;
-import net.minecraft.world.entity.player.Inventory;
-
-import net.fabricmc.fabric.api.transfer.v1.item.ContainerStorage;
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
-import net.fabricmc.fabric.api.transfer.v1.storage.base.CombinedStorage;
-import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
-import net.fabricmc.fabric.api.transfer.v1.transaction.base.SnapshotParticipant;
-import net.fabricmc.fabric.impl.transfer.DebugMessages;
-
-/**
- * Implementation of {@link ContainerStorage}.
- * Note on thread-safety: we assume that Inventory's are inherently single-threaded, and no attempt is made at synchronization.
- * However, the access to implementations can happen on multiple threads concurrently, which is why we use a thread-safe wrapper map.
- */
-public class ContainerStorageImpl extends CombinedStorage> implements ContainerStorage {
-	/**
-	 * Global wrapper concurrent map.
-	 *
-	 * 
    A note on GC: weak keys alone are not suitable as the ContainerStorage slots strongly reference the Inventory keys.
-	 * Weak values are suitable, but we have to ensure that the ContainerStorageImpl remains strongly reachable as long as
-	 * one of the slot wrappers refers to it, hence the {@code strongRef} field in {@link ContainerSlotWrapper}.
-	 */
-	// TODO: look into promoting the weak reference to a soft reference if building the wrappers becomes a performance bottleneck.
-	// TODO: should have identity semantics?
-	private static final Map WRAPPERS = new MapMaker().weakValues().makeMap();
-
-	public static ContainerStorage of(Container inventory, @Nullable Direction direction) {
-		ContainerStorageImpl storage = WRAPPERS.computeIfAbsent(inventory, inv -> {
-			if (inv instanceof Inventory playerInventory) {
-				return new PlayerInventoryStorageImpl(playerInventory);
-			} else {
-				return new ContainerStorageImpl(inv);
-			}
-		});
-		storage.resizeSlotList();
-		return storage.getSidedWrapper(direction);
-	}
-
-	final Container container;
-	/**
-	 * This {@code backingList} is the real list of wrappers.
-	 * The {@code parts} in the superclass is the public-facing unmodifiable sublist with exactly the right amount of slots.
-	 */
-	final List backingList;
-	/**
-	 * This participant ensures that setChanged is only called once for the entire inventory.
-	 */
-	final SetChangedParticipant setChangedParticipant = new SetChangedParticipant();
-
-	ContainerStorageImpl(Container container) {
-		super(Collections.emptyList());
-		this.container = container;
-		this.backingList = new ArrayList<>();
-	}
-
-	@Override
-	public List> getSlots() {
-		return parts;
-	}
-
-	/**
-	 * Resize slot list to match the current size of the inventory.
-	 */
-	private void resizeSlotList() {
-		int inventorySize = container.getContainerSize();
-
-		// If the public-facing list must change...
-		if (inventorySize != parts.size()) {
-			// Ensure we have enough wrappers in the backing list.
-			while (backingList.size() < inventorySize) {
-				backingList.add(new ContainerSlotWrapper(this, backingList.size()));
-			}
-
-			// Update the public-facing list.
-			parts = Collections.unmodifiableList(backingList.subList(0, inventorySize));
-		}
-	}
-
-	private ContainerStorage getSidedWrapper(@Nullable Direction direction) {
-		if (container instanceof WorldlyContainer && direction != null) {
-			return new SidedContainerStorageImpl(this, direction);
-		} else {
-			return this;
-		}
-	}
-
-	@Override
-	public String toString() {
-		return "ContainerStorage[" + DebugMessages.forInventory(container) + "]";
-	}
-
-	// Boolean is used to prevent allocation. Null values are not allowed by SnapshotParticipant.
-	class SetChangedParticipant extends SnapshotParticipant {
-		@Override
-		protected Boolean createSnapshot() {
-			return Boolean.TRUE;
-		}
-
-		@Override
-		protected void readSnapshot(Boolean snapshot) {
-		}
-
-		@Override
-		protected void onFinalCommit() {
-			container.setChanged();
-		}
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ItemContainerContentsStorage.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ItemContainerContentsStorage.java
deleted file mode 100644
index b47fd544e6..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ItemContainerContentsStorage.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * 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.impl.transfer.item;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import net.minecraft.core.component.DataComponentPatch;
-import net.minecraft.core.component.DataComponents;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.ItemStackTemplate;
-import net.minecraft.world.item.component.ItemContainerContents;
-
-import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext;
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
-import net.fabricmc.fabric.api.transfer.v1.storage.StoragePreconditions;
-import net.fabricmc.fabric.api.transfer.v1.storage.base.CombinedSlottedStorage;
-import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
-import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
-import net.fabricmc.fabric.mixin.transfer.ItemContainerContentsAccessor;
-
-public class ItemContainerContentsStorage extends CombinedSlottedStorage> {
-	final ContainerItemContext ctx;
-	private final Item originalItem;
-
-	public ItemContainerContentsStorage(ContainerItemContext ctx, int slots) {
-		super(Collections.emptyList());
-		this.ctx = ctx;
-		this.originalItem = ctx.getItemVariant().getItem();
-
-		List backingList = new ArrayList<>(slots);
-
-		for (int i = 0; i < slots; i++) {
-			backingList.add(new ContainerSlotWrapper(i));
-		}
-
-		parts = Collections.unmodifiableList(backingList);
-	}
-
-	ItemContainerContents container() {
-		return ctx.getItemVariant().getComponents().getOrDefault(DataComponents.CONTAINER, ItemContainerContents.EMPTY);
-	}
-
-	ItemContainerContentsAccessor containerAccessor() {
-		return (ItemContainerContentsAccessor) (Object) container();
-	}
-
-	private boolean isStillValid() {
-		return ctx.getItemVariant().getItem() == originalItem;
-	}
-
-	private class ContainerSlotWrapper implements SingleSlotStorage {
-		final int slot;
-
-		ContainerSlotWrapper(int slot) {
-			this.slot = slot;
-		}
-
-		private ItemStack getStack() {
-			List> stacks = ItemContainerContentsStorage.this.containerAccessor().fabric_getItems();
-
-			if (stacks.size() <= slot) return ItemStack.EMPTY;
-
-			return stacks.get(slot).map(ItemStackTemplate::create).orElse(ItemStack.EMPTY);
-		}
-
-		protected boolean setStack(ItemStack stack, TransactionContext transaction) {
-			List stacks = ItemContainerContentsStorage.this.container().allItemsCopyStream().collect(Collectors.toList());
-
-			while (stacks.size() <= slot) stacks.add(ItemStack.EMPTY);
-
-			stacks.set(slot, stack);
-
-			ContainerItemContext ctx = ItemContainerContentsStorage.this.ctx;
-
-			ItemVariant newVariant = ctx.getItemVariant().withComponents(DataComponentPatch.builder()
-							.set(DataComponents.CONTAINER, ItemContainerContents.fromItems(stacks))
-							.build());
-
-			return ctx.exchange(newVariant, 1, transaction) == 1;
-		}
-
-		@Override
-		public long insert(ItemVariant insertedVariant, long maxAmount, TransactionContext transaction) {
-			StoragePreconditions.notBlankNotNegative(insertedVariant, maxAmount);
-
-			if (!ItemContainerContentsStorage.this.isStillValid()) return 0;
-
-			ItemStack currentStack = getStack();
-
-			if ((insertedVariant.matches(currentStack) || currentStack.isEmpty()) && insertedVariant.getItem().canFitInsideContainerItems()) {
-				int insertedAmount = (int) Math.min(maxAmount, getCapacity() - currentStack.getCount());
-
-				if (insertedAmount > 0) {
-					currentStack = getStack().copy();
-
-					if (currentStack.isEmpty()) {
-						currentStack = insertedVariant.toStack(insertedAmount);
-					} else {
-						currentStack.grow(insertedAmount);
-					}
-
-					if (!setStack(currentStack, transaction)) return 0;
-
-					return insertedAmount;
-				}
-			}
-
-			return 0;
-		}
-
-		@Override
-		public long extract(ItemVariant variant, long maxAmount, TransactionContext transaction) {
-			StoragePreconditions.notBlankNotNegative(variant, maxAmount);
-
-			if (!ItemContainerContentsStorage.this.isStillValid()) return 0;
-
-			ItemStack currentStack = getStack();
-
-			if (variant.matches(currentStack)) {
-				int extracted = (int) Math.min(currentStack.getCount(), maxAmount);
-
-				if (extracted > 0) {
-					currentStack = getStack().copy();
-					currentStack.shrink(extracted);
-
-					if (!setStack(currentStack, transaction)) return 0;
-
-					return extracted;
-				}
-			}
-
-			return 0;
-		}
-
-		@Override
-		public boolean isResourceBlank() {
-			return getStack().isEmpty();
-		}
-
-		@Override
-		public ItemVariant getResource() {
-			return ItemVariant.of(getStack());
-		}
-
-		@Override
-		public long getAmount() {
-			return getStack().getCount();
-		}
-
-		@Override
-		public long getCapacity() {
-			return getStack().getMaxStackSize();
-		}
-
-		@Override
-		public String toString() {
-			return "ContainerSlotWrapper[%s#%d]".formatted(ItemContainerContentsStorage.this.ctx.getItemVariant(), slot);
-		}
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/PlayerInventoryStorageImpl.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/PlayerInventoryStorageImpl.java
deleted file mode 100644
index e6dc1dd734..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/PlayerInventoryStorageImpl.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * 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.impl.transfer.item;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.player.Inventory;
-
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
-import net.fabricmc.fabric.api.transfer.v1.item.PlayerInventoryStorage;
-import net.fabricmc.fabric.api.transfer.v1.storage.StoragePreconditions;
-import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil;
-import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
-import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
-import net.fabricmc.fabric.api.transfer.v1.transaction.base.SnapshotParticipant;
-import net.fabricmc.fabric.impl.transfer.DebugMessages;
-
-class PlayerInventoryStorageImpl extends ContainerStorageImpl implements PlayerInventoryStorage {
-	private final DroppedStacks droppedStacks;
-	private final Inventory inventory;
-
-	PlayerInventoryStorageImpl(Inventory inventory) {
-		super(inventory);
-		this.droppedStacks = new DroppedStacks();
-		this.inventory = inventory;
-	}
-
-	@Override
-	public long insert(ItemVariant resource, long maxAmount, TransactionContext transaction) {
-		return offer(resource, maxAmount, transaction);
-	}
-
-	@Override
-	public long offer(ItemVariant resource, long amount, TransactionContext tx) {
-		StoragePreconditions.notBlankNotNegative(resource, amount);
-		long initialAmount = amount;
-
-		List> mainSlots = getSlots().subList(0, Inventory.INVENTORY_SIZE);
-
-		// Stack into the main stack first and the offhand stack second.
-		for (InteractionHand hand : InteractionHand.values()) {
-			SingleSlotStorage handSlot = getHandSlot(hand);
-
-			if (handSlot.getResource().equals(resource)) {
-				amount -= handSlot.insert(resource, amount, tx);
-
-				if (amount == 0) return initialAmount;
-			}
-		}
-
-		// Otherwise insert into the main slots, stacking first.
-		amount -= StorageUtil.insertStacking(mainSlots, resource, amount, tx);
-
-		return initialAmount - amount;
-	}
-
-	@Override
-	public void drop(ItemVariant variant, long amount, boolean throwRandomly, boolean retainOwnership, TransactionContext transaction) {
-		StoragePreconditions.notBlankNotNegative(variant, amount);
-
-		// Drop in the world on the server side (will be synced by the game with the client).
-		// Dropping items is server-side only because it involves randomness.
-		if (amount > 0 && !inventory.player.level().isClientSide()) {
-			droppedStacks.addDrop(variant, amount, throwRandomly, retainOwnership, transaction);
-		}
-	}
-
-	@Override
-	public SingleSlotStorage getHandSlot(InteractionHand hand) {
-		if (Objects.requireNonNull(hand) == InteractionHand.MAIN_HAND) {
-			if (Inventory.isHotbarSlot(inventory.getSelectedSlot())) {
-				return getSlot(inventory.getSelectedSlot());
-			} else {
-				throw new RuntimeException("Unexpected player selected slot: " + inventory.getSelectedSlot());
-			}
-		} else if (hand == InteractionHand.OFF_HAND) {
-			return getSlot(Inventory.SLOT_OFFHAND);
-		} else {
-			throw new UnsupportedOperationException("Unknown hand: " + hand);
-		}
-	}
-
-	@Override
-	public String toString() {
-		return "PlayerInventoryStorage[" + DebugMessages.forInventory(inventory) + "]";
-	}
-
-	private class DroppedStacks extends SnapshotParticipant {
-		final List entries = new ArrayList<>();
-
-		void addDrop(ItemVariant key, long amount, boolean throwRandomly, boolean retainOwnership, TransactionContext transaction) {
-			updateSnapshots(transaction);
-			entries.add(new Entry(key, amount, throwRandomly, retainOwnership));
-		}
-
-		@Override
-		protected Integer createSnapshot() {
-			return entries.size();
-		}
-
-		@Override
-		protected void readSnapshot(Integer snapshot) {
-			// effectively cancel dropping the stacks
-			int previousSize = snapshot;
-
-			while (entries.size() > previousSize) {
-				entries.remove(entries.size() - 1);
-			}
-		}
-
-		@Override
-		protected void onFinalCommit() {
-			// actually drop the stacks
-			for (Entry entry : entries) {
-				long remainder = entry.amount;
-
-				while (remainder > 0) {
-					int dropped = (int) Math.min(ItemVariantImpl.getMaxStackSize(entry.key), remainder);
-					inventory.player.drop(entry.key.toStack(dropped), entry.throwRandomly, entry.retainOwnership);
-					remainder -= dropped;
-				}
-			}
-
-			entries.clear();
-		}
-
-		private record Entry(ItemVariant key, long amount, boolean throwRandomly, boolean retainOwnership) {
-		}
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/SidedContainerStorageImpl.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/SidedContainerStorageImpl.java
deleted file mode 100644
index 53cb31be8e..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/SidedContainerStorageImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.impl.transfer.item;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import net.minecraft.core.Direction;
-import net.minecraft.world.WorldlyContainer;
-
-import net.fabricmc.fabric.api.transfer.v1.item.ContainerStorage;
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
-import net.fabricmc.fabric.api.transfer.v1.storage.base.CombinedStorage;
-import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
-
-/**
- * Sidedness-aware wrapper around a {@link ContainerStorageImpl} for sided inventories.
- */
-class SidedContainerStorageImpl extends CombinedStorage> implements ContainerStorage {
-	private final ContainerStorageImpl backingStorage;
-
-	SidedContainerStorageImpl(ContainerStorageImpl storage, Direction direction) {
-		super(Collections.unmodifiableList(createWrapperList(storage, direction)));
-		this.backingStorage = storage;
-	}
-
-	@Override
-	public List> getSlots() {
-		return parts;
-	}
-
-	private static List> createWrapperList(ContainerStorageImpl storage, Direction direction) {
-		WorldlyContainer inventory = (WorldlyContainer) storage.container;
-		int[] availableSlots = inventory.getSlotsForFace(direction);
-		WorldlyContainerSlotWrapper[] slots = new WorldlyContainerSlotWrapper[availableSlots.length];
-
-		for (int i = 0; i < availableSlots.length; ++i) {
-			slots[i] = new WorldlyContainerSlotWrapper(storage.backingList.get(availableSlots[i]), inventory, direction);
-		}
-
-		return Arrays.asList(slots);
-	}
-
-	@Override
-	public String toString() {
-		// These two are the same from the user's perspective.
-		return backingStorage.toString();
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/SpecialLogicContainer.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/SpecialLogicContainer.java
deleted file mode 100644
index 842d75dc95..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/SpecialLogicContainer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.impl.transfer.item;
-
-import net.minecraft.world.item.ItemStack;
-
-import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
-
-/**
- * Internal class that allows inventory instances to defer special logic until {@link ContainerSlotWrapper#onFinalCommit()} is called.
- */
-public interface SpecialLogicContainer {
-	/**
-	 * Decide whether special logic should now be suppressed. If true, must remain suppressed until the next call.
-	 */
-	void fabric_setSuppress(boolean suppress);
-
-	void fabric_onFinalCommit(int slot, ItemStack oldStack, ItemStack newStack);
-
-	/**
-	 * Called after a slot has been modified (i.e. insert or extract with result > 0).
-	 */
-	default void fabric_onTransfer(int slot, TransactionContext transaction) {
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/WorldlyContainerSlotWrapper.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/WorldlyContainerSlotWrapper.java
deleted file mode 100644
index 2230c551f4..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/WorldlyContainerSlotWrapper.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.impl.transfer.item;
-
-import net.minecraft.core.Direction;
-import net.minecraft.world.WorldlyContainer;
-
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
-import net.fabricmc.fabric.api.transfer.v1.storage.StorageView;
-import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
-import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
-import net.fabricmc.fabric.impl.transfer.DebugMessages;
-
-/**
- * Wrapper around an {@link ContainerSlotWrapper}, with additional canInsert and canExtract checks.
- */
-class WorldlyContainerSlotWrapper implements SingleSlotStorage {
-	private final ContainerSlotWrapper slotWrapper;
-	private final WorldlyContainer container;
-	private final Direction direction;
-
-	WorldlyContainerSlotWrapper(ContainerSlotWrapper slotWrapper, WorldlyContainer container, Direction direction) {
-		this.slotWrapper = slotWrapper;
-		this.container = container;
-		this.direction = direction;
-	}
-
-	@Override
-	public long insert(ItemVariant resource, long maxAmount, TransactionContext transaction) {
-		if (!container.canPlaceItemThroughFace(slotWrapper.slot, ((ItemVariantImpl) resource).getCachedStack(), direction)) {
-			return 0;
-		} else {
-			return slotWrapper.insert(resource, maxAmount, transaction);
-		}
-	}
-
-	@Override
-	public long extract(ItemVariant resource, long maxAmount, TransactionContext transaction) {
-		if (!container.canTakeItemThroughFace(slotWrapper.slot, ((ItemVariantImpl) resource).getCachedStack(), direction)) {
-			return 0;
-		} else {
-			return slotWrapper.extract(resource, maxAmount, transaction);
-		}
-	}
-
-	@Override
-	public boolean isResourceBlank() {
-		return slotWrapper.isResourceBlank();
-	}
-
-	@Override
-	public ItemVariant getResource() {
-		return slotWrapper.getResource();
-	}
-
-	@Override
-	public long getAmount() {
-		return slotWrapper.getAmount();
-	}
-
-	@Override
-	public long getCapacity() {
-		return slotWrapper.getCapacity();
-	}
-
-	@Override
-	public StorageView getUnderlyingView() {
-		return slotWrapper.getUnderlyingView();
-	}
-
-	@Override
-	public String toString() {
-		return "WorldlyContainerSlotWrapper[%s#%d/%s]".formatted(DebugMessages.forInventory(container), slotWrapper.slot, direction.name());
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/transaction/NeoTransaction.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/transaction/NeoTransaction.java
new file mode 100644
index 0000000000..f78a2ff48a
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/transaction/NeoTransaction.java
@@ -0,0 +1,56 @@
+package net.fabricmc.fabric.impl.transfer.transaction;
+
+import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction;
+import net.fabricmc.fabric.impl.transfer.compat.FabricTransaction;
+
+public class NeoTransaction implements Transaction {
+	private final net.neoforged.neoforge.transfer.transaction.Transaction inner;
+
+	public NeoTransaction(net.neoforged.neoforge.transfer.transaction.Transaction inner) {
+		this.inner = inner;
+	}
+
+	public net.neoforged.neoforge.transfer.transaction.Transaction getInner() {
+		return inner;
+	}
+
+	@Override
+	public void abort() {
+		this.inner.close();
+	}
+
+	@Override
+	public void commit() {
+		this.inner.commit();
+	}
+
+	@Override
+	public void close() {
+		this.inner.close();
+	}
+
+	@Override
+	public Transaction openNested() {
+		return NeoTransactions.openNested(this.inner);
+	}
+
+	@Override
+	public int nestingDepth() {
+		return this.inner.depth();
+	}
+
+	@Override
+	public Transaction getOpenTransaction(int nestingDepth) {
+		return NeoTransactions.getOpenTransaction(nestingDepth);
+	}
+
+	@Override
+	public void addCloseCallback(CloseCallback closeCallback) {
+		((FabricTransaction) (Object) this.inner).addCloseCallback(closeCallback);
+	}
+
+	@Override
+	public void addOuterCloseCallback(OuterCloseCallback outerCloseCallback) {
+		TransactionManagerAccess.getManager().addOuterCloseCallback(outerCloseCallback);
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/transaction/NeoTransactions.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/transaction/NeoTransactions.java
new file mode 100644
index 0000000000..aafa6422df
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/transaction/NeoTransactions.java
@@ -0,0 +1,57 @@
+package net.fabricmc.fabric.impl.transfer.transaction;
+
+import org.jetbrains.annotations.Nullable;
+
+import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction;
+import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction.Lifecycle;
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
+
+public class NeoTransactions {
+	public static Transaction openOuter() {
+		return wrap(net.neoforged.neoforge.transfer.transaction.Transaction.openRoot());
+	}
+
+	public static Lifecycle getLifecycle() {
+		return wrapLifecycle(net.neoforged.neoforge.transfer.transaction.Transaction.getLifecycle());
+	}
+
+	public static Transaction openNested(@Nullable TransactionContext maybeParent) {
+		return wrap(net.neoforged.neoforge.transfer.transaction.Transaction.open(unwrapContext(maybeParent)));
+	}
+
+	public static Transaction openNested(@Nullable net.neoforged.neoforge.transfer.transaction.TransactionContext maybeParent) {
+		return wrap(net.neoforged.neoforge.transfer.transaction.Transaction.open(maybeParent));
+	}
+
+	public static TransactionContext getCurrentUnsafe() {
+		return wrap((net.neoforged.neoforge.transfer.transaction.Transaction) net.neoforged.neoforge.transfer.transaction.Transaction.getCurrentOpenedTransaction());
+	}
+
+	public static Transaction getOpenTransaction(int depth) {
+		return wrap(TransactionManagerAccess.getOpenTransaction(depth));
+	}
+
+	public static Transaction wrap(net.neoforged.neoforge.transfer.transaction.Transaction inner) {
+		return new NeoTransaction(inner);
+	}
+
+	@Nullable
+	public static net.neoforged.neoforge.transfer.transaction.TransactionContext unwrapContext(@Nullable TransactionContext inner) {
+		if (inner == null) {
+			return null;
+		}
+		if (inner instanceof NeoTransaction tx) {
+			return tx.getInner();
+		}
+		throw new UnsupportedOperationException();
+	}
+
+	public static Lifecycle wrapLifecycle(net.neoforged.neoforge.transfer.transaction.Transaction.Lifecycle neo) {
+		return switch (neo) {
+			case NONE -> Lifecycle.NONE;
+			case OPEN -> Lifecycle.OPEN;
+			case CLOSING -> Lifecycle.CLOSING;
+			case ROOT_CLOSING -> Lifecycle.OUTER_CLOSING;
+		};
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/transaction/TransactionManagerAccess.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/transaction/TransactionManagerAccess.java
new file mode 100644
index 0000000000..5b1d030cae
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/transaction/TransactionManagerAccess.java
@@ -0,0 +1,45 @@
+package net.fabricmc.fabric.impl.transfer.transaction;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodHandles.Lookup;
+import java.lang.invoke.MethodType;
+
+import net.neoforged.neoforge.transfer.transaction.Transaction;
+
+import net.fabricmc.fabric.impl.transfer.compat.FabricTransactionManager;
+
+public class TransactionManagerAccess {
+	private static final Class TX_MNG_CLASS;
+	private static final MethodHandle GET_MNG_FOR_THREAD;
+	private static final MethodHandle GET_OPEN_TX;
+
+	static {
+		try {
+			TX_MNG_CLASS = Class.forName("net.neoforged.neoforge.transfer.transaction.TransactionManager");
+			Lookup lookup = MethodHandles.privateLookupIn(TX_MNG_CLASS, MethodHandles.lookup());
+			GET_MNG_FOR_THREAD = lookup.findStatic(TX_MNG_CLASS, "getManagerForThread", MethodType.methodType(TX_MNG_CLASS));
+			GET_OPEN_TX = lookup.findVirtual(TX_MNG_CLASS, "getOpenTransaction", MethodType.methodType(Transaction.class, int.class));
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static Transaction getOpenTransaction(int depth) {
+		try {
+			Object manager = GET_MNG_FOR_THREAD.invoke();
+			return (Transaction) GET_OPEN_TX.invoke(manager, depth);
+		} catch (Throwable t) {
+			throw new RuntimeException(t);
+		}
+	}
+
+	public static FabricTransactionManager getManager() {
+		try {
+			Object manager = GET_MNG_FOR_THREAD.invoke();
+			return (FabricTransactionManager) manager;
+		} catch (Throwable t) {
+			throw new RuntimeException(t);
+		}
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/transaction/TransactionManagerImpl.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/transaction/TransactionManagerImpl.java
deleted file mode 100644
index 3a768fec4c..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/transaction/TransactionManagerImpl.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * 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.impl.transfer.transaction;
-
-import java.util.ArrayList;
-
-import org.jspecify.annotations.Nullable;
-
-import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction;
-import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
-
-public class TransactionManagerImpl {
-	public static final ThreadLocal MANAGERS = ThreadLocal.withInitial(TransactionManagerImpl::new);
-
-	private final Thread thread = Thread.currentThread();
-	private final ArrayList stack = new ArrayList<>();
-	private final ArrayList outerCloseCallbacks = new ArrayList<>();
-	private int currentDepth = -1;
-
-	public boolean isOpen() {
-		return currentDepth > -1;
-	}
-
-	public Transaction openOuter() {
-		if (isOpen()) {
-			throw new IllegalStateException("An outer transaction is already active on this thread.");
-		}
-
-		return open();
-	}
-
-	@Nullable
-	public TransactionContext getCurrentUnsafe() {
-		if (currentDepth == -1) {
-			return null;
-		} else if (stack.get(currentDepth).lifecycle == Transaction.Lifecycle.OPEN) {
-			return stack.get(currentDepth);
-		} else {
-			throw new IllegalStateException("May not call getCurrentUnsafe() from a close callback.");
-		}
-	}
-
-	/**
-	 * Open a new transaction, outer or nested, without performing any state check.
-	 */
-	Transaction open() {
-		currentDepth++;
-
-		if (stack.size() == currentDepth) {
-			stack.add(new TransactionImpl(currentDepth));
-		}
-
-		TransactionImpl current = stack.get(currentDepth);
-		current.lifecycle = Transaction.Lifecycle.OPEN;
-		return current;
-	}
-
-	void validateCurrentThread() {
-		if (Thread.currentThread() != thread) {
-			String errorMessage = String.format(
-					"Attempted to access transaction state from thread %s, but this transaction is only valid on thread %s.",
-					Thread.currentThread().getName(),
-					thread.getName());
-			throw new IllegalStateException(errorMessage);
-		}
-	}
-
-	public Transaction.Lifecycle getLifecycle() {
-		if (currentDepth == -1) {
-			return Transaction.Lifecycle.NONE;
-		} else {
-			return stack.get(currentDepth).lifecycle;
-		}
-	}
-
-	private class TransactionImpl implements Transaction {
-		final int nestingDepth;
-		final ArrayList closeCallbacks = new ArrayList<>();
-		Lifecycle lifecycle = Lifecycle.NONE;
-
-		TransactionImpl(int nestingDepth) {
-			this.nestingDepth = nestingDepth;
-		}
-
-		void validateCurrentTransaction() {
-			validateCurrentThread();
-
-			if (currentDepth == -1 || stack.get(currentDepth) != this) {
-				String errorMessage = String.format(
-						"Transaction function was called on a transaction with depth %d, but the current transaction has depth %d.",
-						nestingDepth,
-						currentDepth);
-				throw new IllegalStateException(errorMessage);
-			}
-		}
-
-		// Validate that this transaction is open.
-		private void validateOpen() {
-			if (lifecycle != Lifecycle.OPEN) {
-				throw new IllegalStateException("Transaction operation cannot be applied to a closed transaction.");
-			}
-		}
-
-		@Override
-		public Transaction openNested() {
-			validateCurrentTransaction();
-			validateOpen();
-			return open();
-		}
-
-		private void close(Result result) {
-			validateCurrentTransaction();
-			validateOpen();
-			// Block transaction operations
-			lifecycle = Lifecycle.CLOSING;
-
-			// Note: it is important that we don't let exceptions corrupt the global state of the transaction manager.
-			// That is why any callback has to run inside a try block.
-			RuntimeException closeException = null;
-
-			// Invoke callbacks in reverse order
-			for (int i = closeCallbacks.size()-1; i >= 0; i--) {
-				try {
-					closeCallbacks.get(i).onClose(this, result);
-				} catch (Exception exception) {
-					if (closeException == null) {
-						closeException = new RuntimeException("Encountered an exception while invoking a transaction close callback.", exception);
-					} else {
-						closeException.addSuppressed(exception);
-					}
-				}
-			}
-
-			closeCallbacks.clear();
-
-			if (currentDepth == 0) {
-				lifecycle = Lifecycle.OUTER_CLOSING;
-
-				// Invoke outer close callbacks in reverse order
-				for (int i = outerCloseCallbacks.size() - 1; i >= 0; i--) {
-					try {
-						outerCloseCallbacks.get(i).afterOuterClose(result);
-					} catch (Exception exception) {
-						if (closeException == null) {
-							closeException = new RuntimeException("Encountered an exception while invoking a transaction outer close callback.", exception);
-						} else {
-							closeException.addSuppressed(exception);
-						}
-					}
-				}
-
-				outerCloseCallbacks.clear();
-			}
-
-			// Only this check will allow openOuter operations.
-			currentDepth--;
-			lifecycle = Lifecycle.NONE;
-
-			// Throw exception if necessary
-			if (closeException != null) {
-				throw closeException;
-			}
-		}
-
-		@Override
-		public void abort() {
-			close(Result.ABORTED);
-		}
-
-		@Override
-		public void commit() {
-			close(Result.COMMITTED);
-		}
-
-		@Override
-		public void close() {
-			if (isOpen() && lifecycle == Lifecycle.OPEN) { // check that a transaction is open on this thread and that this transaction is open.
-				abort();
-			}
-		}
-
-		@Override
-		public int nestingDepth() {
-			validateCurrentThread();
-			return nestingDepth;
-		}
-
-		@Override
-		public Transaction getOpenTransaction(int nestingDepth) {
-			validateCurrentThread();
-
-			if (nestingDepth < 0) {
-				throw new IndexOutOfBoundsException("Nesting depth may not be negative.");
-			}
-
-			if (nestingDepth > currentDepth) {
-				throw new IndexOutOfBoundsException("There is no open transaction for nesting depth " + nestingDepth);
-			}
-
-			TransactionImpl transaction = stack.get(nestingDepth);
-			transaction.validateOpen();
-			return transaction;
-		}
-
-		@Override
-		public void addCloseCallback(CloseCallback closeCallback) {
-			validateCurrentThread();
-			validateOpen();
-			closeCallbacks.add(closeCallback);
-		}
-
-		@Override
-		public void addOuterCloseCallback(OuterCloseCallback outerCloseCallback) {
-			validateCurrentThread();
-			// Note: we don't call validateOpen() because this transaction may not be open if this is called during a CloseCallback.
-			// We rely on a currentDepth check instead, as the depth is only set to -1 at the very end of close(Result).
-
-			if (currentDepth == -1) {
-				throw new IllegalStateException("There is no open transaction on this thread.");
-			}
-
-			outerCloseCallbacks.add(outerCloseCallback);
-		}
-
-		@Override
-		public String toString() {
-			return "Transaction[depth=%d, lifecycle=%s, thread=%s]".formatted(nestingDepth, lifecycle.name(), thread.getName());
-		}
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/AbstractFurnaceBlockEntityMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/AbstractFurnaceBlockEntityMixin.java
deleted file mode 100644
index 1372d135a2..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/AbstractFurnaceBlockEntityMixin.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.mixin.transfer;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.NonNullList;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
-import net.minecraft.world.level.block.entity.BaseContainerBlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-
-import net.fabricmc.fabric.impl.transfer.item.SpecialLogicContainer;
-
-/**
- * Defer cook time updates for furnaces, so that aborted transactions don't reset the cook time.
- */
-@Mixin(AbstractFurnaceBlockEntity.class)
-public abstract class AbstractFurnaceBlockEntityMixin extends BaseContainerBlockEntity implements SpecialLogicContainer {
-	@Shadow
-	protected NonNullList items;
-	@Shadow
-	private int cookingTimer;
-	@Shadow
-	private int cookingTotalTime;
-	@Unique
-	private boolean fabric_suppressSpecialLogic = false;
-
-	protected AbstractFurnaceBlockEntityMixin(BlockEntityType blockEntityType, BlockPos blockPos, BlockState blockState) {
-		super(blockEntityType, blockPos, blockState);
-		throw new AssertionError();
-	}
-
-	@Inject(at = @At("HEAD"), method = "setItem", cancellable = true)
-	public void setStackSuppressUpdate(int slot, ItemStack stack, CallbackInfo ci) {
-		if (fabric_suppressSpecialLogic) {
-			items.set(slot, stack);
-			ci.cancel();
-		}
-	}
-
-	@Override
-	public void fabric_setSuppress(boolean suppress) {
-		fabric_suppressSpecialLogic = suppress;
-	}
-
-	@Override
-	public void fabric_onFinalCommit(int slot, ItemStack oldStack, ItemStack newStack) {
-		if (slot == 0) {
-			ItemStack itemStack = oldStack;
-			ItemStack stack = newStack;
-
-			// Update cook time if needed. Code taken from AbstractFurnaceBlockEntity#setStack.
-			boolean bl = !stack.isEmpty() && ItemStack.isSameItemSameComponents(stack, itemStack);
-
-			if (!bl && this.level instanceof ServerLevel level) {
-				this.cookingTotalTime = getTotalCookTime(level, (AbstractFurnaceBlockEntity) (Object) this);
-				this.cookingTimer = 0;
-			}
-		}
-	}
-
-	@Shadow
-	private static int getTotalCookTime(ServerLevel level, AbstractFurnaceBlockEntity abstractFurnaceBlockEntity) {
-		throw new AssertionError();
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/BaseContainerBlockEntityMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/BaseContainerBlockEntityMixin.java
deleted file mode 100644
index 0c852e79ee..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/BaseContainerBlockEntityMixin.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.mixin.transfer;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.entity.BaseContainerBlockEntity;
-
-import net.fabricmc.fabric.impl.transfer.item.SpecialLogicContainer;
-
-/**
- * Defer setChanged until the outer transaction close callback when setStack is called from an inventory wrapper.
- */
-@Mixin(BaseContainerBlockEntity.class)
-public class BaseContainerBlockEntityMixin implements SpecialLogicContainer {
-	@Unique
-	private boolean fabric_suppressSpecialLogic = false;
-
-	@WrapOperation(
-			at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/entity/BaseContainerBlockEntity;setChanged()V"),
-			method = "setItem(ILnet/minecraft/world/item/ItemStack;)V"
-	)
-	public void fabric_redirectSetChanged(BaseContainerBlockEntity instance, Operation original) {
-		if (!fabric_suppressSpecialLogic) {
-			original.call(instance);
-		}
-	}
-
-	@Override
-	public void fabric_setSuppress(boolean suppress) {
-		fabric_suppressSpecialLogic = suppress;
-	}
-
-	@Override
-	public void fabric_onFinalCommit(int slot, ItemStack oldStack, ItemStack newStack) {
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/BucketItemMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/BucketItemMixin.java
deleted file mode 100644
index ad26f31892..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/BucketItemMixin.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.mixin.transfer;
-
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-
-import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.item.BucketItem;
-import net.minecraft.world.level.material.Fluid;
-
-import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
-import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariantAttributeHandler;
-import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariantAttributes;
-
-/**
- * Automatically uses the correct bucket emptying sound for
- * fluid attributes handlers overriding {@link FluidVariantAttributeHandler#getEmptySound}.
- */
-@Mixin(BucketItem.class)
-public class BucketItemMixin {
-	@Shadow
-	@Final
-	private Fluid content;
-
-	@ModifyVariable(
-			method = "playEmptySound",
-			at = @At("STORE"),
-			name = "soundEvent"
-	)
-	private SoundEvent hookEmptyingSound(SoundEvent previous) {
-		return FluidVariantAttributes.getHandlerOrDefault(content).getEmptySound(FluidVariant.of(content)).orElse(previous);
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/BundleContentsAccessor.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/BundleContentsAccessor.java
deleted file mode 100644
index 252a23938f..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/BundleContentsAccessor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.mixin.transfer;
-
-import com.mojang.serialization.DataResult;
-import org.apache.commons.lang3.math.Fraction;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-import net.minecraft.world.item.ItemInstance;
-import net.minecraft.world.item.component.BundleContents;
-
-@Mixin(BundleContents.class)
-public interface BundleContentsAccessor {
-	@Invoker("getWeight")
-	static DataResult getWeight(ItemInstance itemInstance) {
-		throw new AssertionError("This shouldn't happen!");
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/ChiseledBookShelfBlockEntityMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/ChiseledBookShelfBlockEntityMixin.java
deleted file mode 100644
index ed83990aaf..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/ChiseledBookShelfBlockEntityMixin.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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.mixin.transfer;
-
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.core.NonNullList;
-import net.minecraft.world.Container;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.entity.ChiseledBookShelfBlockEntity;
-
-import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
-import net.fabricmc.fabric.api.transfer.v1.transaction.base.SnapshotParticipant;
-import net.fabricmc.fabric.impl.transfer.item.SpecialLogicContainer;
-
-/**
- * This mixin tracks the last interacted slot for transaction support, defers block state updates,
- * and allows setting empty stacks via {@link Container#setStack} in a transfer API context (needed for extractions).
- */
-@Mixin(ChiseledBookShelfBlockEntity.class)
-public class ChiseledBookShelfBlockEntityMixin implements SpecialLogicContainer {
-	@Shadow
-	@Final
-	private NonNullList items;
-	@Shadow
-	private int lastInteractedSlot; // last interacted slot
-	@Unique
-	private boolean fabric_suppressSpecialLogic = false;
-
-	@Override
-	public void fabric_setSuppress(boolean suppress) {
-		fabric_suppressSpecialLogic = suppress;
-	}
-
-	@Inject(at = @At("HEAD"), method = "setItem", cancellable = true)
-	public void setStackBypass(int slot, ItemStack stack, CallbackInfo ci) {
-		if (fabric_suppressSpecialLogic) {
-			items.set(slot, stack);
-			ci.cancel();
-		}
-	}
-
-	@Shadow
-	private void updateState(int interactedSlot) {
-		throw new AssertionError();
-	}
-
-	@Unique
-	private final SnapshotParticipant fabric_lastInteractedParticipant = new SnapshotParticipant<>() {
-		@Override
-		protected Integer createSnapshot() {
-			return lastInteractedSlot;
-		}
-
-		@Override
-		protected void readSnapshot(Integer snapshot) {
-			lastInteractedSlot = snapshot;
-		}
-
-		@Override
-		protected void onFinalCommit() {
-			updateState(lastInteractedSlot);
-		}
-	};
-
-	@Override
-	public void fabric_onTransfer(int slot, TransactionContext transaction) {
-		fabric_lastInteractedParticipant.updateSnapshots(transaction);
-		lastInteractedSlot = slot;
-	}
-
-	@Override
-	public void fabric_onFinalCommit(int slot, ItemStack oldStack, ItemStack newStack) {
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/CrafterBlockMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/CrafterBlockMixin.java
deleted file mode 100644
index 98ebfe1ba8..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/CrafterBlockMixin.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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.mixin.transfer;
-
-import com.llamalad7.mixinextras.sugar.Local;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.Container;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.CraftingRecipe;
-import net.minecraft.world.item.crafting.RecipeHolder;
-import net.minecraft.world.level.block.CrafterBlock;
-import net.minecraft.world.level.block.entity.CrafterBlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-
-import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage;
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
-import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
-import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction;
-
-@Mixin(CrafterBlock.class)
-public class CrafterBlockMixin {
-	// Inject after vanilla's attempts to insert the stack into an inventory.
-	@Inject(method = "dispenseItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;isEmpty()Z"))
-	private void transferOrSpawnStack(ServerLevel level, BlockPos pos, CrafterBlockEntity blockEntity, ItemStack inputStack, BlockState state, RecipeHolder recipe, CallbackInfo ci, @Local(name = "direction") Direction direction, @Local(name = "into") Container into, @Local(name = "remaining") ItemStack remaining) {
-		if (into != null) {
-			// Vanilla already found and tested an inventory, nothing else to do even if it failed to insert.
-			return;
-		}
-
-		if (remaining.isEmpty()) {
-			// Nothing left to do, in theory should never get here.
-			return;
-		}
-
-		final Storage target = ItemStorage.SIDED.find(level, pos.relative(direction), direction.getOpposite());
-
-		if (target != null) {
-			// Attempt to move the entire stack, and decrement the size of success moves.
-			try (Transaction transaction = Transaction.openOuter()) {
-				long moved = target.insert(ItemVariant.of(remaining), inputStack.getCount(), transaction);
-
-				if (moved > 0) {
-					remaining.shrink((int) moved);
-					transaction.commit();
-				}
-			}
-		}
-
-		// Any remaining will be dropped in the world by vanilla logic
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/DropperBlockMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/DropperBlockMixin.java
deleted file mode 100644
index fceb7927c9..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/DropperBlockMixin.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.mixin.transfer;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.block.DispenserBlock;
-import net.minecraft.world.level.block.DropperBlock;
-import net.minecraft.world.level.block.entity.DispenserBlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-
-import net.fabricmc.fabric.api.transfer.v1.item.ContainerStorage;
-import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage;
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
-import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
-import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil;
-import net.fabricmc.fabric.impl.transfer.TransferApiImpl;
-
-/**
- * Allows droppers to insert into ItemVariant storages.
- */
-@Mixin(DropperBlock.class)
-public class DropperBlockMixin {
-	@Inject(
-			at = @At(
-					value = "INVOKE",
-					target = "Lnet/minecraft/core/dispenser/DispenseItemBehavior;dispense(Lnet/minecraft/core/dispenser/BlockSource;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/ItemStack;"
-			),
-			method = "dispenseFrom",
-			cancellable = true,
-			allow = 1
-	)
-	public void hookDispense(ServerLevel level, BlockState blockState, BlockPos pos, CallbackInfo ci) {
-		DispenserBlockEntity dispenser = (DispenserBlockEntity) level.getBlockEntity(pos);
-		Direction direction = dispenser.getBlockState().getValue(DispenserBlock.FACING);
-
-		Storage target = ItemStorage.SIDED.find(level, pos.relative(direction), direction.getOpposite());
-
-		if (target != null) {
-			// Always cancel if a storage is available.
-			ci.cancel();
-
-			// We pick a non empty slot. It's not necessarily the same as the one vanilla picked, but that doesn't matter.
-			int slot = dispenser.getRandomSlot(level.getRandom());
-
-			if (slot == -1) {
-				TransferApiImpl.LOGGER.warn("Skipping dropper transfer because the empty slot is unexpectedly -1.");
-				return;
-			}
-
-			StorageUtil.move(
-					ContainerStorage.of(dispenser, null).getSlot(slot),
-					target,
-					k -> true,
-					1,
-					null
-			);
-		}
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/HopperBlockEntityMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/HopperBlockEntityMixin.java
deleted file mode 100644
index 899598585f..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/HopperBlockEntityMixin.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.mixin.transfer;
-
-import com.llamalad7.mixinextras.sugar.Local;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.Container;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.Hopper;
-import net.minecraft.world.level.block.entity.HopperBlockEntity;
-
-import net.fabricmc.fabric.api.transfer.v1.item.ContainerStorage;
-import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage;
-import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
-import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
-import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil;
-
-/**
- * Allows hoppers to interact with ItemVariant storages.
- */
-@Mixin(HopperBlockEntity.class)
-public class HopperBlockEntityMixin {
-	@Shadow
-	private Direction facing;
-
-	@Inject(
-			at = @At(
-					value = "INVOKE_ASSIGN",
-					target = "Lnet/minecraft/world/level/block/entity/HopperBlockEntity;getAttachedContainer(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/entity/HopperBlockEntity;)Lnet/minecraft/world/Container;"
-			),
-			method = "ejectItems",
-			cancellable = true
-	)
-	private static void hookInsert(Level level, BlockPos pos, HopperBlockEntity blockEntity, CallbackInfoReturnable cir, @Local(name = "container") Container container) {
-		// Let vanilla handle the transfer if it found an inventory.
-		if (container != null) return;
-
-		// Otherwise inject our transfer logic.
-		Direction direction = ((HopperBlockEntityMixin) (Object) blockEntity).facing;
-		BlockPos targetPos = pos.relative(direction);
-		Storage target = ItemStorage.SIDED.find(level, targetPos, direction.getOpposite());
-
-		if (target != null) {
-			long moved = StorageUtil.move(
-					ContainerStorage.of(blockEntity, direction),
-					target,
-					iv -> true,
-					1,
-					null
-			);
-			cir.setReturnValue(moved == 1);
-		}
-	}
-
-	@Inject(
-			at = @At(
-					value = "INVOKE_ASSIGN",
-					target = "Lnet/minecraft/world/level/block/entity/HopperBlockEntity;getSourceContainer(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/block/entity/Hopper;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/Container;"
-			),
-			method = "suckInItems(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/block/entity/Hopper;)Z",
-			cancellable = true
-	)
-	private static void hookExtract(Level level, Hopper hopper, CallbackInfoReturnable cir, @Local(name = "container") Container container) {
-		// Let vanilla handle the transfer if it found an inventory.
-		if (container != null) return;
-
-		// Otherwise inject our transfer logic.
-		BlockPos sourcePos = BlockPos.containing(hopper.getLevelX(), hopper.getLevelY() + 1.0D, hopper.getLevelZ());
-		Storage source = ItemStorage.SIDED.find(level, sourcePos, Direction.DOWN);
-
-		if (source != null) {
-			long moved = StorageUtil.move(
-					source,
-					ContainerStorage.of(hopper, Direction.UP),
-					iv -> true,
-					1,
-					null
-			);
-			cir.setReturnValue(moved == 1);
-		}
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/JukeboxBlockEntityMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/JukeboxBlockEntityMixin.java
deleted file mode 100644
index 87c31f2701..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/JukeboxBlockEntityMixin.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.mixin.transfer;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.entity.JukeboxBlockEntity;
-
-import net.fabricmc.fabric.impl.transfer.item.SpecialLogicContainer;
-
-@Mixin(JukeboxBlockEntity.class)
-public abstract class JukeboxBlockEntityMixin implements SpecialLogicContainer {
-	@Shadow
-	private ItemStack item;
-
-	@Shadow
-	public abstract void setTheItem(ItemStack stack);
-
-	@Unique
-	private boolean fabric_suppressSpecialLogic = false;
-
-	@Override
-	public void fabric_setSuppress(boolean suppress) {
-		fabric_suppressSpecialLogic = suppress;
-	}
-
-	@Inject(method = "setTheItem", at = @At("HEAD"), cancellable = true)
-	private void setStackBypass(ItemStack stack, CallbackInfo ci) {
-		if (fabric_suppressSpecialLogic) {
-			item = stack;
-			ci.cancel();
-		}
-	}
-
-	@Override
-	public void fabric_onFinalCommit(int slot, ItemStack oldStack, ItemStack newStack) {
-		// Call setStack again without suppressing vanilla logic,
-		// where now the record will actually getting played/stopped.
-		setTheItem(newStack);
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/ListBackedContainerMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/ListBackedContainerMixin.java
deleted file mode 100644
index 9592ed3813..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/ListBackedContainerMixin.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.mixin.transfer;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import net.minecraft.world.level.block.entity.ListBackedContainer;
-
-import net.fabricmc.fabric.impl.transfer.item.SpecialLogicAccess;
-
-@Mixin(ListBackedContainer.class)
-interface ListBackedContainerMixin extends ListBackedContainer, SpecialLogicAccess {
-	@WrapOperation(method = "setItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/entity/ListBackedContainer;setChanged()V"))
-	private void cancelSetChanged(ListBackedContainer instance, Operation original) {
-		if (!this.fabric_shouldSuppressSpecialLogic()) {
-			original.call(instance);
-		}
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/PlayerItemAccessMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/PlayerItemAccessMixin.java
new file mode 100644
index 0000000000..e993f58ac3
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/PlayerItemAccessMixin.java
@@ -0,0 +1,20 @@
+package net.fabricmc.fabric.mixin.transfer;
+
+import net.neoforged.neoforge.transfer.item.PlayerInventoryWrapper;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import net.fabricmc.fabric.impl.transfer.compat.FabricPlayerItemAccess;
+
+@Mixin(targets = "net.neoforged.neoforge.transfer.access.PlayerItemAccess")
+public class PlayerItemAccessMixin implements FabricPlayerItemAccess {
+	@Shadow
+	@Final
+	private PlayerInventoryWrapper inventoryWrapper;
+	
+	@Override
+	public PlayerInventoryWrapper getInventoryWrapper() {
+		return this.inventoryWrapper;
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/ShelfBlockEntityMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/ShelfBlockEntityMixin.java
deleted file mode 100644
index ff0870d579..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/ShelfBlockEntityMixin.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.mixin.transfer;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.entity.ShelfBlockEntity;
-
-import net.fabricmc.fabric.impl.transfer.item.SpecialLogicAccess;
-import net.fabricmc.fabric.impl.transfer.item.SpecialLogicContainer;
-
-@Mixin(ShelfBlockEntity.class)
-public abstract class ShelfBlockEntityMixin implements SpecialLogicContainer, SpecialLogicAccess {
-	@Unique
-	boolean fabric_suppressSpecialLogic;
-
-	@Override
-	public void fabric_setSuppress(boolean suppress) {
-		fabric_suppressSpecialLogic = suppress;
-	}
-
-	@Override
-	public boolean fabric_shouldSuppressSpecialLogic() {
-		return fabric_suppressSpecialLogic;
-	}
-
-	@Override
-	public void fabric_onFinalCommit(int slot, ItemStack oldStack, ItemStack newStack) {
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/SimpleContainerMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/SimpleContainerMixin.java
deleted file mode 100644
index a1eeb34dd4..0000000000
--- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/SimpleContainerMixin.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.mixin.transfer;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import net.minecraft.world.SimpleContainer;
-import net.minecraft.world.item.ItemStack;
-
-import net.fabricmc.fabric.impl.transfer.item.SpecialLogicContainer;
-
-/**
- * Defer setChanged until the outer transaction close callback when setStack is called from an inventory wrapper.
- */
-@Mixin(SimpleContainer.class)
-public class SimpleContainerMixin implements SpecialLogicContainer {
-	@Unique
-	private boolean fabric_suppressSpecialLogic = false;
-
-	@Redirect(
-			at = @At(value = "INVOKE", target = "Lnet/minecraft/world/SimpleContainer;setChanged()V"),
-			method = "setItem(ILnet/minecraft/world/item/ItemStack;)V"
-	)
-	public void fabric_redirectChanged(SimpleContainer self) {
-		if (!fabric_suppressSpecialLogic) {
-			self.setChanged();
-		}
-	}
-
-	@Override
-	public void fabric_setSuppress(boolean suppress) {
-		fabric_suppressSpecialLogic = suppress;
-	}
-
-	@Override
-	public void fabric_onFinalCommit(int slot, ItemStack oldStack, ItemStack newStack) {
-	}
-}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/TransactionManagerMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/TransactionManagerMixin.java
new file mode 100644
index 0000000000..019ee979ef
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/TransactionManagerMixin.java
@@ -0,0 +1,60 @@
+package net.fabricmc.fabric.mixin.transfer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext.Result;
+import net.fabricmc.fabric.impl.transfer.compat.TransferApiNeoCompat;
+
+import org.jspecify.annotations.Nullable;
+import org.objectweb.asm.Opcodes;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.At.Shift;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext.OuterCloseCallback;
+import net.fabricmc.fabric.impl.transfer.compat.FabricTransactionManager;
+
+@Mixin(targets = "net.neoforged.neoforge.transfer.transaction.TransactionManager")
+public class TransactionManagerMixin implements FabricTransactionManager {
+	@Unique
+	private final List fabric$outerCloseCallbacks = new ArrayList<>();
+
+	@Override
+	public void addOuterCloseCallback(OuterCloseCallback outerCloseCallback) {
+		this.fabric$outerCloseCallbacks.add(outerCloseCallback);
+	}
+
+	@ModifyVariable(
+			method = "processRootCommitQueue",
+			at = @At(
+					value = "FIELD",
+					target = "processingRootCommitQueue:Z",
+					opcode = Opcodes.PUTFIELD,
+					shift = Shift.AFTER
+			)
+	)
+	private RuntimeException processOuterCallbacks(@Nullable RuntimeException closeException) {
+		Boolean wasAborted = TransferApiNeoCompat.WAS_ABORTED.get();
+		Result result = wasAborted == null || !wasAborted ? Result.COMMITTED : Result.ABORTED;
+		
+		// Invoke outer close callbacks in reverse order
+		for (int i = fabric$outerCloseCallbacks.size() - 1; i >= 0; i--) {
+			try {
+				fabric$outerCloseCallbacks.get(i).afterOuterClose(result);
+			} catch (Exception exception) {
+				if (closeException == null) {
+					closeException = new RuntimeException("Encountered an exception while invoking a transaction outer close callback.", exception);
+				} else {
+					closeException.addSuppressed(exception);
+				}
+			}
+		}
+
+		fabric$outerCloseCallbacks.clear();
+		
+		return closeException;
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/TransactionMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/TransactionMixin.java
new file mode 100644
index 0000000000..729c488dbb
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/TransactionMixin.java
@@ -0,0 +1,65 @@
+package net.fabricmc.fabric.mixin.transfer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.fabricmc.fabric.impl.transfer.compat.TransferApiNeoCompat;
+
+import net.neoforged.neoforge.transfer.transaction.Transaction;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.At.Shift;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext.CloseCallback;
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext.Result;
+import net.fabricmc.fabric.impl.transfer.compat.FabricTransaction;
+import net.fabricmc.fabric.impl.transfer.transaction.NeoTransactions;
+
+@Mixin(Transaction.class)
+public class TransactionMixin implements FabricTransaction {
+	@Unique
+	private final List fabric$closeCallbacks = new ArrayList<>();
+
+	@Override
+	public void addCloseCallback(CloseCallback closeCallback) {
+		this.fabric$closeCallbacks.add(closeCallback);
+	}
+
+	@ModifyVariable(method = "close(Z)V", at = @At(value = "INVOKE", target = "Ljava/util/List;clear()V"))
+	private RuntimeException processCloseCallbacks(RuntimeException closeException, boolean wasAborted) {
+		Result result = wasAborted ? Result.ABORTED : Result.COMMITTED;
+		Transaction tx = (Transaction) (Object) this;
+		net.fabricmc.fabric.api.transfer.v1.transaction.Transaction fabricTx = NeoTransactions.wrap(tx);
+
+		// Invoke callbacks in reverse order
+		for (int i = fabric$closeCallbacks.size() - 1; i >= 0; i--) {
+			try {
+				fabric$closeCallbacks.get(i).onClose(fabricTx, result);
+			} catch (Exception exception) {
+				if (closeException == null) {
+					closeException = new RuntimeException("Encountered an exception while invoking a transaction close callback.", exception);
+				} else {
+					closeException.addSuppressed(exception);
+				}
+			}
+		}
+
+		fabric$closeCallbacks.clear();
+
+		return closeException;
+	}
+
+	@Inject(method = "close(Z)V", at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/transfer/transaction/TransactionManager;processRootCommitQueue(Ljava/lang/RuntimeException;)Ljava/lang/RuntimeException;"))
+	private void setWasAborted(boolean wasAborted, CallbackInfo ci) {
+		TransferApiNeoCompat.WAS_ABORTED.set(wasAborted);
+	}
+
+	@Inject(method = "close(Z)V", at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/transfer/transaction/TransactionManager;processRootCommitQueue(Ljava/lang/RuntimeException;)Ljava/lang/RuntimeException;", shift = Shift.AFTER))
+	private void resetWasAborted(boolean wasAborted, CallbackInfo ci) {
+		TransferApiNeoCompat.WAS_ABORTED.remove();
+	}
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/registry/BaseMappedRegistryAccessor.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/registry/BaseMappedRegistryAccessor.java
new file mode 100644
index 0000000000..d5ed4cdfc3
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/registry/BaseMappedRegistryAccessor.java
@@ -0,0 +1,11 @@
+package net.fabricmc.fabric.mixin.transfer.registry;
+
+import net.neoforged.neoforge.registries.BaseMappedRegistry;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(BaseMappedRegistry.class)
+public interface BaseMappedRegistryAccessor {
+    @Invoker
+    void invokeUnfreeze(boolean clearTags);
+}
diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/registry/MappedRegistryAccessor.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/registry/MappedRegistryAccessor.java
new file mode 100644
index 0000000000..bc40736cdb
--- /dev/null
+++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/registry/MappedRegistryAccessor.java
@@ -0,0 +1,12 @@
+package net.fabricmc.fabric.mixin.transfer.registry;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import net.minecraft.core.MappedRegistry;
+
+@Mixin(MappedRegistry.class)
+public interface MappedRegistryAccessor {
+    @Accessor
+    boolean getFrozen();
+}
diff --git a/fabric-transfer-api-v1/src/main/resources/fabric-transfer-api-v1.mixins.json b/fabric-transfer-api-v1/src/main/resources/fabric-transfer-api-v1.mixins.json
index 2a149fdfee..b8dc5ad946 100644
--- a/fabric-transfer-api-v1/src/main/resources/fabric-transfer-api-v1.mixins.json
+++ b/fabric-transfer-api-v1/src/main/resources/fabric-transfer-api-v1.mixins.json
@@ -3,24 +3,16 @@
   "package": "net.fabricmc.fabric.mixin.transfer",
   "compatibilityLevel": "JAVA_25",
   "mixins": [
-    "AbstractFurnaceBlockEntityMixin",
-    "BaseContainerBlockEntityMixin",
-    "BucketItemAccessor",
-    "BucketItemMixin",
-    "BundleContentsAccessor",
-    "ChiseledBookShelfBlockEntityMixin",
     "CompoundContainerAccessor",
-    "CrafterBlockMixin",
-    "DropperBlockMixin",
     "FluidMixin",
-    "HopperBlockEntityMixin",
     "ItemContainerContentsAccessor",
     "ItemMixin",
     "ItemStackAccessor",
-    "JukeboxBlockEntityMixin",
-    "ListBackedContainerMixin",
-    "ShelfBlockEntityMixin",
-    "SimpleContainerMixin"
+    "PlayerItemAccessMixin",
+    "TransactionManagerMixin",
+    "TransactionMixin",
+    "registry.BaseMappedRegistryAccessor",
+    "registry.MappedRegistryAccessor"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-transfer-api-v1/src/test/java/net/fabricmc/fabric/test/transfer/unittests/ContainerSlotWrapperTest.java b/fabric-transfer-api-v1/src/test/java/net/fabricmc/fabric/test/transfer/unittests/ContainerSlotWrapperTest.java
new file mode 100644
index 0000000000..88682cd2fe
--- /dev/null
+++ b/fabric-transfer-api-v1/src/test/java/net/fabricmc/fabric/test/transfer/unittests/ContainerSlotWrapperTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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.transfer.unittests;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import net.minecraft.world.SimpleContainer;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+
+import net.fabricmc.fabric.api.transfer.v1.item.ContainerStorage;
+
+class ContainerSlotWrapperTest extends AbstractTransferApiTest {
+	@BeforeAll
+	static void beforeAll() {
+		bootstrap();
+	}
+
+	@Test
+	public void testGetCapacity() {
+		SimpleContainer simpleContainer = new SimpleContainer(3);
+		simpleContainer.setItem(0, new ItemStack(Items.DIRT));
+		simpleContainer.setItem(1, new ItemStack(Items.DIAMOND_PICKAXE));
+
+		ContainerStorage storage = ContainerStorage.of(simpleContainer, null);
+
+		assertEquals(64, storage.getSlot(0).getCapacity());
+		assertEquals(1, storage.getSlot(1).getCapacity());
+		assertEquals(99, storage.getSlot(2).getCapacity(), "Empty slots report the full capacity");
+	}
+}
diff --git a/fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/gametests/VanillaStorageTests.java b/fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/gametests/VanillaStorageTests.java
index 8233479a06..74631a9446 100644
--- a/fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/gametests/VanillaStorageTests.java
+++ b/fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/gametests/VanillaStorageTests.java
@@ -118,7 +118,7 @@ private static  void testComparatorOnInventor
 		BlockPos comparatorPos = new BlockPos(1, 2, 0);
 		Direction comparatorFacing = helper.getTestRotation().rotate(Direction.WEST);
 		// support block under the comparator
-		helper.setBlock(comparatorPos.relative(Direction.DOWN), Blocks.GREEN_WOOL.defaultBlockState());
+		helper.setBlock(comparatorPos.relative(Direction.DOWN), Blocks.WOOL.green().defaultBlockState());
 		// comparator
 		helper.setBlock(comparatorPos, Blocks.COMPARATOR.defaultBlockState().setValue(ComparatorBlock.FACING, comparatorFacing));
 
diff --git a/fabric-transitive-access-wideners-v1/build.gradle b/fabric-transitive-access-wideners-v1/build.gradle
index fd04158ec7..899599ca77 100644
--- a/fabric-transitive-access-wideners-v1/build.gradle
+++ b/fabric-transitive-access-wideners-v1/build.gradle
@@ -5,7 +5,6 @@ loom {
 }
 
 testDependencies(project, [
-	':fabric-rendering-v1',
 	':fabric-object-builder-api-v1'
 ])
 
@@ -41,12 +40,16 @@ tasks.register('generateClassTweaker') {
 			lines.add("")
 			generateEnchantmentMethods(lines, fs)
 			lines.add("")
+			generateNoiseRouterDataFieldsAndMethods(lines, fs)
+			lines.add("")
 		}
 
 		Path clientJar = loom.namedMinecraftProvider.parentMinecraftProvider.clientOnlyJar.path
 
 		FileSystems.newFileSystem(URI.create("jar:${clientJar.toUri()}"), [create: false]).withCloseable { fs ->
 			generateRenderPipelinesFields(lines, fs)
+			lines.add("")
+			generateBuiltInBlockModelsMethods(lines, fs)
 		}
 
 		file('src/main/resources/fabric-transitive-access-wideners-v1.classtweaker').text = String.join('\n', lines) + '\n'
@@ -100,6 +103,28 @@ def generateRenderPipelinesFields(List lines, FileSystem fs) {
 	}
 }
 
+def generateNoiseRouterDataFieldsAndMethods(List lines, FileSystem fs) {
+	lines.add("# private fields of NoiseRouterData")
+
+	def node = loadClass(fs.getPath("net/minecraft/world/level/levelgen/NoiseRouterData.class"))
+
+	for (def field : node.fields) {
+		// Every field can be useful
+		if ((field.access & Opcodes.ACC_PRIVATE) != 0) {
+			lines.add("transitive-accessible field $node.name $field.name $field.desc")
+		}
+	}
+
+	lines.add("# private and protected methods of NoiseRouterData")
+
+	for (def method : node.methods) {
+		// Every method can be useful, but using the vanilla namespace is not recommended
+		if ((method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED)) && !method.name.startsWith("lambda") && method.name != "createKey") {
+			lines.add("transitive-accessible method $node.name $method.name $method.desc")
+		}
+	}
+}
+
 def generateTrackedDataFields(String className, List lines, FileSystem fs, String... extraMethods) {
 	// using a set to prevent duplicates from multiple dataTracker references in a single method
 	// linked to preserve order and improve generated access widener readability
@@ -167,12 +192,30 @@ def generateEnchantmentMethods(List lines, FileSystem fs) {
 			}
 		}
 	}
+
 	lines.add('transitive-accessible class net/minecraft/world/item/enchantment/EnchantmentHelper$EnchantmentVisitor')
 	lines.add('transitive-accessible class net/minecraft/world/item/enchantment/EnchantmentHelper$EnchantmentInSlotVisitor')
 	lines.add('transitive-accessible class net/minecraft/world/item/enchantment/Enchantment$GenericAction')
 	lines.add('transitive-accessible class net/minecraft/world/item/enchantment/Enchantment$FloatAction')
 }
 
+def generateBuiltInBlockModelsMethods(List lines, FileSystem fs) {
+	lines.add("# Private methods of BuiltInBlockModels and BuiltInBlockModels\$Builder")
+
+	for (def node : [ loadClass(fs.getPath("net/minecraft/client/renderer/block/BuiltInBlockModels.class")), loadClass(fs.getPath("net/minecraft/client/renderer/block/BuiltInBlockModels\$Builder.class")) ]) {
+		for (def method : node.methods) {
+			// Every method can be useful
+			if ((method.access & Opcodes.ACC_PRIVATE) != 0 && !method.name.startsWith("lambda\$")) {
+				lines.add("transitive-accessible method $node.name $method.name $method.desc")
+			}
+		}
+	}
+
+	lines.add('transitive-accessible class net/minecraft/client/renderer/block/BuiltInBlockModels$Builder')
+	lines.add('transitive-accessible class net/minecraft/client/renderer/block/BuiltInBlockModels$ModelFactory')
+	lines.add('transitive-accessible class net/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory')
+}
+
 ClassNode loadClass(Path path) {
 	def node = new ClassNode()
 
diff --git a/fabric-transitive-access-wideners-v1/src/main/resources/fabric-transitive-access-wideners-v1.classtweaker b/fabric-transitive-access-wideners-v1/src/main/resources/fabric-transitive-access-wideners-v1.classtweaker
index 3022c7d870..0bfe5fb01f 100644
--- a/fabric-transitive-access-wideners-v1/src/main/resources/fabric-transitive-access-wideners-v1.classtweaker
+++ b/fabric-transitive-access-wideners-v1/src/main/resources/fabric-transitive-access-wideners-v1.classtweaker
@@ -3,9 +3,6 @@ accessWidener v2 official
 # DO NOT EDIT BY HAND! This file is generated automatically.
 # Edit "template.classtweaker" instead then run "gradlew generateClassTweaker".
 
-# Registering custom advancement criteria
-transitive-accessible	method	net/minecraft/advancements/CriteriaTriggers	register	(Ljava/lang/String;Lnet/minecraft/advancements/CriterionTrigger;)Lnet/minecraft/advancements/CriterionTrigger;
-
 # Creating custom screen handler types
 transitive-accessible	class	net/minecraft/world/inventory/MenuType$MenuSupplier
 transitive-accessible	method	net/minecraft/world/inventory/MenuType		(Lnet/minecraft/world/inventory/MenuType$MenuSupplier;Lnet/minecraft/world/flag/FeatureFlagSet;)V
@@ -63,7 +60,11 @@ transitive-accessible	method	net/minecraft/world/entity/schedule/Activity	
 
 # Living entity methods
 transitive-accessible	method	net/minecraft/world/entity/LivingEntity	hurtArmor	(Lnet/minecraft/world/damagesource/DamageSource;F)V
+transitive-accessible	method	net/minecraft/world/entity/player/Player	hurtArmor	(Lnet/minecraft/world/damagesource/DamageSource;F)V
+transitive-accessible	method	net/minecraft/world/entity/animal/equine/Horse	hurtArmor	(Lnet/minecraft/world/damagesource/DamageSource;F)V
+transitive-accessible	method	net/minecraft/world/entity/animal/wolf/Wolf	hurtArmor	(Lnet/minecraft/world/damagesource/DamageSource;F)V
 transitive-accessible	method	net/minecraft/world/entity/LivingEntity	hurtHelmet	(Lnet/minecraft/world/damagesource/DamageSource;F)V
+transitive-accessible	method	net/minecraft/world/entity/player/Player	hurtHelmet	(Lnet/minecraft/world/damagesource/DamageSource;F)V
 
 # Entity constructors
 transitive-accessible	method	net/minecraft/world/entity/projectile/Projectile		(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)V
@@ -323,9 +324,76 @@ transitive-accessible class net/minecraft/world/item/enchantment/EnchantmentHelp
 transitive-accessible class net/minecraft/world/item/enchantment/Enchantment$GenericAction
 transitive-accessible class net/minecraft/world/item/enchantment/Enchantment$FloatAction
 
+# private fields of NoiseRouterData
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData ORE_THICKNESS F
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData VEININESS_FREQUENCY D
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData NOODLE_SPACING_AND_STRAIGHTNESS D
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData SURFACE_DENSITY_THRESHOLD D
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData CHEESE_NOISE_TARGET D
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData DENSITY_Y_ANCHOR_BOTTOM I
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData DENSITY_Y_ANCHOR_TOP I
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData DENSITY_Y_BOTTOM D
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData DENSITY_Y_TOP D
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData OVERWORLD_BOTTOM_SLIDE_HEIGHT I
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData BASE_DENSITY_MULTIPLIER D
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData BLENDING_FACTOR Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData BLENDING_JAGGEDNESS Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData ZERO Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData Y Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData SHIFT_X Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData SHIFT_Z Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData BASE_3D_NOISE_OVERWORLD Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData BASE_3D_NOISE_NETHER Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData BASE_3D_NOISE_END Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData SLOPED_CHEESE Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData OFFSET_LARGE Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData FACTOR_LARGE Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData JAGGEDNESS_LARGE Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData DEPTH_LARGE Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData SLOPED_CHEESE_LARGE Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData OFFSET_AMPLIFIED Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData FACTOR_AMPLIFIED Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData JAGGEDNESS_AMPLIFIED Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData DEPTH_AMPLIFIED Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData SLOPED_CHEESE_AMPLIFIED Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData SLOPED_CHEESE_END Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData SPAGHETTI_ROUGHNESS_FUNCTION Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData ENTRANCES Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData NOODLE Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData PILLARS Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData SPAGHETTI_2D_THICKNESS_MODULATOR Lnet/minecraft/resources/ResourceKey;
+transitive-accessible field net/minecraft/world/level/levelgen/NoiseRouterData SPAGHETTI_2D Lnet/minecraft/resources/ResourceKey;
+# private and protected methods of NoiseRouterData
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData registerTerrainNoises (Lnet/minecraft/data/worldgen/BootstrapContext;Lnet/minecraft/core/HolderGetter;Lnet/minecraft/world/level/levelgen/DensityFunction;Lnet/minecraft/world/level/levelgen/DensityFunction;Lnet/minecraft/world/level/levelgen/DensityFunction;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceKey;Z)V
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData offsetToDepth (Lnet/minecraft/world/level/levelgen/DensityFunction;)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData registerAndWrap (Lnet/minecraft/data/worldgen/BootstrapContext;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/level/levelgen/DensityFunction;)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData getFunction (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData peaksAndValleys (Lnet/minecraft/world/level/levelgen/DensityFunction;)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData spaghettiRoughnessFunction (Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData entrances (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData noodle (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData pillars (Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData spaghetti2D (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData underground (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;Lnet/minecraft/world/level/levelgen/DensityFunction;)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData postProcess (Lnet/minecraft/world/level/levelgen/DensityFunction;)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData remap (Lnet/minecraft/world/level/levelgen/DensityFunction;DDDD)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData overworld (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;ZZ)Lnet/minecraft/world/level/levelgen/NoiseRouter;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData slideOverworld (ZLnet/minecraft/world/level/levelgen/DensityFunction;)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData slideNetherLike (Lnet/minecraft/core/HolderGetter;II)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData slideEndLike (Lnet/minecraft/world/level/levelgen/DensityFunction;II)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData nether (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/levelgen/NoiseRouter;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData caves (Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/levelgen/NoiseRouter;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData floatingIslands (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/levelgen/NoiseRouter;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData slideEnd (Lnet/minecraft/world/level/levelgen/DensityFunction;)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData end (Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/levelgen/NoiseRouter;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData simpleRouter (Lnet/minecraft/world/level/levelgen/DensityFunction;)Lnet/minecraft/world/level/levelgen/NoiseRouter;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData splineWithBlending (Lnet/minecraft/world/level/levelgen/DensityFunction;Lnet/minecraft/world/level/levelgen/DensityFunction;)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData noiseGradientDensity (Lnet/minecraft/world/level/levelgen/DensityFunction;Lnet/minecraft/world/level/levelgen/DensityFunction;)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData preliminarySurfaceLevel (Lnet/minecraft/world/level/levelgen/DensityFunction;Lnet/minecraft/world/level/levelgen/DensityFunction;Z)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData yLimitedInterpolatable (Lnet/minecraft/world/level/levelgen/DensityFunction;Lnet/minecraft/world/level/levelgen/DensityFunction;III)Lnet/minecraft/world/level/levelgen/DensityFunction;
+transitive-accessible method net/minecraft/world/level/levelgen/NoiseRouterData slide (Lnet/minecraft/world/level/levelgen/DensityFunction;IIIIDIID)Lnet/minecraft/world/level/levelgen/DensityFunction;
+
 # private fields of RenderPipelines
-transitive-accessible field net/minecraft/client/renderer/RenderPipelines MATRICES_PROJECTION_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
-transitive-accessible field net/minecraft/client/renderer/RenderPipelines FOG_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
 transitive-accessible field net/minecraft/client/renderer/RenderPipelines GLOBALS_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
 transitive-accessible field net/minecraft/client/renderer/RenderPipelines MATRICES_FOG_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
 transitive-accessible field net/minecraft/client/renderer/RenderPipelines MATRICES_FOG_LIGHT_DIR_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
@@ -337,6 +405,7 @@ transitive-accessible field net/minecraft/client/renderer/RenderPipelines ENTITY
 transitive-accessible field net/minecraft/client/renderer/RenderPipelines BEACON_BEAM_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
 transitive-accessible field net/minecraft/client/renderer/RenderPipelines ITEM_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
 transitive-accessible field net/minecraft/client/renderer/RenderPipelines TEXT_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
+transitive-accessible field net/minecraft/client/renderer/RenderPipelines WORLD_TEXT_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
 transitive-accessible field net/minecraft/client/renderer/RenderPipelines END_PORTAL_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
 transitive-accessible field net/minecraft/client/renderer/RenderPipelines CLOUDS_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
 transitive-accessible field net/minecraft/client/renderer/RenderPipelines LINES_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
@@ -348,3 +417,37 @@ transitive-accessible field net/minecraft/client/renderer/RenderPipelines GUI_TE
 transitive-accessible field net/minecraft/client/renderer/RenderPipelines GUI_TEXT_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
 transitive-accessible field net/minecraft/client/renderer/RenderPipelines OUTLINE_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
 transitive-accessible method net/minecraft/client/renderer/RenderPipelines register (Lcom/mojang/blaze3d/pipeline/RenderPipeline;)Lcom/mojang/blaze3d/pipeline/RenderPipeline;
+
+# Private methods of BuiltInBlockModels and BuiltInBlockModels$Builder
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels addDefaults (Lnet/minecraft/client/renderer/block/BuiltInBlockModels$Builder;)V
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createAir (Lnet/minecraft/client/renderer/block/BuiltInBlockModels$Builder;Lnet/minecraft/world/level/block/Block;)V
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels special (Lnet/minecraft/client/renderer/special/SpecialModelRenderer$Unbaked;)Lnet/minecraft/client/renderer/block/model/BlockModel$Unbaked;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels special (Lnet/minecraft/client/renderer/special/SpecialModelRenderer$Unbaked;Lcom/mojang/math/Transformation;)Lnet/minecraft/client/renderer/block/model/BlockModel$Unbaked;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createMobHead (Lnet/minecraft/world/level/block/SkullBlock$Types;)Lnet/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createMobWallHead (Lnet/minecraft/world/level/block/SkullBlock$Types;)Lnet/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createMobHeads (Lnet/minecraft/client/renderer/block/BuiltInBlockModels$Builder;Lnet/minecraft/world/level/block/SkullBlock$Types;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;)V
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createPlayerHead ()Lnet/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createPlayerWallHead ()Lnet/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createBanner (Lnet/minecraft/world/item/DyeColor;)Lnet/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createWallBanner (Lnet/minecraft/world/item/DyeColor;)Lnet/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createShulkerBox ()Lnet/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createDyedShulkerBox (Lnet/minecraft/world/item/DyeColor;)Lnet/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createChest (Lnet/minecraft/resources/Identifier;Lnet/minecraft/world/level/block/state/properties/ChestType;Lnet/minecraft/core/Direction;)Lnet/minecraft/client/renderer/block/model/BlockModel$Unbaked;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createSingletonChest (Lnet/minecraft/resources/Identifier;)Lnet/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createChest (Lnet/minecraft/client/renderer/MultiblockChestResources;)Lnet/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createXmasChest (Lnet/minecraft/client/renderer/MultiblockChestResources;)Lnet/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createCopperGolem (Lnet/minecraft/world/level/block/WeatheringCopper$WeatherState;)Lnet/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createDecoratedPot ()Lnet/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createBlockStateModelWrapper (Lnet/minecraft/client/color/block/BlockColors;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/client/renderer/block/model/BlockStateModelWrapper$Unbaked;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels combineSpecialAndBlockModels (Lnet/minecraft/client/renderer/block/model/BlockModel$Unbaked;Lnet/minecraft/client/color/block/BlockColors;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/client/renderer/block/model/CompositeBlockModel$Unbaked;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createFlowerBedModel (Lnet/minecraft/client/color/block/BlockColors;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/client/renderer/block/SelectBlockModel$Unbaked;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels createEnchantingTable ()Lnet/minecraft/client/renderer/block/model/BlockModel$Unbaked;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels specialModelWithPropertyDispatch (Lnet/minecraft/world/level/block/state/properties/Property;Ljava/util/function/Function;)Lnet/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels specialModelWithPropertyDispatch (Lnet/minecraft/world/level/block/state/properties/Property;Lnet/minecraft/world/level/block/state/properties/Property;Ljava/util/function/BiFunction;)Lnet/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory;
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels$Builder  (Lnet/minecraft/client/color/block/BlockColors;)V
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels$Builder put (Lnet/minecraft/client/renderer/block/BuiltInBlockModels$ModelFactory;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;)V
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels$Builder put (Lnet/minecraft/client/renderer/block/model/BlockModel$Unbaked;Lnet/minecraft/world/level/block/Block;)V
+transitive-accessible method net/minecraft/client/renderer/block/BuiltInBlockModels$Builder put (Lnet/minecraft/client/renderer/block/BuiltInBlockModels$ModelFactory;Lnet/minecraft/world/level/block/Block;)V
+transitive-accessible class net/minecraft/client/renderer/block/BuiltInBlockModels$Builder
+transitive-accessible class net/minecraft/client/renderer/block/BuiltInBlockModels$ModelFactory
+transitive-accessible class net/minecraft/client/renderer/block/BuiltInBlockModels$SpecialModelFactory
diff --git a/fabric-transitive-access-wideners-v1/template.classtweaker b/fabric-transitive-access-wideners-v1/template.classtweaker
index 073c75edd3..7541ab3f36 100644
--- a/fabric-transitive-access-wideners-v1/template.classtweaker
+++ b/fabric-transitive-access-wideners-v1/template.classtweaker
@@ -1,6 +1,3 @@
-# Registering custom advancement criteria
-transitive-accessible	method	net/minecraft/advancements/CriteriaTriggers	register	(Ljava/lang/String;Lnet/minecraft/advancements/CriterionTrigger;)Lnet/minecraft/advancements/CriterionTrigger;
-
 # Creating custom screen handler types
 transitive-accessible	class	net/minecraft/world/inventory/MenuType$MenuSupplier
 transitive-accessible	method	net/minecraft/world/inventory/MenuType		(Lnet/minecraft/world/inventory/MenuType$MenuSupplier;Lnet/minecraft/world/flag/FeatureFlagSet;)V
@@ -58,7 +55,11 @@ transitive-accessible	method	net/minecraft/world/entity/schedule/Activity	
 
 # Living entity methods
 transitive-accessible	method	net/minecraft/world/entity/LivingEntity	hurtArmor	(Lnet/minecraft/world/damagesource/DamageSource;F)V
+transitive-accessible	method	net/minecraft/world/entity/player/Player	hurtArmor	(Lnet/minecraft/world/damagesource/DamageSource;F)V
+transitive-accessible	method	net/minecraft/world/entity/animal/equine/Horse	hurtArmor	(Lnet/minecraft/world/damagesource/DamageSource;F)V
+transitive-accessible	method	net/minecraft/world/entity/animal/wolf/Wolf	hurtArmor	(Lnet/minecraft/world/damagesource/DamageSource;F)V
 transitive-accessible	method	net/minecraft/world/entity/LivingEntity	hurtHelmet	(Lnet/minecraft/world/damagesource/DamageSource;F)V
+transitive-accessible	method	net/minecraft/world/entity/player/Player	hurtHelmet	(Lnet/minecraft/world/damagesource/DamageSource;F)V
 
 # Entity constructors
 transitive-accessible	method	net/minecraft/world/entity/projectile/Projectile		(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)V
diff --git a/ffapi.gradle.properties b/ffapi.gradle.properties
new file mode 100644
index 0000000000..edb16df734
--- /dev/null
+++ b/ffapi.gradle.properties
@@ -0,0 +1,14 @@
+implementationVersion=4.0.0
+
+versionMc=26.2
+versionNeoForge=26.2.0.88
+versionForgifiedFabricLoader=2.5.83+0.19.3+26.1.2
+
+curseForgeId=889079
+modrinthId=Aqlf1Shp
+githubRepository=Sinytra/ForgifiedFabricAPI
+# This is the branch the release tag will be created from
+publishBranch=26.2
+
+# Versions
+ffapi-fluid-types-version=1.1.0
diff --git a/gradle.properties b/gradle.properties
index 5d8bfeaeca..8c4d92cf3f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,57 +2,58 @@ org.gradle.jvmargs=-Xmx1024M
 org.gradle.parallel=true
 org.gradle.configuration-cache=false
 
-version=0.145.4
-minecraft_version=26.1.1
+version=0.159.0
+minecraft_version=26.2
 loader_version=0.18.4
 installer_version=1.0.1
 
 prerelease=false
-curseforge_minecraft_versions=26.1.1,26.1
-modrinth_extra_minecraft_versions=26.1
+curseforge_minecraft_versions=26.2
+modrinth_extra_minecraft_versions=
 
 # Do not manually update, use the bumpversions task:
-fabric-api-base-version=2.0.3
-fabric-api-lookup-api-v1-version=2.0.10
-fabric-biome-api-v1-version=18.0.4
-fabric-block-api-v1-version=3.0.2
-fabric-block-getter-api-v2-version=2.0.6
-fabric-client-gametest-api-v1-version=5.0.14
-fabric-command-api-v2-version=3.0.5
-fabric-content-registries-v0-version=11.0.12
-fabric-crash-report-info-v1-version=1.0.3
-fabric-data-attachment-api-v1-version=2.2.3
-fabric-data-generation-api-v1-version=24.0.17
-fabric-debug-api-v1-version=1.0.1
-fabric-dimensions-v1-version=5.1.4
-fabric-entity-events-v1-version=5.0.2
-fabric-events-interaction-v0-version=5.1.10
-fabric-game-rule-api-v1-version=4.0.5
-fabric-gametest-api-v1-version=4.0.13
-fabric-item-api-v1-version=14.1.0
-fabric-creative-tab-api-v1-version=5.0.10
-fabric-key-mapping-api-v1-version=2.0.4
-fabric-lifecycle-events-v1-version=4.0.6
-fabric-loot-api-v3-version=3.0.11
-fabric-message-api-v1-version=7.0.5
-fabric-model-loading-api-v1-version=8.0.3
-fabric-networking-api-v1-version=6.3.0
-fabric-object-builder-api-v1-version=23.0.13
-fabric-particles-v1-version=5.0.14
-fabric-recipe-api-v1-version=9.0.13
-fabric-registry-sync-v0-version=7.0.12
-fabric-renderer-api-v1-version=13.0.0
-fabric-renderer-indigo-version=8.0.2
-fabric-rendering-fluids-v1-version=6.0.1
-fabric-rendering-v1-version=23.0.4
-fabric-resource-conditions-api-v1-version=6.0.5
-fabric-resource-loader-v0-version=3.3.16
-fabric-resource-loader-v1-version=2.0.9
-fabric-screen-api-v1-version=5.0.1
-fabric-menu-api-v1-version=2.0.12
-fabric-serialization-api-v1-version=2.0.3
-fabric-sound-api-v1-version=2.0.4
-fabric-tag-api-v1-version=2.0.9
-fabric-transfer-api-v1-version=8.0.2
-fabric-transitive-access-wideners-v1-version=8.0.11
-fabric-convention-tags-v2-version=4.3.2
+fabric-api-base-version=2.0.4
+fabric-api-lookup-api-v1-version=2.0.18
+fabric-biome-api-v1-version=18.0.6
+fabric-block-api-v1-version=3.0.3
+fabric-block-getter-api-v2-version=2.0.7
+fabric-client-gametest-api-v1-version=6.0.1
+fabric-command-api-v2-version=3.1.0
+fabric-content-registries-v0-version=11.3.2
+fabric-crash-report-info-v1-version=1.0.5
+fabric-data-attachment-api-v1-version=2.2.18
+fabric-data-generation-api-v1-version=25.5.1
+fabric-debug-api-v1-version=1.0.2
+fabric-dimensions-v1-version=5.1.12
+fabric-entity-events-v1-version=5.0.5
+fabric-events-interaction-v0-version=5.2.7
+fabric-game-rule-api-v1-version=4.0.8
+fabric-gametest-api-v1-version=4.0.21
+fabric-item-api-v1-version=14.5.0
+fabric-creative-tab-api-v1-version=5.0.14
+fabric-key-mapping-api-v1-version=2.0.5
+fabric-lifecycle-events-v1-version=4.1.4
+fabric-loot-api-v3-version=3.0.17
+fabric-message-api-v1-version=7.0.8
+fabric-model-loading-api-v1-version=8.0.17
+fabric-networking-api-v1-version=6.3.3
+fabric-object-builder-api-v1-version=24.1.0
+fabric-particles-v1-version=5.0.18
+fabric-permission-api-v1-version=1.0.5
+fabric-recipe-api-v1-version=9.0.21
+fabric-registry-sync-v0-version=7.1.0
+fabric-renderer-api-v1-version=14.1.4
+fabric-renderer-indigo-version=9.1.4
+fabric-rendering-fluids-v1-version=6.0.4
+fabric-rendering-v1-version=25.3.3
+fabric-resource-conditions-api-v1-version=6.1.0
+fabric-resource-loader-v0-version=3.3.20
+fabric-resource-loader-v1-version=2.0.13
+fabric-screen-api-v1-version=5.2.1
+fabric-menu-api-v1-version=2.0.16
+fabric-serialization-api-v1-version=2.0.4
+fabric-sound-api-v1-version=2.0.5
+fabric-tag-api-v1-version=2.1.4
+fabric-transfer-api-v1-version=8.0.13
+fabric-transitive-access-wideners-v1-version=8.1.4
+fabric-convention-tags-v2-version=4.7.1
diff --git a/gradle/Focus.java b/gradle/Focus.java
deleted file mode 100644
index 294ad5b983..0000000000
--- a/gradle/Focus.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.
- */
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.Files;
-import java.util.HashSet;
-import java.io.IOException;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * A script to only enable subprojects that you are working on.
- *
- * Usage:
- * - Run "java gradle/Focus.java fabric-networking-api-v1" to focus on fabric-networking-api-v1
- * - Run "java gradle/Focus.java fabric-networking-api-v1 fabric-sound-api-v1" to focus on fabric-networking-api-v1 and fabric-sound-api-v1
- * - Run "java gradle/Focus.java" to reset focus
- *
- * After running the script, refresh the Gradle project in your IDE.
- */
-public class Focus {
-	// Matches the content of moduleDependencies and testDependencies
-	private static final Pattern OUTER_PATTERN = Pattern.compile("(?:moduleDependencies|testDependencies)\\s*\\(.*?\\[\\s*([\\s\\S]*?)\\s*\\]\\s*\\)\n");
-	// Matches the dependency string
-	private static final Pattern INNER_PATTERN = Pattern.compile("['\\\"]([^'\\\"]+)['\\\"]");
-
-	public static void main(String[] args) throws IOException {
-		Path path = Paths.get("focus.txt");
-
-		if (args.length == 0) {
-			Files.deleteIfExists(path);
-			System.out.println("Reset focus");
-			return;
-		}
-
-		Set dependencies = new HashSet<>();
-
-		for (String arg : args) {
-			readDependencies(arg, dependencies);
-		}
-
-		// All modules depend on the following modules:
-		readDependencies("fabric-gametest-api-v1", dependencies);
-		readDependencies("fabric-client-gametest-api-v1", dependencies);
-		readDependencies("fabric-registry-sync-v0", dependencies);
-
-		System.out.println("Focusing on:\n" + String.join("\n", dependencies));
-
-		Files.writeString(path, String.join("\n", dependencies));
-	}
-
-	private static void readDependencies(String project, Set dependencies) throws IOException {
-		if (dependencies.contains(project)) {
-			return;
-		}
-
-		dependencies.add(project);
-
-		Path buildGradlePath = Paths.get(project, "build.gradle");
-
-		if (Files.notExists(buildGradlePath)) {
-			throw new RuntimeException("Project not found: " + project);
-		}
-
-		String content = Files.readString(buildGradlePath);
-		Matcher outerMatcher = OUTER_PATTERN.matcher(content);
-
-		while (outerMatcher.find()) {
-			String outerMatch = outerMatcher.group(1);
-			Matcher innerMatcher = INNER_PATTERN.matcher(outerMatch);
-			while (innerMatcher.find()) {
-				String dependency = innerMatcher.group(1).replace(":", "");
-				readDependencies(dependency, dependencies);
-			}
-		}
-	}
-}
diff --git a/gradle/javadoc.classtweaker b/gradle/javadoc.classtweaker
deleted file mode 100644
index d35627e460..0000000000
--- a/gradle/javadoc.classtweaker
+++ /dev/null
@@ -1,5 +0,0 @@
-classTweaker	v1	official
-# Place access wideners that are required during javadoc generation here
-
-accessible	class	net/minecraft/data/recipes/RecipeProvider$Runner
-accessible	class	net/minecraft/world/item/CreativeModeTab$TabVisibility
diff --git a/gradle/module-validation.gradle b/gradle/module-validation.gradle
deleted file mode 100644
index ae3fef8ce1..0000000000
--- a/gradle/module-validation.gradle
+++ /dev/null
@@ -1,104 +0,0 @@
-import groovy.json.JsonSlurper
-
-/*
- * This buildscript contains tasks related to the validation of each module in fabric api.
- *
- * Right now this task verifies each Fabric API module has a module lifecycle specified.
- * More functionality will probably be added in the future.
- */
-
-subprojects {
-	if (it.name == "deprecated" || it.name == "fabric-api-bom" || it.name == "fabric-api-catalog") {
-		return
-	}
-
-	// Create the task
-	def validateModules = tasks.register("validateModules", ValidateModuleTask)
-	tasks.check.dependsOn(validateModules)
-}
-
-/**
- * Verifies that each module has the required custom values for module lifecycle in it's FMJ.
- *
- * 
    Example:
- * 
    {@code
- * "custom": {
- *   "fabric-api:module-lifecycle": "stable"
- * }
- * }
    
- */
-abstract class ValidateModuleTask extends DefaultTask {
-	@InputFile
-	abstract RegularFileProperty getFmj()
-
-	@Input
-	abstract Property getProjectName()
-
-	@Input
-	abstract Property getProjectPath()
-
-	@Input
-	abstract Property getLoaderVersion()
-
-	ValidateModuleTask() {
-		group = "verification"
-
-		// No outputs
-		outputs.upToDateWhen { true }
-
-		def file = project.file("src/main/resources/fabric.mod.json")
-
-		if (!file.exists()) {
-			file = project.file("src/client/resources/fabric.mod.json")
-		}
-
-		fmj.set(file)
-
-		projectName.set(project.name)
-		projectPath.set(project.path)
-		loaderVersion.set(project.loader_version)
-	}
-
-	@TaskAction
-	void validate() {
-		def file = fmj.get().asFile
-
-		def json = new JsonSlurper().parse(file)
-
-		if (json.custom == null) {
-			throw new GradleException("Module ${projectName.get()} does not have a custom value containing module lifecycle!")
-		}
-
-		def moduleLifecycle = json.custom.get("fabric-api:module-lifecycle")
-
-		if (moduleLifecycle == null) {
-			throw new GradleException("Module ${projectName.get()} does not have module lifecycle in custom values!")
-		}
-
-		if (!moduleLifecycle instanceof String) {
-			throw new GradleException("Module ${projectName.get()} has an invalid module lifecycle value. The value must be a string but read a ${moduleLifecycle.class}")
-		}
-
-		// Validate the lifecycle value
-		switch (moduleLifecycle) {
-			case "stable":
-			case "experimental":
-				break
-			case "deprecated":
-				if (!projectPath.get().startsWith(":deprecated")) {
-					throw new GradleException("Deprecated module ${projectName.get()} must be in the deprecated sub directory.")
-				}
-				break
-			default:
-				throw new GradleException("Module ${projectName.get()} has an invalid module lifecycle ${json.custom.get('fabric-api:module-lifecycle')}")
-		}
-
-		if (json.depends == null) {
-			throw new GradleException("Module ${projectName.get()} does not have a depends value!")
-		}
-
-		if (json.depends.fabricloader != ">=${loaderVersion.get()}") {
-			throw new GradleException("Module ${projectName.get()} does not have a valid fabricloader value! Got \"${json.depends.fabricloader}\" but expected \">=${project.loader_version}\"")
-		}
-	}
-}
diff --git a/gradle/module-versioning.gradle b/gradle/module-versioning.gradle
deleted file mode 100644
index ed88948bba..0000000000
--- a/gradle/module-versioning.gradle
+++ /dev/null
@@ -1,125 +0,0 @@
-
-/**
- * This task should be used to easily bump the major/minor/patch version of a fabric-api module.
- * It will automatically bump the versions of dependent modules.
- */
-tasks.register('bumpVersions', BumpVersionTask)
-
-class BumpVersionTask extends DefaultTask {
-	BumpVersionTask() {
-		group = "publishing"
-
-		outputs.upToDateWhen { false }
-	}
-
-	@TaskAction
-	void runTask() {
-		def scanner = new Scanner(System.in)
-
-		def toUpdate = [:]
-
-		while (true) {
-			println "Enter module name to update, or done to continue"
-
-			def input = scanner.nextLine()
-
-			if (input == "done") {
-				break
-			}
-
-			// Bump all versions. To be used when buildscript changes are made.
-			if (input == "allPatch") {
-				project.getChildProjects().values().forEach {
-					if (it.name == "deprecated" || it.name == "fabric-api-bom" || it.name == "fabric-api-catalog") {
-						return
-					}
-
-					toUpdate.put(it, 2)
-				}
-
-				break
-			}
-
-			def subProject = project.childProjects[input] ?: project.childProjects["deprecated"].childProjects[input]
-
-			if (!subProject) {
-				println "Could not find project with name: $input"
-				continue
-			}
-
-			while (true) {
-				println "Bump version for ${subProject.name}:"
-				println "0) Bump Major"
-				println "1) Bump Minor"
-				println "2) Bump Patch"
-
-				input = scanner.nextLine()
-
-				if (!(input in ["0", "1", "2"])) {
-					println "Invalid input"
-					continue
-				}
-
-				toUpdate.put(subProject, input as Integer)
-				break
-			}
-		}
-
-		while (true) {
-			def temp = [:]
-
-			toUpdate.keySet().forEach { p ->
-				project.allprojects.each { cp ->
-					if (cp.name == "deprecated" || cp.name == "fabric-api" || cp.name == "fabric-api-bom" || cp.name == "fabric-api-catalog") {
-						return
-					}
-
-					def config = cp.configurations.api
-					config.allDependencies.forEach { dep ->
-						if (dep.name == p.name) {
-							if (!toUpdate.containsKey(cp)) {
-								println "Bumping patch of ${cp.name} as it depends on ${p.name}"
-
-								temp.put(cp, 2) // Bump patch
-							}
-						}
-					}
-				}
-			}
-
-			if (temp.isEmpty()) {
-				break
-			}
-
-			toUpdate.putAll(temp)
-		}
-
-		def gpFile = project.file("gradle.properties")
-		def props = project.properties
-		def text = gpFile.text
-
-		toUpdate.forEach { p, i ->
-			def version = props."${p.name}-version"
-
-			if (!version) {
-				throw new NullPointerException("Could not find version for " + p.name)
-			}
-
-			def split = version.split("\\.")
-			split[i] = (split[i] as Integer) + 1
-			for (j in (i + 1) ..< split.length) {
-				split[j] = 0
-			}
-			def newVersion = split.join(".")
-
-			println "${p.name}: $version -> $newVersion"
-
-			text = text.replace(
-					"${p.name}-version=$version",
-					"${p.name}-version=$newVersion"
-					)
-		}
-
-		gpFile.text = text
-	}
-}
diff --git a/gradle/package-info.gradle b/gradle/package-info.gradle
deleted file mode 100644
index 87192cfe57..0000000000
--- a/gradle/package-info.gradle
+++ /dev/null
@@ -1,115 +0,0 @@
-import java.nio.file.Files
-
-for (def sourceSet in [
-			sourceSets.main,
-			sourceSets.client
-		]) {
-	// We have to capture the source set name for the lazy string literals,
-	// otherwise it'll just be whatever the last source set is in the list.
-	def sourceSetName = sourceSet.name
-	def taskName = sourceSet.getTaskName('generate', 'PackageInfos')
-	def task = tasks.register(taskName, GeneratePackageInfos) {
-		group = 'fabric'
-		description = "Generates package-info files for $sourceSetName packages."
-
-		// Only apply to default source directory since we also add the generated
-		// sources to the source set.
-		sourceRoot = file("src/$sourceSetName/java")
-		header = rootProject.file('HEADER')
-		outputDir = file("src/generated/$sourceSetName")
-	}
-	sourceSet.java.srcDir task
-
-	def cleanTask = tasks.register(sourceSet.getTaskName('clean', 'PackageInfos'), Delete) {
-		group = 'fabric'
-		delete file("src/generated/$sourceSetName")
-	}
-	clean.dependsOn cleanTask
-}
-
-abstract class GeneratePackageInfos extends DefaultTask {
-	@InputFile
-	File header
-
-	@Input
-	abstract Property getProjectName()
-
-	@SkipWhenEmpty
-	@InputDirectory
-	final DirectoryProperty sourceRoot = project.objects.directoryProperty()
-
-	@OutputDirectory
-	final DirectoryProperty outputDir = project.objects.directoryProperty()
-
-	GeneratePackageInfos() {
-		projectName.set(project.name)
-	}
-
-	@TaskAction
-	def run() {
-		def output = outputDir.get().asFile.toPath()
-		output.deleteDir()
-		def headerText = header.readLines().join("\n") // normalize line endings
-		def root = sourceRoot.get().asFile.toPath()
-
-		root.eachDirRecurse {
-			def containsJava = Files.list(it).any {
-				Files.isRegularFile(it) && it.fileName.toString().endsWith('.java')
-			}
-
-			if (!containsJava) {
-				return
-			}
-
-			// Check existing package-info.java to ensure it has @NullMarked
-			def existingPackageInfo = it.resolve('package-info.java')
-			if (Files.exists(existingPackageInfo)) {
-				if (!existingPackageInfo.text.contains("@NullMarked")) {
-					throw new RuntimeException("package-info.java ${existingPackageInfo} is missing @NullMarked annotation.")
-				}
-
-				return
-			}
-
-			def relativePath = root.relativize(it)
-			def target = output.resolve(relativePath)
-			Files.createDirectories(target)
-
-			def packageName = relativePath.toString().replace(File.separator, '.')
-
-			if (packageName == "net.fabricmc.fabric.api.util" && projectName.get() == "fabric-content-registries-v0") {
-				// Hack: This package clashes with api-base, don't generate any annotations for it.
-				return
-			}
-
-			def implPattern = /^(net[\/\\]fabricmc[\/\\]fabric[\/\\](impl|mixin))/
-			def isImpl = relativePath.toString() =~ implPattern
-
-			target.resolve('package-info.java').withWriter {
-				if (isImpl) {
-					it.write("""$headerText
-						|/**
-						| * Implementation code for ${projectName.get()}.
-						| */
-						|@ApiStatus.Internal
-						|@NullMarked
-						|package $packageName;
-						|
-						|import org.jetbrains.annotations.ApiStatus;
-						|import org.jspecify.annotations.NullMarked;
-						|""".stripMargin())
-				} else {
-					it.write("""$headerText
-						|/**
-						| * API code for ${projectName.get()}.
-						| */
-						|@NullMarked
-						|package $packageName;
-						|
-						|import org.jspecify.annotations.NullMarked;
-						|""".stripMargin())
-				}
-			}
-		}
-	}
-}
diff --git a/gradle/validate-annotations.gradle b/gradle/validate-annotations.gradle
deleted file mode 100644
index 4ab352a401..0000000000
--- a/gradle/validate-annotations.gradle
+++ /dev/null
@@ -1,49 +0,0 @@
-tasks.register('validateAnnotations', ValidateAnnotations) {
-	group = 'fabric'
-	description = "Validate annotations used in Fabric API code."
-
-	outputs.upToDateWhen { true } // Task has no outputs
-
-	// 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"
-
-abstract class ValidateAnnotations extends SourceTask {
-	private static final def API_STATUS_INTERNAL = ~/@ApiStatus\.Internal/
-	private static final def ENVIRONMENT = ~/@Environment/
-
-	@TaskAction
-	def run() {
-		for (def dir in [
-					'api',
-					'impl',
-					'mixin',
-					'test'
-				]) {
-			getSource().matching { include "net/fabricmc/fabric/$dir/" }.forEach {
-				if (it.isDirectory()) {
-					return
-				}
-
-				def contents = it.text
-
-				// @Environment is never allowed
-				if (ENVIRONMENT.matcher(contents).find()) {
-					throw new RuntimeException("Found @Environment annotation in file: $it")
-				}
-
-				// @ApiStatus.Internal is only allowed in api packages (it's auto-generated for impl and mixin packages)
-				if (dir != "api") {
-					if (API_STATUS_INTERNAL.matcher(contents).find()) {
-						throw new RuntimeException("Found @ApiStatus.Internal in implementation file: " + it)
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d997cfc60f..b1b8ef56b4 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dbc3ce4a04..239d53ff3f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 networkTimeout=10000
+retries=3
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 0262dcbd52..b9bb139f79 100755
--- a/gradlew
+++ b/gradlew
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
diff --git a/gradlew.bat b/gradlew.bat
index c4bdd3ab8e..24c62d56f2 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -23,8 +23,8 @@
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,7 +65,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
@@ -73,21 +73,10 @@ goto fail
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 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!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%
diff --git a/internal/ffapi-fluid-types/build.gradle b/internal/ffapi-fluid-types/build.gradle
new file mode 100644
index 0000000000..5196065dce
--- /dev/null
+++ b/internal/ffapi-fluid-types/build.gradle
@@ -0,0 +1,12 @@
+version = getSubprojectVersion(project)
+
+moduleDependencies(project, [
+	'fabric-api-base',
+	'fabric-content-registries-v0',
+	'fabric-transfer-api-v1',
+])
+
+testDependencies(project, [
+	'fabric-content-registries-v0',
+	'fabric-transfer-api-v1'
+])
diff --git a/internal/ffapi-fluid-types/src/main/java/org/sinytra/ffapi/impl/fluids/FabricFluidTypes.java b/internal/ffapi-fluid-types/src/main/java/org/sinytra/ffapi/impl/fluids/FabricFluidTypes.java
new file mode 100644
index 0000000000..797f30941d
--- /dev/null
+++ b/internal/ffapi-fluid-types/src/main/java/org/sinytra/ffapi/impl/fluids/FabricFluidTypes.java
@@ -0,0 +1,178 @@
+package org.sinytra.ffapi.impl.fluids;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.mojang.datafixers.util.Pair;
+import net.neoforged.neoforge.common.SoundAction;
+import net.neoforged.neoforge.common.SoundActions;
+import net.neoforged.neoforge.fluids.FluidType;
+import net.neoforged.neoforge.registries.NeoForgeRegistries;
+import org.jetbrains.annotations.Nullable;
+
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.tags.TagKey;
+import net.minecraft.util.Util;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.vehicle.boat.AbstractBoat;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.world.phys.Vec3;
+
+import net.fabricmc.fabric.api.registry.fluid.FluidBehavior;
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariantAttributeHandler;
+
+public class FabricFluidTypes {
+	private static final Map FLUID_TYPES = new HashMap<>();
+
+	public static FluidType getFluidType(Fluid fluid) {
+		return FLUID_TYPES.get(fluid);
+	}
+
+	public static void register(Fluid fluid, @Nullable FluidVariantAttributeHandler attributes) {
+		ResourceKey key = fluid.builtInRegistryHolder().getKey();
+		ResourceKey typeKey = ResourceKey.create(NeoForgeRegistries.Keys.FLUID_TYPES, key.identifier());
+
+		FluidVariant variant = FluidVariant.of(fluid);
+		FluidType.Properties properties = FluidType.Properties.create()
+				.descriptionId(getDescriptionId(variant))
+				.canPushEntity(false)
+				.canSwim(false)
+				.canDrown(false)
+				.pathType(null)
+				.adjacentPathType(null);
+
+		FluidType type = new FabricFluidType(properties, variant, attributes);
+		Registry.register(NeoForgeRegistries.FLUID_TYPES, typeKey, type);
+		FLUID_TYPES.put(fluid, type);
+	}
+
+	private static class FabricFluidType extends FluidType {
+		private final FluidVariant variant;
+		@Nullable
+		private final FluidVariantAttributeHandler handler;
+		@Nullable
+		private Pair, FluidBehavior> behavior;
+
+		public FabricFluidType(Properties properties, FluidVariant variant,
+		                       @Nullable FluidVariantAttributeHandler handler) {
+			super(properties);
+			this.variant = variant;
+			this.handler = handler;
+		}
+
+		private Pair, FluidBehavior> getBehavior() {
+			if (this.behavior == null) {
+				this.behavior = FluidTypesImpl.getBehavior(this.variant.getFluid());
+			}
+			return this.behavior;
+		}
+
+		@Override
+		public Component getDescription() {
+			if (this.handler != null) {
+				return this.handler.getName(this.variant);
+			}
+			return super.getDescription();
+		}
+
+		@Nullable
+		@Override
+		public SoundEvent getSound(SoundAction action) {
+			if (this.handler != null) {
+				if (action == SoundActions.BUCKET_FILL) {
+					return this.handler.getFillSound(this.variant).orElse(null);
+				} else if (action == SoundActions.BUCKET_EMPTY) {
+					return this.handler.getEmptySound(this.variant).orElse(null);
+				}
+			}
+			return super.getSound(action);
+		}
+
+		@Override
+		public int getLightLevel() {
+			if (this.handler != null) {
+				return this.handler.getLightEmission(this.variant);
+			}
+			return super.getLightLevel();
+		}
+
+		@Override
+		public int getTemperature() {
+			if (this.handler != null) {
+				return this.handler.getTemperature(this.variant);
+			}
+			return super.getTemperature();
+		}
+
+		@Override
+		public int getViscosity() {
+			if (this.handler != null) {
+				return this.handler.getViscosity(this.variant, null);
+			}
+			return super.getViscosity();
+		}
+
+		@Override
+		public int getDensity() {
+			if (this.handler != null) {
+				return this.handler.isLighterThanAir(this.variant) ? 0 : 1000;
+			}
+			return super.getDensity();
+		}
+
+		@Override
+		public boolean move(LivingEntity entity, Vec3 movementVector, double gravity) {
+			if (getBehavior() != null) {
+				boolean isFalling = entity.getDeltaMovement().y <= 0;
+				double oldY = entity.getY();
+				getBehavior().getSecond().travelInFluid(getBehavior().getFirst(), entity, movementVector, gravity, isFalling, oldY);
+				return true;
+			}
+			return super.move(entity, movementVector, gravity);
+		}
+
+		@Override
+		public boolean canSwim(Entity entity) {
+			if (getBehavior() != null) {
+				return getBehavior().getSecond().canSwimInFluid(getBehavior().getFirst(), entity);
+			}
+			return super.canSwim(entity);
+		}
+
+		@Override
+		public boolean canDrownIn(LivingEntity entity) {
+			if (getBehavior() != null) {
+				return getBehavior().getSecond().canDrownInFluid(getBehavior().getFirst(), entity);
+			}
+			return super.canDrownIn(entity);
+		}
+
+		@Override
+		public boolean supportsBoating(AbstractBoat boat) {
+			if (getBehavior() != null) {
+				return getBehavior().getSecond().canSupportBoat(getBehavior().getFirst(), boat);
+			}
+			return super.supportsBoating(boat);
+		}
+	}
+
+	@Nullable
+	private static String getDescriptionId(FluidVariant variant) {
+		Block fluidBlock = variant.getFluid().defaultFluidState().createLegacyBlock().getBlock();
+
+		if (!variant.isBlank() && fluidBlock == Blocks.AIR) {
+			// Some non-placeable fluids use air as their fluid block, in that case infer translation key from the fluid id.
+			return Util.makeDescriptionId("block", BuiltInRegistries.FLUID.getKey(variant.getFluid()));
+		} else {
+			return fluidBlock.getDescriptionId();
+		}
+	}
+}
diff --git a/internal/ffapi-fluid-types/src/main/java/org/sinytra/ffapi/impl/fluids/FluidTypesImpl.java b/internal/ffapi-fluid-types/src/main/java/org/sinytra/ffapi/impl/fluids/FluidTypesImpl.java
new file mode 100644
index 0000000000..c876ff8d18
--- /dev/null
+++ b/internal/ffapi-fluid-types/src/main/java/org/sinytra/ffapi/impl/fluids/FluidTypesImpl.java
@@ -0,0 +1,102 @@
+package org.sinytra.ffapi.impl.fluids;
+
+import java.util.Map.Entry;
+
+import com.mojang.datafixers.util.Pair;
+import net.neoforged.bus.api.EventPriority;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.neoforged.neoforge.registries.NeoForgeRegistries;
+import org.jetbrains.annotations.Nullable;
+
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.level.material.Fluid;
+
+import net.fabricmc.fabric.api.registry.fluid.EntityFluidInteractionRegistry;
+import net.fabricmc.fabric.api.registry.fluid.FluidBehavior;
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariantAttributeHandler;
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariantAttributes;
+import net.fabricmc.fabric.mixin.transfer.registry.BaseMappedRegistryAccessor;
+import net.fabricmc.fabric.mixin.transfer.registry.MappedRegistryAccessor;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.metadata.CustomValue;
+
+@Mod(FluidTypesImpl.MODID)
+public class FluidTypesImpl {
+	public static final String MODID = "ffapi_fluid_types";
+
+	private static final String POLYFILL_FLUID_TYPES = "sinytra:polyfill_fluid_types";
+
+	public FluidTypesImpl(IEventBus bus) {
+		bus.addListener(EventPriority.LOWEST, FluidTypesImpl::setupFluidTypes);
+	}
+
+	private static void setupFluidTypes(FMLCommonSetupEvent event) {
+		boolean frozen = ((MappedRegistryAccessor) NeoForgeRegistries.FLUID_TYPES).getFrozen();
+		if (frozen) {
+			((BaseMappedRegistryAccessor) NeoForgeRegistries.FLUID_TYPES).invokeUnfreeze(false);
+		}
+
+		registerPolyfillFluidAttributeHandlers();
+
+		for (Fluid fluid : BuiltInRegistries.FLUID) {
+			if (definesCustomFluidType(fluid)) {
+				continue;
+			}
+
+			FluidVariantAttributeHandler attributes = FluidVariantAttributes.getHandler(fluid);
+
+			if (attributes != null) {
+				FabricFluidTypes.register(fluid, attributes);
+			}
+		}
+
+		if (frozen) {
+			NeoForgeRegistries.FLUID_TYPES.freeze();
+		}
+	}
+
+	private static void registerPolyfillFluidAttributeHandlers() {
+		for (Entry, Fluid> entry : BuiltInRegistries.FLUID.entrySet()) {
+			ResourceKey key = entry.getKey();
+			Fluid fluid = entry.getValue();
+
+			boolean polyfill = FabricLoader.getInstance().getModContainer(key.identifier().getNamespace())
+					.map(c -> c.getMetadata().getCustomValue(POLYFILL_FLUID_TYPES))
+					.map(CustomValue::getAsBoolean)
+					.orElse(false);
+			if (!polyfill) {
+				continue;
+			}
+
+			if (FluidVariantAttributes.getHandler(fluid) != null || definesCustomFluidType(fluid)) {
+				continue;
+			}
+
+			FluidVariantAttributes.register(fluid, FluidVariantAttributes.getHandlerOrDefault(fluid));
+		}
+	}
+
+	@Nullable
+	public static Pair, FluidBehavior> getBehavior(Fluid fluid) {
+		for (TagKey tagKey : EntityFluidInteractionRegistry.getCustomInteractableFluids()) {
+			if (fluid.is(tagKey)) {
+				FluidBehavior behavior = EntityFluidInteractionRegistry.getFluidBehavior(tagKey);
+				return Pair.of(tagKey, behavior);
+			}
+		}
+		return null;
+	}
+
+	private static boolean definesCustomFluidType(Fluid fluid) {
+		try {
+			fluid.getFluidType();
+			return true;
+		} catch (RuntimeException e) {
+			return false;
+		}
+	}
+}
diff --git a/internal/ffapi-fluid-types/src/main/java/org/sinytra/ffapi/mixin/fluids/CommonHooksMixin.java b/internal/ffapi-fluid-types/src/main/java/org/sinytra/ffapi/mixin/fluids/CommonHooksMixin.java
new file mode 100644
index 0000000000..f261fb1aab
--- /dev/null
+++ b/internal/ffapi-fluid-types/src/main/java/org/sinytra/ffapi/mixin/fluids/CommonHooksMixin.java
@@ -0,0 +1,22 @@
+package org.sinytra.ffapi.mixin.fluids;
+
+import net.neoforged.neoforge.common.CommonHooks;
+import net.neoforged.neoforge.fluids.FluidType;
+import org.sinytra.ffapi.impl.fluids.FabricFluidTypes;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.world.level.material.Fluid;
+
+@Mixin(CommonHooks.class)
+public class CommonHooksMixin {
+	@Inject(method = "getVanillaFluidType", at = @At(value = "NEW", target = "java/lang/RuntimeException"), cancellable = true)
+	private static void getFabricVanillaFluidType(Fluid fluid, CallbackInfoReturnable cir) {
+		FluidType fabricFluidType = FabricFluidTypes.getFluidType(fluid);
+		if (fabricFluidType != null) {
+			cir.setReturnValue(fabricFluidType);
+		}
+	}
+}
diff --git a/internal/ffapi-fluid-types/src/main/resources/META-INF/neoforge.mods.toml b/internal/ffapi-fluid-types/src/main/resources/META-INF/neoforge.mods.toml
new file mode 100644
index 0000000000..325c80a7c7
--- /dev/null
+++ b/internal/ffapi-fluid-types/src/main/resources/META-INF/neoforge.mods.toml
@@ -0,0 +1,45 @@
+modLoader = "javafml"
+loaderVersion = "*"
+license = "Apache-2.0"
+issueTrackerURL = "https://github.com/Sinytra/ForgifiedFabricAPI/issues"
+
+[[mods]]
+modId = "ffapi_fluid_types"
+version = "${file.jarVersion}"
+displayName = "Forgified Fabric API Fluid Types"
+logoFile = "assets/ffapi-fluid-types/icon.png"
+iconFile = "assets/ffapi-fluid-types/icon.png"
+authors = "Sinytra"
+description = "Handles Fluid Type behavior"
+displayURL = "https://github.com/Sinytra/ForgifiedFabricAPI"
+
+[[dependencies.ffapi_fluid_types]]
+modId = "neoforge"
+type = "required"
+versionRange = "[26.1.2,27)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.ffapi_fluid_types]]
+modId = "minecraft"
+type = "required"
+versionRange = "[26.1,27)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.ffapi_fluid_types]]
+modId = "fabric_content_registries_v0"
+type = "required"
+versionRange = "*"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.ffapi_fluid_types]]
+modId = "fabric_transfer_api_v1"
+type = "required"
+versionRange = "*"
+ordering = "NONE"
+side = "BOTH"
+
+[[mixins]]
+config = "ffapi_fluid_types.mixins.json"
diff --git a/internal/ffapi-fluid-types/src/main/resources/assets/ffapi-fluid-types/icon.png b/internal/ffapi-fluid-types/src/main/resources/assets/ffapi-fluid-types/icon.png
new file mode 100644
index 0000000000..12c4531de9
Binary files /dev/null and b/internal/ffapi-fluid-types/src/main/resources/assets/ffapi-fluid-types/icon.png differ
diff --git a/internal/ffapi-fluid-types/src/main/resources/ffapi_fluid_types.mixins.json b/internal/ffapi-fluid-types/src/main/resources/ffapi_fluid_types.mixins.json
new file mode 100644
index 0000000000..2291429cbb
--- /dev/null
+++ b/internal/ffapi-fluid-types/src/main/resources/ffapi_fluid_types.mixins.json
@@ -0,0 +1,14 @@
+{
+  "required": true,
+  "package": "org.sinytra.ffapi.mixin.fluids",
+  "compatibilityLevel": "JAVA_25",
+  "mixins": [
+    "CommonHooksMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "overwrites": {
+    "requireAnnotations": true
+  }
+}
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 8e249715bc..0000000000
--- a/settings.gradle
+++ /dev/null
@@ -1,71 +0,0 @@
-pluginManagement {
-	repositories {
-		maven {
-			name = 'Fabric'
-			url = 'https://maven.fabricmc.net/'
-		}
-		gradlePluginPortal()
-	}
-}
-
-rootProject.name = "fabric-api"
-
-include 'fabric-api-bom'
-include 'fabric-api-catalog'
-
-def focus = new File('focus.txt')
-
-if (focus.exists()) {
-	focus.eachLine {
-		include it
-	}
-
-	return // Skip the rest of the includes
-}
-
-include 'fabric-api-base'
-
-include 'fabric-api-lookup-api-v1'
-include 'fabric-biome-api-v1'
-include 'fabric-block-api-v1'
-include 'fabric-block-getter-api-v2'
-include 'fabric-client-gametest-api-v1'
-include 'fabric-command-api-v2'
-include 'fabric-content-registries-v0'
-include 'fabric-convention-tags-v2'
-include 'fabric-crash-report-info-v1'
-include 'fabric-creative-tab-api-v1'
-include 'fabric-data-attachment-api-v1'
-include 'fabric-data-generation-api-v1'
-include 'fabric-debug-api-v1'
-include 'fabric-dimensions-v1'
-include 'fabric-entity-events-v1'
-include 'fabric-events-interaction-v0'
-include 'fabric-game-rule-api-v1'
-include 'fabric-gametest-api-v1'
-include 'fabric-item-api-v1'
-include 'fabric-key-mapping-api-v1'
-include 'fabric-lifecycle-events-v1'
-include 'fabric-loot-api-v3'
-include 'fabric-menu-api-v1'
-include 'fabric-message-api-v1'
-include 'fabric-model-loading-api-v1'
-include 'fabric-networking-api-v1'
-include 'fabric-object-builder-api-v1'
-include 'fabric-particles-v1'
-include 'fabric-recipe-api-v1'
-include 'fabric-registry-sync-v0'
-include 'fabric-renderer-api-v1'
-include 'fabric-renderer-indigo'
-include 'fabric-rendering-fluids-v1'
-include 'fabric-rendering-v1'
-include 'fabric-resource-conditions-api-v1'
-include 'fabric-resource-loader-v1'
-include 'fabric-screen-api-v1'
-include 'fabric-serialization-api-v1'
-include 'fabric-sound-api-v1'
-include 'fabric-tag-api-v1'
-include 'fabric-transfer-api-v1'
-include 'fabric-transitive-access-wideners-v1'
-include 'deprecated'
-include 'deprecated:fabric-resource-loader-v0'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000000..6e86e0e7ae
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,83 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven {
+            name = "Architectury"
+            url = uri("https://maven.architectury.dev/")
+        }
+        maven {
+            name = "Fabric"
+            url = uri("https://maven.fabricmc.net")
+        }
+        maven {
+            name = "NeoForged"
+            url = uri("https://maven.neoforged.net/releases")
+        }
+    }
+}
+
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
+}
+
+rootProject.name = "forgified-fabric-api"
+
+gradle.beforeProject {
+    val localPropertiesFile = rootDir.resolve("ffapi.gradle.properties")
+    if (localPropertiesFile.exists()) {
+        val localProperties = java.util.Properties()
+        localProperties.load(localPropertiesFile.inputStream())
+        localProperties.forEach { (k, v) -> if (k is String) project.extra.set(k, v) }
+    }
+}
+
+include("fabric-api-bom")
+include("fabric-api-catalog")
+
+include("fabric-api-base")
+
+include("fabric-api-lookup-api-v1")
+include("fabric-biome-api-v1")
+include("fabric-block-api-v1")
+include("fabric-block-getter-api-v2")
+include("fabric-client-gametest-api-v1")
+include("fabric-command-api-v2")
+include("fabric-content-registries-v0")
+include("fabric-convention-tags-v2")
+include("fabric-creative-tab-api-v1")
+include("fabric-data-attachment-api-v1")
+include("fabric-data-generation-api-v1")
+include("fabric-debug-api-v1")
+include("fabric-dimensions-v1")
+include("fabric-entity-events-v1")
+include("fabric-events-interaction-v0")
+include("fabric-game-rule-api-v1")
+include("fabric-gametest-api-v1")
+include("fabric-item-api-v1")
+include("fabric-key-mapping-api-v1")
+include("fabric-lifecycle-events-v1")
+include("fabric-loot-api-v3")
+include("fabric-menu-api-v1")
+include("fabric-message-api-v1")
+include("fabric-model-loading-api-v1")
+include("fabric-networking-api-v1")
+include("fabric-object-builder-api-v1")
+include("fabric-particles-v1")
+include("fabric-permission-api-v1")
+include("fabric-recipe-api-v1")
+include("fabric-registry-sync-v0")
+include("fabric-renderer-api-v1")
+include("fabric-renderer-indigo")
+include("fabric-rendering-fluids-v1")
+include("fabric-rendering-v1")
+include("fabric-resource-conditions-api-v1")
+include("fabric-resource-loader-v1")
+include("fabric-screen-api-v1")
+include("fabric-serialization-api-v1")
+include("fabric-sound-api-v1")
+include("fabric-tag-api-v1")
+include("fabric-transfer-api-v1")
+include("fabric-transitive-access-wideners-v1")
+include("internal:ffapi-fluid-types")
+include("deprecated")
+include("deprecated:fabric-resource-loader-v0")
diff --git a/src/main/resources/assets/fabric/icon.png b/src/main/resources/assets/fabric/icon.png
index 12c4531de9..24c80d44d2 100644
Binary files a/src/main/resources/assets/fabric/icon.png and b/src/main/resources/assets/fabric/icon.png differ
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 2e91de0da3..9c62c2f8a2 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -18,7 +18,7 @@
   "depends": {
     "fabricloader": ">=0.18.4",
     "java": ">=25",
-    "minecraft": "~26.1-"
+    "minecraft": "~26.2-"
   },
   "description": "Core API module providing key hooks and intercompatibility features."
 }