Sort features package by current mixin sorting

src/main/java/com/viaversion/viafabricplus/ViaFabricPlusImpl.java

@@ -29,7 +29,7 @@
 import com.viaversion.viafabricplus.base.Events;
 import com.viaversion.viafabricplus.base.overriding_jars.ClassLoaderPriorityUtil;
 import com.viaversion.viafabricplus.features.item.filter_creative_tabs.ItemRegistryDiff;
-import com.viaversion.viafabricplus.features.item.negative_items.NegativeItemUtil;
+import com.viaversion.viafabricplus.features.item.negative_item_count.NegativeItemUtil;
 import com.viaversion.viafabricplus.injection.access.base.IClientConnection;
 import com.viaversion.viafabricplus.injection.access.base.IServerInfo;
 import com.viaversion.viafabricplus.protocoltranslator.translator.ItemTranslator;
@@ -40,9 +40,8 @@
 import com.viaversion.viafabricplus.screen.impl.settings.SettingsScreen;
 import com.viaversion.viafabricplus.settings.SettingsManager;
 import com.viaversion.viafabricplus.features.FeaturesLoading;
-import com.viaversion.viafabricplus.features.max_chat_length.MaxChatLength;
+import com.viaversion.viafabricplus.features.limitation.max_chat_length.MaxChatLength;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
-import com.viaversion.viafabricplus.base.overriding_jars.ClassLoaderPriorityUtil;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;

src/main/java/com/viaversion/viafabricplus/features/FeaturesLoading.java

@@ -24,14 +24,14 @@
 import com.viaversion.viafabricplus.api.events.LoadingCycleCallback;
 import com.viaversion.viafabricplus.base.Events;
 import com.viaversion.viafabricplus.base.sync_tasks.DataCustomPayload;
-import com.viaversion.viafabricplus.features.armor_hud.ArmorHudEmulation1_8;
-import com.viaversion.viafabricplus.features.block.CollisionShapes;
-import com.viaversion.viafabricplus.features.classic.cpe_extensions.CPEAdditions;
+import com.viaversion.viafabricplus.features.emulation.armor_hud.ArmorHudEmulation1_8;
+import com.viaversion.viafabricplus.features.block.shape.CollisionShapes;
+import com.viaversion.viafabricplus.features.classic.cpe_extension.CPEAdditions;
 import com.viaversion.viafabricplus.features.entity.EntityDimensionDiff;
-import com.viaversion.viafabricplus.features.entity.enchantment_attributes.EnchantmentAttributesEmulation1_20_6;
+import com.viaversion.viafabricplus.features.entity.attribute.EnchantmentAttributesEmulation1_20_6;
 import com.viaversion.viafabricplus.features.footstep_particle.FootStepParticle1_12_2;
 import com.viaversion.viafabricplus.features.networking.resource_pack_header.ResourcePackHeaderDiff;
-import com.viaversion.viafabricplus.features.recipe_emulation.Recipes1_11_2;
+import com.viaversion.viafabricplus.features.emulation.recipe.Recipes1_11_2;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.client.MinecraftClient;
 import net.raphimc.viaaprilfools.api.AprilFoolsProtocolVersion;

src/main/java/com/viaversion/viafabricplus/features/block/CollisionShapes.java → src/main/java/com/viaversion/viafabricplus/features/block/shape/CollisionShapes.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.block;
+package com.viaversion.viafabricplus.features.block.shape;
 
 import net.minecraft.block.*;
 import net.minecraft.registry.Registries;

src/main/java/com/viaversion/viafabricplus/features/classic/cpe_extensions/CPEAdditions.java → src/main/java/com/viaversion/viafabricplus/features/classic/cpe_extension/CPEAdditions.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.classic.cpe_extensions;
+package com.viaversion.viafabricplus.features.classic.cpe_extension;
 
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viaversion.api.connection.UserConnection;

src/main/java/com/viaversion/viafabricplus/features/armor_hud/ArmorHudEmulation1_8.java → src/main/java/com/viaversion/viafabricplus/features/emulation/armor_hud/ArmorHudEmulation1_8.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.armor_hud;
+package com.viaversion.viafabricplus.features.emulation.armor_hud;
 
 import com.viaversion.viafabricplus.ViaFabricPlus;
 import com.viaversion.viafabricplus.visuals.ViaFabricPlusVisuals;

src/main/java/com/viaversion/viafabricplus/features/recipe_emulation/AddBannerPatternRecipe.java → src/main/java/com/viaversion/viafabricplus/features/emulation/recipe/AddBannerPatternRecipe.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.recipe_emulation;
+package com.viaversion.viafabricplus.features.emulation.recipe;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;

src/main/java/com/viaversion/viafabricplus/features/recipe_emulation/BannerPattern_1_13_2.java → src/main/java/com/viaversion/viafabricplus/features/emulation/recipe/BannerPattern_1_13_2.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.recipe_emulation;
+package com.viaversion.viafabricplus.features.emulation.recipe;
 
 import net.minecraft.block.Blocks;
 import net.minecraft.block.entity.BannerPattern;

src/main/java/com/viaversion/viafabricplus/features/recipe_emulation/RecipeInfo.java → src/main/java/com/viaversion/viafabricplus/features/emulation/recipe/RecipeInfo.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.recipe_emulation;
+package com.viaversion.viafabricplus.features.emulation.recipe;
 
 import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.ItemStack;

src/main/java/com/viaversion/viafabricplus/features/recipe_emulation/RecipeManager1_11_2.java → src/main/java/com/viaversion/viafabricplus/features/emulation/recipe/RecipeManager1_11_2.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.recipe_emulation;
+package com.viaversion.viafabricplus.features.emulation.recipe;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;

src/main/java/com/viaversion/viafabricplus/features/recipe_emulation/Recipes1_11_2.java → src/main/java/com/viaversion/viafabricplus/features/emulation/recipe/Recipes1_11_2.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.recipe_emulation;
+package com.viaversion.viafabricplus.features.emulation.recipe;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
@@ -40,7 +40,6 @@
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.util.Identifier;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
-import org.jetbrains.annotations.ApiStatus;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/viaversion/viafabricplus/features/recipe_emulation/ShulkerBoxColoringRecipe.java → src/main/java/com/viaversion/viafabricplus/features/emulation/recipe/ShulkerBoxColoringRecipe.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.recipe_emulation;
+package com.viaversion.viafabricplus.features.emulation.recipe;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.ShulkerBoxBlock;

src/main/java/com/viaversion/viafabricplus/features/entity/enchantment_attributes/EnchantmentAttributesEmulation1_20_6.java → src/main/java/com/viaversion/viafabricplus/features/entity/attribute/EnchantmentAttributesEmulation1_20_6.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.entity.enchantment_attributes;
+package com.viaversion.viafabricplus.features.entity.attribute;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;

src/main/java/com/viaversion/viafabricplus/features/entity/v1_8_boat/BoatModel1_8.java → src/main/java/com/viaversion/viafabricplus/features/entity/r1_8_boat/BoatModel1_8.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.entity.v1_8_boat;
+package com.viaversion.viafabricplus.features.entity.r1_8_boat;
 
 import net.minecraft.client.model.*;
 import net.minecraft.client.render.entity.model.EntityModel;

src/main/java/com/viaversion/viafabricplus/features/entity/v1_8_boat/BoatRenderer1_8.java → src/main/java/com/viaversion/viafabricplus/features/entity/r1_8_boat/BoatRenderer1_8.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.entity.v1_8_boat;
+package com.viaversion.viafabricplus.features.entity.r1_8_boat;
 
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.RenderLayer;

src/main/java/com/viaversion/viafabricplus/features/entity/riding_offsets/EntityRidingOffsetsPre1_20_2.java → src/main/java/com/viaversion/viafabricplus/features/entity/riding_offset/EntityRidingOffsetsPre1_20_2.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.entity.riding_offsets;
+package com.viaversion.viafabricplus.features.entity.riding_offset;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;

src/main/java/com/viaversion/viafabricplus/features/interaction/v1_18_2_block_ack_emulation/ClientPlayerInteractionManager1_18_2.java → src/main/java/com/viaversion/viafabricplus/features/interaction/r1_18_2_block_ack_emulation/ClientPlayerInteractionManager1_18_2.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.interaction.v1_18_2_block_ack_emulation;
+package com.viaversion.viafabricplus.features.interaction.r1_18_2_block_ack_emulation;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.ViaFabricPlusImpl;

src/main/java/com/viaversion/viafabricplus/features/item/negative_items/NegativeItemUtil.java → src/main/java/com/viaversion/viafabricplus/features/item/negative_item_count/NegativeItemUtil.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.item.negative_items;
+package com.viaversion.viafabricplus.features.item.negative_item_count;
 
 import com.viaversion.viafabricplus.util.ItemUtil;
 import com.viaversion.viaversion.protocols.v1_10to1_11.Protocol1_10To1_11;

src/main/java/com/viaversion/viafabricplus/features/item/tooltip_changes/Enchantments1_14_4.java → src/main/java/com/viaversion/viafabricplus/features/item/r1_14_4_enchantment_tooltip/Enchantments1_14_4.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.item.tooltip_changes;
+package com.viaversion.viafabricplus.features.item.r1_14_4_enchantment_tooltip;
 
 import com.viaversion.viaversion.util.Key;
 import net.minecraft.enchantment.Enchantment;

src/main/java/com/viaversion/viafabricplus/features/max_chat_length/MaxChatLength.java → src/main/java/com/viaversion/viafabricplus/features/limitation/max_chat_length/MaxChatLength.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.max_chat_length;
+package com.viaversion.viafabricplus.features.limitation.max_chat_length;
 
 import com.viaversion.viafabricplus.injection.access.base.IClientConnection;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;

src/main/java/com/viaversion/viafabricplus/features/networking/legacy_chat_signatures/KeyPairResponse1_19_0.java → src/main/java/com/viaversion/viafabricplus/features/networking/legacy_chat_signature/KeyPairResponse1_19_0.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.features.networking.legacy_chat_signatures;
+package com.viaversion.viafabricplus.features.networking.legacy_chat_signature;
 
 import com.mojang.authlib.yggdrasil.response.KeyPairResponse;
 

src/main/java/com/viaversion/viafabricplus/injection/access/IScreenHandler.java → src/main/java/com/viaversion/viafabricplus/injection/access/interaction/container_clicking/IScreenHandler.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access.interaction.container_clicking;
 
 public interface IScreenHandler {
 

src/main/java/com/viaversion/viafabricplus/injection/access/IClientPlayerInteractionManager.java → src/main/java/com/viaversion/viafabricplus/injection/access/interaction/r1_18_2_block_ack_emulation/IClientPlayerInteractionManager.java

@@ -19,9 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.access;
+package com.viaversion.viafabricplus.injection.access.interaction.r1_18_2_block_ack_emulation;
 
-import com.viaversion.viafabricplus.features.interaction.v1_18_2_block_ack_emulation.ClientPlayerInteractionManager1_18_2;
+import com.viaversion.viafabricplus.features.interaction.r1_18_2_block_ack_emulation.ClientPlayerInteractionManager1_18_2;
 
 public interface IClientPlayerInteractionManager {
 

src/main/java/com/viaversion/viafabricplus/injection/access/networking/downloading_terrain_handling/IDownloadingTerrainScreen.java → src/main/java/com/viaversion/viafabricplus/injection/access/networking/downloading_terrain/IDownloadingTerrainScreen.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.access.networking.downloading_terrain_handling;
+package com.viaversion.viafabricplus.injection.access.networking.downloading_terrain;
 
 public interface IDownloadingTerrainScreen {
 

src/main/java/com/viaversion/viafabricplus/injection/access/legacy_chat_signatures/ILegacyKeySignatureStorage.java → src/main/java/com/viaversion/viafabricplus/injection/access/networking/legacy_chat_signature/ILegacyKeySignatureStorage.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.access.legacy_chat_signatures;
+package com.viaversion.viafabricplus.injection.access.networking.legacy_chat_signature;
 
 public interface ILegacyKeySignatureStorage {
 

src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/cpe_extension/MixinClassicProtocolExtension.java

@@ -21,7 +21,7 @@
 
 package com.viaversion.viafabricplus.injection.mixin.features.classic.cpe_extension;
 
-import com.viaversion.viafabricplus.features.classic.cpe_extensions.CPEAdditions;
+import com.viaversion.viafabricplus.features.classic.cpe_extension.CPEAdditions;
 import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.data.ClassicProtocolExtension;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/cpe_extension/MixinClientboundPacketsc0_30cpe.java

@@ -21,7 +21,7 @@
 
 package com.viaversion.viafabricplus.injection.mixin.features.classic.cpe_extension;
 
-import com.viaversion.viafabricplus.features.classic.cpe_extensions.CPEAdditions;
+import com.viaversion.viafabricplus.features.classic.cpe_extension.CPEAdditions;
 import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.packet.ClientboundPacketsc0_30cpe;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/cpe_extension/MixinProtocolc0_30cpeToc0_28_30.java

@@ -21,7 +21,7 @@
 
 package com.viaversion.viafabricplus.injection.mixin.features.classic.cpe_extension;
 
-import com.viaversion.viafabricplus.features.classic.cpe_extensions.CPEAdditions;
+import com.viaversion.viafabricplus.features.classic.cpe_extension.CPEAdditions;
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;

src/main/java/com/viaversion/viafabricplus/injection/mixin/features/classic/cpe_extension/MixinWeatherRendering.java

@@ -21,7 +21,7 @@
 
 package com.viaversion.viafabricplus.injection.mixin.features.classic.cpe_extension;
 
-import com.viaversion.viafabricplus.features.classic.cpe_extensions.CPEAdditions;
+import com.viaversion.viafabricplus.features.classic.cpe_extension.CPEAdditions;
 import net.minecraft.client.render.WeatherRendering;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;

src/main/java/com/viaversion/viafabricplus/injection/mixin/features/recipe_emulation/MixinCraftingScreenHandler.java → src/main/java/com/viaversion/viafabricplus/injection/mixin/features/emulation/recipe/MixinCraftingScreenHandler.java

@@ -19,9 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.recipe_emulation;
+package com.viaversion.viafabricplus.injection.mixin.features.emulation.recipe;
 
-import com.viaversion.viafabricplus.features.recipe_emulation.Recipes1_11_2;
+import com.viaversion.viafabricplus.features.emulation.recipe.Recipes1_11_2;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.inventory.Inventory;

src/main/java/com/viaversion/viafabricplus/injection/mixin/features/recipe_emulation/MixinEntityPacketRewriter1_12.java → src/main/java/com/viaversion/viafabricplus/injection/mixin/features/emulation/recipe/MixinEntityPacketRewriter1_12.java

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.recipe_emulation;
+package com.viaversion.viafabricplus.injection.mixin.features.emulation.recipe;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/com/viaversion/viafabricplus/injection/mixin/features/recipe_emulation/MixinPlayerScreenHandler.java → src/main/java/com/viaversion/viafabricplus/injection/mixin/features/emulation/recipe/MixinPlayerScreenHandler.java

@@ -19,9 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.features.recipe_emulation;
+package com.viaversion.viafabricplus.injection.mixin.features.emulation.recipe;
 
-import com.viaversion.viafabricplus.features.recipe_emulation.Recipes1_11_2;
+import com.viaversion.viafabricplus.features.emulation.recipe.Recipes1_11_2;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.inventory.Inventory;

src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/attribute/MixinLivingEntity.java

@@ -21,7 +21,7 @@
 
 package com.viaversion.viafabricplus.injection.mixin.features.entity.attribute;
 
-import com.viaversion.viafabricplus.features.entity.enchantment_attributes.EnchantmentAttributesEmulation1_20_6;
+import com.viaversion.viafabricplus.features.entity.attribute.EnchantmentAttributesEmulation1_20_6;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.LivingEntity;

src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/r1_8_boat/MixinEntityModels.java

@@ -22,7 +22,7 @@
 package com.viaversion.viafabricplus.injection.mixin.features.entity.r1_8_boat;
 
 import com.google.common.collect.ImmutableMap;
-import com.viaversion.viafabricplus.features.entity.v1_8_boat.BoatModel1_8;
+import com.viaversion.viafabricplus.features.entity.r1_8_boat.BoatModel1_8;
 import net.minecraft.client.model.TexturedModelData;
 import net.minecraft.client.render.entity.model.EntityModelLayer;
 import net.minecraft.client.render.entity.model.EntityModels;

src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/r1_8_boat/MixinEntityRenderDispatcher.java

@@ -23,7 +23,7 @@
 
 import com.llamalad7.mixinextras.sugar.Local;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import com.viaversion.viafabricplus.features.entity.v1_8_boat.BoatRenderer1_8;
+import com.viaversion.viafabricplus.features.entity.r1_8_boat.BoatRenderer1_8;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.render.entity.EntityRenderer;

src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offset/MixinAbstractBoatEntity.java

@@ -21,7 +21,7 @@
 
 package com.viaversion.viafabricplus.injection.mixin.features.entity.riding_offset;
 
-import com.viaversion.viafabricplus.features.entity.riding_offsets.EntityRidingOffsetsPre1_20_2;
+import com.viaversion.viafabricplus.features.entity.riding_offset.EntityRidingOffsetsPre1_20_2;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.Entity;

src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offset/MixinEntity.java

@@ -21,7 +21,7 @@
 
 package com.viaversion.viafabricplus.injection.mixin.features.entity.riding_offset;
 
-import com.viaversion.viafabricplus.features.entity.riding_offsets.EntityRidingOffsetsPre1_20_2;
+import com.viaversion.viafabricplus.features.entity.riding_offset.EntityRidingOffsetsPre1_20_2;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.Entity;

src/main/java/com/viaversion/viafabricplus/injection/mixin/features/entity/riding_offset/MixinLivingEntity.java

@@ -21,7 +21,7 @@
 
 package com.viaversion.viafabricplus.injection.mixin.features.entity.riding_offset;
 
-import com.viaversion.viafabricplus.features.entity.riding_offsets.EntityRidingOffsetsPre1_20_2;
+import com.viaversion.viafabricplus.features.entity.riding_offset.EntityRidingOffsetsPre1_20_2;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import net.minecraft.entity.Entity;

src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/container_clicking/MixinClientPlayerInteractionManager.java

@@ -28,7 +28,7 @@
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.Protocol1_16_4To1_17;
 import com.viaversion.viafabricplus.injection.access.base.IClientConnection;
-import com.viaversion.viafabricplus.injection.access.IScreenHandler;
+import com.viaversion.viafabricplus.injection.access.interaction.container_clicking.IScreenHandler;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import com.viaversion.viafabricplus.protocoltranslator.translator.ItemTranslator;
 import net.minecraft.client.MinecraftClient;

src/main/java/com/viaversion/viafabricplus/injection/mixin/features/interaction/container_clicking/MixinScreenHandler.java

@@ -22,7 +22,7 @@
 package com.viaversion.viafabricplus.injection.mixin.features.interaction.container_clicking;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import com.viaversion.viafabricplus.injection.access.IScreenHandler;
+import com.viaversion.viafabricplus.injection.access.interaction.container_clicking.IScreenHandler;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.ScreenHandler;