diff --git a/src/main/java/net/doppelr/lemonmates/block/ModDrinkingGlassBlock.java b/src/main/java/net/doppelr/lemonmates/block/ModDrinkingGlassBlock.java
index febe16d..2da293c 100644
--- a/src/main/java/net/doppelr/lemonmates/block/ModDrinkingGlassBlock.java
+++ b/src/main/java/net/doppelr/lemonmates/block/ModDrinkingGlassBlock.java
@@ -118,18 +118,18 @@ private void getDroppedItem(Item item, BlockPos pos, Level level) {
     @Override
     protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) {
         if (stack.getItem() instanceof ModJugItem jugItem && Boolean.TRUE.equals(stack.get(AllDataComponents.CAN_POUR))) {
-            if (state.getValue(DRINK_LEVEL) != 2) {
-                if (stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) != null || (stack.get(AllDataComponents.JUG_LEVEL) != null && stack.get(AllDataComponents.JUG_LEVEL) != 0)) {
-                    int newDrinkLevel = stack.get(AllDataComponents.JUG_LEVEL) > 0 ? 2 - state.getValue(DRINK_LEVEL) : 0;
-                    if (stack.get(AllDataComponents.JUG_LEVEL) == 1 || state.getValue(DRINK_LEVEL) == 1)
-                        newDrinkLevel = 1;
-                    int blockDrinkLevel = state.getValue(DRINK_LEVEL) == 1 ? 2 : newDrinkLevel;
-                    ApplicableFluidsToFluidContainer pouredFluid = stack.get(AllDataComponents.JUG_LEVEL) > 0 ? stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) : state.getValue(FLUID);
-                    if (state.getValue(FLUID) == ApplicableFluidsToFluidContainer.NONE || state.getValue(DRINK_LEVEL) == 0) {
-                        if (stack.get(AllDataComponents.JUG_LEVEL) > 0)
+            if (state.getValue(DRINK_LEVEL) == 0) {
+                if (stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) != null
+                        || (stack.get(AllDataComponents.JUG_LEVEL) != null) && stack.get(AllDataComponents.JUG_LEVEL) != 0) {
+                    ApplicableFluidsToFluidContainer pouredFluid = stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER);
+                    if ((state.getValue(FLUID) == ApplicableFluidsToFluidContainer.NONE
+                            || state.getValue(FLUID) == stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER))
+                            || (state.getValue(DRINK_LEVEL) == 0)) {
+                        if (stack.get(AllDataComponents.JUG_LEVEL) > 0) {
                             level.playSound(player, pos, SoundEvents.BOTTLE_EMPTY, SoundSource.BLOCKS, 1.0F, 1.0F);
-                        level.setBlockAndUpdate(pos, state.setValue(FLUID, pouredFluid).setValue(DRINK_LEVEL, blockDrinkLevel));
-                        jugItem.removeFromJugLevelWithBlockStateData(stack, player, newDrinkLevel);
+                            level.setBlockAndUpdate(pos, state.setValue(FLUID, pouredFluid).setValue(DRINK_LEVEL, 2));
+                            jugItem.removeFromJugLevelWithBlockStateData(stack, player, 1);
+                        }
                     }
                 }
             } else {
@@ -138,7 +138,6 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
         }
 
         if (stack.is(Items.SHEARS)) {
-            //BlockPos popPosition = pos.offset(0, 1, 0);
             if (state.getValue(AllBlockStateProperties.STRAWS).getValue() != 0) {
                 this.getDroppedItem(state.getValue(AllBlockStateProperties.STRAWS).getRegisteredItem().get(), pos, player, level);
                 level.setBlockAndUpdate(pos, state.setValue(AllBlockStateProperties.STRAWS, StrawsVariants.NONE));
diff --git a/src/main/java/net/doppelr/lemonmates/item/ModJugItem.java b/src/main/java/net/doppelr/lemonmates/item/ModJugItem.java
index 4b5650b..9a934db 100644
--- a/src/main/java/net/doppelr/lemonmates/item/ModJugItem.java
+++ b/src/main/java/net/doppelr/lemonmates/item/ModJugItem.java
@@ -47,6 +47,44 @@ else if (stack.get(AllDataComponents.JUG_LEVEL) != null && stack.get(AllDataComp
             stack.set(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER, fluid);
     }
 
+    public void setContainedFluidWithBlockStateData(ItemStack stack, ApplicableFluidsToFluidContainer fluid) {
+        if (stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) == ApplicableFluidsToFluidContainer.NONE
+                || stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) == fluid) {
+            this.setContainedFluid(stack, fluid);
+            if (stack.get(DataComponents.BLOCK_STATE) != null) {
+                DataComponentMap.Builder map = DataComponentMap.builder();
+
+                int jugLevel = stack.get(AllDataComponents.JUG_LEVEL) != null ?
+                        stack.get(AllDataComponents.JUG_LEVEL) : 0;
+
+                map.set(DataComponents.BLOCK_STATE, BlockItemStateProperties.EMPTY
+                                .with(AllBlockStateProperties.JUG_LEVEL, jugLevel)
+                                .with(AllBlockStateProperties.APPLICABLE_FLUID_TO_CONTAINER, fluid))
+                        .set(AllDataComponents.JUG_LEVEL, jugLevel)
+                        .set(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER, fluid);
+
+                stack.applyComponents(map.build());
+            }
+        }
+        else if (stack.get(AllDataComponents.JUG_LEVEL) != null && stack.get(AllDataComponents.JUG_LEVEL) == 0) {
+            this.setContainedFluid(stack, fluid);
+            if (stack.get(DataComponents.BLOCK_STATE) != null) {
+                DataComponentMap.Builder map = DataComponentMap.builder();
+
+                int jugLevel = stack.get(AllDataComponents.JUG_LEVEL) != null ?
+                        stack.get(AllDataComponents.JUG_LEVEL) : 0;
+
+                map.set(DataComponents.BLOCK_STATE, BlockItemStateProperties.EMPTY
+                                .with(AllBlockStateProperties.JUG_LEVEL, jugLevel)
+                                .with(AllBlockStateProperties.APPLICABLE_FLUID_TO_CONTAINER, fluid))
+                        .set(AllDataComponents.JUG_LEVEL, jugLevel)
+                        .set(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER, fluid);
+
+                stack.applyComponents(map.build());
+            }
+        }
+    }
+
     public void setJugLevel(ItemStack stack, int jugLevel) {
         stack.set(AllDataComponents.JUG_LEVEL, jugLevel);
     }
@@ -110,31 +148,43 @@ public void removeFromJugLevelWithBlockStateData(ItemStack stack, Player player,
         }
     }
 
-    public void jugLevelHandling(ItemStack stack, Player player, ApplicableFluidsToFluidContainer fluid) {
+    public void jugLevelHandling(ItemStack stack, ItemStack offHandStack, ItemStack emptyStack, Player player, ApplicableFluidsToFluidContainer fluid) {
         Level level = player.level();
         if (stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) != fluid)
-            this.setContainedFluid(stack, fluid);
+            this.setContainedFluidWithBlockStateData(stack, fluid);
 
         boolean checkFluid = stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) != null && (stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) == fluid || stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) == ApplicableFluidsToFluidContainer.NONE);
 
         if (stack.get(AllDataComponents.JUG_LEVEL) == null || stack.get(AllDataComponents.JUG_LEVEL) == 0) {
             this.setJugLevel(stack, 4);
             level.playSound(player, player.blockPosition(), SoundEvents.BOTTLE_FILL, SoundSource.PLAYERS, 1.0F, 1.0F);
-            if (!player.getAbilities().instabuild)
-                player.setItemInHand(InteractionHand.OFF_HAND, ModItems.BOTTLE_EMPTY.toStack());
+            if (!player.getAbilities().instabuild) {
+                offHandStack.shrink(1);
+                if (!player.getInventory().add(emptyStack))
+                    player.drop(emptyStack, false);
+                else player.addItem(emptyStack);
+            }
         } else if (stack.get(AllDataComponents.JUG_LEVEL) <= 4 && checkFluid) {
             this.addToJugLevelWithBlockStateData(stack, 4);
             level.playSound(player, player.blockPosition(), SoundEvents.BOTTLE_FILL, SoundSource.PLAYERS, 1.0F, 1.0F);
-            if (!player.getAbilities().instabuild)
-                player.setItemInHand(InteractionHand.OFF_HAND, ModItems.BOTTLE_EMPTY.toStack());
+            if (!player.getAbilities().instabuild) {
+                offHandStack.shrink(1);
+                if (!player.getInventory().add(emptyStack))
+                    player.drop(emptyStack, false);
+                else player.addItem(emptyStack);
+            }
         } else if (stack.get(AllDataComponents.JUG_LEVEL) < 8 && checkFluid) {
             int incrementJugLevel = 4;
             if (stack.get(AllDataComponents.JUG_LEVEL) > 4)
                 incrementJugLevel = 8 - stack.get(AllDataComponents.JUG_LEVEL);
             this.addToJugLevelWithBlockStateData(stack, incrementJugLevel);
             level.playSound(player, player.blockPosition(), SoundEvents.BOTTLE_FILL, SoundSource.PLAYERS, 1.0F, 1.0F);
-            if (!player.getAbilities().instabuild)
-                player.setItemInHand(InteractionHand.OFF_HAND, ModItems.BOTTLE_EMPTY.toStack());
+            if (!player.getAbilities().instabuild) {
+                offHandStack.shrink(1);
+                if (!player.getInventory().add(emptyStack))
+                    player.drop(emptyStack, false);
+                else player.addItem(emptyStack);
+            }
         }
     }
 
@@ -179,15 +229,15 @@ public InteractionResult useOn(UseOnContext context) {
             } else if (Boolean.FALSE.equals(stack.get(AllDataComponents.CAN_POUR))) {
                 if (stack.get(AllDataComponents.JUG_LEVEL) == null || stack.get(AllDataComponents.JUG_LEVEL) <= 4) {
                     if (offHandStack.is(ModItems.SUMMERMIX_LEMONADE_BOTTLE))
-                        this.jugLevelHandling(stack, player, ApplicableFluidsToFluidContainer.SUMMERMIX_LEMONADE);
+                        this.jugLevelHandling(stack, offHandStack, ModItems.EMPTY_SUMMERMIX_LEMONADE_BOTTLE.toStack(), player, ApplicableFluidsToFluidContainer.SUMMERMIX_LEMONADE);
                     if (offHandStack.is(ModItems.CITRON_LEMONADE_BOTTLE))
-                        this.jugLevelHandling(stack, player, ApplicableFluidsToFluidContainer.CITRON_LEMONADE);
+                        this.jugLevelHandling(stack, offHandStack, ModItems.EMPTY_CITRON_LEMONADE_BOTTLE.toStack(), player, ApplicableFluidsToFluidContainer.CITRON_LEMONADE);
                     if (offHandStack.is(ModItems.ORANGE_LEMONADE_BOTTLE))
-                        this.jugLevelHandling(stack, player, ApplicableFluidsToFluidContainer.ORANGE_LEMONADE);
+                        this.jugLevelHandling(stack, offHandStack, ModItems.EMPTY_ORANGE_LEMONADE_BOTTLE.toStack(), player, ApplicableFluidsToFluidContainer.ORANGE_LEMONADE);
                     if (offHandStack.is(ModItems.RASPBERRY_LEMONADE_BOTTLE))
-                        this.jugLevelHandling(stack, player, ApplicableFluidsToFluidContainer.RASPBERRY_LEMONADE);
+                        this.jugLevelHandling(stack, offHandStack, ModItems.EMPTY_RASPBERRY_LEMONADE_BOTTLE.toStack(), player, ApplicableFluidsToFluidContainer.RASPBERRY_LEMONADE);
                     if (offHandStack.is(ModItems.WATERMELON_LEMONADE_BOTTLE))
-                        this.jugLevelHandling(stack, player, ApplicableFluidsToFluidContainer.WATERMELON_LEMONADE);
+                        this.jugLevelHandling(stack, offHandStack, ModItems.EMPTY_WATERMELON_LEMONADE_BOTTLE.toStack(), player, ApplicableFluidsToFluidContainer.WATERMELON_LEMONADE);
                 }
             }
         }
@@ -199,8 +249,8 @@ public InteractionResult useOn(UseOnContext context) {
     public void appendHoverText(ItemStack stack, @NotNull TooltipContext context, @NotNull List<Component> tooltipComponents, @NotNull TooltipFlag tooltipFlag) {
         String id = "block.lemonmates.lemonade_jug_terracotta";
         boolean pour = stack.get(AllDataComponents.CAN_POUR) != null ? stack.get(AllDataComponents.CAN_POUR) : false;
-        ApplicableFluidsToFluidContainer applicableFluid = stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) != null ? stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) : ApplicableFluidsToFluidContainer.NONE;
         int level = stack.get(AllDataComponents.JUG_LEVEL) != null ? stack.get(AllDataComponents.JUG_LEVEL): 0;
+        ApplicableFluidsToFluidContainer applicableFluid = level > 0 ? (stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) != null ? stack.get(AllDataComponents.APPLICABLE_FLUID_TO_CONTAINER) : ApplicableFluidsToFluidContainer.NONE) : ApplicableFluidsToFluidContainer.NONE;
         Component fluid = Component.translatable("jugFluid.lemonmates." + applicableFluid.getSerializedName());
         LemonMatesTooltipUtils.createCustomTooltip(id, true, tooltipComponents, pour, fluid, level);
         LemonMatesTooltipUtils.createAdditionalConditionalBehaviourTooltip(id, 2, tooltipComponents, pour, fluid, level);