From 6300a776b7b44ee4130b02d857b6f0df232618a3 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 18 Aug 2024 18:05:46 +0100 Subject: [PATCH] Misc build fixes --- build.gradle | 3 +-- .../src/main/resources/fabric.mod.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../src/client/resources/fabric.mod.json | 2 +- .../main/resources/fabric-loot-api-v2.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../src/client/resources/fabric.mod.json | 2 +- ...rendering-data-attachment-v1.client.mixins.json | 2 +- ...fabric-rendering-data-attachment-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../src/client/resources/fabric.mod.json | 2 +- fabric-api-base/src/main/resources/fabric.mod.json | 2 +- .../fabric-api-base-testmod.client.mixins.json | 2 +- .../resources/fabric-api-lookup-api-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../main/resources/fabric-biome-api-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../main/resources/fabric-block-api-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-block-view-api-v2.client.mixins.json | 2 +- .../resources/fabric-block-view-api-v2.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-blockrenderlayer-v1.mixins.json | 2 +- .../src/client/resources/fabric.mod.json | 2 +- .../src/client/resources/fabric.mod.json | 2 +- .../fabric-command-api-v2.client.mixins.json | 2 +- .../resources/fabric-command-api-v2.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-content-registries-v0.accesswidener | 3 --- .../fabric-content-registries-v0.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- ...abric-content-registries-v0-testmod.mixins.json | 2 +- .../src/datagen/resources/fabric.mod.json | 2 +- .../fabric-convention-tags-api-v2.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-crash-report-info-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- ...abric-data-attachment-api-v1.client.mixins.json | 2 +- .../fabric-data-attachment-api-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- ...bric-data-attachment-api-v1-testmod.mixins.json | 2 +- ...abric-data-generation-api-v1.client.mixins.json | 2 +- .../fabric-data-generation-api-v1.accesswidener | 5 ----- .../fabric-data-generation-api-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../test/datagen/DataGeneratorTestEntrypoint.java | 2 +- .../template.accesswidener | 5 ----- .../resources/fabric-dimensions-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-entity-events-v1.client.mixins.json | 2 +- .../resources/fabric-entity-events-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- ...fabric-events-interaction-v0.client.mixins.json | 2 +- .../fabric-events-interaction-v0.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-game-rule-api-v1.client.mixins.json | 2 +- .../resources/fabric-game-rule-api-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../resources/fabric-gametest-api-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-item-api-v1.client.mixins.json | 2 +- .../main/resources/fabric-item-api-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-item-group-api-v1.client.mixins.json | 2 +- .../resources/fabric-item-group-api-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-key-binding-api-v1.mixins.json | 2 +- .../src/client/resources/fabric.mod.json | 2 +- .../fabric-lifecycle-events-v1.client.mixins.json | 2 +- .../fabric-lifecycle-events-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../main/resources/fabric-loot-api-v3.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-message-api-v1.client.mixins.json | 2 +- .../resources/fabric-message-api-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-model-loading-api-v1.mixins.json | 2 +- .../src/client/resources/fabric.mod.json | 2 +- .../fabric-networking-api-v1.client.mixins.json | 2 +- .../resources/fabric-networking-api-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-object-builder-v1.client.mixins.json | 2 +- .../resources/fabric-object-builder-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-particles-v1.client.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../resources/fabric-recipe-api-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-registry-sync-v0.client.mixins.json | 2 +- .../resources/fabric-registry-sync-v0.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-registry-sync-v0-testmod.mixins.json | 2 +- .../fabric-renderer-api-v1.debughud.mixins.json | 2 +- .../src/client/resources/fabric.mod.json | 2 +- .../src/client/resources/fabric.mod.json | 2 +- .../fabric-rendering-fluids-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../resources/fabric-rendering-v1.mixins.json | 2 +- .../src/client/resources/fabric.mod.json | 2 +- .../resource/conditions/v1/ResourceCondition.java | 5 +---- .../conditions/ResourceConditionsImpl.java | 7 +------ .../conditions/AllModsLoadedResourceCondition.java | 5 +---- .../conditions/AndResourceCondition.java | 5 +---- .../conditions/AnyModsLoadedResourceCondition.java | 5 +---- .../FeaturesEnabledResourceCondition.java | 5 +---- .../conditions/NotResourceCondition.java | 5 +---- .../conditions/conditions/OrResourceCondition.java | 5 +---- .../RegistryContainsResourceCondition.java | 5 +---- .../conditions/TagsPopulatedResourceCondition.java | 5 +---- .../conditions/TrueResourceCondition.java | 5 +---- .../resource/conditions/JsonDataLoaderMixin.java | 5 +---- .../conditions/ServerAdvancementLoaderMixin.java | 3 +-- .../SinglePreparationResourceReloaderMixin.java | 4 +--- ...fabric-resource-conditions-api-v1.accesswidener | 1 - .../fabric-resource-conditions-api-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../conditions/ConditionalResourcesTest.java | 14 +++++++------- .../fabric-resource-loader-v0.client.mixins.json | 2 +- .../fabric-resource-loader-v0.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-resource-loader-v0-testmod.mixins.json | 2 +- .../resources/fabric-screen-api-v1.mixins.json | 2 +- .../src/client/resources/fabric.mod.json | 2 +- .../fabric-screen-handler-api-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../resources/fabric-sound-api-v1.mixins.json | 2 +- .../src/client/resources/fabric.mod.json | 2 +- .../resources/fabric-transfer-api-v1.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- .../fabric-transfer-api-v1-testmod.mixins.json | 2 +- .../src/main/resources/fabric.mod.json | 2 +- gradle.properties | 2 +- gradle/javadoc.accesswidener | 5 +++++ src/main/resources/fabric.mod.json | 2 +- 135 files changed, 141 insertions(+), 192 deletions(-) create mode 100644 gradle/javadoc.accesswidener diff --git a/build.gradle b/build.gradle index be3bf3344..fb341b9cc 100644 --- a/build.gradle +++ b/build.gradle @@ -365,8 +365,7 @@ apply from: "gradle/module-validation.gradle" apply from: "gradle/module-versioning.gradle" loom { - // Required as the item-group API uses access widened classes in its API, without this the javadoc generation fails. - accessWidenerPath = file("fabric-item-group-api-v1/src/main/resources/fabric-item-group-api-v1.accesswidener") + accessWidenerPath = file("gradle/javadoc.accesswidener") } javadoc { diff --git a/deprecated/fabric-command-api-v1/src/main/resources/fabric.mod.json b/deprecated/fabric-command-api-v1/src/main/resources/fabric.mod.json index 0474c0ae5..5d95e54de 100644 --- a/deprecated/fabric-command-api-v1/src/main/resources/fabric.mod.json +++ b/deprecated/fabric-command-api-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*", "fabric-command-api-v2": "*" }, diff --git a/deprecated/fabric-commands-v0/src/main/resources/fabric.mod.json b/deprecated/fabric-commands-v0/src/main/resources/fabric.mod.json index b285ac02c..5756ce633 100644 --- a/deprecated/fabric-commands-v0/src/main/resources/fabric.mod.json +++ b/deprecated/fabric-commands-v0/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*", "fabric-command-api-v2": "*" }, diff --git a/deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json b/deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json index ac6e109c3..426b04048 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json +++ b/deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json @@ -21,7 +21,7 @@ ] }, "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "minecraft": ">=1.18.2" }, "description": "Contains common tags used by mods for vanilla things.", diff --git a/deprecated/fabric-keybindings-v0/src/client/resources/fabric.mod.json b/deprecated/fabric-keybindings-v0/src/client/resources/fabric.mod.json index b8bee105d..e373810fc 100644 --- a/deprecated/fabric-keybindings-v0/src/client/resources/fabric.mod.json +++ b/deprecated/fabric-keybindings-v0/src/client/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-key-binding-api-v1": "*" }, "description": "Keybinding registry API.", diff --git a/deprecated/fabric-loot-api-v2/src/main/resources/fabric-loot-api-v2.mixins.json b/deprecated/fabric-loot-api-v2/src/main/resources/fabric-loot-api-v2.mixins.json index 15d28a491..edfdddc51 100644 --- a/deprecated/fabric-loot-api-v2/src/main/resources/fabric-loot-api-v2.mixins.json +++ b/deprecated/fabric-loot-api-v2/src/main/resources/fabric-loot-api-v2.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.loot.v2", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "LootPoolBuilderMixin", "LootTableBuilderMixin" diff --git a/deprecated/fabric-loot-api-v2/src/main/resources/fabric.mod.json b/deprecated/fabric-loot-api-v2/src/main/resources/fabric.mod.json index a7cdc9dd9..c0f4f8738 100644 --- a/deprecated/fabric-loot-api-v2/src/main/resources/fabric.mod.json +++ b/deprecated/fabric-loot-api-v2/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*", "fabric-resource-loader-v0": "*" }, diff --git a/deprecated/fabric-renderer-registries-v1/src/client/resources/fabric.mod.json b/deprecated/fabric-renderer-registries-v1/src/client/resources/fabric.mod.json index 347b64c7c..b10ab5e7e 100644 --- a/deprecated/fabric-renderer-registries-v1/src/client/resources/fabric.mod.json +++ b/deprecated/fabric-renderer-registries-v1/src/client/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "minecraft": ">=1.15-alpha.19.39.a", "fabric-api-base": "*", "fabric-rendering-v1": "*" diff --git a/deprecated/fabric-rendering-data-attachment-v1/src/client/resources/fabric-rendering-data-attachment-v1.client.mixins.json b/deprecated/fabric-rendering-data-attachment-v1/src/client/resources/fabric-rendering-data-attachment-v1.client.mixins.json index 0eb7357bd..77772befd 100644 --- a/deprecated/fabric-rendering-data-attachment-v1/src/client/resources/fabric-rendering-data-attachment-v1.client.mixins.json +++ b/deprecated/fabric-rendering-data-attachment-v1/src/client/resources/fabric-rendering-data-attachment-v1.client.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.rendering.data.client", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "ChunkRendererRegionMixin" ], diff --git a/deprecated/fabric-rendering-data-attachment-v1/src/main/resources/fabric-rendering-data-attachment-v1.mixins.json b/deprecated/fabric-rendering-data-attachment-v1/src/main/resources/fabric-rendering-data-attachment-v1.mixins.json index 9c09ede3c..1f3e0aee8 100644 --- a/deprecated/fabric-rendering-data-attachment-v1/src/main/resources/fabric-rendering-data-attachment-v1.mixins.json +++ b/deprecated/fabric-rendering-data-attachment-v1/src/main/resources/fabric-rendering-data-attachment-v1.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.rendering.data", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "BlockEntityMixin", "WorldViewMixin" diff --git a/deprecated/fabric-rendering-data-attachment-v1/src/main/resources/fabric.mod.json b/deprecated/fabric-rendering-data-attachment-v1/src/main/resources/fabric.mod.json index 37986bbf6..b3faf556a 100644 --- a/deprecated/fabric-rendering-data-attachment-v1/src/main/resources/fabric.mod.json +++ b/deprecated/fabric-rendering-data-attachment-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-block-view-api-v2": "*" }, "description": "Thread-safe hooks for block entity data use during terrain rendering.", diff --git a/deprecated/fabric-rendering-v0/src/client/resources/fabric.mod.json b/deprecated/fabric-rendering-v0/src/client/resources/fabric.mod.json index cd1d4895b..ec1913f91 100644 --- a/deprecated/fabric-rendering-v0/src/client/resources/fabric.mod.json +++ b/deprecated/fabric-rendering-v0/src/client/resources/fabric.mod.json @@ -21,7 +21,7 @@ ] }, "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "minecraft": ">=1.15-alpha.19.39.a", "fabric-api-base": "*", "fabric-rendering-v1": "*" diff --git a/fabric-api-base/src/main/resources/fabric.mod.json b/fabric-api-base/src/main/resources/fabric.mod.json index df4320105..78ebdaf9f 100644 --- a/fabric-api-base/src/main/resources/fabric.mod.json +++ b/fabric-api-base/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11" + "fabricloader": ">=0.16.2" }, "description": "Contains the essentials for Fabric API modules.", "custom": { diff --git a/fabric-api-base/src/testmodClient/resources/fabric-api-base-testmod.client.mixins.json b/fabric-api-base/src/testmodClient/resources/fabric-api-base-testmod.client.mixins.json index c7451283c..d8de76c1b 100644 --- a/fabric-api-base/src/testmodClient/resources/fabric-api-base-testmod.client.mixins.json +++ b/fabric-api-base/src/testmodClient/resources/fabric-api-base-testmod.client.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.test.base.client.mixin", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "CyclingButtonWidgetAccessor", "ScreenAccessor" 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 327b248b1..7e41151da 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.lookup", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "BlockEntityTypeAccessor", "ServerWorldMixin" diff --git a/fabric-api-lookup-api-v1/src/main/resources/fabric.mod.json b/fabric-api-lookup-api-v1/src/main/resources/fabric.mod.json index 02be22d22..401b50e88 100644 --- a/fabric-api-lookup-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-api-lookup-api-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*", "fabric-lifecycle-events-v1": "*" }, 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 e45d15408..8c34ad9f3 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.biome", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "BiomeSourceMixin", "ChunkNoiseSamplerMixin", diff --git a/fabric-biome-api-v1/src/main/resources/fabric.mod.json b/fabric-biome-api-v1/src/main/resources/fabric.mod.json index 750c8fb3d..b71ab4968 100644 --- a/fabric-biome-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-biome-api-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "minecraft": ">=1.16.2" }, "description": "Hooks for adding biomes to the default world generator.", 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 090d0938c..c9f06f26d 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.block", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "BlockMixin", "BlockStateMixin", diff --git a/fabric-block-api-v1/src/main/resources/fabric.mod.json b/fabric-block-api-v1/src/main/resources/fabric.mod.json index 9124464cc..c24a9e8e6 100644 --- a/fabric-block-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-block-api-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11" + "fabricloader": ">=0.16.2" }, "entrypoints": { }, diff --git a/fabric-block-view-api-v2/src/client/resources/fabric-block-view-api-v2.client.mixins.json b/fabric-block-view-api-v2/src/client/resources/fabric-block-view-api-v2.client.mixins.json index 2aae97626..f70efd346 100644 --- a/fabric-block-view-api-v2/src/client/resources/fabric-block-view-api-v2.client.mixins.json +++ b/fabric-block-view-api-v2/src/client/resources/fabric-block-view-api-v2.client.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.blockview.client", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "ChunkRendererRegionMixin", "ChunkRendererRegionBuilderMixin" diff --git a/fabric-block-view-api-v2/src/main/resources/fabric-block-view-api-v2.mixins.json b/fabric-block-view-api-v2/src/main/resources/fabric-block-view-api-v2.mixins.json index 4fdfe605a..56973fb04 100644 --- a/fabric-block-view-api-v2/src/main/resources/fabric-block-view-api-v2.mixins.json +++ b/fabric-block-view-api-v2/src/main/resources/fabric-block-view-api-v2.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.blockview", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "BlockEntityMixin", "BlockViewMixin" diff --git a/fabric-block-view-api-v2/src/main/resources/fabric.mod.json b/fabric-block-view-api-v2/src/main/resources/fabric.mod.json index 4aa54dac7..ada4de85a 100644 --- a/fabric-block-view-api-v2/src/main/resources/fabric.mod.json +++ b/fabric-block-view-api-v2/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11" + "fabricloader": ">=0.16.2" }, "description": "Hooks for block views", "mixins": [ diff --git a/fabric-blockrenderlayer-v1/src/client/resources/fabric-blockrenderlayer-v1.mixins.json b/fabric-blockrenderlayer-v1/src/client/resources/fabric-blockrenderlayer-v1.mixins.json index eec9c63b2..5afc35d43 100644 --- a/fabric-blockrenderlayer-v1/src/client/resources/fabric-blockrenderlayer-v1.mixins.json +++ b/fabric-blockrenderlayer-v1/src/client/resources/fabric-blockrenderlayer-v1.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.blockrenderlayer", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "RenderLayersMixin" ], diff --git a/fabric-blockrenderlayer-v1/src/client/resources/fabric.mod.json b/fabric-blockrenderlayer-v1/src/client/resources/fabric.mod.json index a8967e540..2c0c3501d 100644 --- a/fabric-blockrenderlayer-v1/src/client/resources/fabric.mod.json +++ b/fabric-blockrenderlayer-v1/src/client/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "minecraft": ">=1.15-alpha.19.38.b", "fabric-api-base": "*" }, diff --git a/fabric-client-tags-api-v1/src/client/resources/fabric.mod.json b/fabric-client-tags-api-v1/src/client/resources/fabric.mod.json index 5e55ddbe9..6a74e112e 100644 --- a/fabric-client-tags-api-v1/src/client/resources/fabric.mod.json +++ b/fabric-client-tags-api-v1/src/client/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11" + "fabricloader": ">=0.16.2" }, "description": "Adds the ability to load tags from the local mods.", "custom": { 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 441344089..686892f5b 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.command.client", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "ClientCommandSourceMixin", "ClientPlayNetworkHandlerMixin" 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 bb264c0ce..7935ecc2b 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.command", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "ArgumentTypesAccessor", "CommandManagerMixin", 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 587357e29..7070e2065 100644 --- a/fabric-command-api-v2/src/main/resources/fabric.mod.json +++ b/fabric-command-api-v2/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*", "minecraft": ">1.19-alpha.22.11.a" }, diff --git a/fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.accesswidener b/fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.accesswidener index b43be0dc0..34d544784 100644 --- a/fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.accesswidener +++ b/fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.accesswidener @@ -1,6 +1,3 @@ accessWidener v1 named -accessible method net/minecraft/block/entity/AbstractFurnaceBlockEntity addFuel (Ljava/util/Map;Lnet/minecraft/registry/tag/TagKey;I)V -accessible method net/minecraft/block/entity/AbstractFurnaceBlockEntity addFuel (Ljava/util/Map;Lnet/minecraft/item/ItemConvertible;I)V - accessible method net/minecraft/recipe/BrewingRecipeRegistry$Recipe (Lnet/minecraft/registry/entry/RegistryEntry;Lnet/minecraft/recipe/Ingredient;Lnet/minecraft/registry/entry/RegistryEntry;)V 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 804d421d6..9a0c717e2 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.content.registry", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "AxeItemAccessor", "BrewingRecipeRegistryBuilderMixin", 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 ab6e48035..094eb0066 100644 --- a/fabric-content-registries-v0/src/main/resources/fabric.mod.json +++ b/fabric-content-registries-v0/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*", "fabric-lifecycle-events-v1": "*", "fabric-resource-loader-v0": "*" diff --git a/fabric-content-registries-v0/src/testmod/resources/fabric-content-registries-v0-testmod.mixins.json b/fabric-content-registries-v0/src/testmod/resources/fabric-content-registries-v0-testmod.mixins.json index ad31e080b..8bcaed0d6 100644 --- a/fabric-content-registries-v0/src/testmod/resources/fabric-content-registries-v0-testmod.mixins.json +++ b/fabric-content-registries-v0/src/testmod/resources/fabric-content-registries-v0-testmod.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.test.mixin.content.registry", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ ], "injectors": { diff --git a/fabric-convention-tags-v2/src/datagen/resources/fabric.mod.json b/fabric-convention-tags-v2/src/datagen/resources/fabric.mod.json index 1d24ae61a..7371c71cc 100644 --- a/fabric-convention-tags-v2/src/datagen/resources/fabric.mod.json +++ b/fabric-convention-tags-v2/src/datagen/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "minecraft": ">=1.18.2" }, "description": "Contains common tags used by mods for vanilla things.", diff --git a/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json b/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json index ac33b25a2..70b80c518 100644 --- a/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json +++ b/fabric-convention-tags-v2/src/main/resources/fabric-convention-tags-api-v2.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.tag", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "TagKeyMixin" ], diff --git a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json index 321e79199..a7d646897 100644 --- a/fabric-convention-tags-v2/src/main/resources/fabric.mod.json +++ b/fabric-convention-tags-v2/src/main/resources/fabric.mod.json @@ -21,7 +21,7 @@ ] }, "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "minecraft": ">=1.20.5-beta.1", "fabric-lifecycle-events-v1": "*" }, diff --git a/fabric-crash-report-info-v1/src/main/resources/fabric-crash-report-info-v1.mixins.json b/fabric-crash-report-info-v1/src/main/resources/fabric-crash-report-info-v1.mixins.json index d29bd2c05..c2664af34 100644 --- a/fabric-crash-report-info-v1/src/main/resources/fabric-crash-report-info-v1.mixins.json +++ b/fabric-crash-report-info-v1/src/main/resources/fabric-crash-report-info-v1.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.crash.report.info", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "SystemDetailsMixin" ], diff --git a/fabric-crash-report-info-v1/src/main/resources/fabric.mod.json b/fabric-crash-report-info-v1/src/main/resources/fabric.mod.json index fe7f6df8f..abd43aa4b 100644 --- a/fabric-crash-report-info-v1/src/main/resources/fabric.mod.json +++ b/fabric-crash-report-info-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11" + "fabricloader": ">=0.16.2" }, "description": "Adds Fabric-related debug info to crash reports.", "mixins": [ diff --git a/fabric-data-attachment-api-v1/src/client/resources/fabric-data-attachment-api-v1.client.mixins.json b/fabric-data-attachment-api-v1/src/client/resources/fabric-data-attachment-api-v1.client.mixins.json index 9634f8d1e..fdf9b0f4c 100644 --- a/fabric-data-attachment-api-v1/src/client/resources/fabric-data-attachment-api-v1.client.mixins.json +++ b/fabric-data-attachment-api-v1/src/client/resources/fabric-data-attachment-api-v1.client.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.attachment.client", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ ], "injectors": { 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 daa2a6b88..1ceeec076 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.attachment", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "AttachmentTargetsMixin", "BannerBlockEntityMixin", 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 c8c486730..6ed025776 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 @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-entity-events-v1": "*", "fabric-object-builder-api-v1": "*" }, diff --git a/fabric-data-attachment-api-v1/src/testmod/resources/fabric-data-attachment-api-v1-testmod.mixins.json b/fabric-data-attachment-api-v1/src/testmod/resources/fabric-data-attachment-api-v1-testmod.mixins.json index 5a74edbaa..156ced751 100644 --- a/fabric-data-attachment-api-v1/src/testmod/resources/fabric-data-attachment-api-v1-testmod.mixins.json +++ b/fabric-data-attachment-api-v1/src/testmod/resources/fabric-data-attachment-api-v1-testmod.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.test.attachment.mixin", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "BlockEntityTypeAccessor" ], diff --git a/fabric-data-generation-api-v1/src/client/resources/fabric-data-generation-api-v1.client.mixins.json b/fabric-data-generation-api-v1/src/client/resources/fabric-data-generation-api-v1.client.mixins.json index 8e1924f58..44f325e09 100644 --- a/fabric-data-generation-api-v1/src/client/resources/fabric-data-generation-api-v1.client.mixins.json +++ b/fabric-data-generation-api-v1/src/client/resources/fabric-data-generation-api-v1.client.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.datagen.client", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "MinecraftClientMixin" ], diff --git a/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.accesswidener b/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.accesswidener index 13eb43f84..a255793ea 100644 --- a/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.accesswidener +++ b/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.accesswidener @@ -6,9 +6,6 @@ accessWidener v2 named accessible field net/minecraft/data/DataGenerator output Lnet/minecraft/data/DataOutput; mutable field net/minecraft/data/DataGenerator output Lnet/minecraft/data/DataOutput; -accessible field net/minecraft/data/server/recipe/RecipeProvider recipesPathResolver Lnet/minecraft/data/DataOutput$PathResolver; -accessible field net/minecraft/data/server/recipe/RecipeProvider advancementsPathResolver Lnet/minecraft/data/DataOutput$PathResolver; - accessible class net/minecraft/data/server/recipe/RecipeGenerator$RecipeProvider extendable method net/minecraft/data/server/recipe/RecipeGenerator$RecipeProvider run (Lnet/minecraft/data/DataWriter;)Ljava/util/concurrent/CompletableFuture; @@ -57,8 +54,6 @@ transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$B transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$LogTexturePool transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$BuiltinModelPool -transitive-accessible field net/minecraft/data/server/loottable/BlockLootTableGenerator WITH_SHEARS Lnet/minecraft/loot/condition/LootCondition$Builder; - ### Generated access wideners below transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator generate ()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 c8d44bcde..bce891c47 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.datagen", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "DataProviderMixin", "ModelProviderMixin", diff --git a/fabric-data-generation-api-v1/src/main/resources/fabric.mod.json b/fabric-data-generation-api-v1/src/main/resources/fabric.mod.json index da1f32445..4e1616b5b 100644 --- a/fabric-data-generation-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-data-generation-api-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11" + "fabricloader": ">=0.16.2" }, "description": "Allows for automatic data generation.", "mixins": [ 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 816757839..97ac9668b 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 @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/fabric-data-generation-api-v1/template.accesswidener b/fabric-data-generation-api-v1/template.accesswidener index d1f5442d0..dde92a0dc 100644 --- a/fabric-data-generation-api-v1/template.accesswidener +++ b/fabric-data-generation-api-v1/template.accesswidener @@ -1,9 +1,6 @@ accessible field net/minecraft/data/DataGenerator output Lnet/minecraft/data/DataOutput; mutable field net/minecraft/data/DataGenerator output Lnet/minecraft/data/DataOutput; -accessible field net/minecraft/data/server/recipe/RecipeProvider recipesPathResolver Lnet/minecraft/data/DataOutput$PathResolver; -accessible field net/minecraft/data/server/recipe/RecipeProvider advancementsPathResolver Lnet/minecraft/data/DataOutput$PathResolver; - accessible class net/minecraft/data/server/recipe/RecipeGenerator$RecipeProvider extendable method net/minecraft/data/server/recipe/RecipeGenerator$RecipeProvider run (Lnet/minecraft/data/DataWriter;)Ljava/util/concurrent/CompletableFuture; @@ -52,6 +49,4 @@ transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$B transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$LogTexturePool transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$BuiltinModelPool -transitive-accessible field net/minecraft/data/server/loottable/BlockLootTableGenerator WITH_SHEARS Lnet/minecraft/loot/condition/LootCondition$Builder; - ### Generated access wideners below 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 3834a1142..9bec26f3e 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.dimension", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "DimensionOptionsRegistryHolderMixin", "Schema2832Mixin", diff --git a/fabric-dimensions-v1/src/main/resources/fabric.mod.json b/fabric-dimensions-v1/src/main/resources/fabric.mod.json index 298b69754..c0687be1e 100644 --- a/fabric-dimensions-v1/src/main/resources/fabric.mod.json +++ b/fabric-dimensions-v1/src/main/resources/fabric.mod.json @@ -15,7 +15,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "minecraft": ">=1.16-rc.3", "fabric-api-base": "*" }, diff --git a/fabric-entity-events-v1/src/client/resources/fabric-entity-events-v1.client.mixins.json b/fabric-entity-events-v1/src/client/resources/fabric-entity-events-v1.client.mixins.json index c4866c6e9..f39270ec8 100644 --- a/fabric-entity-events-v1/src/client/resources/fabric-entity-events-v1.client.mixins.json +++ b/fabric-entity-events-v1/src/client/resources/fabric-entity-events-v1.client.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.client.entity.event", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "elytra.ClientPlayerEntityMixin" ], diff --git a/fabric-entity-events-v1/src/main/resources/fabric-entity-events-v1.mixins.json b/fabric-entity-events-v1/src/main/resources/fabric-entity-events-v1.mixins.json index 9299aca2f..76b522c1c 100644 --- a/fabric-entity-events-v1/src/main/resources/fabric-entity-events-v1.mixins.json +++ b/fabric-entity-events-v1/src/main/resources/fabric-entity-events-v1.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.entity.event", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "EntityMixin", "LivingEntityMixin", diff --git a/fabric-entity-events-v1/src/main/resources/fabric.mod.json b/fabric-entity-events-v1/src/main/resources/fabric.mod.json index 56e3e4bc2..104b396fa 100644 --- a/fabric-entity-events-v1/src/main/resources/fabric.mod.json +++ b/fabric-entity-events-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11" + "fabricloader": ">=0.16.2" }, "description": "Events to hook into entities.", "mixins": [ 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 8df589f49..5d4355d59 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.event.interaction.client", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "ClientPlayerInteractionManagerMixin", "KeyBindingAccessor", 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 c4c196277..4309a52c9 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.event.interaction", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "PlayerAdvancementTrackerMixin", "ServerPlayerEntityMixin", 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 38baa8dbd..894328e14 100644 --- a/fabric-events-interaction-v0/src/main/resources/fabric.mod.json +++ b/fabric-events-interaction-v0/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*", "fabric-networking-api-v1": "*", "minecraft": ">=1.15-alpha.19.37.a" diff --git a/fabric-game-rule-api-v1/src/client/resources/fabric-game-rule-api-v1.client.mixins.json b/fabric-game-rule-api-v1/src/client/resources/fabric-game-rule-api-v1.client.mixins.json index 6b8151c74..041421ddc 100644 --- a/fabric-game-rule-api-v1/src/client/resources/fabric-game-rule-api-v1.client.mixins.json +++ b/fabric-game-rule-api-v1/src/client/resources/fabric-game-rule-api-v1.client.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.gamerule.client", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "EditGameRulesScreenAccessor", "EditGameRulesScreenRuleListWidgetMixin", diff --git a/fabric-game-rule-api-v1/src/main/resources/fabric-game-rule-api-v1.mixins.json b/fabric-game-rule-api-v1/src/main/resources/fabric-game-rule-api-v1.mixins.json index 246772bb2..0595252d0 100644 --- a/fabric-game-rule-api-v1/src/main/resources/fabric-game-rule-api-v1.mixins.json +++ b/fabric-game-rule-api-v1/src/main/resources/fabric-game-rule-api-v1.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.gamerule", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "GameRulesBooleanRuleAccessor", "GameRuleCommandAccessor", diff --git a/fabric-game-rule-api-v1/src/main/resources/fabric.mod.json b/fabric-game-rule-api-v1/src/main/resources/fabric.mod.json index 4a80d52ac..8ec677977 100644 --- a/fabric-game-rule-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-game-rule-api-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11" + "fabricloader": ">=0.16.2" }, "description": "Allows registration of custom game rules.", "mixins": [ 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 723e45278..2f52ab6dd 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.gametest", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "ArgumentTypesMixin", "CommandManagerMixin", 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 05517327c..32326fb30 100644 --- a/fabric-gametest-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-gametest-api-v1/src/main/resources/fabric.mod.json @@ -21,7 +21,7 @@ ] }, "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-resource-loader-v0": "*" }, "description": "Allows registration of custom game tests.", 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 9e93814bd..02e9d62d7 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.item.client", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "ClientPlayerInteractionManagerMixin", "HeldItemRendererMixin", 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 845c30509..920ff6492 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.item", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "AbstractFurnaceBlockEntityMixin", "AnvilScreenHandlerMixin", diff --git a/fabric-item-api-v1/src/main/resources/fabric.mod.json b/fabric-item-api-v1/src/main/resources/fabric.mod.json index 57c971e29..592c4a3e3 100644 --- a/fabric-item-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-item-api-v1/src/main/resources/fabric.mod.json @@ -23,7 +23,7 @@ } ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*" }, "description": "Hooks for items", diff --git a/fabric-item-group-api-v1/src/client/resources/fabric-item-group-api-v1.client.mixins.json b/fabric-item-group-api-v1/src/client/resources/fabric-item-group-api-v1.client.mixins.json index 1a157d307..e11d4530d 100644 --- a/fabric-item-group-api-v1/src/client/resources/fabric-item-group-api-v1.client.mixins.json +++ b/fabric-item-group-api-v1/src/client/resources/fabric-item-group-api-v1.client.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.itemgroup.client", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "CreativeInventoryScreenMixin" ], diff --git a/fabric-item-group-api-v1/src/main/resources/fabric-item-group-api-v1.mixins.json b/fabric-item-group-api-v1/src/main/resources/fabric-item-group-api-v1.mixins.json index 7f0ffba3c..84b62384e 100644 --- a/fabric-item-group-api-v1/src/main/resources/fabric-item-group-api-v1.mixins.json +++ b/fabric-item-group-api-v1/src/main/resources/fabric-item-group-api-v1.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.itemgroup", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "ItemGroupAccessor", "ItemGroupMixin", diff --git a/fabric-item-group-api-v1/src/main/resources/fabric.mod.json b/fabric-item-group-api-v1/src/main/resources/fabric.mod.json index d5d92a70c..bb57f7660 100644 --- a/fabric-item-group-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-item-group-api-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*", "fabric-resource-loader-v0": "*" }, diff --git a/fabric-key-binding-api-v1/src/client/resources/fabric-key-binding-api-v1.mixins.json b/fabric-key-binding-api-v1/src/client/resources/fabric-key-binding-api-v1.mixins.json index 84ca7ff9f..0c1e4914b 100644 --- a/fabric-key-binding-api-v1/src/client/resources/fabric-key-binding-api-v1.mixins.json +++ b/fabric-key-binding-api-v1/src/client/resources/fabric-key-binding-api-v1.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.client.keybinding", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "KeyBindingAccessor", "GameOptionsMixin" diff --git a/fabric-key-binding-api-v1/src/client/resources/fabric.mod.json b/fabric-key-binding-api-v1/src/client/resources/fabric.mod.json index 1eb9e5542..7551c8fea 100644 --- a/fabric-key-binding-api-v1/src/client/resources/fabric.mod.json +++ b/fabric-key-binding-api-v1/src/client/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11" + "fabricloader": ">=0.16.2" }, "description": "Key Binding registry API.", "mixins": [ diff --git a/fabric-lifecycle-events-v1/src/client/resources/fabric-lifecycle-events-v1.client.mixins.json b/fabric-lifecycle-events-v1/src/client/resources/fabric-lifecycle-events-v1.client.mixins.json index 7365897ec..2229ca44e 100644 --- a/fabric-lifecycle-events-v1/src/client/resources/fabric-lifecycle-events-v1.client.mixins.json +++ b/fabric-lifecycle-events-v1/src/client/resources/fabric-lifecycle-events-v1.client.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.event.lifecycle.client", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "ClientChunkManagerMixin", "ClientPlayNetworkHandlerMixin", 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 f186b59c2..bd9fd6bc3 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.event.lifecycle", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "ChunkGeneratingMixin", "DataPackContentsMixin", diff --git a/fabric-lifecycle-events-v1/src/main/resources/fabric.mod.json b/fabric-lifecycle-events-v1/src/main/resources/fabric.mod.json index 2d6b32b42..05efecbe4 100644 --- a/fabric-lifecycle-events-v1/src/main/resources/fabric.mod.json +++ b/fabric-lifecycle-events-v1/src/main/resources/fabric.mod.json @@ -31,7 +31,7 @@ } ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*" }, "description": "Events for the game's lifecycle.", diff --git a/fabric-loot-api-v3/src/main/resources/fabric-loot-api-v3.mixins.json b/fabric-loot-api-v3/src/main/resources/fabric-loot-api-v3.mixins.json index e9f4864cb..a26e1b321 100644 --- a/fabric-loot-api-v3/src/main/resources/fabric-loot-api-v3.mixins.json +++ b/fabric-loot-api-v3/src/main/resources/fabric-loot-api-v3.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.loot", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "JsonDataLoaderMixin", "ReloadableRegistriesMixin", diff --git a/fabric-loot-api-v3/src/main/resources/fabric.mod.json b/fabric-loot-api-v3/src/main/resources/fabric.mod.json index d7cb6d194..9d775be6c 100644 --- a/fabric-loot-api-v3/src/main/resources/fabric.mod.json +++ b/fabric-loot-api-v3/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*", "fabric-resource-loader-v0": "*" }, diff --git a/fabric-message-api-v1/src/client/resources/fabric-message-api-v1.client.mixins.json b/fabric-message-api-v1/src/client/resources/fabric-message-api-v1.client.mixins.json index 00088d171..59129af0c 100644 --- a/fabric-message-api-v1/src/client/resources/fabric-message-api-v1.client.mixins.json +++ b/fabric-message-api-v1/src/client/resources/fabric-message-api-v1.client.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.client.message", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "ClientPlayNetworkHandlerMixin", "MessageHandlerMixin" diff --git a/fabric-message-api-v1/src/main/resources/fabric-message-api-v1.mixins.json b/fabric-message-api-v1/src/main/resources/fabric-message-api-v1.mixins.json index ee23a39ad..8e1ca659e 100644 --- a/fabric-message-api-v1/src/main/resources/fabric-message-api-v1.mixins.json +++ b/fabric-message-api-v1/src/main/resources/fabric-message-api-v1.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.message", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "MinecraftServerMixin", "PlayerManagerMixin" diff --git a/fabric-message-api-v1/src/main/resources/fabric.mod.json b/fabric-message-api-v1/src/main/resources/fabric.mod.json index 064c93b98..81baf3836 100644 --- a/fabric-message-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-message-api-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*" }, "description": "Adds message-related hooks.", 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 e59c298da..8da1ac215 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.client.model.loading", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "BakedModelManagerMixin", "BlockStatesLoaderMixin", diff --git a/fabric-model-loading-api-v1/src/client/resources/fabric.mod.json b/fabric-model-loading-api-v1/src/client/resources/fabric.mod.json index 01169141c..d5a360a20 100644 --- a/fabric-model-loading-api-v1/src/client/resources/fabric.mod.json +++ b/fabric-model-loading-api-v1/src/client/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*" }, "description": "Provides hooks for model loading.", 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 114fd6087..8d4a9a137 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.networking.client", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "accessor.ClientCommonNetworkHandlerAccessor", "accessor.ClientConfigurationNetworkHandlerAccessor", 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 4ec0e45e8..c700e4cd7 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.networking", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "PacketCodecDispatcherMixin", "ClientConnectionMixin", 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 e3753b1a4..f9fb84c57 100644 --- a/fabric-networking-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-networking-api-v1/src/main/resources/fabric.mod.json @@ -26,7 +26,7 @@ }, "accessWidener": "fabric-networking-api-v1.accesswidener", "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*" }, "description": "Low-level, vanilla protocol oriented networking hooks.", 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 14d6a5f1a..fbc7aabea 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.object.builder.client", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "EntityModelLayersMixin", "HangingSignEditScreenMixin", diff --git a/fabric-object-builder-api-v1/src/main/resources/fabric-object-builder-v1.mixins.json b/fabric-object-builder-api-v1/src/main/resources/fabric-object-builder-v1.mixins.json index 5df1250cc..7664e138b 100644 --- a/fabric-object-builder-api-v1/src/main/resources/fabric-object-builder-v1.mixins.json +++ b/fabric-object-builder-api-v1/src/main/resources/fabric-object-builder-v1.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.object.builder", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "AbstractBlockAccessor", "AbstractBlockSettingsAccessor", diff --git a/fabric-object-builder-api-v1/src/main/resources/fabric.mod.json b/fabric-object-builder-api-v1/src/main/resources/fabric.mod.json index 31ee33820..ba3a128e4 100644 --- a/fabric-object-builder-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-object-builder-api-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*" }, "description": "Builders for objects vanilla has locked down.", diff --git a/fabric-particles-v1/src/client/resources/fabric-particles-v1.client.mixins.json b/fabric-particles-v1/src/client/resources/fabric-particles-v1.client.mixins.json index 24b0acf88..98cd3e526 100644 --- a/fabric-particles-v1/src/client/resources/fabric-particles-v1.client.mixins.json +++ b/fabric-particles-v1/src/client/resources/fabric-particles-v1.client.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.client.particle", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "BlockDustParticleMixin", "ParticleManagerMixin", diff --git a/fabric-particles-v1/src/main/resources/fabric.mod.json b/fabric-particles-v1/src/main/resources/fabric.mod.json index fe85771ff..919b10cd4 100644 --- a/fabric-particles-v1/src/main/resources/fabric.mod.json +++ b/fabric-particles-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11" + "fabricloader": ">=0.16.2" }, "description": "Hooks for registering custom particles.", "mixins": [ 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 5b7bd4030..ab54cf5e9 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.recipe", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "ingredient.IngredientMixin", "ingredient.EncoderHandlerMixin", 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 07ae00369..d723972d3 100644 --- a/fabric-recipe-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-recipe-api-v1/src/main/resources/fabric.mod.json @@ -20,7 +20,7 @@ ], "accessWidener": "fabric-recipe-api-v1.accesswidener", "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-networking-api-v1": "*" }, "entrypoints": { 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 index b3bc30e83..eb599ba36 100644 --- 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.registry.sync.client", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "BlockColorsMixin", "ClientRegistriesMixin", 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 42b08f0cc..95fefd75e 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.registry.sync", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "BootstrapMixin", "ChunkSerializerMixin", 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 e2a8e3053..b05a6c7e0 100644 --- a/fabric-registry-sync-v0/src/main/resources/fabric.mod.json +++ b/fabric-registry-sync-v0/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*", "fabric-networking-api-v1": "*" }, diff --git a/fabric-registry-sync-v0/src/testmod/resources/fabric-registry-sync-v0-testmod.mixins.json b/fabric-registry-sync-v0/src/testmod/resources/fabric-registry-sync-v0-testmod.mixins.json index 224148e02..56177d3d5 100644 --- a/fabric-registry-sync-v0/src/testmod/resources/fabric-registry-sync-v0-testmod.mixins.json +++ b/fabric-registry-sync-v0/src/testmod/resources/fabric-registry-sync-v0-testmod.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.test.registry.sync.mixin", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "PacketCodecsMixin" ], diff --git a/fabric-renderer-api-v1/src/client/resources/fabric-renderer-api-v1.debughud.mixins.json b/fabric-renderer-api-v1/src/client/resources/fabric-renderer-api-v1.debughud.mixins.json index 038461e75..a4ddec940 100644 --- a/fabric-renderer-api-v1/src/client/resources/fabric-renderer-api-v1.debughud.mixins.json +++ b/fabric-renderer-api-v1/src/client/resources/fabric-renderer-api-v1.debughud.mixins.json @@ -1,7 +1,7 @@ { "required": false, "package": "net.fabricmc.fabric.mixin.renderer.client.debughud", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "DebugHudMixin" ], diff --git a/fabric-renderer-api-v1/src/client/resources/fabric.mod.json b/fabric-renderer-api-v1/src/client/resources/fabric.mod.json index 7b1f0db72..f360c2f17 100644 --- a/fabric-renderer-api-v1/src/client/resources/fabric.mod.json +++ b/fabric-renderer-api-v1/src/client/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "minecraft": ">=1.15-alpha.19.39.a", "fabric-api-base": "*" }, diff --git a/fabric-renderer-indigo/src/client/resources/fabric.mod.json b/fabric-renderer-indigo/src/client/resources/fabric.mod.json index ea9e5f1a4..be37a6e18 100644 --- a/fabric-renderer-indigo/src/client/resources/fabric.mod.json +++ b/fabric-renderer-indigo/src/client/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "minecraft": ">=1.15-alpha.19.39.a", "fabric-api-base": "*", "fabric-renderer-api-v1": "*" diff --git a/fabric-rendering-fluids-v1/src/client/resources/fabric-rendering-fluids-v1.mixins.json b/fabric-rendering-fluids-v1/src/client/resources/fabric-rendering-fluids-v1.mixins.json index c5ec419ca..76178371d 100644 --- a/fabric-rendering-fluids-v1/src/client/resources/fabric-rendering-fluids-v1.mixins.json +++ b/fabric-rendering-fluids-v1/src/client/resources/fabric-rendering-fluids-v1.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.client.rendering.fluid", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "FluidRendererMixin" ], diff --git a/fabric-rendering-fluids-v1/src/main/resources/fabric.mod.json b/fabric-rendering-fluids-v1/src/main/resources/fabric.mod.json index 33b4d8ab0..8f0b85964 100644 --- a/fabric-rendering-fluids-v1/src/main/resources/fabric.mod.json +++ b/fabric-rendering-fluids-v1/src/main/resources/fabric.mod.json @@ -15,7 +15,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*" }, "description": "Hooks for registering fluid renders.", 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 0ec5218d1..304e9be0b 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.client.rendering", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "ArmorFeatureRendererMixin", "AtlasSourceManagerAccessor", diff --git a/fabric-rendering-v1/src/client/resources/fabric.mod.json b/fabric-rendering-v1/src/client/resources/fabric.mod.json index d3224ffb9..b8e62fffa 100644 --- a/fabric-rendering-v1/src/client/resources/fabric.mod.json +++ b/fabric-rendering-v1/src/client/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*" }, "description": "Hooks and registries for rendering-related things.", diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceCondition.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceCondition.java index abf145853..32f6b5ea9 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceCondition.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceCondition.java @@ -19,12 +19,9 @@ package net.fabricmc.fabric.api.resource.conditions.v1; import java.util.List; import com.mojang.serialization.Codec; - -import net.minecraft.registry.RegistryOps; - import org.jetbrains.annotations.Nullable; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryOps; /** * A resource condition. To create a custom condition type, implement this interface, 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 1b90d3413..2e1a090dc 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 @@ -27,11 +27,6 @@ import java.util.stream.Collectors; import com.google.gson.JsonObject; import com.mojang.serialization.DataResult; import com.mojang.serialization.JsonOps; - -import net.minecraft.registry.RegistryEntryLookup; -import net.minecraft.registry.RegistryOps; -import net.minecraft.registry.entry.RegistryEntryInfo; - import org.apache.commons.lang3.mutable.MutableBoolean; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -39,7 +34,7 @@ import org.slf4j.LoggerFactory; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryOps; import net.minecraft.registry.tag.TagKey; import net.minecraft.resource.featuretoggle.FeatureFlags; import net.minecraft.resource.featuretoggle.FeatureSet; diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/AllModsLoadedResourceCondition.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/AllModsLoadedResourceCondition.java index e92f616ec..e617738c7 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/AllModsLoadedResourceCondition.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/AllModsLoadedResourceCondition.java @@ -21,12 +21,9 @@ import java.util.List; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; - -import net.minecraft.registry.RegistryOps; - import org.jetbrains.annotations.Nullable; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryOps; import net.fabricmc.fabric.api.resource.conditions.v1.ResourceCondition; import net.fabricmc.fabric.api.resource.conditions.v1.ResourceConditionType; diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/AndResourceCondition.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/AndResourceCondition.java index ca66cf2d0..722a00c5e 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/AndResourceCondition.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/AndResourceCondition.java @@ -20,12 +20,9 @@ import java.util.List; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; - -import net.minecraft.registry.RegistryOps; - import org.jetbrains.annotations.Nullable; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryOps; import net.fabricmc.fabric.api.resource.conditions.v1.ResourceCondition; import net.fabricmc.fabric.api.resource.conditions.v1.ResourceConditionType; diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/AnyModsLoadedResourceCondition.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/AnyModsLoadedResourceCondition.java index 1cc77e8a7..4139a4af8 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/AnyModsLoadedResourceCondition.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/AnyModsLoadedResourceCondition.java @@ -21,12 +21,9 @@ import java.util.List; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; - -import net.minecraft.registry.RegistryOps; - import org.jetbrains.annotations.Nullable; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryOps; import net.fabricmc.fabric.api.resource.conditions.v1.ResourceCondition; import net.fabricmc.fabric.api.resource.conditions.v1.ResourceConditionType; diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/FeaturesEnabledResourceCondition.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/FeaturesEnabledResourceCondition.java index 5be6d2e7b..4e3613d56 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/FeaturesEnabledResourceCondition.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/FeaturesEnabledResourceCondition.java @@ -21,12 +21,9 @@ import java.util.List; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; - -import net.minecraft.registry.RegistryOps; - import org.jetbrains.annotations.Nullable; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryOps; import net.minecraft.resource.featuretoggle.FeatureFlag; import net.minecraft.resource.featuretoggle.FeatureFlags; import net.minecraft.util.Identifier; diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/NotResourceCondition.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/NotResourceCondition.java index 2ce36747b..44ce14d09 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/NotResourceCondition.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/NotResourceCondition.java @@ -18,12 +18,9 @@ package net.fabricmc.fabric.impl.resource.conditions.conditions; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; - -import net.minecraft.registry.RegistryOps; - import org.jetbrains.annotations.Nullable; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryOps; import net.fabricmc.fabric.api.resource.conditions.v1.ResourceCondition; import net.fabricmc.fabric.api.resource.conditions.v1.ResourceConditionType; diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/OrResourceCondition.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/OrResourceCondition.java index 591c8f088..6d6eb7236 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/OrResourceCondition.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/OrResourceCondition.java @@ -20,12 +20,9 @@ import java.util.List; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; - -import net.minecraft.registry.RegistryOps; - import org.jetbrains.annotations.Nullable; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryOps; import net.fabricmc.fabric.api.resource.conditions.v1.ResourceCondition; import net.fabricmc.fabric.api.resource.conditions.v1.ResourceConditionType; diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/RegistryContainsResourceCondition.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/RegistryContainsResourceCondition.java index 99ac59f70..cd7d374bc 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/RegistryContainsResourceCondition.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/RegistryContainsResourceCondition.java @@ -21,14 +21,11 @@ import java.util.List; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; - -import net.minecraft.registry.RegistryOps; - import org.jetbrains.annotations.Nullable; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryOps; import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.resource.conditions.v1.ResourceCondition; diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/TagsPopulatedResourceCondition.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/TagsPopulatedResourceCondition.java index b12ad4f5a..6205fbc1a 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/TagsPopulatedResourceCondition.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/TagsPopulatedResourceCondition.java @@ -21,13 +21,10 @@ import java.util.List; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; - -import net.minecraft.registry.RegistryOps; - import org.jetbrains.annotations.Nullable; import net.minecraft.registry.RegistryKeys; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryOps; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/TrueResourceCondition.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/TrueResourceCondition.java index 45c5f18cf..22490c8ed 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/TrueResourceCondition.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/conditions/TrueResourceCondition.java @@ -17,12 +17,9 @@ package net.fabricmc.fabric.impl.resource.conditions.conditions; import com.mojang.serialization.MapCodec; - -import net.minecraft.registry.RegistryOps; - import org.jetbrains.annotations.Nullable; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryOps; import net.fabricmc.fabric.api.resource.conditions.v1.ResourceCondition; import net.fabricmc.fabric.api.resource.conditions.v1.ResourceConditionType; diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/JsonDataLoaderMixin.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/JsonDataLoaderMixin.java index 9e809f110..62560ceff 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/JsonDataLoaderMixin.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/JsonDataLoaderMixin.java @@ -21,15 +21,12 @@ import java.util.Map; import com.google.gson.JsonElement; import com.google.gson.JsonObject; - -import net.minecraft.registry.RegistryOps; - import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryOps; import net.minecraft.resource.JsonDataLoader; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/ServerAdvancementLoaderMixin.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/ServerAdvancementLoaderMixin.java index 5b13390f4..c0b75f83a 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/ServerAdvancementLoaderMixin.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/ServerAdvancementLoaderMixin.java @@ -16,13 +16,12 @@ package net.fabricmc.fabric.mixin.resource.conditions; -import net.minecraft.registry.RegistryOps; - import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; +import net.minecraft.registry.RegistryOps; import net.minecraft.registry.RegistryWrapper; import net.minecraft.server.ServerAdvancementLoader; diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/SinglePreparationResourceReloaderMixin.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/SinglePreparationResourceReloaderMixin.java index a95fbf3a3..4b8152955 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/SinglePreparationResourceReloaderMixin.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/SinglePreparationResourceReloaderMixin.java @@ -16,15 +16,13 @@ package net.fabricmc.fabric.mixin.resource.conditions; -import net.minecraft.registry.RegistryOps; - 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.callback.CallbackInfo; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryOps; import net.minecraft.resource.ResourceManager; import net.minecraft.resource.SinglePreparationResourceReloader; import net.minecraft.util.profiler.Profiler; diff --git a/fabric-resource-conditions-api-v1/src/main/resources/fabric-resource-conditions-api-v1.accesswidener b/fabric-resource-conditions-api-v1/src/main/resources/fabric-resource-conditions-api-v1.accesswidener index abbb50e08..1b6fa6d92 100644 --- a/fabric-resource-conditions-api-v1/src/main/resources/fabric-resource-conditions-api-v1.accesswidener +++ b/fabric-resource-conditions-api-v1/src/main/resources/fabric-resource-conditions-api-v1.accesswidener @@ -1,4 +1,3 @@ accessWidener v2 named -accessible class net/minecraft/registry/ReloadableRegistries$ReloadableWrapperLookup accessible class net/minecraft/registry/RegistryOps$CachedRegistryInfoGetter 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 290c89075..87948f4ad 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.resource.conditions", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "DataPackContentsMixin", "DataProviderMixin", diff --git a/fabric-resource-conditions-api-v1/src/main/resources/fabric.mod.json b/fabric-resource-conditions-api-v1/src/main/resources/fabric.mod.json index 8214e7048..ba02919c9 100644 --- a/fabric-resource-conditions-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-resource-conditions-api-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11" + "fabricloader": ">=0.16.2" }, "description": "Allows conditionally loading resources.", "entrypoints": { diff --git a/fabric-resource-conditions-api-v1/src/testmod/java/net/fabricmc/fabric/test/resource/conditions/ConditionalResourcesTest.java b/fabric-resource-conditions-api-v1/src/testmod/java/net/fabricmc/fabric/test/resource/conditions/ConditionalResourcesTest.java index 71f8992b6..9ffcbe2cb 100644 --- a/fabric-resource-conditions-api-v1/src/testmod/java/net/fabricmc/fabric/test/resource/conditions/ConditionalResourcesTest.java +++ b/fabric-resource-conditions-api-v1/src/testmod/java/net/fabricmc/fabric/test/resource/conditions/ConditionalResourcesTest.java @@ -19,8 +19,8 @@ package net.fabricmc.fabric.test.resource.conditions; import net.minecraft.block.entity.BannerPattern; import net.minecraft.loot.LootTable; import net.minecraft.recipe.RecipeManager; -import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryEntryLookup; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.ReloadableRegistries; @@ -80,13 +80,13 @@ public class ConditionalResourcesTest { // Predicates are internally handled as a kind of loot data, // hence the yarn name "loot condition". - DynamicRegistryManager registries = context.getWorld().getServer().getRegistryManager(); + RegistryEntryLookup.RegistryLookup registries = context.getWorld().getServer().getReloadableRegistries().createRegistryLookup(); - if (!registries.get(RegistryKeys.PREDICATE).containsId(id("loaded"))) { + if (registries.getOptionalEntry(RegistryKeys.PREDICATE, RegistryKey.of(RegistryKeys.PREDICATE, id("loaded"))).isEmpty()) { throw new AssertionError("loaded predicate should have been loaded."); } - if (registries.get(RegistryKeys.PREDICATE).containsId(id("not_loaded"))) { + if (registries.getOptionalEntry(RegistryKeys.PREDICATE, RegistryKey.of(RegistryKeys.PREDICATE, id("not_loaded"))).isPresent()) { throw new AssertionError("not_loaded predicate should not have been loaded."); } @@ -125,13 +125,13 @@ public class ConditionalResourcesTest { @GameTest(templateName = FabricGameTest.EMPTY_STRUCTURE) public void conditionalOverlays(TestContext context) { - DynamicRegistryManager registries = context.getWorld().getServer().getRegistryManager(); + RegistryEntryLookup.RegistryLookup registries = context.getWorld().getServer().getReloadableRegistries().createRegistryLookup(); - if (!registries.get(RegistryKeys.PREDICATE).containsId(id("do_overlay"))) { + if (registries.getOptionalEntry(RegistryKeys.PREDICATE, RegistryKey.of(RegistryKeys.PREDICATE, id("do_overlay"))).isEmpty()) { throw new AssertionError("do_overlay predicate should have been overlayed."); } - if (registries.get(RegistryKeys.PREDICATE).containsId(id("dont_overlay"))) { + if (registries.getOptionalEntry(RegistryKeys.PREDICATE, RegistryKey.of(RegistryKeys.PREDICATE, id("dont_overlay"))).isPresent()) { throw new AssertionError("dont_overlay predicate should not have been overlayed."); } diff --git a/fabric-resource-loader-v0/src/client/resources/fabric-resource-loader-v0.client.mixins.json b/fabric-resource-loader-v0/src/client/resources/fabric-resource-loader-v0.client.mixins.json index 7a91d9fb1..f6d3846f4 100644 --- a/fabric-resource-loader-v0/src/client/resources/fabric-resource-loader-v0.client.mixins.json +++ b/fabric-resource-loader-v0/src/client/resources/fabric-resource-loader-v0.client.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.resource.loader.client", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "CreateWorldScreenMixin", "FontManagerMixin", diff --git a/fabric-resource-loader-v0/src/main/resources/fabric-resource-loader-v0.mixins.json b/fabric-resource-loader-v0/src/main/resources/fabric-resource-loader-v0.mixins.json index 04c6747b7..f1117e5bf 100644 --- a/fabric-resource-loader-v0/src/main/resources/fabric-resource-loader-v0.mixins.json +++ b/fabric-resource-loader-v0/src/main/resources/fabric-resource-loader-v0.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.resource.loader", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "DatapackCommandMixin", "KeyedResourceReloadListenerMixin", diff --git a/fabric-resource-loader-v0/src/main/resources/fabric.mod.json b/fabric-resource-loader-v0/src/main/resources/fabric.mod.json index 68eb8e52d..97bb998e3 100644 --- a/fabric-resource-loader-v0/src/main/resources/fabric.mod.json +++ b/fabric-resource-loader-v0/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11" + "fabricloader": ">=0.16.2" }, "description": "Asset and data resource loading.", "mixins": [ diff --git a/fabric-resource-loader-v0/src/testmod/resources/fabric-resource-loader-v0-testmod.mixins.json b/fabric-resource-loader-v0/src/testmod/resources/fabric-resource-loader-v0-testmod.mixins.json index 73e4f1c42..ad86e3499 100644 --- a/fabric-resource-loader-v0/src/testmod/resources/fabric-resource-loader-v0-testmod.mixins.json +++ b/fabric-resource-loader-v0/src/testmod/resources/fabric-resource-loader-v0-testmod.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.test.mixin.resource.loader", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "SynchronizeRegistriesTaskMixin" ], 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 54504d406..32f6ef081 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.screen", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "GameRendererMixin", "HandledScreenMixin", diff --git a/fabric-screen-api-v1/src/client/resources/fabric.mod.json b/fabric-screen-api-v1/src/client/resources/fabric.mod.json index 11a842856..704058546 100644 --- a/fabric-screen-api-v1/src/client/resources/fabric.mod.json +++ b/fabric-screen-api-v1/src/client/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*" }, "description": "Adds screen related hooks.", diff --git a/fabric-screen-handler-api-v1/src/main/resources/fabric-screen-handler-api-v1.mixins.json b/fabric-screen-handler-api-v1/src/main/resources/fabric-screen-handler-api-v1.mixins.json index 15ddbba8f..f37dc0d63 100644 --- a/fabric-screen-handler-api-v1/src/main/resources/fabric-screen-handler-api-v1.mixins.json +++ b/fabric-screen-handler-api-v1/src/main/resources/fabric-screen-handler-api-v1.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.screenhandler", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "NamedScreenHandlerFactoryMixin", "ServerPlayerEntityMixin" diff --git a/fabric-screen-handler-api-v1/src/main/resources/fabric.mod.json b/fabric-screen-handler-api-v1/src/main/resources/fabric.mod.json index 0d1a8d320..1a326739b 100644 --- a/fabric-screen-handler-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-screen-handler-api-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-base": "*", "fabric-networking-api-v1": "*" }, 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 4a88b5a5e..2a8776672 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.client.sound", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "SoundInstanceMixin", "SoundSystemMixin" diff --git a/fabric-sound-api-v1/src/client/resources/fabric.mod.json b/fabric-sound-api-v1/src/client/resources/fabric.mod.json index ca0d13a73..39c681509 100644 --- a/fabric-sound-api-v1/src/client/resources/fabric.mod.json +++ b/fabric-sound-api-v1/src/client/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "minecraft": ">=1.19.2" }, "description": "Hooks for modifying Minecraft's sound system.", 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 4952c8429..2ab99dd8a 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 @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.mixin.transfer", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "AbstractFurnaceBlockEntityMixin", "BucketItemAccessor", diff --git a/fabric-transfer-api-v1/src/main/resources/fabric.mod.json b/fabric-transfer-api-v1/src/main/resources/fabric.mod.json index 0370b2cfd..79bace873 100644 --- a/fabric-transfer-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-transfer-api-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "fabric-api-lookup-api-v1": "*", "fabric-rendering-fluids-v1": "*" }, diff --git a/fabric-transfer-api-v1/src/testmod/resources/fabric-transfer-api-v1-testmod.mixins.json b/fabric-transfer-api-v1/src/testmod/resources/fabric-transfer-api-v1-testmod.mixins.json index 838420653..3b6df30d7 100644 --- a/fabric-transfer-api-v1/src/testmod/resources/fabric-transfer-api-v1-testmod.mixins.json +++ b/fabric-transfer-api-v1/src/testmod/resources/fabric-transfer-api-v1-testmod.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "net.fabricmc.fabric.test.transfer.mixin", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "AbstractFurnaceBlockEntityAccessor" ] diff --git a/fabric-transitive-access-wideners-v1/src/main/resources/fabric.mod.json b/fabric-transitive-access-wideners-v1/src/main/resources/fabric.mod.json index ed9fc503d..75aa37a95 100644 --- a/fabric-transitive-access-wideners-v1/src/main/resources/fabric.mod.json +++ b/fabric-transitive-access-wideners-v1/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11" + "fabricloader": ">=0.16.2" }, "description": "Contains transitive access wideners that provide access to otherwise inaccessible Minecraft code.", "accessWidener": "fabric-transitive-access-wideners-v1.accesswidener", diff --git a/gradle.properties b/gradle.properties index c25bd6b95..2f084de0b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.16.2 installer_version=1.0.1 prerelease=true -curseforge_minecraft_version=1.21.1 +curseforge_minecraft_version=1.21.2-Snapshot # Do not manually update, use the bumpversions task: fabric-api-base-version=0.4.42 diff --git a/gradle/javadoc.accesswidener b/gradle/javadoc.accesswidener new file mode 100644 index 000000000..dbb9408ba --- /dev/null +++ b/gradle/javadoc.accesswidener @@ -0,0 +1,5 @@ +accessWidener v2 named +# Place access wideners that are required during javadoc generation here + +accessible class net/minecraft/data/server/recipe/RecipeGenerator$RecipeProvider +accessible class net/minecraft/item/ItemGroup$StackVisibility diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 19c733429..73cba974f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -19,7 +19,7 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.2", "java": ">=21", "minecraft": ">=1.21.2- <1.21.3-" },