Add checkstyle verification for package names, fix non-API packages.

checkstyle.xml

@@ -151,6 +151,41 @@
 		</module>
 
 		<module name="OuterTypeFilename"/>
+		<module name="PackageDeclaration"/>
+		<module name="PackageName">
+			<!-- require a package following the following structure:
+			base package name: net.fabricmc.fabric
+			+ api/implementation/mixin subpackage: api/impl/mixin
+			+ client/dedicated server/common env subpackage: client/server/<nothing>
+			+ module name subpackage, singular, may contain multiple .-separated parts
+			+ api only: module major version with v prefix (e.g. v1)
+			+ other subpackages as needed, all singular
+
+			The regex works as follows:
+			It matches (=succeeds) for one of these cases:
+			- net.fabricmc.fabric.api.client.<module-name>.v<version>[.<extra packages...>]
+			- net.fabricmc.fabric.api.server.<module-name>.v<version>[.<extra packages...>]
+			- net.fabricmc.fabric.api.<module-name>.v<version>[.<extra packages...>]
+			- net.fabricmc.fabric.(impl|mixin).client.<module-name>[.<extra packages...>]
+			- net.fabricmc.fabric.(impl|mixin).server.<module-name>[.<extra packages...>]
+			- net.fabricmc.fabric.(impl|mixin).<module-name>[.<extra packages...>]
+			- <any legacy package>
+			where <module-name> is a set of '.'-separated words, all in singular (not ending with s)
+			and <version> is a positive integer (1, 2, 3, ...)
+			and <extra packages...> is a set of '.'-separated words with all the first potentially containing digits.
+			Negative lookahead ensures that client/server can't be replaced with common disguised as the module name.
+
+			The regex is implemented in 3 parts:
+			- the net.fabricmc.fabric. prefix
+			- patterns for
+				- api packages: api + <not common> + client/server/nothing + <module-name> + 'v' + <version>
+				- impl+mixin packages : impl/mixin + <not common> + client/server/nothing + <module-name>
+				- literal legacy packages (exceptions)
+			- largely unconstained trailing subpackages
+			-->
+			<property name="format"
+			value="^net\.fabricmc\.fabric\.(api(?!\.common\.)(\.client|\.server|)(\.[a-z]+[a-rt-z])+\.v[1-9][0-9]*|(impl|mixin)(?!\.common\.)(\.client|\.server|)(\.[a-z]+[a-rt-z])+|api\.(event|util|biomes\.v1|registry|client\.screen|container|block|entity|client\.itemgroup|client\.keybinding|tag|tools|client\.model|network|server|client\.render|resource|client\.texture))(|\.[a-z]+(\.[a-z0-9]+)*)$"/>
+		</module>
 
 		<!--<module name="InvalidJavadocPosition"/>-->
 		<module name="JavadocParagraph"/>

fabric-api-base/build.gradle

@@ -1,2 +1,2 @@
 archivesBaseName = "fabric-api-base"
-version = getSubprojectVersion(project, "0.1.1")
+version = getSubprojectVersion(project, "0.1.2")

fabric-api-base/src/main/java/net/fabricmc/fabric/api/event/EventFactory.java

@@ -18,7 +18,7 @@ package net.fabricmc.fabric.api.event;
 
 import java.util.function.Function;
 
-import net.fabricmc.fabric.impl.event.EventFactoryImpl;
+import net.fabricmc.fabric.impl.base.event.EventFactoryImpl;
 
 /**
  * Helper for creating {@link Event} classes.

fabric-api-base/src/main/java/net/fabricmc/fabric/impl/base/event/ArrayBackedEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.event;
+package net.fabricmc.fabric.impl.base.event;
 
 import java.lang.reflect.Array;
 import java.util.Arrays;

fabric-api-base/src/main/java/net/fabricmc/fabric/impl/base/event/EventFactoryImpl.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.event;
+package net.fabricmc.fabric.impl.base.event;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;

fabric-biomes-v1/build.gradle

@@ -1,2 +1,2 @@
 archivesBaseName = "fabric-biomes-v1"
-version = getSubprojectVersion(project, "0.1.2")
+version = getSubprojectVersion(project, "0.1.3")

fabric-biomes-v1/src/main/java/net/fabricmc/fabric/api/biomes/v1/FabricBiomes.java

@@ -18,7 +18,7 @@ package net.fabricmc.fabric.api.biomes.v1;
 
 import net.minecraft.world.biome.Biome;
 
-import net.fabricmc.fabric.impl.biomes.InternalBiomeData;
+import net.fabricmc.fabric.impl.biome.InternalBiomeData;
 
 /**
  * General API that applies to all biome sources.

fabric-biomes-v1/src/main/java/net/fabricmc/fabric/api/biomes/v1/OverworldBiomes.java

@@ -18,7 +18,7 @@ package net.fabricmc.fabric.api.biomes.v1;
 
 import net.minecraft.world.biome.Biome;
 
-import net.fabricmc.fabric.impl.biomes.InternalBiomeData;
+import net.fabricmc.fabric.impl.biome.InternalBiomeData;
 
 /**
  * API that exposes some internals of the minecraft default biome source for the overworld.

fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biome/BiomeVariant.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.biomes;
+package net.fabricmc.fabric.impl.biome;
 
 import net.minecraft.world.biome.Biome;
 

fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biome/ContinentalBiomeEntry.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.biomes;
+package net.fabricmc.fabric.impl.biome;
 
 import net.minecraft.world.biome.Biome;
 

fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biome/InternalBiomeData.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.biomes;
+package net.fabricmc.fabric.impl.biome;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biome/InternalBiomeUtils.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.biomes;
+package net.fabricmc.fabric.impl.biome;
 
 import java.util.List;
 import java.util.Map;

fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biome/VariantTransformer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.biomes;
+package net.fabricmc.fabric.impl.biome;
 
 import java.util.ArrayList;
 import java.util.HashMap;

fabric-biomes-v1/src/main/java/net/fabricmc/fabric/impl/biome/WeightedBiomePicker.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.biomes;
+package net.fabricmc.fabric.impl.biome;
 
 import java.util.ArrayList;
 import java.util.List;

fabric-biomes-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MixinAddEdgeBiomesLayer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.biomes;
+package net.fabricmc.fabric.mixin.biome;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -27,8 +27,8 @@ import net.minecraft.world.biome.layer.AddEdgeBiomesLayer;
 import net.minecraft.world.biome.layer.LayerRandomnessSource;
 
 import net.fabricmc.fabric.api.biomes.v1.OverworldBiomes;
-import net.fabricmc.fabric.impl.biomes.InternalBiomeData;
-import net.fabricmc.fabric.impl.biomes.InternalBiomeUtils;
+import net.fabricmc.fabric.impl.biome.InternalBiomeData;
+import net.fabricmc.fabric.impl.biome.InternalBiomeUtils;
 
 /**
  * Adds edges and shores specified in {@link OverworldBiomes#addEdgeBiome(Biome, Biome, double)} and {@link OverworldBiomes#addShoreBiome(Biome, Biome, double)} to the edges layer.

fabric-biomes-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MixinAddHillsLayer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.biomes;
+package net.fabricmc.fabric.mixin.biome;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -29,8 +29,8 @@ import net.minecraft.world.biome.layer.LayerRandomnessSource;
 import net.minecraft.world.biome.layer.LayerSampler;
 
 import net.fabricmc.fabric.api.biomes.v1.OverworldBiomes;
-import net.fabricmc.fabric.impl.biomes.InternalBiomeData;
-import net.fabricmc.fabric.impl.biomes.WeightedBiomePicker;
+import net.fabricmc.fabric.impl.biome.InternalBiomeData;
+import net.fabricmc.fabric.impl.biome.WeightedBiomePicker;
 
 /**
  * Injects hills biomes specified from {@link OverworldBiomes#addHillsBiome(Biome, Biome, double)}into the default hills layer.

fabric-biomes-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MixinAddRiversLayer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.biomes;
+package net.fabricmc.fabric.mixin.biome;
 
 import java.util.Map;
 
@@ -32,7 +32,7 @@ import net.minecraft.world.biome.layer.LayerRandomnessSource;
 import net.minecraft.world.biome.layer.LayerSampler;
 
 import net.fabricmc.fabric.api.biomes.v1.OverworldBiomes;
-import net.fabricmc.fabric.impl.biomes.InternalBiomeData;
+import net.fabricmc.fabric.impl.biome.InternalBiomeData;
 
 /**
  * Sets river biomes specified with {@link OverworldBiomes#setRiverBiome(Biome, Biome)}.

fabric-biomes-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MixinBiomeSource.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.biomes;
+package net.fabricmc.fabric.mixin.biome;
 
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -31,7 +31,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.source.BiomeSource;
 
-import net.fabricmc.fabric.impl.biomes.InternalBiomeData;
+import net.fabricmc.fabric.impl.biome.InternalBiomeData;
 
 /**
  * Adds spawn biomes to the base {@link BiomeSource} class.

fabric-biomes-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MixinSetBaseBiomesLayer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.biomes;
+package net.fabricmc.fabric.mixin.biome;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -30,7 +30,7 @@ import net.minecraft.world.biome.layer.LayerRandomnessSource;
 import net.minecraft.world.biome.layer.SetBaseBiomesLayer;
 
 import net.fabricmc.fabric.api.biomes.v1.OverworldClimate;
-import net.fabricmc.fabric.impl.biomes.InternalBiomeUtils;
+import net.fabricmc.fabric.impl.biome.InternalBiomeUtils;
 
 /**
  * Injects biomes into the arrays of biomes in the {@link SetBaseBiomesLayer}.

fabric-biomes-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MixinVanillaLayeredBiomeSource.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.biomes;
+package net.fabricmc.fabric.mixin.biome;
 
 import java.util.HashSet;
 import java.util.Set;

fabric-biomes-v1/src/main/resources/fabric-biomes-v1.mixins.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "net.fabricmc.fabric.mixin.biomes",
+  "package": "net.fabricmc.fabric.mixin.biome",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "MixinAddEdgeBiomesLayer",

fabric-commands-v0/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-commands-v0"
-version = getSubprojectVersion(project, "0.1.1")
+version = getSubprojectVersion(project, "0.1.2")
 
 dependencies {
 	compile project(path: ':fabric-api-base', configuration: 'dev')

fabric-commands-v0/src/main/java/net/fabricmc/fabric/api/registry/CommandRegistry.java

@@ -22,7 +22,7 @@ import com.mojang.brigadier.CommandDispatcher;
 
 import net.minecraft.server.command.ServerCommandSource;
 
-import net.fabricmc.fabric.impl.registry.CommandRegistryImpl;
+import net.fabricmc.fabric.impl.command.CommandRegistryImpl;
 
 /**
  * Registry for server-side command providers.

fabric-commands-v0/src/main/java/net/fabricmc/fabric/impl/command/CommandRegistryImpl.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.registry;
+package net.fabricmc.fabric.impl.command;
 
 import java.util.ArrayList;
 import java.util.Collections;

fabric-commands-v0/src/main/java/net/fabricmc/fabric/mixin/command/MixinCommandManagerIntegrated.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.registrycommands;
+package net.fabricmc.fabric.mixin.command;
 
 import com.mojang.brigadier.CommandDispatcher;
 import org.spongepowered.asm.mixin.Mixin;
@@ -26,7 +26,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
 
-import net.fabricmc.fabric.impl.registry.CommandRegistryImpl;
+import net.fabricmc.fabric.impl.command.CommandRegistryImpl;
 
 @Mixin(CommandManager.class)
 public class MixinCommandManagerIntegrated {

fabric-commands-v0/src/main/java/net/fabricmc/fabric/mixin/command/MixinMinecraftDedicatedServer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.registrycommands;
+package net.fabricmc.fabric.mixin.command;
 
 import java.io.File;
 import java.net.Proxy;
@@ -34,7 +34,7 @@ import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.dedicated.MinecraftDedicatedServer;
 import net.minecraft.util.UserCache;
 
-import net.fabricmc.fabric.impl.registry.CommandRegistryImpl;
+import net.fabricmc.fabric.impl.command.CommandRegistryImpl;
 
 @Mixin(MinecraftDedicatedServer.class)
 public abstract class MixinMinecraftDedicatedServer extends MinecraftServer {

fabric-commands-v0/src/main/resources/fabric-commands-v0.mixins.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "net.fabricmc.fabric.mixin.registrycommands",
+  "package": "net.fabricmc.fabric.mixin.command",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "MixinMinecraftDedicatedServer"

fabric-containers-v0/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-containers-v0"
-version = getSubprojectVersion(project, "0.1.2")
+version = getSubprojectVersion(project, "0.1.3")
 
 dependencies {
 	compile project(path: ':fabric-api-base', configuration: 'dev')

fabric-containers-v0/src/main/java/net/fabricmc/fabric/api/client/screen/ScreenProviderRegistry.java

@@ -22,7 +22,7 @@ import net.minecraft.util.Identifier;
 
 import net.fabricmc.fabric.api.container.ContainerFactory;
 import net.fabricmc.fabric.api.container.ContainerProviderRegistry;
-import net.fabricmc.fabric.impl.client.gui.ScreenProviderRegistryImpl;
+import net.fabricmc.fabric.impl.client.container.ScreenProviderRegistryImpl;
 
 public interface ScreenProviderRegistry {
 	ScreenProviderRegistry INSTANCE = ScreenProviderRegistryImpl.INSTANCE;

fabric-containers-v0/src/main/java/net/fabricmc/fabric/impl/client/container/ScreenProviderRegistryImpl.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.client.gui;
+package net.fabricmc.fabric.impl.client.container;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -32,7 +32,7 @@ import net.fabricmc.fabric.api.client.screen.ScreenProviderRegistry;
 import net.fabricmc.fabric.api.container.ContainerFactory;
 import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
 import net.fabricmc.fabric.impl.container.ContainerProviderImpl;
-import net.fabricmc.fabric.impl.network.PacketTypes;
+import net.fabricmc.fabric.impl.networking.PacketTypes;
 
 public class ScreenProviderRegistryImpl implements ScreenProviderRegistry {
 	/**

fabric-containers-v0/src/main/java/net/fabricmc/fabric/impl/container/ContainerProviderImpl.java

@@ -33,7 +33,7 @@ import net.minecraft.util.PacketByteBuf;
 
 import net.fabricmc.fabric.api.container.ContainerFactory;
 import net.fabricmc.fabric.api.container.ContainerProviderRegistry;
-import net.fabricmc.fabric.impl.network.PacketTypes;
+import net.fabricmc.fabric.impl.networking.PacketTypes;
 import net.fabricmc.fabric.mixin.container.ServerPlayerEntityAccessor;
 
 public class ContainerProviderImpl implements ContainerProviderRegistry {

fabric-containers-v0/src/main/resources/fabric.mod.json

@@ -27,7 +27,7 @@
   ],
   "entrypoints": {
     "client": [
-      "net.fabricmc.fabric.impl.client.gui.ScreenProviderRegistryImpl::init"
+      "net.fabricmc.fabric.impl.client.container.ScreenProviderRegistryImpl::init"
     ]
   }
 }

fabric-content-registries-v0/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-content-registries-v0"
-version = getSubprojectVersion(project, "0.1.2")
+version = getSubprojectVersion(project, "0.1.3")
 
 dependencies {
 	compile project(path: ':fabric-api-base', configuration: 'dev')

fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/CompostingChanceRegistry.java

@@ -17,7 +17,7 @@
 package net.fabricmc.fabric.api.registry;
 
 import net.fabricmc.fabric.api.util.Item2ObjectMap;
-import net.fabricmc.fabric.impl.registry.CompostingChanceRegistryImpl;
+import net.fabricmc.fabric.impl.content.registry.CompostingChanceRegistryImpl;
 
 /**
  * Registry of items to 0.0-1.0 values, defining the chance of a given item

fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/FlammableBlockRegistry.java

@@ -21,7 +21,7 @@ import net.minecraft.block.Blocks;
 import net.minecraft.tag.Tag;
 
 import net.fabricmc.fabric.api.util.Block2ObjectMap;
-import net.fabricmc.fabric.impl.registry.FlammableBlockRegistryImpl;
+import net.fabricmc.fabric.impl.content.registry.FlammableBlockRegistryImpl;
 
 public interface FlammableBlockRegistry extends Block2ObjectMap<FlammableBlockRegistry.Entry> {
 	static FlammableBlockRegistry getDefaultInstance() {

fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/FuelRegistry.java

@@ -17,7 +17,7 @@
 package net.fabricmc.fabric.api.registry;
 
 import net.fabricmc.fabric.api.util.Item2ObjectMap;
-import net.fabricmc.fabric.impl.registry.FuelRegistryImpl;
+import net.fabricmc.fabric.impl.content.registry.FuelRegistryImpl;
 
 /**
  * Registry of items to 0-32767 fuel burn time values, in in-game ticks.

fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/LootEntryTypeRegistry.java

@@ -18,7 +18,7 @@ package net.fabricmc.fabric.api.registry;
 
 import net.minecraft.loot.entry.LootEntry;
 
-import net.fabricmc.fabric.impl.registry.LootEntryTypeRegistryImpl;
+import net.fabricmc.fabric.impl.content.registry.LootEntryTypeRegistryImpl;
 
 /**
  * @deprecated Use {@link net.fabricmc.fabric.api.loot.v1.LootEntryTypeRegistry}

fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/CompostingChanceRegistryImpl.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.registry;
+package net.fabricmc.fabric.impl.content.registry;
 
 import net.minecraft.block.ComposterBlock;
 import net.minecraft.item.Item;

fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FireBlockHooks.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.registry;
+package net.fabricmc.fabric.impl.content.registry;
 
 import net.minecraft.block.BlockState;
 

fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FlammableBlockRegistryImpl.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.registry;
+package net.fabricmc.fabric.impl.content.registry;
 
 import java.util.Collection;
 import java.util.Collections;

fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FuelRegistryImpl.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.registry;
+package net.fabricmc.fabric.impl.content.registry;
 
 import java.util.Map;
 

fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/LootEntryTypeRegistryImpl.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.registry;
+package net.fabricmc.fabric.impl.content.registry;
 
 import java.lang.reflect.Method;
 

fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/MixinAbstractFurnaceBlockEntity.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.registryextras;
+package net.fabricmc.fabric.mixin.content.registry;
 
 import java.util.Map;
 
@@ -26,7 +26,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import net.minecraft.block.entity.AbstractFurnaceBlockEntity;
 import net.minecraft.item.Item;
 
-import net.fabricmc.fabric.impl.registry.FuelRegistryImpl;
+import net.fabricmc.fabric.impl.content.registry.FuelRegistryImpl;
 
 @Mixin(AbstractFurnaceBlockEntity.class)
 public class MixinAbstractFurnaceBlockEntity {

fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/MixinFireBlock.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.registryextras;
+package net.fabricmc.fabric.mixin.content.registry;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -29,8 +29,8 @@ import net.minecraft.block.FireBlock;
 import net.minecraft.state.property.Properties;
 
 import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
-import net.fabricmc.fabric.impl.registry.FireBlockHooks;
-import net.fabricmc.fabric.impl.registry.FlammableBlockRegistryImpl;
+import net.fabricmc.fabric.impl.content.registry.FireBlockHooks;
+import net.fabricmc.fabric.impl.content.registry.FlammableBlockRegistryImpl;
 
 @Mixin(FireBlock.class)
 public class MixinFireBlock implements FireBlockHooks {

fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.mixins.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "net.fabricmc.fabric.mixin.registryextras",
+  "package": "net.fabricmc.fabric.mixin.content.registry",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "MixinAbstractFurnaceBlockEntity",

fabric-crash-report-info-v1/build.gradle

@@ -1,2 +1,2 @@
 archivesBaseName = "fabric-crash-report-info-v1"
-version = getSubprojectVersion(project, "0.1.1")
+version = getSubprojectVersion(project, "0.1.2")

fabric-crash-report-info-v1/src/main/java/net/fabricmc/fabric/mixin/crash/report/info/MixinCrashReport.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.crash;
+package net.fabricmc.fabric.mixin.crash.report.info;
 
 import java.util.Map;
 import java.util.TreeMap;

fabric-crash-report-info-v1/src/main/resources/fabric-crash-report-info-v1.mixins.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "net.fabricmc.fabric.mixin.crash",
+  "package": "net.fabricmc.fabric.mixin.crash.report.info",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "MixinCrashReport"

fabric-dimensions-v1/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-dimensions-v1"
-version = getSubprojectVersion(project, "0.2.1")
+version = getSubprojectVersion(project, "0.2.2")
 
 dependencies {
 	compile project(path: ':fabric-api-base', configuration: 'dev')

fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/DimensionIdsFixer.java

@@ -35,7 +35,7 @@ import net.minecraft.world.level.LevelProperties;
 
 import net.fabricmc.fabric.api.dimension.v1.FabricDimensionType;
 import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;
-import net.fabricmc.fabric.impl.registry.RemapException;
+import net.fabricmc.fabric.impl.registry.sync.RemapException;
 
 /**
  * Handles fixing raw dimension ids between saves and servers,

fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/DimensionRemapException.java

@@ -16,7 +16,7 @@
 
 package net.fabricmc.fabric.impl.dimension;
 
-import net.fabricmc.fabric.impl.registry.RemapException;
+import net.fabricmc.fabric.impl.registry.sync.RemapException;
 
 public class DimensionRemapException extends RuntimeException {
 	public DimensionRemapException(String message, RemapException cause) {

fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/FabricDimensionClientInit.java

@@ -26,7 +26,7 @@ import net.minecraft.text.LiteralText;
 
 import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
 import net.fabricmc.fabric.api.network.PacketContext;
-import net.fabricmc.fabric.impl.registry.RemapException;
+import net.fabricmc.fabric.impl.registry.sync.RemapException;
 
 /**
  * Client entry point for fabric-dimensions.

fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/impl/dimension/FabricDimensionInternals.java

@@ -29,7 +29,7 @@ import net.minecraft.world.dimension.DimensionType;
 import net.fabricmc.fabric.api.dimension.v1.EntityPlacer;
 import net.fabricmc.fabric.api.dimension.v1.FabricDimensionType;
 import net.fabricmc.fabric.api.dimension.v1.FabricDimensions;
-import net.fabricmc.fabric.mixin.EntityHooks;
+import net.fabricmc.fabric.mixin.dimension.EntityHooks;
 
 public final class FabricDimensionInternals {
 	private FabricDimensionInternals() {

fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/EntityHooks.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin;
+package net.fabricmc.fabric.mixin.dimension;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/MixinEntity.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin;
+package net.fabricmc.fabric.mixin.dimension;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/MixinPortalForcer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin;
+package net.fabricmc.fabric.mixin.dimension;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;

fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/idremap/MixinDimensionRawIndexFix.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.idremap;
+package net.fabricmc.fabric.mixin.dimension.idremap;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/idremap/MixinLevelProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.idremap;
+package net.fabricmc.fabric.mixin.dimension.idremap;
 
 import com.mojang.datafixers.DataFixer;
 import org.spongepowered.asm.mixin.Mixin;
@@ -29,7 +29,7 @@ import net.minecraft.world.level.LevelProperties;
 import net.fabricmc.fabric.impl.dimension.DimensionIdsFixer;
 import net.fabricmc.fabric.impl.dimension.DimensionIdsHolder;
 import net.fabricmc.fabric.impl.dimension.DimensionRemapException;
-import net.fabricmc.fabric.impl.registry.RemapException;
+import net.fabricmc.fabric.impl.registry.sync.RemapException;
 
 @Mixin(LevelProperties.class)
 public abstract class MixinLevelProperties implements DimensionIdsHolder {

fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/idremap/MixinLevelStorage.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.idremap;
+package net.fabricmc.fabric.mixin.dimension.idremap;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/idremap/MixinPlayerManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.idremap;
+package net.fabricmc.fabric.mixin.dimension.idremap;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/idremap/MixinUnmodifiableLevelProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.idremap;
+package net.fabricmc.fabric.mixin.dimension.idremap;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;

fabric-dimensions-v1/src/main/resources/fabric-dimensions-v1.mixins.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "net.fabricmc.fabric.mixin",
+  "package": "net.fabricmc.fabric.mixin.dimension",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "EntityHooks",

fabric-events-interaction-v0/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-events-interaction-v0"
-version = getSubprojectVersion(project, "0.2.4")
+version = getSubprojectVersion(project, "0.2.5")
 
 dependencies {
 	compile project(path: ':fabric-api-base', configuration: 'dev')

fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/impl/event/interaction/InteractionEventsRouter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.event;
+package net.fabricmc.fabric.impl.event.interaction;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.util.ActionResult;

fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/impl/event/interaction/InteractionEventsRouterClient.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.event;
+package net.fabricmc.fabric.impl.event.interaction;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;

fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/MixinClientPlayerInteractionManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.eventsinteraction;
+package net.fabricmc.fabric.mixin.event.interaction;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/MixinMinecraftClient.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.eventsinteraction;
+package net.fabricmc.fabric.mixin.event.interaction;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/MixinServerPlayNetworkHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.eventsinteraction;
+package net.fabricmc.fabric.mixin.event.interaction;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/MixinServerPlayerEntity.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.eventsinteraction;
+package net.fabricmc.fabric.mixin.event.interaction;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/MixinServerPlayerInteractionManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.eventsinteraction;
+package net.fabricmc.fabric.mixin.event.interaction;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

fabric-events-interaction-v0/src/main/resources/fabric-events-interaction-v0.mixins.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "net.fabricmc.fabric.mixin.eventsinteraction",
+  "package": "net.fabricmc.fabric.mixin.event.interaction",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "MixinServerPlayerEntity",

fabric-events-interaction-v0/src/main/resources/fabric.mod.json

@@ -22,10 +22,10 @@
   },
   "entrypoints": {
     "main": [
-      "net.fabricmc.fabric.impl.event.InteractionEventsRouter"
+      "net.fabricmc.fabric.impl.event.interaction.InteractionEventsRouter"
     ],
     "client": [
-      "net.fabricmc.fabric.impl.event.InteractionEventsRouterClient"
+      "net.fabricmc.fabric.impl.event.interaction.InteractionEventsRouterClient"
     ]
   },
   "description": "Events for player interaction with blocks and entities.",

fabric-events-lifecycle-v0/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-events-lifecycle-v0"
-version = getSubprojectVersion(project, "0.1.1")
+version = getSubprojectVersion(project, "0.1.2")
 
 dependencies {
 	compile project(path: ':fabric-api-base', configuration: 'dev')

fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MixinItemStack.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.eventslifecycle;
+package net.fabricmc.fabric.mixin.event.lifecycle;
 
 import java.util.List;
 

fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MixinMinecraftClient.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.eventslifecycle;
+package net.fabricmc.fabric.mixin.event.lifecycle;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MixinMinecraftServer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.eventslifecycle;
+package net.fabricmc.fabric.mixin.event.lifecycle;
 
 import java.util.function.BooleanSupplier;
 

fabric-events-lifecycle-v0/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MixinWorld.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.eventslifecycle;
+package net.fabricmc.fabric.mixin.event.lifecycle;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

fabric-events-lifecycle-v0/src/main/resources/fabric-events-lifecycle-v0.mixins.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "net.fabricmc.fabric.mixin.eventslifecycle",
+  "package": "net.fabricmc.fabric.mixin.event.lifecycle",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "MixinMinecraftServer",

fabric-item-groups-v0/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-item-groups-v0"
-version = getSubprojectVersion(project, "0.1.3")
+version = getSubprojectVersion(project, "0.1.4")
 
 dependencies {
 	compile project(path: ':fabric-api-base', configuration: 'dev')

fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/api/client/itemgroup/FabricItemGroupBuilder.java

@@ -25,7 +25,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.DefaultedList;
 import net.minecraft.util.Identifier;
 
-import net.fabricmc.fabric.impl.itemgroup.ItemGroupExtensions;
+import net.fabricmc.fabric.impl.item.group.ItemGroupExtensions;
 
 public final class FabricItemGroupBuilder {
 	private Identifier identifier;

fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/impl/item/group/CreativeGuiExtensions.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.itemgroup;
+package net.fabricmc.fabric.impl.item.group;
 
 public interface CreativeGuiExtensions {
 	void fabric_nextPage();

fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/impl/item/group/FabricCreativeGuiComponents.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.itemgroup;
+package net.fabricmc.fabric.impl.item.group;
 
 import java.util.HashSet;
 import java.util.Set;

fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/impl/item/group/ItemGroupExtensions.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.itemgroup;
+package net.fabricmc.fabric.impl.item.group;
 
 public interface ItemGroupExtensions {
 	void fabric_expandArray();

fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/mixin/item/group/MixinItemGroup.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.itemgroup;
+package net.fabricmc.fabric.mixin.item.group;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -23,7 +23,7 @@ import org.spongepowered.asm.mixin.Shadow;
 
 import net.minecraft.item.ItemGroup;
 
-import net.fabricmc.fabric.impl.itemgroup.ItemGroupExtensions;
+import net.fabricmc.fabric.impl.item.group.ItemGroupExtensions;
 
 @Mixin(ItemGroup.class)
 public abstract class MixinItemGroup implements ItemGroupExtensions {

fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/mixin/item/group/client/MixinCreativePlayerInventoryGui.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.itemgroup.client;
+package net.fabricmc.fabric.mixin.item.group.client;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -30,8 +30,8 @@ import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.text.Text;
 
-import net.fabricmc.fabric.impl.itemgroup.CreativeGuiExtensions;
-import net.fabricmc.fabric.impl.itemgroup.FabricCreativeGuiComponents;
+import net.fabricmc.fabric.impl.item.group.CreativeGuiExtensions;
+import net.fabricmc.fabric.impl.item.group.FabricCreativeGuiComponents;
 
 @Mixin(CreativeInventoryScreen.class)
 public abstract class MixinCreativePlayerInventoryGui extends AbstractInventoryScreen implements CreativeGuiExtensions {

fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/mixin/item/group/client/MixinItemGroup.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.itemgroup.client;
+package net.fabricmc.fabric.mixin.item.group.client;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -24,7 +24,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import net.minecraft.item.ItemGroup;
 
-import net.fabricmc.fabric.impl.itemgroup.FabricCreativeGuiComponents;
+import net.fabricmc.fabric.impl.item.group.FabricCreativeGuiComponents;
 
 @Mixin(ItemGroup.class)
 public abstract class MixinItemGroup {

fabric-item-groups-v0/src/main/resources/fabric-item-groups-v0.mixins.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "net.fabricmc.fabric.mixin.itemgroup",
+  "package": "net.fabricmc.fabric.mixin.item.group",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "MixinItemGroup"

fabric-loot-tables-v1/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-loot-tables-v1"
-version = getSubprojectVersion(project, "0.1.3")
+version = getSubprojectVersion(project, "0.1.4")
 
 dependencies {
 	compile project(path: ':fabric-api-base', configuration: 'dev')

fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootPoolBuilder.java

@@ -22,7 +22,7 @@ import net.minecraft.loot.condition.LootCondition;
 import net.minecraft.loot.entry.LootEntry;
 import net.minecraft.loot.function.LootFunction;
 
-import net.fabricmc.fabric.mixin.loot.LootPoolBuilderHooks;
+import net.fabricmc.fabric.mixin.loot.table.LootPoolBuilderHooks;
 
 public class FabricLootPoolBuilder extends LootPool.Builder {
 	private final LootPoolBuilderHooks extended = (LootPoolBuilderHooks) this;

fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootSupplierBuilder.java

@@ -23,7 +23,7 @@ import net.minecraft.loot.LootTable;
 import net.minecraft.loot.context.LootContextType;
 import net.minecraft.loot.function.LootFunction;
 
-import net.fabricmc.fabric.mixin.loot.LootSupplierBuilderHooks;
+import net.fabricmc.fabric.mixin.loot.table.LootSupplierBuilderHooks;
 
 public class FabricLootSupplierBuilder extends LootTable.Builder {
 	private final LootSupplierBuilderHooks extended = (LootSupplierBuilderHooks) this;

fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/LootEntryTypeRegistry.java

@@ -18,7 +18,7 @@ package net.fabricmc.fabric.api.loot.v1;
 
 import net.minecraft.loot.entry.LootEntry;
 
-import net.fabricmc.fabric.impl.loot.LootEntryTypeRegistryImpl;
+import net.fabricmc.fabric.impl.loot.table.LootEntryTypeRegistryImpl;
 
 /**
  * Fabric's extensions to {@code net.minecraft.loot.entry.LootEntries} for registering

fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/impl/loot/table/LootEntryTypeRegistryImpl.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.loot;
+package net.fabricmc.fabric.impl.loot.table;
 
 import java.lang.reflect.Method;
 

fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/table/LootPoolBuilderHooks.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.loot;
+package net.fabricmc.fabric.mixin.loot.table;
 
 import java.util.List;
 

fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/table/LootSupplierBuilderHooks.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.loot;
+package net.fabricmc.fabric.mixin.loot.table;
 
 import java.util.List;
 

fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/table/MixinLootManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.loot;
+package net.fabricmc.fabric.mixin.loot.table;
 
 import java.util.HashMap;
 import java.util.Map;

fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/table/MixinLootPool.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.loot;
+package net.fabricmc.fabric.mixin.loot.table;
 
 import java.util.Arrays;
 import java.util.List;

fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/table/MixinLootSupplier.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.loot;
+package net.fabricmc.fabric.mixin.loot.table;
 
 import java.util.Arrays;
 import java.util.List;

fabric-loot-tables-v1/src/main/resources/fabric-loot-tables-v1.mixins.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "net.fabricmc.fabric.mixin.loot",
+  "package": "net.fabricmc.fabric.mixin.loot.table",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "LootPoolBuilderHooks",

fabric-mining-levels-v0/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-mining-levels-v0"
-version = getSubprojectVersion(project, "0.1.0")
+version = getSubprojectVersion(project, "0.1.1")
 
 dependencies {
     compile project(path: ':fabric-api-base', configuration: 'dev')

fabric-mining-levels-v0/src/main/java/net/fabricmc/fabric/impl/mining/level/ToolManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.tools;
+package net.fabricmc.fabric.impl.mining.level;
 
 import java.util.HashMap;
 import java.util.Map;