From ba05af6caa7c8b1473a11440f041c4927b6025f2 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 1 Oct 2023 14:07:41 +0100 Subject: [PATCH 1/2] Make some experimental APIs stable. --- .../net/fabricmc/fabric/api/biome/v1/BiomeModification.java | 2 -- .../fabricmc/fabric/api/biome/v1/BiomeModificationContext.java | 2 -- .../net/fabricmc/fabric/api/biome/v1/BiomeModifications.java | 2 -- .../java/net/fabricmc/fabric/api/biome/v1/BiomeSelectors.java | 2 -- .../net/fabricmc/fabric/api/biome/v1/ModificationPhase.java | 2 -- .../java/net/fabricmc/fabric/api/biome/v1/NetherBiomes.java | 2 -- .../java/net/fabricmc/fabric/api/biome/v1/TheEndBiomes.java | 3 --- fabric-biome-api-v1/src/main/resources/fabric.mod.json | 2 +- .../api/datagen/v1/provider/FabricDynamicRegistryProvider.java | 1 - .../fabric/api/itemgroup/v1/FabricItemGroupEntries.java | 1 - fabric-message-api-v1/src/main/resources/fabric.mod.json | 2 +- .../networking/v1/ClientConfigurationConnectionEvents.java | 1 - .../client/networking/v1/ClientConfigurationNetworking.java | 1 - .../api/networking/v1/ServerConfigurationConnectionEvents.java | 1 - .../api/networking/v1/ServerConfigurationNetworking.java | 1 - .../src/main/resources/fabric.mod.json | 2 +- 16 files changed, 3 insertions(+), 24 deletions(-) diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeModification.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeModification.java index 88a95b71c1..846f2dbc09 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeModification.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeModification.java @@ -30,8 +30,6 @@ * Provides methods for modifying biomes. To create an instance, call * {@link BiomeModifications#create(Identifier)}. * - *

Experimental feature, may be removed or changed without further notice. - * * @see BiomeModifications */ public class BiomeModification { diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeModificationContext.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeModificationContext.java index 3d772c98d7..34cdde5c08 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeModificationContext.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeModificationContext.java @@ -40,8 +40,6 @@ /** * Allows {@link Biome} properties to be modified. - * - *

Experimental feature, may be removed or changed without further notice. */ public interface BiomeModificationContext { /** diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeModifications.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeModifications.java index bf13746d71..fd0e243d33 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeModifications.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeModifications.java @@ -34,8 +34,6 @@ * Provides an API to modify Biomes after they have been loaded and before they are used in the World. * *

Any modifications made to biomes will not be available for use in the demo level. - * - *

Experimental feature, may be removed or changed without further notice. */ public final class BiomeModifications { private BiomeModifications() { diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeSelectors.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeSelectors.java index b8b92c1aea..6da5235af7 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeSelectors.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeSelectors.java @@ -34,8 +34,6 @@ /** * Provides several convenient biome selectors that can be used with {@link BiomeModifications}. - * - *

Experimental feature, may be removed or changed without further notice. */ public final class BiomeSelectors { private BiomeSelectors() { diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/ModificationPhase.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/ModificationPhase.java index 1f4d3ae1a7..9e227f1380 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/ModificationPhase.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/ModificationPhase.java @@ -27,8 +27,6 @@ *

  • Replacements (removal + add) in biomes
    • *
  • Generic post-processing of biomes
    • * - * - *

    Experimental feature, may be removed or changed without further notice. */ public enum ModificationPhase { /** diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/NetherBiomes.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/NetherBiomes.java index d76c7cf3bb..b5fabc239c 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/NetherBiomes.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/NetherBiomes.java @@ -24,8 +24,6 @@ /** * API that exposes the internals of Minecraft's nether biome code. - * - *

    Experimental feature, may be removed or changed without further notice. */ public final class NetherBiomes { private NetherBiomes() { diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/TheEndBiomes.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/TheEndBiomes.java index d020a9a745..8a69dfdf6e 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/TheEndBiomes.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/TheEndBiomes.java @@ -25,9 +25,6 @@ /** * API that exposes some internals of the minecraft default biome source for The End. * - *

    Experimental feature, may be removed or changed without further notice. - * Because of the volatility of world generation in Minecraft 1.16, this API is marked experimental - * since it is likely to change in future Minecraft versions. */ public final class TheEndBiomes { private TheEndBiomes() { 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 21c70d68f8..d73bb37296 100644 --- a/fabric-biome-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-biome-api-v1/src/main/resources/fabric.mod.json @@ -25,6 +25,6 @@ ], "accessWidener" : "fabric-biome-api-v1.accesswidener", "custom": { - "fabric-api:module-lifecycle": "experimental" + "fabric-api:module-lifecycle": "stable" } } diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricDynamicRegistryProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricDynamicRegistryProvider.java index 667f114e18..0be6cc8287 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricDynamicRegistryProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricDynamicRegistryProvider.java @@ -58,7 +58,6 @@ * A provider to help with data-generation of dynamic registry objects, * such as biomes, features, or message types. */ -@ApiStatus.Experimental public abstract class FabricDynamicRegistryProvider implements DataProvider { private static final Logger LOGGER = LoggerFactory.getLogger(FabricDynamicRegistryProvider.class); diff --git a/fabric-item-group-api-v1/src/main/java/net/fabricmc/fabric/api/itemgroup/v1/FabricItemGroupEntries.java b/fabric-item-group-api-v1/src/main/java/net/fabricmc/fabric/api/itemgroup/v1/FabricItemGroupEntries.java index 2823fafcfd..f43082aeec 100644 --- a/fabric-item-group-api-v1/src/main/java/net/fabricmc/fabric/api/itemgroup/v1/FabricItemGroupEntries.java +++ b/fabric-item-group-api-v1/src/main/java/net/fabricmc/fabric/api/itemgroup/v1/FabricItemGroupEntries.java @@ -32,7 +32,6 @@ /** * This class allows the entries of {@linkplain ItemGroup item groups} to be modified by the events in {@link ItemGroupEvents}. */ -@ApiStatus.Experimental public class FabricItemGroupEntries implements ItemGroup.Entries { private final ItemGroup.DisplayContext context; private final List displayStacks; 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 7a0e078cb9..546a20b66e 100644 --- a/fabric-message-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-message-api-v1/src/main/resources/fabric.mod.json @@ -28,6 +28,6 @@ } ], "custom": { - "fabric-api:module-lifecycle": "experimental" + "fabric-api:module-lifecycle": "stable" } } diff --git a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationConnectionEvents.java b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationConnectionEvents.java index 680dd34267..ef16a884d7 100644 --- a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationConnectionEvents.java +++ b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationConnectionEvents.java @@ -28,7 +28,6 @@ /** * Offers access to events related to the configuration connection to a server on a logical client. */ -@ApiStatus.Experimental public final class ClientConfigurationConnectionEvents { /** * Event indicating a connection entering the CONFIGURATION state, ready for registering channel handlers. diff --git a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationNetworking.java b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationNetworking.java index a6e4fe0d25..527c9eedf0 100644 --- a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationNetworking.java +++ b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationNetworking.java @@ -51,7 +51,6 @@ * * @see ServerConfigurationNetworking */ -@ApiStatus.Experimental public final class ClientConfigurationNetworking { /** * Registers a handler to a channel. diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerConfigurationConnectionEvents.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerConfigurationConnectionEvents.java index 294741f88d..d270eeeee7 100644 --- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerConfigurationConnectionEvents.java +++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerConfigurationConnectionEvents.java @@ -27,7 +27,6 @@ /** * Offers access to events related to the connection to a client on a logical server while a client is configuring. */ -@ApiStatus.Experimental public final class ServerConfigurationConnectionEvents { /** * Event fired before any vanilla configuration has taken place. diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerConfigurationNetworking.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerConfigurationNetworking.java index 9e98197347..af06072c13 100644 --- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerConfigurationNetworking.java +++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerConfigurationNetworking.java @@ -48,7 +48,6 @@ * @see ServerLoginNetworking * @see ServerConfigurationNetworking */ -@ApiStatus.Experimental public final class ServerConfigurationNetworking { /** * Registers a handler to a channel. 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 f6ffdfb8e3..17da02e358 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 @@ -23,6 +23,6 @@ "fabric-resource-conditions-api-v1.mixins.json" ], "custom": { - "fabric-api:module-lifecycle": "experimental" + "fabric-api:module-lifecycle": "stable" } } From 4b7429f55dcc24413b38593f8379bb411a94134b Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 1 Oct 2023 14:13:15 +0100 Subject: [PATCH 2/2] Imports. --- .../networking/v1/ClientConfigurationConnectionEvents.java | 2 -- .../api/client/networking/v1/ClientConfigurationNetworking.java | 1 - .../api/networking/v1/ServerConfigurationConnectionEvents.java | 2 -- .../fabric/api/networking/v1/ServerConfigurationNetworking.java | 1 - 4 files changed, 6 deletions(-) diff --git a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationConnectionEvents.java b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationConnectionEvents.java index ef16a884d7..42eb7abc10 100644 --- a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationConnectionEvents.java +++ b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationConnectionEvents.java @@ -16,8 +16,6 @@ package net.fabricmc.fabric.api.client.networking.v1; -import org.jetbrains.annotations.ApiStatus; - import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientConfigurationNetworkHandler; import net.minecraft.util.Identifier; diff --git a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationNetworking.java b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationNetworking.java index 527c9eedf0..455771367e 100644 --- a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationNetworking.java +++ b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/api/client/networking/v1/ClientConfigurationNetworking.java @@ -19,7 +19,6 @@ import java.util.Objects; import java.util.Set; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import net.minecraft.client.MinecraftClient; diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerConfigurationConnectionEvents.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerConfigurationConnectionEvents.java index d270eeeee7..3a1452f99d 100644 --- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerConfigurationConnectionEvents.java +++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerConfigurationConnectionEvents.java @@ -16,8 +16,6 @@ package net.fabricmc.fabric.api.networking.v1; -import org.jetbrains.annotations.ApiStatus; - import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerConfigurationNetworkHandler; diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerConfigurationNetworking.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerConfigurationNetworking.java index af06072c13..2261d5817c 100644 --- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerConfigurationNetworking.java +++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/ServerConfigurationNetworking.java @@ -19,7 +19,6 @@ import java.util.Objects; import java.util.Set; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import net.minecraft.network.PacketByteBuf;