diff --git a/sakura-server/src/main/java/me/samsuik/sakura/player/item/DataComponentHelper.java b/sakura-server/src/main/java/me/samsuik/sakura/player/item/DataComponentHelper.java index 1dd113a..c6e830c 100644 --- a/sakura-server/src/main/java/me/samsuik/sakura/player/item/DataComponentHelper.java +++ b/sakura-server/src/main/java/me/samsuik/sakura/player/item/DataComponentHelper.java @@ -1,14 +1,20 @@ package me.samsuik.sakura.player.item; +import me.samsuik.sakura.configuration.GlobalConfiguration; import net.minecraft.core.component.DataComponentMap; import net.minecraft.core.component.DataComponents; public final class DataComponentHelper { public static int bucketMaxStackSize() { - me.samsuik.sakura.configuration.GlobalConfiguration config = me.samsuik.sakura.configuration.GlobalConfiguration.get(); + GlobalConfiguration config = GlobalConfiguration.get(); return config == null || !config.players.bucketStackSize.isDefined() ? -1 : config.players.bucketStackSize.intValue(); } + public static boolean stackableMilkBuckets() { + GlobalConfiguration config = GlobalConfiguration.get(); + return config != null && config.players.stackableMilkBuckets; + } + public static DataComponentMap copyComponentsAndModifyMaxStackSize(DataComponentMap componentMap, int maxItemSize) { if (maxItemSize > 0 && maxItemSize <= 99) { return DataComponentMap.builder() diff --git a/sakura-server/src/main/java/me/samsuik/sakura/player/item/MilkBucketItem.java b/sakura-server/src/main/java/me/samsuik/sakura/player/item/MilkBucketItem.java index dbffb10..29e10af 100644 --- a/sakura-server/src/main/java/me/samsuik/sakura/player/item/MilkBucketItem.java +++ b/sakura-server/src/main/java/me/samsuik/sakura/player/item/MilkBucketItem.java @@ -15,7 +15,7 @@ public final class MilkBucketItem extends Item { @Override public void verifyComponentsAfterLoad(ItemStack stack) { int maxStackSize = DataComponentHelper.bucketMaxStackSize(); - if (GlobalConfiguration.get().players.stackableMilkBuckets && maxStackSize > 0 && maxStackSize < 100) { + if (DataComponentHelper.stackableMilkBuckets() && maxStackSize > 0 && maxStackSize < 100) { stack.set(DataComponents.MAX_STACK_SIZE, maxStackSize); } }