From 8637bc55bd1a8551ebc60502d037908f1974db50 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Tue, 2 Jul 2024 13:00:14 +0100
Subject: [PATCH] Remove redundant bottle class

---
 .../psychedelicraft/item/BottleItem.java        | 17 -----------------
 .../item/MolotovCocktailItem.java               |  7 ++++---
 .../ivorius/psychedelicraft/item/PSItems.java   |  4 ++--
 .../item/component/BagContentsComponent.java    |  4 ++--
 4 files changed, 8 insertions(+), 24 deletions(-)
 delete mode 100644 src/main/java/ivorius/psychedelicraft/item/BottleItem.java

diff --git a/src/main/java/ivorius/psychedelicraft/item/BottleItem.java b/src/main/java/ivorius/psychedelicraft/item/BottleItem.java
deleted file mode 100644
index 0fdff380..00000000
--- a/src/main/java/ivorius/psychedelicraft/item/BottleItem.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- *  Copyright (c) 2014, Lukas Tenbrink.
- *  * http://lukas.axxim.net
- */
-
-package ivorius.psychedelicraft.item;
-
-import ivorius.psychedelicraft.fluid.*;
-
-/**
- * Created by Sollace on Jan 1 2023
- */
-public class BottleItem extends DrinkableItem {
-    public BottleItem(Settings settings, int consumptionVolume, ConsumableFluid.ConsumptionType consumptionType) {
-        super(settings, consumptionVolume, DEFAULT_MAX_USE_TIME, consumptionType);
-    }
-}
diff --git a/src/main/java/ivorius/psychedelicraft/item/MolotovCocktailItem.java b/src/main/java/ivorius/psychedelicraft/item/MolotovCocktailItem.java
index 72d37e5b..fe860ee3 100644
--- a/src/main/java/ivorius/psychedelicraft/item/MolotovCocktailItem.java
+++ b/src/main/java/ivorius/psychedelicraft/item/MolotovCocktailItem.java
@@ -7,7 +7,8 @@
 
 import ivorius.psychedelicraft.entity.MolotovCocktailEntity;
 import ivorius.psychedelicraft.fluid.Combustable;
-import ivorius.psychedelicraft.fluid.ConsumableFluid.ConsumptionType;
+import ivorius.psychedelicraft.fluid.ConsumableFluid;
+import ivorius.psychedelicraft.fluid.FluidVolumes;
 import ivorius.psychedelicraft.item.component.ItemFluids;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -20,9 +21,9 @@
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 
-public class MolotovCocktailItem extends BottleItem {
+public class MolotovCocktailItem extends DrinkableItem {
     public MolotovCocktailItem(Settings settings) {
-        super(settings, DrinkableItem.FLUID_PER_DRINKING, ConsumptionType.DRINK);
+        super(settings, FluidVolumes.BOTTLE, DEFAULT_MAX_USE_TIME, ConsumableFluid.ConsumptionType.DRINK);
     }
 
     @Override
diff --git a/src/main/java/ivorius/psychedelicraft/item/PSItems.java b/src/main/java/ivorius/psychedelicraft/item/PSItems.java
index 98146278..5644a877 100644
--- a/src/main/java/ivorius/psychedelicraft/item/PSItems.java
+++ b/src/main/java/ivorius/psychedelicraft/item/PSItems.java
@@ -49,9 +49,9 @@ public interface PSItems {
             .component(PSComponents.FLUID_CAPACITY, FluidCapacity.create(FluidVolumes.CHALLICE)), FluidVolumes.GULP, DrinkableItem.DEFAULT_MAX_USE_TIME, ConsumableFluid.ConsumptionType.DRINK));
     DrinkableItem SHOT_GLASS = register("shot_glass", new DrinkableItem(new Settings()
             .component(PSComponents.FLUID_CAPACITY, FluidCapacity.create(FluidVolumes.SHOT)), FluidVolumes.GULP, DrinkableItem.DEFAULT_MAX_USE_TIME / 4, ConsumableFluid.ConsumptionType.DRINK));
-    DrinkableItem BOTTLE = register("bottle", new BottleItem(new Settings()
+    DrinkableItem BOTTLE = register("bottle", new DrinkableItem(new Settings()
             .component(DataComponentTypes.DYED_COLOR, new DyedColorComponent(Colors.WHITE, true))
-            .component(PSComponents.FLUID_CAPACITY, FluidCapacity.create(FluidVolumes.BOTTLE)), FluidVolumes.GULP, ConsumableFluid.ConsumptionType.DRINK));
+            .component(PSComponents.FLUID_CAPACITY, FluidCapacity.create(FluidVolumes.BOTTLE)), FluidVolumes.GULP, DrinkableItem.DEFAULT_MAX_USE_TIME, ConsumableFluid.ConsumptionType.DRINK));
     MolotovCocktailItem MOLOTOV_COCKTAIL = register("molotov_cocktail", new MolotovCocktailItem(new Settings()
             .component(DataComponentTypes.DYED_COLOR, new DyedColorComponent(Colors.WHITE, true))
             .component(PSComponents.FLUID_CAPACITY, FluidCapacity.create(FluidVolumes.BOTTLE))
diff --git a/src/main/java/ivorius/psychedelicraft/item/component/BagContentsComponent.java b/src/main/java/ivorius/psychedelicraft/item/component/BagContentsComponent.java
index c25bec11..316702bc 100644
--- a/src/main/java/ivorius/psychedelicraft/item/component/BagContentsComponent.java
+++ b/src/main/java/ivorius/psychedelicraft/item/component/BagContentsComponent.java
@@ -5,7 +5,7 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 
-import ivorius.psychedelicraft.item.BottleItem;
+import ivorius.psychedelicraft.item.PSItems;
 import ivorius.psychedelicraft.item.PaperBagItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.Item.TooltipContext;
@@ -60,7 +60,7 @@ public static ItemStack withdraw(ItemStack stack, int count) {
     }
 
     public static int getMaxCountForItem(Item item) {
-        if (item instanceof BottleItem) {
+        if (item == PSItems.BOTTLE || item == PSItems.MOLOTOV_COCKTAIL) {
             return 1;
         }
         return 64 * 1000;