Finish cleaning out v0 folder

lowercasebtw · lowercasebtw · commit eefbd9b8a77f · 2025-10-22T20:12:09.000-04:00
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/MixinHumanoidModel.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/MixinHumanoidModel.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity;
+package btw.mixces.animatium.mixins.v1.entity;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
@@ -80,6 +80,7 @@ protected MixinHumanoidModel(ModelPart modelPart, Function<ResourceLocation, Ren
         super(modelPart, function);
     }
 
+    // TODO/MOVE
     @WrapOperation(method = "setupAnim(Lnet/minecraft/client/renderer/entity/state/HumanoidRenderState;)V", at = @At(value = "FIELD", opcode = Opcodes.GETFIELD, target = "Lnet/minecraft/client/renderer/entity/state/HumanoidRenderState;isCrouching:Z"))
     private boolean animatium$sneakingFeetPosition(HumanoidRenderState instance, Operation<Boolean> original) {
         if (AnimatiumClient.isEnabled() && AnimatiumConfig.instance().sneakingFeetPosition && instance.isCrouching) {
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/MixinItemPickupParticle.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/MixinItemPickupParticle.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.item;
+package btw.mixces.animatium.mixins.v1.entity;
 
 import btw.mixces.animatium.config.AnimatiumConfig;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/MixinLivingEntityRenderer.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/MixinLivingEntityRenderer.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity;
+package btw.mixces.animatium.mixins.v1.entity;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
@@ -45,6 +45,7 @@
 
 @Mixin(LivingEntityRenderer.class)
 public abstract class MixinLivingEntityRenderer<S extends LivingEntityRenderState> {
+    // TODO/MOVE
     @Inject(method = "submit(Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/state/CameraRenderState;)V", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/PoseStack;translate(FFF)V", ordinal = 1))
     private void animatium$syncPlayerModelWithEyeHeight(S livingEntityRenderState, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, CameraRenderState cameraRenderState, CallbackInfo ci) {
         if (AnimatiumClient.isEnabled() && AnimatiumConfig.instance().syncPlayerModelWithEyeHeight) {
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/MixinPlayer.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/MixinPlayer.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity;
+package btw.mixces.animatium.mixins.v1.entity;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/armor_hurt/MixinEquipmentLayerRenderer.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/armor_hurt/MixinEquipmentLayerRenderer.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity.layer;
+package btw.mixces.animatium.mixins.v1.entity.armor_hurt;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/cape_movement/MixinAvatarRenderer.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/cape_movement/MixinAvatarRenderer.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity;
+package btw.mixces.animatium.mixins.v1.entity.cape_movement;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
@@ -44,7 +44,6 @@
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Avatar;
 import net.minecraft.world.entity.HumanoidArm;
-import org.jetbrains.annotations.NotNull;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -59,10 +58,6 @@ public MixinAvatarRenderer(EntityRendererProvider.Context context, PlayerModel e
         super(context, entityModel, f);
     }
 
-    @Shadow
-    @NotNull
-    public abstract AvatarRenderState createRenderState();
-
     @Shadow
     private static HumanoidModel.ArmPose getArmPose(Avatar avatar, HumanoidArm humanoidArm) {
         return null;
@@ -96,6 +91,7 @@ private static HumanoidModel.ArmPose getArmPose(Avatar avatar, HumanoidArm human
         return !AnimatiumClient.isEnabled() || !AnimatiumConfig.instance().capeMovement;
     }
 
+    // TODO/MOVE
     @WrapOperation(method = "getRenderOffset(Lnet/minecraft/client/renderer/entity/state/AvatarRenderState;)Lnet/minecraft/world/phys/Vec3;", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/entity/state/AvatarRenderState;isCrouching:Z"))
     private boolean animatium$fixSneakingFeetPosition(AvatarRenderState instance, Operation<Boolean> original) {
         if (AnimatiumClient.isEnabled() && AnimatiumConfig.instance().fixSneakingFeetPosition) {
@@ -105,6 +101,7 @@ private static HumanoidModel.ArmPose getArmPose(Avatar avatar, HumanoidArm human
         }
     }
 
+    // TODO/MOVE
     @Inject(method = "renderHand", at = @At(value = "FIELD", opcode = Opcodes.PUTFIELD, target = "Lnet/minecraft/client/model/geom/ModelPart;visible:Z", ordinal = 2))
     private void animatium$heldItemArmLogic(PoseStack poseStack, SubmitNodeCollector submitNodeCollector, int i, ResourceLocation resourceLocation, ModelPart modelPart, boolean bl, CallbackInfo ci, @Local PlayerModel playerModel) {
         if (AnimatiumClient.isEnabled() && AnimatiumConfig.instance().heldItemArmLogic) {
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/cape_movement/MixinCapeLayer.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/cape_movement/MixinCapeLayer.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity.layer;
+package btw.mixces.animatium.mixins.v1.entity.cape_movement;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/fishing/MixinFishingHookRenderer.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/fishing/MixinFishingHookRenderer.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity;
+package btw.mixces.animatium.mixins.v1.entity.fishing;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/fishing/MixinItemModelResolver.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/fishing/MixinItemModelResolver.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.item;
+package btw.mixces.animatium.mixins.v1.entity.fishing;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
@@ -47,6 +47,7 @@
 
 @Mixin(ItemModelResolver.class)
 public abstract class MixinItemModelResolver {
+    // TODO/MOVE
     @Inject(method = "appendItemLayers", at = @At("HEAD"))
     private void animatium$setItemUtils(ItemStackRenderState stackRenderState, ItemStack stack, ItemDisplayContext displayContext, Level level, ItemOwner owner, int i, CallbackInfo ci) {
         ItemUtils.set(stackRenderState, stack, displayContext);
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/flame/MixinFlameFeatureRenderer.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/flame/MixinFlameFeatureRenderer.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity;
+package btw.mixces.animatium.mixins.v1.entity.flame;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/projectile_age/MixinEyeOfEnder.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/projectile_age/MixinEyeOfEnder.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity;
+package btw.mixces.animatium.mixins.v1.entity.projectile_age;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/projectile_age/MixinFireball.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/projectile_age/MixinFireball.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity;
+package btw.mixces.animatium.mixins.v1.entity.projectile_age;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/projectile_age/MixinThrowableProjectile.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/projectile_age/MixinThrowableProjectile.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity;
+package btw.mixces.animatium.mixins.v1.entity.projectile_age;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/projectile_age/MixinWindCharge.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/projectile_age/MixinWindCharge.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity;
+package btw.mixces.animatium.mixins.v1.entity.projectile_age;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/rotations/MixinLivingEntity.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/rotations/MixinLivingEntity.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity;
+package btw.mixces.animatium.mixins.v1.entity.rotations;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
@@ -81,6 +81,7 @@ public MixinLivingEntity(EntityType<?> type, Level level) {
         }
     }
 
+    // TODO/MOVE
     @WrapOperation(method = "drop(Lnet/minecraft/world/item/ItemStack;ZZ)Lnet/minecraft/world/entity/item/ItemEntity;", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;swing(Lnet/minecraft/world/InteractionHand;)V"))
     private void animatium$swingOnDropInventory(LivingEntity entity, InteractionHand hand, Operation<Void> original) {
         if (AnimatiumClient.isEnabled() && !AnimatiumConfig.instance().swingOnDrop && entity instanceof LocalPlayer localPlayer) {
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/sneaking/MixinElytraAnimationState.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/sneaking/MixinElytraAnimationState.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.item;
+package btw.mixces.animatium.mixins.v1.entity.sneaking;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
@@ -36,7 +36,7 @@
 public class MixinElytraAnimationState {
     @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;isCrouching()Z"))
     private boolean animatium$sneakAnimationWhileFlying(LivingEntity livingEntity, Operation<Boolean> original) {
-        boolean isCrouching = original.call(livingEntity);
+        final boolean isCrouching = original.call(livingEntity);
         if (AnimatiumClient.isEnabled() && AnimatiumConfig.instance().sneakAnimationWhileFlying) {
             return isCrouching || livingEntity.isShiftKeyDown();
         } else {
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/sneaking/MixinElytraModel.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/sneaking/MixinElytraModel.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.item;
+package btw.mixces.animatium.mixins.v1.entity.sneaking;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/sneaking/MixinEntityRenderer.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/sneaking/MixinEntityRenderer.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity;
+package btw.mixces.animatium.mixins.v1.entity.sneaking;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/entity/sneaking/MixinHumanoidMobRenderer.java b/src/main/java/btw/mixces/animatium/mixins/v1/entity/sneaking/MixinHumanoidMobRenderer.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity;
+package btw.mixces.animatium.mixins.v1.entity.sneaking;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/general/camera/view_bobbing/MixinEntity.java b/src/main/java/btw/mixces/animatium/mixins/v1/general/camera/view_bobbing/MixinEntity.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity;
+package btw.mixces.animatium.mixins.v1.general.camera.view_bobbing;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/general/camera/view_bobbing/MixinGameRenderer.java b/src/main/java/btw/mixces/animatium/mixins/v1/general/camera/view_bobbing/MixinGameRenderer.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0;
+package btw.mixces.animatium.mixins.v1.general.camera.view_bobbing;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
@@ -89,6 +89,7 @@ public abstract class MixinGameRenderer {
         }
     }
 
+    // TODO/MOVE
     @ModifyArg(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GlobalSettingsUniform;update(IIDJLnet/minecraft/client/DeltaTracker;I)V"), index = 2)
     private double animatium$forceMaxGlintStrength(double original) {
         if (AnimatiumClient.isEnabled() && AnimatiumConfig.instance().maxGlintProperties) {
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/general/items/MixinItem.java b/src/main/java/btw/mixces/animatium/mixins/v1/general/items/MixinItem.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.item;
+package btw.mixces.animatium.mixins.v1.general.items;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
@@ -40,7 +40,7 @@ public abstract class MixinItem {
     @Inject(method = "getBarColor", at = @At("HEAD"), cancellable = true)
     private void animatium$durabilityBarColors(ItemStack stack, CallbackInfoReturnable<Integer> cir) {
         if (AnimatiumClient.isEnabled() && AnimatiumConfig.instance().durabilityBarColors && !((Item) (Object) this instanceof BundleItem)) {
-            int value = ItemUtils.getLegacyDurabilityColorValue(stack);
+            final int value = ItemUtils.getLegacyDurabilityColorValue(stack);
             cir.setReturnValue(ARGB.color(255 - value, value, 0));
         }
     }
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/general/items/MixinItemInHandLayer.java b/src/main/java/btw/mixces/animatium/mixins/v1/general/items/MixinItemInHandLayer.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.item;
+package btw.mixces.animatium.mixins.v1.general.items;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/general/items/MixinItemInHandRenderer.java b/src/main/java/btw/mixces/animatium/mixins/v1/general/items/MixinItemInHandRenderer.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.item;
+package btw.mixces.animatium.mixins.v1.general.items;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/general/items/MixinItemStack.java b/src/main/java/btw/mixces/animatium/mixins/v1/general/items/MixinItemStack.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.item;
+package btw.mixces.animatium.mixins.v1.general.items;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/general/items/flat/MixinItemEntityRenderer.java b/src/main/java/btw/mixces/animatium/mixins/v1/general/items/flat/MixinItemEntityRenderer.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.entity;
+package btw.mixces.animatium.mixins.v1.general.items.flat;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/general/items/flat/MixinItemFrameRenderer.java b/src/main/java/btw/mixces/animatium/mixins/v1/general/items/flat/MixinItemFrameRenderer.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.item;
+package btw.mixces.animatium.mixins.v1.general.items.flat;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
@@ -43,4 +43,4 @@ public abstract class MixinItemFrameRenderer {
             poseStack.translate(0.0F, 0.0F, 0.0625F);
         }
     }
-}
+}
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/general/items/flat/MixinItemRenderer.java b/src/main/java/btw/mixces/animatium/mixins/v1/general/items/flat/MixinItemRenderer.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.item;
+package btw.mixces.animatium.mixins.v1.general.items.flat;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/general/items/flat/MixinItemStackRenderLayerState.java b/src/main/java/btw/mixces/animatium/mixins/v1/general/items/flat/MixinItemStackRenderLayerState.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.item;
+package btw.mixces.animatium.mixins.v1.general.items.flat;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
@@ -61,6 +61,7 @@ public abstract class MixinItemStackRenderLayerState {
         }
     }
 
+    // TODO/MOVE
     @Inject(method = "submit", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/block/model/ItemTransform;apply(ZLcom/mojang/blaze3d/vertex/PoseStack$Pose;)V"))
     private void animatium$itemPositionsRod(PoseStack poseStack, SubmitNodeCollector submitNodeCollector, int light, int overlay, int k, CallbackInfo ci) {
         if (AnimatiumClient.isEnabled()) {
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/general/items/flat/MixinVertexConsumer.java b/src/main/java/btw/mixces/animatium/mixins/v1/general/items/flat/MixinVertexConsumer.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v1.general.flat_items;
+package btw.mixces.animatium.mixins.v1.general.items.flat;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/general/items/usage/MixinFishingRodCast.java b/src/main/java/btw/mixces/animatium/mixins/v1/general/items/usage/MixinFishingRodCast.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.item;
+package btw.mixces.animatium.mixins.v1.general.items.usage;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/general/items/usage/MixinIsUsingItem.java b/src/main/java/btw/mixces/animatium/mixins/v1/general/items/usage/MixinIsUsingItem.java
@@ -21,7 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package btw.mixces.animatium.mixins.v0.item;
+package btw.mixces.animatium.mixins.v1.general.items.usage;
 
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
diff --git a/src/main/java/btw/mixces/animatium/mixins/v1/general/items/usage/MixinMinecraft.java b/src/main/java/btw/mixces/animatium/mixins/v1/general/items/usage/MixinMinecraft.java
diff --git a/src/main/resources/animatium.mixins.json b/src/main/resources/animatium.mixins.json
