Update botarium & fix capacity amounts

.gitignore

@@ -29,3 +29,4 @@ forge*changelog.txt
 /.vscode/
 /old.7z
 /.architectury-transformer/
+.DS_Store

build.gradle

@@ -20,7 +20,7 @@ subprojects {
         minecraft "com.mojang:minecraft:$mc_version"
         mappings loom.officialMojangMappings()
 
-        modApi "earth.terrarium:botarium-$name-1.20:$botarium_version"
+        modApi "earth.terrarium.botarium:botarium-$name-1.20.1:$botarium_version"
     }
 }
 

common/src/main/java/com/teamresourceful/resourcefulbees/client/component/SelectableFluidWidget.java

@@ -8,9 +8,9 @@
 import com.teamresourceful.resourcefulbees.common.util.containers.SelectableFluidContainer;
 import com.teamresourceful.resourcefullib.client.utils.ScreenUtils;
 import com.teamresourceful.resourcefullib.common.collections.SelectableList;
+import earth.terrarium.botarium.common.fluid.FluidConstants;
 import earth.terrarium.botarium.common.fluid.base.FluidHolder;
 import earth.terrarium.botarium.common.fluid.utils.ClientFluidHooks;
-import earth.terrarium.botarium.common.fluid.utils.FluidHooks;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
@@ -70,7 +70,7 @@ public void renderToolTip() {
                     line = Component.literal(" ○ ").withStyle(ChatFormatting.DARK_GRAY);
                 }
                 line = line.append(Component.empty().withStyle(ChatFormatting.RESET).append(ClientFluidHooks.getDisplayName(tankFluid)));
-                line = line.append(Component.literal(" " + FluidHooks.toMillibuckets(tankFluid.getFluidAmount()) + "mb").withStyle(ChatFormatting.RESET));
+                line = line.append(Component.literal(" " + FluidConstants.toMillibuckets(tankFluid.getFluidAmount()) + "mb").withStyle(ChatFormatting.RESET));
                 tooltip.add(line);
             }
         }

common/src/main/java/com/teamresourceful/resourcefulbees/client/screen/EnderBeeconScreen.java

@@ -9,9 +9,9 @@
 import com.teamresourceful.resourcefulbees.common.menus.EnderBeeconMenu;
 import com.teamresourceful.resourcefulbees.common.networking.NetworkHandler;
 import com.teamresourceful.resourcefulbees.common.networking.packets.client.BeeconChangePacket;
+import earth.terrarium.botarium.common.fluid.FluidConstants;
 import earth.terrarium.botarium.common.fluid.base.FluidHolder;
 import earth.terrarium.botarium.common.fluid.utils.ClientFluidHooks;
-import earth.terrarium.botarium.common.fluid.utils.FluidHooks;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractSliderButton;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
@@ -105,7 +105,7 @@ protected void renderLabels(@NotNull GuiGraphics graphics, int mouseX, int mouse
         graphics.drawString(font, BeeconTranslations.FLUID_LABEL, 110, 56, 14737632);
         graphics.drawString(font, holder.isEmpty() ? BeeconTranslations.NO_FLUID_LABEL : ClientFluidHooks.getDisplayName(holder), 137, 56, 16751628);
         graphics.drawString(font, BeeconTranslations.FLUID_AMOUNT_LABEL, 110, 68, 14737632);
-        graphics.drawString(font, FluidHooks.toMillibuckets(holder.getFluidAmount()) +"mB", 148, 68, 47104);
+        graphics.drawString(font, FluidConstants.toMillibuckets(holder.getFluidAmount()) +"mB", 148, 68, 47104);
     }
 
     @Override

common/src/main/java/com/teamresourceful/resourcefulbees/client/screen/HoneyGeneratorScreen.java

@@ -8,9 +8,9 @@
 import com.teamresourceful.resourcefulbees.common.util.MathUtils;
 import com.teamresourceful.resourcefullib.client.CloseablePoseStack;
 import earth.terrarium.botarium.common.energy.base.EnergyContainer;
+import earth.terrarium.botarium.common.fluid.FluidConstants;
 import earth.terrarium.botarium.common.fluid.base.FluidHolder;
 import earth.terrarium.botarium.common.fluid.utils.ClientFluidHooks;
-import earth.terrarium.botarium.common.fluid.utils.FluidHooks;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
@@ -51,7 +51,7 @@ protected void renderBg(@NotNull GuiGraphics graphics, float partialTicks, int m
                 graphics.drawString(this.font, "Fluid: ", 57, 22, 0xffffff);
                 graphics.drawString(this.font, holder.isEmpty() ? GuiTranslations.NO_FLUID : ClientFluidHooks.getDisplayName(holder), 61, 32, 0xffffff);
                 graphics.drawString(this.font, "Amount: ", 57, 42, 0xffffff);
-                graphics.drawString(this.font, FluidHooks.toMillibuckets(holder.getFluidAmount()) + "mB", 61, 52, 0xffffff);
+                graphics.drawString(this.font, FluidConstants.toMillibuckets(holder.getFluidAmount()) + "mB", 61, 52, 0xffffff);
             }
         }
     }
@@ -84,9 +84,9 @@ public void renderFluidTooltip(int mouseX, int mouseY) {
         if (MathUtils.inRangeInclusive(mouseX, this.leftPos + 28, this.leftPos + 40) && MathUtils.inRangeInclusive(mouseY, this.topPos + 16, this.topPos + 70)) {
             FluidHolder holder = this.menu.getEntity().getFluid();
             if (Screen.hasShiftDown() || holder.getFluidAmount() < 500) {
-                setTooltipForNextRenderPass(Component.literal(FluidHooks.toMillibuckets(holder.getFluidAmount()) + " MB"));
+                setTooltipForNextRenderPass(Component.literal(FluidConstants.toMillibuckets(holder.getFluidAmount()) + " MB"));
             } else {
-                setTooltipForNextRenderPass(Component.literal(TextUtils.NUMBER_FORMAT.format((double) holder.getFluidAmount() / FluidHooks.getBucketAmount()) + " Buckets"));
+                setTooltipForNextRenderPass(Component.literal(TextUtils.NUMBER_FORMAT.format((double) holder.getFluidAmount() / FluidConstants.getBucketAmount()) + " Buckets"));
             }
         }
     }

common/src/main/java/com/teamresourceful/resourcefulbees/client/screen/HoneyPotScreen.java

@@ -5,9 +5,9 @@
 import com.teamresourceful.resourcefulbees.common.lib.constants.translations.GuiTranslations;
 import com.teamresourceful.resourcefulbees.common.menus.HoneyPotMenu;
 import com.teamresourceful.resourcefulbees.common.util.MathUtils;
+import earth.terrarium.botarium.common.fluid.FluidConstants;
 import earth.terrarium.botarium.common.fluid.base.FluidHolder;
 import earth.terrarium.botarium.common.fluid.utils.ClientFluidHooks;
-import earth.terrarium.botarium.common.fluid.utils.FluidHooks;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
@@ -36,9 +36,9 @@ protected void renderBg(@NotNull GuiGraphics graphics, float partialTicks, int x
         graphics.drawString(this.font, "Fluid: ",this.leftPos + 36, this.topPos + 17, 0xffffff);
         graphics.drawString(this.font, holder.isEmpty() ? GuiTranslations.NO_FLUID : ClientFluidHooks.getDisplayName(holder), this.leftPos + 40, this.topPos + 27, 0xffffff);
         graphics.drawString(this.font, "Amount: ",this.leftPos + 36, this.topPos + 37, 0xffffff);
-        graphics.drawString(this.font, FluidHooks.toMillibuckets(holder.getFluidAmount())+"mB",this.leftPos + 40, this.topPos + 47, 0xffffff);
+        graphics.drawString(this.font, FluidConstants.toMillibuckets(holder.getFluidAmount())+"mB",this.leftPos + 40, this.topPos + 47, 0xffffff);
 
-        int height = (int) ((holder.getFluidAmount() / FluidHooks.buckets(64)) * 54);
+        int height = (int) ((holder.getFluidAmount() / FluidConstants.fromMillibuckets(64000)) * 54);
         ClientRenderUtils.drawFluid(graphics, height, 12, holder, this.leftPos+129, this.topPos+16);
     }
 
@@ -64,10 +64,10 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float
 
 
     private Component getMillibuckets(long fluidAmount) {
-        return Component.literal(FluidHooks.toMillibuckets(fluidAmount) + "mB");
+        return Component.literal(FluidConstants.toMillibuckets(fluidAmount) + "mB");
     }
 
     private Component getBuckets(long fluidAmount) {
-        return Component.literal(((double) fluidAmount / FluidHooks.getBucketAmount()) + "B");
+        return Component.literal(((double) fluidAmount / FluidConstants.getBucketAmount()) + "B");
     }
 }

common/src/main/java/com/teamresourceful/resourcefulbees/client/screen/SolidificationChamberScreen.java

@@ -5,8 +5,8 @@
 import com.teamresourceful.resourcefulbees.common.lib.constants.ModConstants;
 import com.teamresourceful.resourcefulbees.common.menus.SolidificationChamberMenu;
 import com.teamresourceful.resourcefulbees.common.util.MathUtils;
+import earth.terrarium.botarium.common.fluid.FluidConstants;
 import earth.terrarium.botarium.common.fluid.base.FluidHolder;
-import earth.terrarium.botarium.common.fluid.utils.FluidHooks;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
@@ -33,7 +33,7 @@ protected void renderBg(@NotNull GuiGraphics graphics, float partialTicks, int m
             int j = this.topPos;
             graphics.blit(texture, i, j, 0, 0, this.imageWidth, this.imageHeight);
             FluidHolder holder = tileEntity.getFluid();
-            int height = (int) ((holder.getFluidAmount() / FluidHooks.buckets(16)) * 62);
+            int height = (int) ((holder.getFluidAmount() / FluidConstants.fromMillibuckets(16000)) * 62);
             ClientRenderUtils.drawFluid(graphics, height, 14, holder, i + 67, j + 12+(62-height));
         }
     }
@@ -60,10 +60,10 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float
     }
 
     private Component getMillibuckets(long fluidAmount) {
-        return Component.literal(FluidHooks.toMillibuckets(fluidAmount) + "mB");
+        return Component.literal(FluidConstants.toMillibuckets(fluidAmount) + "mB");
     }
 
     private Component getBuckets(long fluidAmount) {
-        return Component.literal(((double) fluidAmount / FluidHooks.getBucketAmount()) + "B");
+        return Component.literal(((double) fluidAmount / FluidConstants.getBucketAmount()) + "B");
     }
 }

common/src/main/java/com/teamresourceful/resourcefulbees/common/blockentities/CreativeGenBlockEntity.java

@@ -2,10 +2,10 @@
 
 import com.teamresourceful.resourcefulbees.common.blocks.base.InstanceBlockEntityTicker;
 import com.teamresourceful.resourcefulbees.common.registries.minecraft.ModBlockEntityTypes;
+import earth.terrarium.botarium.common.energy.EnergyApi;
 import earth.terrarium.botarium.common.energy.base.BotariumEnergyBlock;
 import earth.terrarium.botarium.common.energy.impl.ExtractOnlyEnergyContainer;
 import earth.terrarium.botarium.common.energy.impl.WrappedBlockEnergyContainer;
-import earth.terrarium.botarium.common.energy.util.EnergyHooks;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -28,14 +28,14 @@ public Side getSide() {
     public void serverTick(Level level, BlockPos pos, BlockState state) {
         if (level != null) {
             this.energy.setEnergy(Integer.MAX_VALUE);
-            EnergyHooks.distributeEnergyNearby(this);
+            EnergyApi.distributeEnergyNearby(this, Integer.MAX_VALUE);
         }
     }
 
     @Override
     public WrappedBlockEnergyContainer getEnergyStorage() {
         if (energy == null) {
-            energy = new WrappedBlockEnergyContainer(this, new ExtractOnlyEnergyContainer(Integer.MAX_VALUE));
+            energy = new WrappedBlockEnergyContainer(this, new ExtractOnlyEnergyContainer(Integer.MAX_VALUE, Integer.MAX_VALUE));
         }
         return null;
     }

common/src/main/java/com/teamresourceful/resourcefulbees/common/blockentities/EnderBeeconBlockEntity.java

@@ -15,11 +15,12 @@
 import com.teamresourceful.resourcefulbees.common.registries.minecraft.ModBlockEntityTypes;
 import com.teamresourceful.resourcefulbees.common.registries.minecraft.ModEffects;
 import com.teamresourceful.resourcefullib.common.menu.ContentMenuProvider;
+import earth.terrarium.botarium.common.fluid.FluidConstants;
 import earth.terrarium.botarium.common.fluid.base.BotariumFluidBlock;
+import earth.terrarium.botarium.common.fluid.base.FluidContainer;
 import earth.terrarium.botarium.common.fluid.base.FluidHolder;
 import earth.terrarium.botarium.common.fluid.impl.InsertOnlyFluidContainer;
 import earth.terrarium.botarium.common.fluid.impl.WrappedBlockFluidContainer;
-import earth.terrarium.botarium.common.fluid.utils.FluidHooks;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -40,7 +41,6 @@
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
 import org.jetbrains.annotations.NotNull;
@@ -173,20 +173,18 @@ private void startUpCheck(@NotNull Level level, BlockPos pos, BlockState state)
 
     private void pullFluidFromBelow(@NotNull Level level, BlockPos pos) {
         if (this.getFluid().getFluidAmount() >= this.tank.getTankCapacity(0)) return;
-        BlockEntity tileEntity = level.getBlockEntity(pos.below());
-        if (tileEntity == null) return;
-
-        FluidHooks.safeGetBlockFluidManager(tileEntity, Direction.UP).ifPresent(manager -> {
-            for (FluidHolder fluidTank : manager.getFluidTanks()) {
-                if (fluidTank.isEmpty()) continue;
-                FluidHolder holder = fluidTank.copyWithAmount(Math.min(fluidTank.getFluidAmount(), EnderBeeconConfig.beeconPullAmount));
-                FluidHolder extracted = manager.extractFluid(holder, true);
-                if (!extracted.isEmpty() && this.tank.internalInsert(extracted, true) > 0) {
-                    manager.extractFluid(extracted, false);
-                    this.tank.internalInsert(extracted, false);
-                }
+        FluidContainer container = FluidContainer.of(level, pos.below(), Direction.UP);
+        if (container == null) return;
+
+        for (FluidHolder fluidTank : container.getFluids()) {
+            if (fluidTank.isEmpty()) continue;
+            FluidHolder holder = fluidTank.copyWithAmount(Math.min(fluidTank.getFluidAmount(), EnderBeeconConfig.beeconPullAmount));
+            FluidHolder extracted = container.extractFluid(holder, true);
+            if (!extracted.isEmpty() && this.tank.internalInsert(extracted, true) > 0) {
+                container.extractFluid(extracted, false);
+                this.tank.internalInsert(extracted, false);
             }
-        });
+        }
     }
 
     public FluidHolder getFluid() {
@@ -297,7 +295,7 @@ public void setChanged() {
     @Override
     public WrappedBlockFluidContainer getFluidContainer() {
         if (tank == null) {
-            tank = new WrappedBlockFluidContainer(this, new InsertOnlyFluidContainer(i -> FluidHooks.buckets(16), 1, (amount, fluid) -> fluid.is(ModFluidTags.HONEY)));
+            tank = new WrappedBlockFluidContainer(this, new InsertOnlyFluidContainer(i -> FluidConstants.fromMillibuckets(16000), 1, (amount, fluid) -> fluid.is(ModFluidTags.HONEY)));
         }
         return this.tank;
     }

common/src/main/java/com/teamresourceful/resourcefulbees/common/blockentities/FlowHiveBlockEntity.java

@@ -6,6 +6,7 @@
 import com.teamresourceful.resourcefulbees.common.lib.constants.NBTConstants;
 import com.teamresourceful.resourcefulbees.common.recipes.FlowHiveRecipe;
 import com.teamresourceful.resourcefulbees.common.registries.minecraft.ModBlockEntityTypes;
+import earth.terrarium.botarium.common.fluid.FluidConstants;
 import earth.terrarium.botarium.common.fluid.base.BotariumFluidBlock;
 import earth.terrarium.botarium.common.fluid.base.FluidHolder;
 import earth.terrarium.botarium.common.fluid.impl.ExtractOnlyFluidContainer;
@@ -101,7 +102,7 @@ public void setChanged() {
     @Override
     public WrappedBlockFluidContainer getFluidContainer() {
         if (tank == null) {
-            tank = new WrappedBlockFluidContainer(this, new ExtractOnlyFluidContainer(i -> 16000, 1, (amount, fluid) -> true));
+            tank = new WrappedBlockFluidContainer(this, new ExtractOnlyFluidContainer(i -> FluidConstants.fromMillibuckets(16000), 1, (amount, fluid) -> true));
         }
         return this.tank;
     }

common/src/main/java/com/teamresourceful/resourcefulbees/common/blockentities/HoneyGeneratorBlockEntity.java

@@ -16,10 +16,11 @@
 import com.teamresourceful.resourcefulbees.common.recipes.HoneyGenRecipe;
 import com.teamresourceful.resourcefulbees.common.registries.minecraft.ModBlockEntityTypes;
 import com.teamresourceful.resourcefulbees.common.util.containers.AutomationSensitiveContainer;
+import earth.terrarium.botarium.common.energy.EnergyApi;
 import earth.terrarium.botarium.common.energy.base.BotariumEnergyBlock;
 import earth.terrarium.botarium.common.energy.impl.ExtractOnlyEnergyContainer;
 import earth.terrarium.botarium.common.energy.impl.WrappedBlockEnergyContainer;
-import earth.terrarium.botarium.common.energy.util.EnergyHooks;
+import earth.terrarium.botarium.common.fluid.FluidConstants;
 import earth.terrarium.botarium.common.fluid.base.BotariumFluidBlock;
 import earth.terrarium.botarium.common.fluid.base.FluidHolder;
 import earth.terrarium.botarium.common.fluid.impl.InsertOnlyFluidContainer;
@@ -49,7 +50,7 @@ public class HoneyGeneratorBlockEntity extends GUISyncedBlockEntity implements I
 
     public static final int ENERGY_TRANSFER_AMOUNT = HoneyGenConfig.energyTransferAmount;
     public static final int MAX_ENERGY_CAPACITY = HoneyGenConfig.maxEnergyCapacity;
-    public static final int MAX_TANK_STORAGE = HoneyGenConfig.maxTankCapacity;
+    public static final int MAX_TANK_STORAGE = (int) FluidConstants.fromMillibuckets(HoneyGenConfig.maxTankCapacity);
 
     private FluidContainer fluidContainer;
     private WrappedBlockFluidContainer wrappedFluidContainer;
@@ -82,7 +83,7 @@ public void serverTick(Level level, BlockPos pos, BlockState state) {
             else this.processCompleted(level);
         }
         if (hasEnergy()) {
-            EnergyHooks.distributeEnergyNearby(this, ENERGY_TRANSFER_AMOUNT);
+            EnergyApi.distributeEnergyNearby(this, ENERGY_TRANSFER_AMOUNT);
         }
     }
 
@@ -257,7 +258,7 @@ private static class FluidContainer extends InsertOnlyFluidContainer {
         private int capacity;
 
         public FluidContainer() {
-            super(i -> HoneyGenConfig.maxTankCapacity, 1, (i, holder) -> holder.getFluid().is(ModFluidTags.HONEY));
+            super(i -> MAX_TANK_STORAGE, 1, (i, holder) -> holder.getFluid().is(ModFluidTags.HONEY));
         }
 
         @Override

common/src/main/java/com/teamresourceful/resourcefulbees/common/blockentities/HoneyPotBlockEntity.java

@@ -8,11 +8,11 @@
 import com.teamresourceful.resourcefulbees.common.menus.content.PositionContent;
 import com.teamresourceful.resourcefulbees.common.registries.minecraft.ModBlockEntityTypes;
 import com.teamresourceful.resourcefullib.common.menu.ContentMenuProvider;
+import earth.terrarium.botarium.common.fluid.FluidConstants;
 import earth.terrarium.botarium.common.fluid.base.BotariumFluidBlock;
 import earth.terrarium.botarium.common.fluid.base.FluidHolder;
 import earth.terrarium.botarium.common.fluid.impl.SimpleFluidContainer;
 import earth.terrarium.botarium.common.fluid.impl.WrappedBlockFluidContainer;
-import earth.terrarium.botarium.common.fluid.utils.FluidHooks;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
@@ -80,7 +80,7 @@ public PositionContent createContent() {
     private static class HoneyFluidContainer extends SimpleFluidContainer {
 
         public HoneyFluidContainer() {
-            super(i -> FluidHooks.buckets(64), 1, (i, holder) -> holder.is(ModFluidTags.HONEY));
+            super(i -> FluidConstants.fromMillibuckets(64000), 1, (i, holder) -> holder.is(ModFluidTags.HONEY));
         }
 
         @Override