diff --git a/build.gradle b/build.gradle index 73001c5ceb..0e9867d20d 100644 --- a/build.gradle +++ b/build.gradle @@ -258,6 +258,10 @@ allprojects { spotless { java { licenseHeaderFile(rootProject.file("HEADER")) + removeUnusedImports() + importOrder('java', 'javax', '', 'net.minecraft', 'net.fabricmc') + indentWithTabs() + trimTrailingWhitespace() } } diff --git a/checkstyle.xml b/checkstyle.xml index 27d48c071c..daf09c3b61 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -77,7 +77,7 @@ - + diff --git a/deprecated/fabric-containers-v0/src/client/java/net/fabricmc/fabric/impl/client/container/ScreenProviderRegistryImpl.java b/deprecated/fabric-containers-v0/src/client/java/net/fabricmc/fabric/impl/client/container/ScreenProviderRegistryImpl.java index 4189569008..208fd7abd1 100644 --- a/deprecated/fabric-containers-v0/src/client/java/net/fabricmc/fabric/impl/client/container/ScreenProviderRegistryImpl.java +++ b/deprecated/fabric-containers-v0/src/client/java/net/fabricmc/fabric/impl/client/container/ScreenProviderRegistryImpl.java @@ -19,13 +19,13 @@ import java.util.HashMap; import java.util.Map; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.util.Identifier; import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.screen.ScreenHandler; +import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.client.screen.ContainerScreenFactory; diff --git a/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/container/ContainerFactory.java b/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/container/ContainerFactory.java index 15daa3dd29..ec1096ed7d 100644 --- a/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/container/ContainerFactory.java +++ b/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/container/ContainerFactory.java @@ -17,8 +17,8 @@ package net.fabricmc.fabric.api.container; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Identifier; import net.minecraft.network.PacketByteBuf; +import net.minecraft.util.Identifier; /** * @deprecated Use {@link net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry.ExtendedClientHandlerFactory} instead. diff --git a/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/container/ContainerProviderRegistry.java b/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/container/ContainerProviderRegistry.java index 2f804cc511..3397f765ed 100644 --- a/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/container/ContainerProviderRegistry.java +++ b/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/container/ContainerProviderRegistry.java @@ -18,11 +18,11 @@ import java.util.function.Consumer; -import net.minecraft.screen.ScreenHandler; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandler; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Identifier; -import net.minecraft.network.PacketByteBuf; import net.fabricmc.fabric.impl.container.ContainerProviderImpl; diff --git a/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/mixin/container/ServerPlayerEntityAccessor.java b/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/mixin/container/ServerPlayerEntityAccessor.java index ec7a5e8c78..b2ee3b0d21 100644 --- a/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/mixin/container/ServerPlayerEntityAccessor.java +++ b/deprecated/fabric-containers-v0/src/main/java/net/fabricmc/fabric/mixin/container/ServerPlayerEntityAccessor.java @@ -20,8 +20,8 @@ import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Invoker; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.screen.ScreenHandler; +import net.minecraft.server.network.ServerPlayerEntity; @Mixin(ServerPlayerEntity.class) public interface ServerPlayerEntityAccessor { diff --git a/deprecated/fabric-events-lifecycle-v0/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/legacy/LegacyLifecycleEventsTest.java b/deprecated/fabric-events-lifecycle-v0/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/legacy/LegacyLifecycleEventsTest.java index 15cfe81a48..40cdd489c0 100644 --- a/deprecated/fabric-events-lifecycle-v0/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/legacy/LegacyLifecycleEventsTest.java +++ b/deprecated/fabric-events-lifecycle-v0/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/legacy/LegacyLifecycleEventsTest.java @@ -19,8 +19,8 @@ import java.util.HashMap; import java.util.Map; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.minecraft.registry.RegistryKey; import net.minecraft.world.World; diff --git a/deprecated/fabric-renderer-registries-v1/src/client/java/net/fabricmc/fabric/api/client/rendereregistry/v1/BlockEntityRendererRegistry.java b/deprecated/fabric-renderer-registries-v1/src/client/java/net/fabricmc/fabric/api/client/rendereregistry/v1/BlockEntityRendererRegistry.java index f39c4a18b6..48f1164a88 100644 --- a/deprecated/fabric-renderer-registries-v1/src/client/java/net/fabricmc/fabric/api/client/rendereregistry/v1/BlockEntityRendererRegistry.java +++ b/deprecated/fabric-renderer-registries-v1/src/client/java/net/fabricmc/fabric/api/client/rendereregistry/v1/BlockEntityRendererRegistry.java @@ -18,9 +18,9 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; /** * Helper class for registering BlockEntityRenderers. diff --git a/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/block/BlockApiLookupImpl.java b/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/block/BlockApiLookupImpl.java index 367fa16962..c98dc94190 100644 --- a/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/block/BlockApiLookupImpl.java +++ b/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/block/BlockApiLookupImpl.java @@ -28,9 +28,9 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; -import net.minecraft.registry.Registries; import net.minecraft.world.World; import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup; diff --git a/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/entity/EntityApiLookupImpl.java b/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/entity/EntityApiLookupImpl.java index 9a8dc948f6..e489d82ae2 100644 --- a/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/entity/EntityApiLookupImpl.java +++ b/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/entity/EntityApiLookupImpl.java @@ -32,9 +32,9 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.predicate.entity.EntityPredicates; +import net.minecraft.registry.Registries; import net.minecraft.server.MinecraftServer; import net.minecraft.util.Identifier; -import net.minecraft.registry.Registries; import net.fabricmc.fabric.api.lookup.v1.custom.ApiLookupMap; import net.fabricmc.fabric.api.lookup.v1.custom.ApiProviderMap; diff --git a/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/item/ItemApiLookupImpl.java b/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/item/ItemApiLookupImpl.java index d03b5f7371..a99dbdb90f 100644 --- a/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/item/ItemApiLookupImpl.java +++ b/fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/item/ItemApiLookupImpl.java @@ -27,8 +27,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; import net.minecraft.item.ItemStack; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.lookup.v1.custom.ApiLookupMap; import net.fabricmc.fabric.api.lookup.v1.custom.ApiProviderMap; diff --git a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/ChuteBlock.java b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/ChuteBlock.java index c1c1b5b190..f62ec72daa 100644 --- a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/ChuteBlock.java +++ b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/ChuteBlock.java @@ -20,11 +20,11 @@ import net.minecraft.block.BlockState; import net.minecraft.block.BlockWithEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.block.entity.BlockEntity; public class ChuteBlock extends BlockWithEntity { public ChuteBlock(Settings settings) { diff --git a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/ChuteBlockEntity.java b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/ChuteBlockEntity.java index 0bb847b376..cda21d2e54 100644 --- a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/ChuteBlockEntity.java +++ b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/ChuteBlockEntity.java @@ -19,11 +19,11 @@ import org.jetbrains.annotations.NotNull; import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import net.minecraft.block.entity.BlockEntity; import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.world.World; import net.fabricmc.fabric.api.lookup.v1.block.BlockApiCache; import net.fabricmc.fabric.test.lookup.api.ItemApis; diff --git a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/CobbleGenBlock.java b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/CobbleGenBlock.java index c19701a494..79d62f9c19 100644 --- a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/CobbleGenBlock.java +++ b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/CobbleGenBlock.java @@ -20,8 +20,8 @@ import net.minecraft.block.BlockState; import net.minecraft.block.BlockWithEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.math.BlockPos; public class CobbleGenBlock extends BlockWithEntity { public CobbleGenBlock(Settings settings) { diff --git a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/entity/FabricEntityApiLookupTest.java b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/entity/FabricEntityApiLookupTest.java index a3df19e19a..8611962084 100644 --- a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/entity/FabricEntityApiLookupTest.java +++ b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/entity/FabricEntityApiLookupTest.java @@ -21,10 +21,10 @@ import net.minecraft.entity.SpawnGroup; import net.minecraft.entity.mob.CreeperEntity; import net.minecraft.entity.passive.PigEntity; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.lookup.v1.entity.EntityApiLookup; import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry; diff --git a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/item/FabricItemApiLookupTest.java b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/item/FabricItemApiLookupTest.java index 324245ccd3..1a77fbd284 100644 --- a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/item/FabricItemApiLookupTest.java +++ b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/item/FabricItemApiLookupTest.java @@ -21,10 +21,10 @@ import net.minecraft.item.Item; import net.minecraft.item.Items; import net.minecraft.item.ToolItem; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.lookup.v1.item.ItemApiLookup; import net.fabricmc.fabric.test.lookup.FabricApiLookupTest; 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 fd0e243d33..e54efd2046 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 @@ -22,9 +22,9 @@ import net.minecraft.entity.EntityType; import net.minecraft.entity.SpawnGroup; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryKey; +import net.minecraft.util.Identifier; import net.minecraft.world.biome.SpawnSettings; import net.minecraft.world.gen.GenerationStep; import net.minecraft.world.gen.carver.ConfiguredCarver; @@ -94,4 +94,3 @@ public static BiomeModification create(Identifier id) { return new BiomeModification(id); } } - diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeSelectionContext.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeSelectionContext.java index 0a7f53a036..69f0369bac 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeSelectionContext.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeSelectionContext.java @@ -19,10 +19,10 @@ import java.util.List; import java.util.Optional; -import net.minecraft.registry.tag.TagKey; +import net.minecraft.registry.RegistryKey; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.registry.entry.RegistryEntryList; -import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.tag.TagKey; import net.minecraft.world.biome.Biome; import net.minecraft.world.dimension.DimensionOptions; import net.minecraft.world.gen.feature.ConfiguredFeature; 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 6da5235af7..a216c9d945 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 @@ -24,8 +24,8 @@ import net.minecraft.entity.EntityType; import net.minecraft.entity.SpawnGroup; -import net.minecraft.registry.tag.TagKey; import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.tag.TagKey; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.SpawnSettings; import net.minecraft.world.dimension.DimensionOptions; diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/TheEndBiomeData.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/TheEndBiomeData.java index da4043b7bf..e5cc933036 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/TheEndBiomeData.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/TheEndBiomeData.java @@ -29,9 +29,9 @@ import org.jetbrains.annotations.Nullable; import net.minecraft.registry.RegistryEntryLookup; -import net.minecraft.util.math.noise.PerlinNoiseSampler; -import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.util.math.noise.PerlinNoiseSampler; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeKeys; import net.minecraft.world.biome.source.TheEndBiomeSource; diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationImpl.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationImpl.java index ac80c96005..6e8735aef8 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationImpl.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationImpl.java @@ -30,11 +30,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.minecraft.registry.RegistryKeys; -import net.minecraft.util.Identifier; import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; import net.minecraft.world.biome.Biome; import net.fabricmc.fabric.api.biome.v1.BiomeModificationContext; diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/TheEndBiomeSourceMixin.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/TheEndBiomeSourceMixin.java index 09ee624240..24221979d4 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/TheEndBiomeSourceMixin.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/TheEndBiomeSourceMixin.java @@ -34,10 +34,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import net.minecraft.registry.RegistryEntryLookup; import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryOps; import net.minecraft.registry.entry.RegistryEntry; -import net.minecraft.registry.RegistryEntryLookup; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.source.TheEndBiomeSource; import net.minecraft.world.biome.source.util.MultiNoiseUtil; diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/modification/MinecraftServerMixin.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/modification/MinecraftServerMixin.java index d4b24cae5b..ef51441124 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/modification/MinecraftServerMixin.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/modification/MinecraftServerMixin.java @@ -23,8 +23,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import net.minecraft.server.MinecraftServer; import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.server.MinecraftServer; import net.minecraft.world.SaveProperties; import net.minecraft.world.level.LevelProperties; diff --git a/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/api/command/v2/ArgumentTypeRegistry.java b/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/api/command/v2/ArgumentTypeRegistry.java index f9139659a2..4b75fca885 100644 --- a/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/api/command/v2/ArgumentTypeRegistry.java +++ b/fabric-command-api-v2/src/main/java/net/fabricmc/fabric/api/command/v2/ArgumentTypeRegistry.java @@ -18,10 +18,10 @@ import com.mojang.brigadier.arguments.ArgumentType; -import net.minecraft.registry.Registries; import net.minecraft.command.argument.serialize.ArgumentSerializer; -import net.minecraft.util.Identifier; +import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; import net.fabricmc.fabric.mixin.command.ArgumentTypesAccessor; diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/FlattenableBlockRegistry.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/FlattenableBlockRegistry.java index a95881912c..6aad9c875a 100644 --- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/FlattenableBlockRegistry.java +++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/FlattenableBlockRegistry.java @@ -18,8 +18,8 @@ import java.util.Objects; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/StrippableBlockRegistry.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/StrippableBlockRegistry.java index 1723daf961..596ddba967 100644 --- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/StrippableBlockRegistry.java +++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/StrippableBlockRegistry.java @@ -19,14 +19,14 @@ import java.util.Map; import java.util.Objects; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.minecraft.block.Block; import net.minecraft.state.property.Properties; -import net.fabricmc.fabric.mixin.content.registry.AxeItemAccessor; import net.fabricmc.fabric.impl.content.registry.util.ImmutableCollectionUtils; +import net.fabricmc.fabric.mixin.content.registry.AxeItemAccessor; /** * A registry for axe stripping interactions. A vanilla example is turning logs to stripped logs. diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/VillagerInteractionRegistries.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/VillagerInteractionRegistries.java index bc8691d791..d54c71445a 100644 --- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/VillagerInteractionRegistries.java +++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/VillagerInteractionRegistries.java @@ -31,9 +31,9 @@ import net.minecraft.village.VillagerProfession; import net.fabricmc.fabric.impl.content.registry.util.ImmutableCollectionUtils; -import net.fabricmc.fabric.mixin.content.registry.VillagerEntityAccessor; import net.fabricmc.fabric.mixin.content.registry.FarmerWorkTaskAccessor; import net.fabricmc.fabric.mixin.content.registry.GiveGiftsToHeroTaskAccessor; +import net.fabricmc.fabric.mixin.content.registry.VillagerEntityAccessor; /** * Registries for modifying villager interactions that diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/util/Item2ObjectMap.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/util/Item2ObjectMap.java index fdb88d45db..b7530bc55a 100644 --- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/util/Item2ObjectMap.java +++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/util/Item2ObjectMap.java @@ -16,9 +16,9 @@ package net.fabricmc.fabric.api.util; -import net.minecraft.registry.tag.TagKey; import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; +import net.minecraft.registry.tag.TagKey; public interface Item2ObjectMap { V get(ItemConvertible item); diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/CompostingChanceRegistryImpl.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/CompostingChanceRegistryImpl.java index 85fc29b4bc..234285fb21 100644 --- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/CompostingChanceRegistryImpl.java +++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/CompostingChanceRegistryImpl.java @@ -17,9 +17,9 @@ package net.fabricmc.fabric.impl.content.registry; import net.minecraft.block.ComposterBlock; -import net.minecraft.registry.tag.TagKey; import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; +import net.minecraft.registry.tag.TagKey; import net.fabricmc.fabric.api.registry.CompostingChanceRegistry; diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FlammableBlockRegistryImpl.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FlammableBlockRegistryImpl.java index 09f0bc7d68..4c72195771 100644 --- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FlammableBlockRegistryImpl.java +++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FlammableBlockRegistryImpl.java @@ -21,9 +21,9 @@ import java.util.Map; import net.minecraft.block.Block; -import net.minecraft.registry.tag.TagKey; import net.minecraft.registry.Registries; import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.registry.tag.TagKey; import net.fabricmc.fabric.api.event.lifecycle.v1.CommonLifecycleEvents; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FuelRegistryImpl.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FuelRegistryImpl.java index 8683c2ce5e..c630611710 100644 --- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FuelRegistryImpl.java +++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FuelRegistryImpl.java @@ -27,9 +27,9 @@ import net.minecraft.block.entity.AbstractFurnaceBlockEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; -import net.minecraft.registry.tag.TagKey; import net.minecraft.registry.Registries; import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.registry.tag.TagKey; import net.fabricmc.fabric.api.event.lifecycle.v1.CommonLifecycleEvents; import net.fabricmc.fabric.api.registry.FuelRegistry; diff --git a/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/ContentRegistryTest.java b/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/ContentRegistryTest.java index 3395994a0a..3c228c2ccf 100644 --- a/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/ContentRegistryTest.java +++ b/fabric-content-registries-v0/src/testmod/java/net/fabricmc/fabric/test/content/registry/ContentRegistryTest.java @@ -19,12 +19,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.PotionItem; -import net.minecraft.potion.Potions; -import net.minecraft.recipe.Ingredient; -import net.minecraft.text.Text; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -32,16 +26,22 @@ import net.minecraft.entity.ai.pathing.PathNodeType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.HoeItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.item.PotionItem; +import net.minecraft.potion.Potions; +import net.minecraft.recipe.Ingredient; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.registry.tag.BlockTags; import net.minecraft.registry.tag.ItemTags; +import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.Identifier; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; import net.minecraft.village.VillagerProfession; import net.minecraft.world.World; import net.minecraft.world.event.GameEvent; diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java index fad79f66fd..52d671a53e 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java @@ -19,8 +19,8 @@ import java.util.concurrent.CompletableFuture; import net.minecraft.registry.RegistryKeys; -import net.minecraft.registry.tag.BiomeTags; import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.BiomeTags; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeKeys; diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java index 35b819db66..aa8b316563 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagGenerator.java @@ -18,8 +18,8 @@ import java.util.concurrent.CompletableFuture; -import net.minecraft.registry.RegistryWrapper; import net.minecraft.enchantment.Enchantments; +import net.minecraft.registry.RegistryWrapper; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; diff --git a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java index 02b67d2ce9..e141177c2a 100644 --- a/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java +++ b/fabric-convention-tags-v1/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java @@ -18,8 +18,8 @@ import java.util.concurrent.CompletableFuture; -import net.minecraft.registry.RegistryWrapper; import net.minecraft.entity.EntityType; +import net.minecraft.registry.RegistryWrapper; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java index 5ea38bf2e8..08102e4cf3 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/TagUtil.java @@ -21,11 +21,11 @@ import org.jetbrains.annotations.Nullable; -import net.minecraft.registry.Registries; -import net.minecraft.registry.tag.TagKey; import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.tag.TagKey; /** * A Helper class for checking whether a {@link TagKey} contains some entry. diff --git a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java index 5f29f8377c..89c105c42f 100644 --- a/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java +++ b/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/TagRegistration.java @@ -17,15 +17,15 @@ package net.fabricmc.fabric.impl.tag.convention; import net.minecraft.block.Block; -import net.minecraft.registry.RegistryKeys; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; -import net.minecraft.registry.tag.TagKey; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; import net.minecraft.world.biome.Biome; public class TagRegistration { diff --git a/fabric-convention-tags-v1/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java b/fabric-convention-tags-v1/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java index f68080ed22..aeb6ccf953 100644 --- a/fabric-convention-tags-v1/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java +++ b/fabric-convention-tags-v1/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v1/TagUtilTest.java @@ -20,8 +20,8 @@ import org.slf4j.LoggerFactory; import net.minecraft.block.Blocks; -import net.minecraft.registry.RegistryKeys; import net.minecraft.enchantment.Enchantments; +import net.minecraft.registry.RegistryKeys; import net.minecraft.world.biome.BiomeKeys; import net.fabricmc.api.ModInitializer; 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 0be6cc8287..c3171b2439 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 @@ -34,19 +34,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.minecraft.registry.RegistryKeys; import net.minecraft.data.DataOutput; import net.minecraft.data.DataProvider; import net.minecraft.data.DataWriter; -import net.minecraft.util.Identifier; -import net.minecraft.registry.RegistryOps; import net.minecraft.registry.Registry; -import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.registry.RegistryEntryLookup; -import net.minecraft.registry.entry.RegistryEntryOwner; import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryLoader; +import net.minecraft.registry.RegistryOps; import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.registry.entry.RegistryEntryOwner; +import net.minecraft.util.Identifier; import net.minecraft.world.gen.carver.ConfiguredCarver; import net.minecraft.world.gen.feature.PlacedFeature; diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/ModelProviderMixin.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/ModelProviderMixin.java index 3cd09d0c0c..06bc3c5513 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/ModelProviderMixin.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/ModelProviderMixin.java @@ -39,8 +39,8 @@ import net.minecraft.data.client.ItemModelGenerator; import net.minecraft.data.client.ModelProvider; import net.minecraft.item.Item; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/EntityMixin.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/EntityMixin.java index 80bb69d904..c413032abc 100644 --- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/EntityMixin.java +++ b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/EntityMixin.java @@ -25,9 +25,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import net.minecraft.entity.Entity; +import net.minecraft.registry.RegistryKey; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; -import net.minecraft.registry.RegistryKey; import net.minecraft.world.TeleportTarget; import net.minecraft.world.World; diff --git a/fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/VoidChunkGenerator.java b/fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/VoidChunkGenerator.java index 7f45168bba..1c04554e4b 100644 --- a/fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/VoidChunkGenerator.java +++ b/fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/VoidChunkGenerator.java @@ -24,10 +24,10 @@ import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.block.BlockState; +import net.minecraft.registry.RegistryEntryLookup; import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryOps; import net.minecraft.util.math.BlockPos; -import net.minecraft.registry.RegistryEntryLookup; import net.minecraft.world.ChunkRegion; import net.minecraft.world.HeightLimitView; import net.minecraft.world.Heightmap; diff --git a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/PlayerEntityMixin.java b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/PlayerEntityMixin.java index e0ebe00cb5..631f924dad 100644 --- a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/PlayerEntityMixin.java +++ b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/PlayerEntityMixin.java @@ -23,8 +23,8 @@ import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.Unit; import net.minecraft.util.math.BlockPos; diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/impl/event/interaction/InteractionEventsRouter.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/impl/event/interaction/InteractionEventsRouter.java index 6b5d28cc2e..ff0d4772e9 100644 --- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/impl/event/interaction/InteractionEventsRouter.java +++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/impl/event/interaction/InteractionEventsRouter.java @@ -16,16 +16,16 @@ package net.fabricmc.fabric.impl.event.interaction; -import net.minecraft.util.math.BlockPos; import net.minecraft.block.BlockState; import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.ActionResult; +import net.minecraft.util.math.BlockPos; -import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.block.BlockAttackInteractionAware; import net.fabricmc.fabric.api.event.player.AttackBlockCallback; +import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; public class InteractionEventsRouter implements ModInitializer { @Override diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/PlayerAdvancementTrackerMixin.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/PlayerAdvancementTrackerMixin.java index 259ccae0be..a085be2bdb 100644 --- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/PlayerAdvancementTrackerMixin.java +++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/PlayerAdvancementTrackerMixin.java @@ -23,8 +23,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import net.minecraft.advancement.PlayerAdvancementTracker; import net.minecraft.advancement.AdvancementEntry; +import net.minecraft.advancement.PlayerAdvancementTracker; import net.minecraft.server.network.ServerPlayerEntity; import net.fabricmc.fabric.api.entity.FakePlayer; diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayNetworkHandlerMixin.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayNetworkHandlerMixin.java index 964bd057d1..df6800c38b 100644 --- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayNetworkHandlerMixin.java +++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayNetworkHandlerMixin.java @@ -25,12 +25,12 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket; +import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.math.Vec3d; -import net.minecraft.server.network.ServerPlayNetworkHandler; -import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket; import net.minecraft.world.World; import net.fabricmc.fabric.api.event.player.UseEntityCallback; diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerInteractionManagerMixin.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerInteractionManagerMixin.java index 7da11eb49d..1f343da86f 100644 --- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerInteractionManagerMixin.java +++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerInteractionManagerMixin.java @@ -29,8 +29,8 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.item.ItemStack; -import net.minecraft.network.packet.Packet; import net.minecraft.network.listener.ClientPlayPacketListener; +import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket; import net.minecraft.server.network.ServerPlayerEntity; diff --git a/fabric-events-interaction-v0/src/testmod/java/net/fabricmc/fabric/test/event/interaction/AttackBlockTests.java b/fabric-events-interaction-v0/src/testmod/java/net/fabricmc/fabric/test/event/interaction/AttackBlockTests.java index ea4759f1d4..0a0a8a480c 100644 --- a/fabric-events-interaction-v0/src/testmod/java/net/fabricmc/fabric/test/event/interaction/AttackBlockTests.java +++ b/fabric-events-interaction-v0/src/testmod/java/net/fabricmc/fabric/test/event/interaction/AttackBlockTests.java @@ -16,8 +16,8 @@ package net.fabricmc.fabric.test.event.interaction; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.minecraft.block.Blocks; import net.minecraft.item.Items; diff --git a/fabric-events-interaction-v0/src/testmod/java/net/fabricmc/fabric/test/event/interaction/PlayerBreakBlockTests.java b/fabric-events-interaction-v0/src/testmod/java/net/fabricmc/fabric/test/event/interaction/PlayerBreakBlockTests.java index 0942614b62..6a510ec62f 100644 --- a/fabric-events-interaction-v0/src/testmod/java/net/fabricmc/fabric/test/event/interaction/PlayerBreakBlockTests.java +++ b/fabric-events-interaction-v0/src/testmod/java/net/fabricmc/fabric/test/event/interaction/PlayerBreakBlockTests.java @@ -16,8 +16,8 @@ package net.fabricmc.fabric.test.event.interaction; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.minecraft.block.Blocks; diff --git a/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/GameRuleRegistry.java b/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/GameRuleRegistry.java index 7c83c90cda..d45ee002e0 100644 --- a/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/GameRuleRegistry.java +++ b/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/GameRuleRegistry.java @@ -74,4 +74,3 @@ public static boolean hasRegistration(String ruleName) { return GameRulesAccessor.getRuleTypes().keySet().stream().anyMatch(key -> key.getName().equals(ruleName)); } } - diff --git a/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/rule/DoubleRule.java b/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/rule/DoubleRule.java index 8890715ec1..aee650bf49 100644 --- a/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/rule/DoubleRule.java +++ b/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/rule/DoubleRule.java @@ -17,8 +17,8 @@ package net.fabricmc.fabric.api.gamerule.v1.rule; import com.mojang.brigadier.context.CommandContext; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.ServerCommandSource; diff --git a/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/rule/EnumRule.java b/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/rule/EnumRule.java index 76d700c881..46e7f41962 100644 --- a/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/rule/EnumRule.java +++ b/fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/api/gamerule/v1/rule/EnumRule.java @@ -24,9 +24,9 @@ import java.util.List; import com.mojang.brigadier.context.CommandContext; -import org.slf4j.LoggerFactory; -import org.slf4j.Logger; import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.ServerCommandSource; diff --git a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/impl/gametest/FabricGameTestModInitializer.java b/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/impl/gametest/FabricGameTestModInitializer.java index 8b1bfa9c1a..ba1c6c6bef 100644 --- a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/impl/gametest/FabricGameTestModInitializer.java +++ b/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/impl/gametest/FabricGameTestModInitializer.java @@ -20,8 +20,8 @@ import java.util.List; import java.util.Map; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.minecraft.test.TestFunctions; diff --git a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/server/MainMixin.java b/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/server/MainMixin.java index 42282b5166..e11eafa9ad 100644 --- a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/server/MainMixin.java +++ b/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/server/MainMixin.java @@ -29,11 +29,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import net.minecraft.util.ApiServices; import net.minecraft.resource.ResourcePackManager; import net.minecraft.server.Main; import net.minecraft.server.dedicated.EulaReader; import net.minecraft.server.dedicated.ServerPropertiesLoader; +import net.minecraft.util.ApiServices; import net.minecraft.world.level.storage.LevelStorage; import net.minecraft.world.level.storage.LevelSummary; diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractFurnaceBlockEntityMixin.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractFurnaceBlockEntityMixin.java index d1524d1eef..3f197499ee 100644 --- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractFurnaceBlockEntityMixin.java +++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractFurnaceBlockEntityMixin.java @@ -26,8 +26,8 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.AbstractFurnaceBlockEntity; -import net.minecraft.recipe.RecipeEntry; import net.minecraft.item.ItemStack; +import net.minecraft.recipe.RecipeEntry; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java index 932259c3d1..fcd6768ee9 100644 --- a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java +++ b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java @@ -22,10 +22,10 @@ import net.minecraft.item.ToolMaterials; import net.minecraft.nbt.NbtCompound; import net.minecraft.potion.Potions; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.item.v1.CustomDamageHandler; diff --git a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/ItemUpdateAnimationTest.java b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/ItemUpdateAnimationTest.java index dfa1f2f02d..ee7aa8ed25 100644 --- a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/ItemUpdateAnimationTest.java +++ b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/ItemUpdateAnimationTest.java @@ -16,9 +16,9 @@ package net.fabricmc.fabric.test.item; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; import net.fabricmc.api.ModInitializer; diff --git a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/DataPackContentsMixin.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/DataPackContentsMixin.java index 5b3b64cabf..9d93184c31 100644 --- a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/DataPackContentsMixin.java +++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/DataPackContentsMixin.java @@ -21,8 +21,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import net.minecraft.server.DataPackContents; import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.server.DataPackContents; import net.fabricmc.fabric.api.event.lifecycle.v1.CommonLifecycleEvents; diff --git a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerBlockEntityLifecycleTests.java b/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerBlockEntityLifecycleTests.java index ab73d74fee..52091d4268 100644 --- a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerBlockEntityLifecycleTests.java +++ b/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerBlockEntityLifecycleTests.java @@ -22,8 +22,8 @@ import org.slf4j.Logger; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.server.world.ServerWorld; import net.minecraft.registry.Registries; +import net.minecraft.server.world.ServerWorld; import net.minecraft.world.chunk.WorldChunk; import net.fabricmc.api.ModInitializer; diff --git a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerLifecycleTests.java b/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerLifecycleTests.java index e870d43340..3294bd2548 100644 --- a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerLifecycleTests.java +++ b/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerLifecycleTests.java @@ -16,8 +16,8 @@ package net.fabricmc.fabric.test.event.lifecycle; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; diff --git a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerResourceReloadTests.java b/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerResourceReloadTests.java index 262720e740..0e4c6b7a1f 100644 --- a/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerResourceReloadTests.java +++ b/fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerResourceReloadTests.java @@ -16,8 +16,8 @@ package net.fabricmc.fabric.test.event.lifecycle; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; diff --git a/fabric-model-loading-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/model/loading/ModelTestModClient.java b/fabric-model-loading-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/model/loading/ModelTestModClient.java index 2f0ba65ab9..c11eecea8e 100644 --- a/fabric-model-loading-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/model/loading/ModelTestModClient.java +++ b/fabric-model-loading-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/model/loading/ModelTestModClient.java @@ -36,9 +36,9 @@ import net.minecraft.world.BlockRenderView; import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.client.model.loading.v1.DelegatingUnbakedModel; import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin; import net.fabricmc.fabric.api.client.model.loading.v1.ModelModifier; -import net.fabricmc.fabric.api.client.model.loading.v1.DelegatingUnbakedModel; import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityFeatureRendererRegistrationCallback; import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/PlayerLookup.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/PlayerLookup.java index 5001033643..73e2f5c93e 100644 --- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/PlayerLookup.java +++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/PlayerLookup.java @@ -24,8 +24,8 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; import net.minecraft.server.MinecraftServer; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.PlayerAssociatedNetworkHandler; +import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerChunkManager; import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ThreadedAnvilChunkStorage; diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/GenericFutureListenerHolder.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/GenericFutureListenerHolder.java index a11c5a49c9..239d587fa3 100644 --- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/GenericFutureListenerHolder.java +++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/GenericFutureListenerHolder.java @@ -23,8 +23,8 @@ import org.jetbrains.annotations.Nullable; import net.minecraft.network.ClientConnection; -import net.minecraft.network.packet.Packet; import net.minecraft.network.PacketCallbacks; +import net.minecraft.network.packet.Packet; /** * We still need to support {@link GenericFutureListener} so we use this disguise impl {@link PacketCallbacks} diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerCommonNetworkHandlerMixin.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerCommonNetworkHandlerMixin.java index 58734f1bf0..22e31cf1af 100644 --- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerCommonNetworkHandlerMixin.java +++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/ServerCommonNetworkHandlerMixin.java @@ -21,8 +21,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import net.minecraft.network.packet.c2s.common.CustomPayloadC2SPacket; import net.minecraft.network.packet.c2s.common.CommonPongC2SPacket; +import net.minecraft.network.packet.c2s.common.CustomPayloadC2SPacket; import net.minecraft.server.network.ServerCommonNetworkHandler; import net.fabricmc.fabric.impl.networking.NetworkHandlerExtensions; diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/accessor/ThreadedAnvilChunkStorageAccessor.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/accessor/ThreadedAnvilChunkStorageAccessor.java index 83b1a1c2cb..65adb6c418 100644 --- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/accessor/ThreadedAnvilChunkStorageAccessor.java +++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/accessor/ThreadedAnvilChunkStorageAccessor.java @@ -16,9 +16,9 @@ package net.fabricmc.fabric.mixin.networking.accessor; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.server.world.ThreadedAnvilChunkStorage; diff --git a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/NetworkingTestmods.java b/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/NetworkingTestmods.java index 7d45709cec..280e7bfc83 100644 --- a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/NetworkingTestmods.java +++ b/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/NetworkingTestmods.java @@ -16,8 +16,8 @@ package net.fabricmc.fabric.test.networking; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.minecraft.util.Identifier; diff --git a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/login/NetworkingLoginQueryTest.java b/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/login/NetworkingLoginQueryTest.java index 2c8d6ded53..83ac2671c9 100644 --- a/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/login/NetworkingLoginQueryTest.java +++ b/fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/login/NetworkingLoginQueryTest.java @@ -24,9 +24,9 @@ import net.minecraft.util.Util; import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.networking.v1.ServerLoginConnectionEvents; import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; import net.fabricmc.fabric.api.networking.v1.PacketSender; +import net.fabricmc.fabric.api.networking.v1.ServerLoginConnectionEvents; import net.fabricmc.fabric.api.networking.v1.ServerLoginNetworking; import net.fabricmc.fabric.test.networking.NetworkingTestmods; import net.fabricmc.fabric.test.networking.play.NetworkingPlayPacketTest; diff --git a/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/NetworkingChannelClientTest.java b/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/NetworkingChannelClientTest.java index 32eb0b08b0..e526b7e880 100644 --- a/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/NetworkingChannelClientTest.java +++ b/fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/channeltest/NetworkingChannelClientTest.java @@ -29,8 +29,8 @@ import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; -import net.fabricmc.fabric.api.client.networking.v1.ClientLoginConnectionEvents; import net.fabricmc.fabric.api.client.networking.v1.C2SPlayChannelEvents; +import net.fabricmc.fabric.api.client.networking.v1.ClientLoginConnectionEvents; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; public final class NetworkingChannelClientTest implements ClientModInitializer { diff --git a/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/api/object/builder/v1/client/model/FabricModelPredicateProviderRegistry.java b/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/api/object/builder/v1/client/model/FabricModelPredicateProviderRegistry.java index 3f06d93310..6a801b5d42 100644 --- a/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/api/object/builder/v1/client/model/FabricModelPredicateProviderRegistry.java +++ b/fabric-object-builder-api-v1/src/client/java/net/fabricmc/fabric/api/object/builder/v1/client/model/FabricModelPredicateProviderRegistry.java @@ -16,9 +16,9 @@ package net.fabricmc.fabric.api.object.builder.v1.client.model; +import net.minecraft.client.item.ClampedModelPredicateProvider; import net.minecraft.item.Item; import net.minecraft.util.Identifier; -import net.minecraft.client.item.ClampedModelPredicateProvider; import net.fabricmc.fabric.mixin.object.builder.client.ModelPredicateProviderRegistryAccessor; import net.fabricmc.fabric.mixin.object.builder.client.ModelPredicateProviderRegistrySpecificAccessor; diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/FabricBlockSettings.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/FabricBlockSettings.java index 588846c563..5d90b75844 100644 --- a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/FabricBlockSettings.java +++ b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/FabricBlockSettings.java @@ -69,10 +69,18 @@ protected FabricBlockSettings(AbstractBlock.Settings settings) { thisAccessor.setDynamicBounds(otherAccessor.getDynamicBounds()); thisAccessor.setOpaque(otherAccessor.getOpaque()); thisAccessor.setIsAir(otherAccessor.getIsAir()); + thisAccessor.setBurnable(otherAccessor.getBurnable()); + thisAccessor.setLiquid(otherAccessor.getLiquid()); + thisAccessor.setForceNotSolid(otherAccessor.getForceNotSolid()); + thisAccessor.setForceSolid(otherAccessor.getForceSolid()); + this.pistonBehavior(otherAccessor.getPistonBehavior()); thisAccessor.setToolRequired(otherAccessor.isToolRequired()); thisAccessor.setOffsetter(otherAccessor.getOffsetter()); thisAccessor.setBlockBreakParticles(otherAccessor.getBlockBreakParticles()); thisAccessor.setRequiredFeatures(otherAccessor.getRequiredFeatures()); + this.emissiveLighting(otherAccessor.getEmissiveLightingPredicate()); + this.instrument(otherAccessor.getInstrument()); + thisAccessor.setReplaceable(otherAccessor.getReplaceable()); // Not copied in vanilla: field definition order this.jumpVelocityMultiplier(otherAccessor.getJumpVelocityMultiplier()); @@ -82,7 +90,6 @@ protected FabricBlockSettings(AbstractBlock.Settings settings) { this.suffocates(otherAccessor.getSuffocationPredicate()); this.blockVision(otherAccessor.getBlockVisionPredicate()); this.postProcess(otherAccessor.getPostProcessPredicate()); - this.emissiveLighting(otherAccessor.getEmissiveLightingPredicate()); } public static FabricBlockSettings create() { diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/FabricDefaultAttributeRegistry.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/FabricDefaultAttributeRegistry.java index 8b6983aa64..2da45120a4 100644 --- a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/FabricDefaultAttributeRegistry.java +++ b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/entity/FabricDefaultAttributeRegistry.java @@ -21,10 +21,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.minecraft.registry.Registries; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.attribute.DefaultAttributeContainer; +import net.minecraft.registry.Registries; import net.fabricmc.fabric.mixin.object.builder.DefaultAttributeRegistryAccessor; diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/villager/VillagerProfessionBuilder.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/villager/VillagerProfessionBuilder.java index 1a78631bce..de8cc34361 100644 --- a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/villager/VillagerProfessionBuilder.java +++ b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/villager/VillagerProfessionBuilder.java @@ -26,10 +26,10 @@ import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.item.Item; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; -import net.minecraft.registry.entry.RegistryEntry; -import net.minecraft.registry.RegistryKey; import net.minecraft.village.TradeOffers; import net.minecraft.village.VillagerProfession; import net.minecraft.world.poi.PointOfInterestType; diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/villager/VillagerTypeHelper.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/villager/VillagerTypeHelper.java index ac4b082901..958fad34d5 100644 --- a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/villager/VillagerTypeHelper.java +++ b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/villager/VillagerTypeHelper.java @@ -21,10 +21,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; +import net.minecraft.util.Identifier; import net.minecraft.village.VillagerProfession; import net.minecraft.village.VillagerType; import net.minecraft.world.biome.Biome; diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/world/poi/PointOfInterestHelper.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/world/poi/PointOfInterestHelper.java index 171f3a20e4..2ddc5dcab9 100644 --- a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/world/poi/PointOfInterestHelper.java +++ b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/world/poi/PointOfInterestHelper.java @@ -23,9 +23,9 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.registry.Registries; +import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; -import net.minecraft.registry.RegistryKey; import net.minecraft.world.poi.PointOfInterest; import net.minecraft.world.poi.PointOfInterestType; import net.minecraft.world.poi.PointOfInterestTypes; diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricEntityType.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricEntityType.java index 7b68ef0f4f..c76c8e721d 100644 --- a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricEntityType.java +++ b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricEntityType.java @@ -20,9 +20,9 @@ import net.minecraft.block.Block; import net.minecraft.entity.Entity; -import net.minecraft.entity.SpawnGroup; import net.minecraft.entity.EntityDimensions; import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnGroup; import net.minecraft.resource.featuretoggle.FeatureSet; public class FabricEntityType extends EntityType { diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/AbstractBlockSettingsAccessor.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/AbstractBlockSettingsAccessor.java index 31a9afb1d1..1c4cef0eaf 100644 --- a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/AbstractBlockSettingsAccessor.java +++ b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/AbstractBlockSettingsAccessor.java @@ -26,6 +26,8 @@ import net.minecraft.block.AbstractBlock; import net.minecraft.block.BlockState; import net.minecraft.block.MapColor; +import net.minecraft.block.enums.Instrument; +import net.minecraft.block.piston.PistonBehavior; import net.minecraft.entity.EntityType; import net.minecraft.resource.featuretoggle.FeatureSet; import net.minecraft.sound.BlockSoundGroup; @@ -106,6 +108,27 @@ public interface AbstractBlockSettingsAccessor { @Accessor FeatureSet getRequiredFeatures(); + @Accessor + boolean getBurnable(); + + @Accessor + boolean getLiquid(); + + @Accessor + boolean getForceNotSolid(); + + @Accessor + boolean getForceSolid(); + + @Accessor + PistonBehavior getPistonBehavior(); + + @Accessor + Instrument getInstrument(); + + @Accessor + boolean getReplaceable(); + /* SETTERS */ @Accessor void setCollidable(boolean collidable); @@ -139,4 +162,19 @@ public interface AbstractBlockSettingsAccessor { @Accessor void setOffsetter(Optional offsetter); + + @Accessor + void setBurnable(boolean burnable); + + @Accessor + void setLiquid(boolean liquid); + + @Accessor + void setForceNotSolid(boolean forceNotSolid); + + @Accessor + void setForceSolid(boolean forceSolid); + + @Accessor + void setReplaceable(boolean replaceable); } diff --git a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/ObjectBuilderTestConstants.java b/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/ObjectBuilderTestConstants.java index fd9278397a..594d351076 100644 --- a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/ObjectBuilderTestConstants.java +++ b/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/ObjectBuilderTestConstants.java @@ -16,8 +16,8 @@ package net.fabricmc.fabric.test.object.builder; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.minecraft.util.Identifier; diff --git a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/SimpleTradeFactory.java b/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/SimpleTradeFactory.java index acf6114d55..77f76c6c6d 100644 --- a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/SimpleTradeFactory.java +++ b/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/SimpleTradeFactory.java @@ -17,9 +17,9 @@ package net.fabricmc.fabric.test.object.builder; import net.minecraft.entity.Entity; +import net.minecraft.util.math.random.Random; import net.minecraft.village.TradeOffer; import net.minecraft.village.TradeOffers; -import net.minecraft.util.math.random.Random; class SimpleTradeFactory implements TradeOffers.Factory { private final TradeOffer offer; diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/DefaultCustomIngredients.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/DefaultCustomIngredients.java index 6d9380e466..8b29da7f11 100644 --- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/DefaultCustomIngredients.java +++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/DefaultCustomIngredients.java @@ -27,9 +27,9 @@ import net.minecraft.recipe.Ingredient; import net.fabricmc.fabric.impl.recipe.ingredient.builtin.AllIngredient; +import net.fabricmc.fabric.impl.recipe.ingredient.builtin.AnyIngredient; import net.fabricmc.fabric.impl.recipe.ingredient.builtin.DifferenceIngredient; import net.fabricmc.fabric.impl.recipe.ingredient.builtin.NbtIngredient; -import net.fabricmc.fabric.impl.recipe.ingredient.builtin.AnyIngredient; /** * Factory methods for the custom ingredients directly provided by Fabric API. diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/PacketEncoderMixin.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/PacketEncoderMixin.java index 633cf5af1e..351833e386 100644 --- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/PacketEncoderMixin.java +++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/PacketEncoderMixin.java @@ -26,8 +26,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import net.minecraft.network.packet.Packet; import net.minecraft.network.handler.PacketEncoder; +import net.minecraft.network.packet.Packet; import net.minecraft.util.Identifier; import net.fabricmc.fabric.impl.recipe.ingredient.CustomIngredientSync; diff --git a/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/BlockColorsMixin.java b/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/BlockColorsMixin.java index d173f82616..e22f637181 100644 --- a/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/BlockColorsMixin.java +++ b/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/BlockColorsMixin.java @@ -25,8 +25,8 @@ import net.minecraft.client.color.block.BlockColorProvider; import net.minecraft.client.color.block.BlockColors; -import net.minecraft.util.collection.IdList; import net.minecraft.registry.Registries; +import net.minecraft.util.collection.IdList; import net.fabricmc.fabric.impl.registry.sync.trackers.IdListTracker; diff --git a/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/ItemColorsMixin.java b/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/ItemColorsMixin.java index 2d3eb38e2f..24c8607b2c 100644 --- a/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/ItemColorsMixin.java +++ b/fabric-registry-sync-v0/src/client/java/net/fabricmc/fabric/mixin/registry/sync/client/ItemColorsMixin.java @@ -25,8 +25,8 @@ import net.minecraft.client.color.item.ItemColorProvider; import net.minecraft.client.color.item.ItemColors; -import net.minecraft.util.collection.IdList; import net.minecraft.registry.Registries; +import net.minecraft.util.collection.IdList; import net.fabricmc.fabric.impl.registry.sync.trackers.IdListTracker; diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryEntryAddedCallback.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryEntryAddedCallback.java index c9f2b1497d..dc6cf7056d 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryEntryAddedCallback.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryEntryAddedCallback.java @@ -16,8 +16,8 @@ package net.fabricmc.fabric.api.event.registry; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.impl.registry.sync.ListenableRegistry; diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryEntryRemovedCallback.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryEntryRemovedCallback.java index 951b9a8385..8ef9c60853 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryEntryRemovedCallback.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryEntryRemovedCallback.java @@ -16,8 +16,8 @@ package net.fabricmc.fabric.api.event.registry; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.impl.registry.sync.ListenableRegistry; diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryIdRemapCallback.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryIdRemapCallback.java index e6ca554f73..c76c0b350f 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryIdRemapCallback.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryIdRemapCallback.java @@ -18,8 +18,8 @@ import it.unimi.dsi.fastutil.ints.Int2IntMap; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.impl.registry.sync.ListenableRegistry; diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RemapStateImpl.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RemapStateImpl.java index ec8023c416..f2718bd1bc 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RemapStateImpl.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RemapStateImpl.java @@ -20,8 +20,8 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.event.registry.RegistryIdRemapCallback; diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/IdListTracker.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/IdListTracker.java index 280ba31a28..e5d301a155 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/IdListTracker.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/IdListTracker.java @@ -19,9 +19,9 @@ import java.util.HashMap; import java.util.Map; -import net.minecraft.util.collection.IdList; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; +import net.minecraft.util.collection.IdList; import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback; import net.fabricmc.fabric.api.event.registry.RegistryEntryRemovedCallback; diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/Int2ObjectMapTracker.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/Int2ObjectMapTracker.java index 5d2648a3e0..239e495cd1 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/Int2ObjectMapTracker.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/Int2ObjectMapTracker.java @@ -25,11 +25,11 @@ import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback; import net.fabricmc.fabric.api.event.registry.RegistryEntryRemovedCallback; diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/StateIdTracker.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/StateIdTracker.java index b8493ac6ff..fee0031487 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/StateIdTracker.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/StateIdTracker.java @@ -21,12 +21,12 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import net.minecraft.util.collection.IdList; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; +import net.minecraft.util.collection.IdList; import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback; import net.fabricmc.fabric.api.event.registry.RegistryIdRemapCallback; diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockInitTracker.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockInitTracker.java index bdf9837a9f..5e5d1e41bc 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockInitTracker.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockInitTracker.java @@ -20,10 +20,10 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.MathHelper; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.MathHelper; import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback; import net.fabricmc.fabric.mixin.registry.sync.DebugChunkGeneratorAccessor; diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockItemTracker.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockItemTracker.java index 76d813f55e..3475fe4545 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockItemTracker.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/trackers/vanilla/BlockItemTracker.java @@ -18,8 +18,8 @@ import net.minecraft.item.BlockItem; import net.minecraft.item.Item; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback; diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BootstrapMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BootstrapMixin.java index a2c14939bf..b7078ff7f3 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BootstrapMixin.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/BootstrapMixin.java @@ -25,10 +25,10 @@ import net.minecraft.Bootstrap; import net.minecraft.block.Block; import net.minecraft.block.Blocks; -import net.minecraft.registry.Registries; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; import net.minecraft.item.Items; +import net.minecraft.registry.Registries; import net.fabricmc.fabric.impl.registry.sync.RegistrySyncManager; import net.fabricmc.fabric.impl.registry.sync.trackers.StateIdTracker; diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/SimpleRegistryMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/SimpleRegistryMixin.java index 1e0f0bbad5..1e9582a8d4 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/SimpleRegistryMixin.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/SimpleRegistryMixin.java @@ -44,12 +44,12 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import net.minecraft.util.Identifier; import net.minecraft.registry.MutableRegistry; import net.minecraft.registry.Registry; -import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.SimpleRegistry; +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/DimensionRenderingRegistryImpl.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/DimensionRenderingRegistryImpl.java index 7d177de483..fe11bc9f46 100644 --- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/DimensionRenderingRegistryImpl.java +++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/DimensionRenderingRegistryImpl.java @@ -23,8 +23,8 @@ import org.jetbrains.annotations.Nullable; import net.minecraft.client.render.DimensionEffects; -import net.minecraft.util.Identifier; import net.minecraft.registry.RegistryKey; +import net.minecraft.util.Identifier; import net.minecraft.world.World; import net.fabricmc.fabric.api.client.rendering.v1.DimensionRenderingRegistry; diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/RegistrationHelperImpl.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/RegistrationHelperImpl.java index 974df96478..732f3803af 100644 --- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/RegistrationHelperImpl.java +++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/RegistrationHelperImpl.java @@ -38,4 +38,3 @@ public void register(FeatureRenderer fabric_getAfterMouseScrollEvent(); } - diff --git a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/ScreenMixin.java b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/ScreenMixin.java index 92483af80d..eea189a663 100644 --- a/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/ScreenMixin.java +++ b/fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen/ScreenMixin.java @@ -26,10 +26,10 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import net.minecraft.client.gui.Selectable; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ClickableWidget; diff --git a/fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/SoundButton.java b/fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/SoundButton.java index 20da5ca36d..364c70de54 100644 --- a/fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/SoundButton.java +++ b/fabric-screen-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screen/SoundButton.java @@ -20,12 +20,12 @@ import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; import net.minecraft.client.gui.widget.PressableWidget; import net.minecraft.client.sound.PositionedSoundInstance; +import net.minecraft.registry.Registries; +import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvents; import net.minecraft.text.Text; import net.minecraft.util.math.random.Random; -import net.minecraft.registry.Registries; -import net.minecraft.registry.entry.RegistryEntry; class SoundButton extends PressableWidget { private static final Random RANDOM = Random.create(); diff --git a/fabric-screen-handler-api-v1/src/main/java/net/fabricmc/fabric/api/screenhandler/v1/ScreenHandlerRegistry.java b/fabric-screen-handler-api-v1/src/main/java/net/fabricmc/fabric/api/screenhandler/v1/ScreenHandlerRegistry.java index 8d9441c4cc..dd0a2dfb88 100644 --- a/fabric-screen-handler-api-v1/src/main/java/net/fabricmc/fabric/api/screenhandler/v1/ScreenHandlerRegistry.java +++ b/fabric-screen-handler-api-v1/src/main/java/net/fabricmc/fabric/api/screenhandler/v1/ScreenHandlerRegistry.java @@ -16,13 +16,13 @@ package net.fabricmc.fabric.api.screenhandler.v1; -import net.minecraft.registry.Registries; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.resource.featuretoggle.FeatureFlags; import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.Identifier; -import net.minecraft.registry.Registry; /** * An API for creating and registering {@linkplain ScreenHandlerType screen handler types}. diff --git a/fabric-screen-handler-api-v1/src/main/java/net/fabricmc/fabric/impl/screenhandler/Networking.java b/fabric-screen-handler-api-v1/src/main/java/net/fabricmc/fabric/impl/screenhandler/Networking.java index 555b480146..39277259fc 100644 --- a/fabric-screen-handler-api-v1/src/main/java/net/fabricmc/fabric/impl/screenhandler/Networking.java +++ b/fabric-screen-handler-api-v1/src/main/java/net/fabricmc/fabric/impl/screenhandler/Networking.java @@ -22,8 +22,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.minecraft.registry.Registries; import net.minecraft.network.PacketByteBuf; +import net.minecraft.registry.Registries; import net.minecraft.screen.ScreenHandler; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Identifier; diff --git a/fabric-screen-handler-api-v1/src/testmod/java/net/fabricmc/fabric/test/screenhandler/ScreenHandlerTest.java b/fabric-screen-handler-api-v1/src/testmod/java/net/fabricmc/fabric/test/screenhandler/ScreenHandlerTest.java index 252a73a84b..404c400288 100644 --- a/fabric-screen-handler-api-v1/src/testmod/java/net/fabricmc/fabric/test/screenhandler/ScreenHandlerTest.java +++ b/fabric-screen-handler-api-v1/src/testmod/java/net/fabricmc/fabric/test/screenhandler/ScreenHandlerTest.java @@ -22,11 +22,11 @@ import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.resource.featuretoggle.FeatureFlags; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.Identifier; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; diff --git a/fabric-screen-handler-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screenhandler/client/ClientScreenHandlerTest.java b/fabric-screen-handler-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screenhandler/client/ClientScreenHandlerTest.java index f5bd4e4682..3e48113b27 100644 --- a/fabric-screen-handler-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screenhandler/client/ClientScreenHandlerTest.java +++ b/fabric-screen-handler-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/screenhandler/client/ClientScreenHandlerTest.java @@ -19,8 +19,8 @@ import net.minecraft.client.gui.screen.ingame.Generic3x3ContainerScreen; import net.minecraft.client.gui.screen.ingame.HandledScreens; -import net.fabricmc.fabric.test.screenhandler.ScreenHandlerTest; import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.test.screenhandler.ScreenHandlerTest; public class ClientScreenHandlerTest implements ClientModInitializer { @Override diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/fluid/FluidStorage.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/fluid/FluidStorage.java index 084ef40100..3c901033e3 100644 --- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/fluid/FluidStorage.java +++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/fluid/FluidStorage.java @@ -23,8 +23,8 @@ import net.minecraft.fluid.Fluids; import net.minecraft.item.BucketItem; import net.minecraft.item.Item; -import net.minecraft.item.Items; import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; import net.minecraft.potion.PotionUtil; import net.minecraft.potion.Potions; import net.minecraft.util.Identifier; @@ -33,14 +33,14 @@ import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup; import net.fabricmc.fabric.api.lookup.v1.item.ItemApiLookup; -import net.fabricmc.fabric.api.transfer.v1.storage.base.SidedStorageBlockEntity; import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; import net.fabricmc.fabric.api.transfer.v1.fluid.base.EmptyItemFluidStorage; import net.fabricmc.fabric.api.transfer.v1.fluid.base.FullItemFluidStorage; import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; import net.fabricmc.fabric.api.transfer.v1.storage.Storage; -import net.fabricmc.fabric.impl.transfer.fluid.EmptyBucketStorage; +import net.fabricmc.fabric.api.transfer.v1.storage.base.SidedStorageBlockEntity; import net.fabricmc.fabric.impl.transfer.fluid.CombinedProvidersImpl; +import net.fabricmc.fabric.impl.transfer.fluid.EmptyBucketStorage; import net.fabricmc.fabric.impl.transfer.fluid.WaterPotionStorage; import net.fabricmc.fabric.mixin.transfer.BucketItemAccessor; diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/ItemVariant.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/ItemVariant.java index 0eda7a8411..787590ae11 100644 --- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/ItemVariant.java +++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/item/ItemVariant.java @@ -26,8 +26,8 @@ import net.minecraft.nbt.NbtCompound; import net.minecraft.network.PacketByteBuf; -import net.fabricmc.fabric.impl.transfer.item.ItemVariantImpl; import net.fabricmc.fabric.api.transfer.v1.storage.TransferVariant; +import net.fabricmc.fabric.impl.transfer.item.ItemVariantImpl; /** * An immutable count-less ItemStack, i.e. an immutable association of an item and an optional NBT compound tag. diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/storage/SlottedStorage.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/storage/SlottedStorage.java index bb8cc60f90..be9d738b93 100644 --- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/storage/SlottedStorage.java +++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/storage/SlottedStorage.java @@ -21,8 +21,8 @@ import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.UnmodifiableView; -import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage; import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; +import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage; import net.fabricmc.fabric.impl.transfer.TransferApiImpl; /** diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/TransferApiImpl.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/TransferApiImpl.java index 7593228aef..274915a556 100644 --- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/TransferApiImpl.java +++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/TransferApiImpl.java @@ -23,8 +23,8 @@ import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicLong; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.fabricmc.fabric.api.transfer.v1.storage.SlottedStorage; import net.fabricmc.fabric.api.transfer.v1.storage.Storage; diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ItemVariantImpl.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ItemVariantImpl.java index 7d71c2e314..8209d994c0 100644 --- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ItemVariantImpl.java +++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ItemVariantImpl.java @@ -27,8 +27,8 @@ import net.minecraft.item.Items; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.PacketByteBuf; -import net.minecraft.util.Identifier; import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/transaction/TransactionManagerImpl.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/transaction/TransactionManagerImpl.java index 3c89a70756..6d1137fbfb 100644 --- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/transaction/TransactionManagerImpl.java +++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/transaction/TransactionManagerImpl.java @@ -20,8 +20,8 @@ import org.jetbrains.annotations.Nullable; -import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext; import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; +import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext; public class TransactionManagerImpl { public static final ThreadLocal MANAGERS = ThreadLocal.withInitial(TransactionManagerImpl::new); diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/FluidMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/FluidMixin.java index 27cad756f9..0178c5a2b5 100644 --- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/FluidMixin.java +++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/FluidMixin.java @@ -29,8 +29,8 @@ import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariantAttributeHandler; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariantAttributes; -import net.fabricmc.fabric.impl.transfer.fluid.FluidVariantImpl; import net.fabricmc.fabric.impl.transfer.fluid.FluidVariantCache; +import net.fabricmc.fabric.impl.transfer.fluid.FluidVariantImpl; /** *
    diff --git a/fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/ingame/CreativeStorage.java b/fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/ingame/CreativeStorage.java index f2121ae729..b854b51dcf 100644 --- a/fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/ingame/CreativeStorage.java +++ b/fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/ingame/CreativeStorage.java @@ -21,8 +21,8 @@ import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; -import net.fabricmc.fabric.api.transfer.v1.storage.TransferVariant; import net.fabricmc.fabric.api.transfer.v1.storage.StoragePreconditions; +import net.fabricmc.fabric.api.transfer.v1.storage.TransferVariant; import net.fabricmc.fabric.api.transfer.v1.storage.base.ExtractionOnlyStorage; import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage; import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext; diff --git a/gradle.properties b/gradle.properties index 9a100eaeac..89091e6bcc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx2560M org.gradle.parallel=true fabric.loom.multiProjectOptimisation=true -version=0.90.0 +version=0.90.4 minecraft_version=1.20.2 yarn_version=+build.1 loader_version=0.14.22 @@ -13,52 +13,52 @@ curseforge_minecraft_version=1.20.2 # Do not manually update, use the bumpversions task: fabric-api-base-version=0.4.33 -fabric-api-lookup-api-v1-version=1.6.41 -fabric-biome-api-v1-version=13.0.13 +fabric-api-lookup-api-v1-version=1.6.42 +fabric-biome-api-v1-version=13.0.14 fabric-block-api-v1-version=1.0.12 fabric-block-view-api-v2-version=1.0.1 fabric-blockrenderlayer-v1-version=1.1.43 -fabric-command-api-v1-version=1.2.36 -fabric-command-api-v2-version=2.2.15 -fabric-commands-v0-version=0.2.53 -fabric-containers-v0-version=0.1.73 -fabric-content-registries-v0-version=5.0.4 +fabric-command-api-v1-version=1.2.37 +fabric-command-api-v2-version=2.2.16 +fabric-commands-v0-version=0.2.54 +fabric-containers-v0-version=0.1.74 +fabric-content-registries-v0-version=5.0.5 fabric-crash-report-info-v1-version=0.2.20 -fabric-data-generation-api-v1-version=13.1.3 -fabric-dimensions-v1-version=2.1.56 -fabric-entity-events-v1-version=1.5.25 -fabric-events-interaction-v0-version=0.6.9 -fabric-events-lifecycle-v0-version=0.2.68 -fabric-game-rule-api-v1-version=1.0.40 -fabric-gametest-api-v1-version=1.2.15 -fabric-item-api-v1-version=2.1.32 -fabric-item-group-api-v1-version=4.0.14 +fabric-data-generation-api-v1-version=13.1.4 +fabric-dimensions-v1-version=2.1.57 +fabric-entity-events-v1-version=1.5.26 +fabric-events-interaction-v0-version=0.6.10 +fabric-events-lifecycle-v0-version=0.2.69 +fabric-game-rule-api-v1-version=1.0.41 +fabric-gametest-api-v1-version=1.2.16 +fabric-item-api-v1-version=2.1.33 +fabric-item-group-api-v1-version=4.0.15 fabric-key-binding-api-v1-version=1.0.38 fabric-keybindings-v0-version=0.2.36 -fabric-lifecycle-events-v1-version=2.2.26 -fabric-loot-api-v2-version=2.1.0 +fabric-lifecycle-events-v1-version=2.2.27 +fabric-loot-api-v2-version=2.1.1 fabric-message-api-v1-version=6.0.2 -fabric-mining-level-api-v1-version=2.1.54 -fabric-model-loading-api-v1-version=1.0.5 -fabric-models-v0-version=0.4.4 -fabric-networking-api-v1-version=3.0.9 -fabric-object-builder-api-v1-version=12.1.1 +fabric-mining-level-api-v1-version=2.1.55 +fabric-model-loading-api-v1-version=1.0.6 +fabric-models-v0-version=0.4.5 +fabric-networking-api-v1-version=3.0.10 +fabric-object-builder-api-v1-version=12.1.2 fabric-particles-v1-version=1.1.4 -fabric-recipe-api-v1-version=2.0.6 -fabric-registry-sync-v0-version=4.0.4 +fabric-recipe-api-v1-version=2.0.7 +fabric-registry-sync-v0-version=4.0.5 fabric-renderer-api-v1-version=3.2.1 fabric-renderer-indigo-version=1.5.1 -fabric-renderer-registries-v1-version=3.2.48 +fabric-renderer-registries-v1-version=3.2.49 fabric-rendering-data-attachment-v1-version=0.3.39 fabric-rendering-fluids-v1-version=3.0.30 -fabric-rendering-v0-version=1.1.51 -fabric-rendering-v1-version=3.0.10 +fabric-rendering-v0-version=1.1.52 +fabric-rendering-v1-version=3.0.11 fabric-resource-conditions-api-v1-version=2.3.10 -fabric-resource-loader-v0-version=0.11.11 -fabric-screen-api-v1-version=2.0.11 -fabric-screen-handler-api-v1-version=1.3.39 +fabric-resource-loader-v0-version=0.11.12 +fabric-screen-api-v1-version=2.0.12 +fabric-screen-handler-api-v1-version=1.3.40 fabric-sound-api-v1-version=1.0.14 -fabric-transfer-api-v1-version=3.3.8 +fabric-transfer-api-v1-version=3.3.9 fabric-transitive-access-wideners-v1-version=5.0.3 -fabric-convention-tags-v1-version=1.5.7 +fabric-convention-tags-v1-version=1.5.8 fabric-client-tags-api-v1-version=1.1.4