Delete internal library and use MythLib

TonimatasDEV · Oct 21, 2023 · 5c5a625 · 5c5a625
1 parent 4a1d438
commit 5c5a625
Show file tree

Hide file tree

Showing 155 changed files with 153 additions and 5,350 deletions.
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -8,6 +8,8 @@ val reiVersion: String by extra
 dependencies {
     modImplementation("net.fabricmc:fabric-loader:$fabricLoaderVersion")
 
+    modApi(files("../libs/MythLib-common-1.0.0.jar"))
+
     modCompileOnly("mezz.jei:jei-$minecraftVersion-common-api:$jeiVersion")
     modRuntimeOnly("mezz.jei:jei-$minecraftVersion-common:$jeiVersion")
     //modCompileOnly("me.shedaniel:RoughlyEnoughItems-api:$reiVersion")

diff --git a/common/src/main/java/net/tonimatasdev/krystalcraft/block/util/AbstractMachineBlock.java b/common/src/main/java/net/tonimatasdev/krystalcraft/block/util/AbstractMachineBlock.java
@@ -1,5 +1,8 @@
 package net.tonimatasdev.krystalcraft.block.util;
 
+import dev.tonimatas.mythlib.energy.EnergyApi;
+import dev.tonimatas.mythlib.registry.RegistryEntry;
+import dev.tonimatas.mythlib.util.Hooks;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
@@ -23,9 +26,6 @@
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 import net.minecraft.world.phys.BlockHitResult;
 import net.tonimatasdev.krystalcraft.blockentity.util.AbstractBlockEntity;
-import net.tonimatasdev.krystalcraft.plorix.energy.EnergyApi;
-import net.tonimatasdev.krystalcraft.plorix.registry.RegistryEntry;
-import net.tonimatasdev.krystalcraft.plorix.util.Hooks;
 import net.tonimatasdev.krystalcraft.registry.ModBlockEntities;
 import org.jetbrains.annotations.NotNull;
 
@@ -157,7 +157,7 @@ public int getAnalogOutputSignal(BlockState state, Level level, BlockPos pos) {
             ContainerHelper.saveAllItems(tag, machineBlock.getItems());
 
             if (EnergyApi.isEnergyBlock(machineBlock, null)) {
-                tag.putLong("Energy", EnergyApi.getBlockEnergyContainer(machineBlock, null).getStoredEnergy());
+                tag.putLong("Energy", Objects.requireNonNull(EnergyApi.getBlockEnergyContainer(machineBlock, null)).getStoredEnergy());
             }
         }
         return stack;

diff --git a/.../src/main/java/net/tonimatasdev/krystalcraft/blockentity/CombiningFactoryBlockEntity.java b/.../src/main/java/net/tonimatasdev/krystalcraft/blockentity/CombiningFactoryBlockEntity.java
@@ -1,5 +1,7 @@
 package net.tonimatasdev.krystalcraft.blockentity;
 
+import dev.tonimatas.mythlib.energy.impl.InsertOnlyEnergyContainer;
+import dev.tonimatas.mythlib.energy.impl.WrappedBlockEnergyContainer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
@@ -9,8 +11,6 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.tonimatasdev.krystalcraft.blockentity.util.EnergyProcessingBlockEntity;
 import net.tonimatasdev.krystalcraft.menu.CombiningFactoryMenu;
-import net.tonimatasdev.krystalcraft.plorix.energy.impl.InsertOnlyEnergyContainer;
-import net.tonimatasdev.krystalcraft.plorix.energy.impl.WrappedBlockEnergyContainer;
 import net.tonimatasdev.krystalcraft.recipe.CombiningRecipe;
 import net.tonimatasdev.krystalcraft.registry.ModBlockEntities;
 import net.tonimatasdev.krystalcraft.registry.ModRecipes;

diff --git a/.../src/main/java/net/tonimatasdev/krystalcraft/blockentity/CombiningStationBlockEntity.java b/.../src/main/java/net/tonimatasdev/krystalcraft/blockentity/CombiningStationBlockEntity.java
@@ -1,5 +1,6 @@
 package net.tonimatasdev.krystalcraft.blockentity;
 
+import dev.tonimatas.mythlib.util.Hooks;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
@@ -9,7 +10,6 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.tonimatasdev.krystalcraft.blockentity.util.BurnProcessingBlockEntity;
 import net.tonimatasdev.krystalcraft.menu.CombiningStationMenu;
-import net.tonimatasdev.krystalcraft.plorix.util.Hooks;
 import net.tonimatasdev.krystalcraft.recipe.CombiningRecipe;
 import net.tonimatasdev.krystalcraft.registry.ModBlockEntities;
 import net.tonimatasdev.krystalcraft.registry.ModRecipes;

diff --git a/...c/main/java/net/tonimatasdev/krystalcraft/blockentity/CombustionGeneratorBlockEntity.java b/...c/main/java/net/tonimatasdev/krystalcraft/blockentity/CombustionGeneratorBlockEntity.java
@@ -1,5 +1,8 @@
 package net.tonimatasdev.krystalcraft.blockentity;
 
+import dev.tonimatas.mythlib.energy.impl.SimpleEnergyContainer;
+import dev.tonimatas.mythlib.energy.impl.WrappedBlockEnergyContainer;
+import dev.tonimatas.mythlib.util.Hooks;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.player.Inventory;
@@ -8,9 +11,6 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.tonimatasdev.krystalcraft.blockentity.util.EnergyBlockEntity;
 import net.tonimatasdev.krystalcraft.menu.CombustionGeneratorMenu;
-import net.tonimatasdev.krystalcraft.plorix.energy.impl.SimpleEnergyContainer;
-import net.tonimatasdev.krystalcraft.plorix.energy.impl.WrappedBlockEnergyContainer;
-import net.tonimatasdev.krystalcraft.plorix.util.Hooks;
 import net.tonimatasdev.krystalcraft.registry.ModBlockEntities;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...n/src/main/java/net/tonimatasdev/krystalcraft/blockentity/CrushingFactoryBlockEntity.java b/...n/src/main/java/net/tonimatasdev/krystalcraft/blockentity/CrushingFactoryBlockEntity.java
@@ -1,5 +1,7 @@
 package net.tonimatasdev.krystalcraft.blockentity;
 
+import dev.tonimatas.mythlib.energy.impl.InsertOnlyEnergyContainer;
+import dev.tonimatas.mythlib.energy.impl.WrappedBlockEnergyContainer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
@@ -9,8 +11,6 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.tonimatasdev.krystalcraft.blockentity.util.EnergyProcessingBlockEntity;
 import net.tonimatasdev.krystalcraft.menu.CrushingFactoryMenu;
-import net.tonimatasdev.krystalcraft.plorix.energy.impl.InsertOnlyEnergyContainer;
-import net.tonimatasdev.krystalcraft.plorix.energy.impl.WrappedBlockEnergyContainer;
 import net.tonimatasdev.krystalcraft.recipe.CrushingRecipe;
 import net.tonimatasdev.krystalcraft.registry.ModBlockEntities;
 import net.tonimatasdev.krystalcraft.registry.ModRecipes;

diff --git a/...n/src/main/java/net/tonimatasdev/krystalcraft/blockentity/CrushingStationBlockEntity.java b/...n/src/main/java/net/tonimatasdev/krystalcraft/blockentity/CrushingStationBlockEntity.java
@@ -1,5 +1,6 @@
 package net.tonimatasdev.krystalcraft.blockentity;
 
+import dev.tonimatas.mythlib.util.Hooks;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
@@ -9,7 +10,6 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.tonimatasdev.krystalcraft.blockentity.util.BurnProcessingBlockEntity;
 import net.tonimatasdev.krystalcraft.menu.CrushingStationMenu;
-import net.tonimatasdev.krystalcraft.plorix.util.Hooks;
 import net.tonimatasdev.krystalcraft.recipe.CrushingRecipe;
 import net.tonimatasdev.krystalcraft.registry.ModBlockEntities;
 import net.tonimatasdev.krystalcraft.registry.ModRecipes;

diff --git a/...on/src/main/java/net/tonimatasdev/krystalcraft/blockentity/CuttingFactoryBlockEntity.java b/...on/src/main/java/net/tonimatasdev/krystalcraft/blockentity/CuttingFactoryBlockEntity.java
@@ -1,5 +1,12 @@
 package net.tonimatasdev.krystalcraft.blockentity;
 
+import dev.tonimatas.mythlib.energy.impl.InsertOnlyEnergyContainer;
+import dev.tonimatas.mythlib.energy.impl.WrappedBlockEnergyContainer;
+import dev.tonimatas.mythlib.fluid.base.FluidHolder;
+import dev.tonimatas.mythlib.fluid.base.MythFluidBlock;
+import dev.tonimatas.mythlib.fluid.impl.SimpleFluidContainer;
+import dev.tonimatas.mythlib.fluid.impl.WrappedBlockFluidContainer;
+import dev.tonimatas.mythlib.fluid.util.FluidUtils;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
@@ -11,21 +18,14 @@
 import net.minecraft.world.level.material.Fluids;
 import net.tonimatasdev.krystalcraft.blockentity.util.EnergyProcessingBlockEntity;
 import net.tonimatasdev.krystalcraft.menu.CuttingFactoryMenu;
-import net.tonimatasdev.krystalcraft.plorix.energy.impl.InsertOnlyEnergyContainer;
-import net.tonimatasdev.krystalcraft.plorix.energy.impl.WrappedBlockEnergyContainer;
-import net.tonimatasdev.krystalcraft.plorix.fluid.base.FluidHolder;
-import net.tonimatasdev.krystalcraft.plorix.fluid.base.PlorixFluidBlock;
-import net.tonimatasdev.krystalcraft.plorix.fluid.impl.SimpleFluidContainer;
-import net.tonimatasdev.krystalcraft.plorix.fluid.impl.WrappedBlockFluidContainer;
-import net.tonimatasdev.krystalcraft.plorix.fluid.util.FluidHooks;
 import net.tonimatasdev.krystalcraft.recipe.CuttingRecipe;
 import net.tonimatasdev.krystalcraft.registry.ModBlockEntities;
 import net.tonimatasdev.krystalcraft.registry.ModRecipes;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Optional;
 
-public class CuttingFactoryBlockEntity extends EnergyProcessingBlockEntity implements PlorixFluidBlock<WrappedBlockFluidContainer> {
+public class CuttingFactoryBlockEntity extends EnergyProcessingBlockEntity implements MythFluidBlock<WrappedBlockFluidContainer> {
     protected final int INPUT_SLOT = 0;
     protected final int RESULT_SLOT = 1;
     protected final int BATTERY_SLOT = 2;
@@ -85,7 +85,7 @@ public void tick() {
         if (hasRecipe(level) && energyAmount() > 0 && getFluidContainer().getFluids().get(0).getFluidAmount() > 0) {
             progress++;
             energyExtract(5);
-            FluidHolder fluidHolder = FluidHooks.newFluidHolder(Fluids.WATER, 2, null);
+            FluidHolder fluidHolder = FluidUtils.newFluidHolder(Fluids.WATER, 2, null);
             getFluidContainer().internalExtract(fluidHolder, true);
             getFluidContainer().internalExtract(fluidHolder, false);
 

diff --git a/...on/src/main/java/net/tonimatasdev/krystalcraft/blockentity/CuttingStationBlockEntity.java b/...on/src/main/java/net/tonimatasdev/krystalcraft/blockentity/CuttingStationBlockEntity.java
@@ -1,5 +1,11 @@
 package net.tonimatasdev.krystalcraft.blockentity;
 
+import dev.tonimatas.mythlib.fluid.base.FluidHolder;
+import dev.tonimatas.mythlib.fluid.base.MythFluidBlock;
+import dev.tonimatas.mythlib.fluid.impl.SimpleFluidContainer;
+import dev.tonimatas.mythlib.fluid.impl.WrappedBlockFluidContainer;
+import dev.tonimatas.mythlib.fluid.util.FluidUtils;
+import dev.tonimatas.mythlib.util.Hooks;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
@@ -11,20 +17,14 @@
 import net.minecraft.world.level.material.Fluids;
 import net.tonimatasdev.krystalcraft.blockentity.util.BurnProcessingBlockEntity;
 import net.tonimatasdev.krystalcraft.menu.CuttingStationMenu;
-import net.tonimatasdev.krystalcraft.plorix.fluid.base.FluidHolder;
-import net.tonimatasdev.krystalcraft.plorix.fluid.base.PlorixFluidBlock;
-import net.tonimatasdev.krystalcraft.plorix.fluid.impl.SimpleFluidContainer;
-import net.tonimatasdev.krystalcraft.plorix.fluid.impl.WrappedBlockFluidContainer;
-import net.tonimatasdev.krystalcraft.plorix.fluid.util.FluidHooks;
-import net.tonimatasdev.krystalcraft.plorix.util.Hooks;
 import net.tonimatasdev.krystalcraft.recipe.CuttingRecipe;
 import net.tonimatasdev.krystalcraft.registry.ModBlockEntities;
 import net.tonimatasdev.krystalcraft.registry.ModRecipes;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
 
-public class CuttingStationBlockEntity extends BurnProcessingBlockEntity implements PlorixFluidBlock<WrappedBlockFluidContainer> {
+public class CuttingStationBlockEntity extends BurnProcessingBlockEntity implements MythFluidBlock<WrappedBlockFluidContainer> {
     protected final int INPUT_SLOT = 0;
     protected final int RESULT_SLOT = 1;
     protected final int COMBUSTION_SLOT = 2;
@@ -75,7 +75,7 @@ public void tick() {
                 removeItem(COMBUSTION_SLOT, 1);
             } else {
                 progress++;
-                FluidHolder fluidHolder = FluidHooks.newFluidHolder(Fluids.WATER, 2, null);
+                FluidHolder fluidHolder = FluidUtils.newFluidHolder(Fluids.WATER, 2, null);
                 getFluidContainer().internalExtract(fluidHolder, true);
                 getFluidContainer().internalExtract(fluidHolder, false);
             }

diff --git a/common/src/main/java/net/tonimatasdev/krystalcraft/blockentity/util/AbstractBlockEntity.java b/common/src/main/java/net/tonimatasdev/krystalcraft/blockentity/util/AbstractBlockEntity.java
@@ -1,5 +1,7 @@
 package net.tonimatasdev.krystalcraft.blockentity.util;
 
+import dev.tonimatas.mythlib.inventory.ModInventory;
+import dev.tonimatas.mythlib.menu.ExtraDataMenuProvider;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -17,8 +19,6 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
-import net.tonimatasdev.krystalcraft.plorix.inventory.ModInventory;
-import net.tonimatasdev.krystalcraft.plorix.menu.ExtraDataMenuProvider;
 
 @MethodsReturnNonnullByDefault
 public abstract class AbstractBlockEntity extends BlockEntity implements ExtraDataMenuProvider, ModInventory, WorldlyContainer {

diff --git a/common/src/main/java/net/tonimatasdev/krystalcraft/blockentity/util/EnergyBlockEntity.java b/common/src/main/java/net/tonimatasdev/krystalcraft/blockentity/util/EnergyBlockEntity.java
@@ -1,17 +1,17 @@
 package net.tonimatasdev.krystalcraft.blockentity.util;
 
+import dev.tonimatas.mythlib.energy.EnergyApi;
+import dev.tonimatas.mythlib.energy.base.EnergyContainer;
+import dev.tonimatas.mythlib.energy.base.MythEnergyBlock;
+import dev.tonimatas.mythlib.energy.impl.WrappedBlockEnergyContainer;
+import dev.tonimatas.mythlib.item.ItemStackHolder;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
-import net.tonimatasdev.krystalcraft.plorix.energy.EnergyApi;
-import net.tonimatasdev.krystalcraft.plorix.energy.base.EnergyContainer;
-import net.tonimatasdev.krystalcraft.plorix.energy.base.PlorixEnergyBlock;
-import net.tonimatasdev.krystalcraft.plorix.energy.impl.WrappedBlockEnergyContainer;
-import net.tonimatasdev.krystalcraft.plorix.item.ItemStackHolder;
 
-public abstract class EnergyBlockEntity extends AbstractBlockEntity implements PlorixEnergyBlock<WrappedBlockEnergyContainer> {
+public abstract class EnergyBlockEntity extends AbstractBlockEntity implements MythEnergyBlock<WrappedBlockEnergyContainer> {
     protected WrappedBlockEnergyContainer energyContainer;
 
     public EnergyBlockEntity(BlockEntityType<?> blockEntityType, BlockPos blockPos, BlockState blockState) {

diff --git a/common/src/main/java/net/tonimatasdev/krystalcraft/client/KrystalCraftClient.java b/common/src/main/java/net/tonimatasdev/krystalcraft/client/KrystalCraftClient.java
@@ -0,0 +1,17 @@
+package net.tonimatasdev.krystalcraft.client;
+
+import dev.tonimatas.mythlib.client.RegistryClientHelpers;
+import net.tonimatasdev.krystalcraft.client.screen.*;
+import net.tonimatasdev.krystalcraft.registry.ModMenus;
+
+public class KrystalCraftClient {
+    public static void init() {
+        RegistryClientHelpers.registerMenu(ModMenus.COMBINING_STATION_MENU.get(), CombiningStationScreen::new);
+        RegistryClientHelpers.registerMenu(ModMenus.COMBINING_FACTORY_MENU.get(), CombiningFactoryScreen::new);
+        RegistryClientHelpers.registerMenu(ModMenus.CRUSHING_STATION_MENU.get(), CrushingStationScreen::new);
+        RegistryClientHelpers.registerMenu(ModMenus.CRUSHING_FACTORY_MENU.get(), CrushingFactoryScreen::new);
+        RegistryClientHelpers.registerMenu(ModMenus.CUTTING_STATION_MENU.get(), CuttingStationScreen::new);
+        RegistryClientHelpers.registerMenu(ModMenus.CUTTING_FACTORY_MENU.get(), CuttingFactoryScreen::new);
+        RegistryClientHelpers.registerMenu(ModMenus.COMBUSTION_GENERATOR_MENU.get(), CombustionGeneratorScreen::new);
+    }
+}
diff --git a/common/src/main/java/net/tonimatasdev/krystalcraft/client/screen/CombiningFactoryScreen.java b/common/src/main/java/net/tonimatasdev/krystalcraft/client/screen/CombiningFactoryScreen.java
@@ -8,6 +8,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
 import net.tonimatasdev.krystalcraft.KrystalCraft;
+import net.tonimatasdev.krystalcraft.client.utils.GuiUtil;
 import net.tonimatasdev.krystalcraft.menu.CombiningFactoryMenu;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/common/src/main/java/net/tonimatasdev/krystalcraft/client/screen/CombiningStationScreen.java b/common/src/main/java/net/tonimatasdev/krystalcraft/client/screen/CombiningStationScreen.java
@@ -8,6 +8,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
 import net.tonimatasdev.krystalcraft.KrystalCraft;
+import net.tonimatasdev.krystalcraft.client.utils.GuiUtil;
 import net.tonimatasdev.krystalcraft.menu.CombiningStationMenu;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/.../src/main/java/net/tonimatasdev/krystalcraft/client/screen/CombustionGeneratorScreen.java b/.../src/main/java/net/tonimatasdev/krystalcraft/client/screen/CombustionGeneratorScreen.java
@@ -8,6 +8,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
 import net.tonimatasdev.krystalcraft.KrystalCraft;
+import net.tonimatasdev.krystalcraft.client.utils.GuiUtil;
 import net.tonimatasdev.krystalcraft.menu.CombustionGeneratorMenu;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/common/src/main/java/net/tonimatasdev/krystalcraft/client/screen/CrushingFactoryScreen.java b/common/src/main/java/net/tonimatasdev/krystalcraft/client/screen/CrushingFactoryScreen.java
@@ -8,6 +8,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
 import net.tonimatasdev.krystalcraft.KrystalCraft;
+import net.tonimatasdev.krystalcraft.client.utils.GuiUtil;
 import net.tonimatasdev.krystalcraft.menu.CrushingFactoryMenu;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/common/src/main/java/net/tonimatasdev/krystalcraft/client/screen/CrushingStationScreen.java b/common/src/main/java/net/tonimatasdev/krystalcraft/client/screen/CrushingStationScreen.java
@@ -8,6 +8,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
 import net.tonimatasdev.krystalcraft.KrystalCraft;
+import net.tonimatasdev.krystalcraft.client.utils.GuiUtil;
 import net.tonimatasdev.krystalcraft.menu.CrushingStationMenu;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/common/src/main/java/net/tonimatasdev/krystalcraft/client/screen/CuttingFactoryScreen.java b/common/src/main/java/net/tonimatasdev/krystalcraft/client/screen/CuttingFactoryScreen.java
@@ -8,6 +8,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
 import net.tonimatasdev.krystalcraft.KrystalCraft;
+import net.tonimatasdev.krystalcraft.client.utils.GuiUtil;
 import net.tonimatasdev.krystalcraft.menu.CuttingFactoryMenu;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/common/src/main/java/net/tonimatasdev/krystalcraft/client/screen/CuttingStationScreen.java b/common/src/main/java/net/tonimatasdev/krystalcraft/client/screen/CuttingStationScreen.java
@@ -8,6 +8,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
 import net.tonimatasdev.krystalcraft.KrystalCraft;
+import net.tonimatasdev.krystalcraft.client.utils.GuiUtil;
 import net.tonimatasdev.krystalcraft.menu.CuttingStationMenu;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...v/krystalcraft/client/screen/GuiUtil.java → ...ev/krystalcraft/client/utils/GuiUtil.java b/...v/krystalcraft/client/screen/GuiUtil.java → ...ev/krystalcraft/client/utils/GuiUtil.java
@@ -1,6 +1,9 @@
-package net.tonimatasdev.krystalcraft.client.screen;
+package net.tonimatasdev.krystalcraft.client.utils;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+import dev.tonimatas.mythlib.client.ClientHooks;
+import dev.tonimatas.mythlib.fluid.base.FluidHolder;
+import dev.tonimatas.mythlib.fluid.util.FluidUtils;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
@@ -10,9 +13,6 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.inventory.InventoryMenu;
 import net.tonimatasdev.krystalcraft.KrystalCraft;
-import net.tonimatasdev.krystalcraft.plorix.fluid.base.FluidHolder;
-import net.tonimatasdev.krystalcraft.plorix.fluid.util.FluidHooks;
-import net.tonimatasdev.krystalcraft.plorix.util.Hooks;
 
 import java.awt.*;
 
@@ -69,8 +69,8 @@ private static void drawFluid(GuiGraphics graphics, int x, int y, double ratio,
             return;
         }
 
-        TextureAtlasSprite sprite = Hooks.getFluidSprite(fluid);
-        int colour = Hooks.getFluidColor(fluid);
+        TextureAtlasSprite sprite = ClientHooks.getFluidSprite(fluid);
+        int colour = ClientHooks.getFluidColor(fluid);
         int spriteHeight = sprite.contents().height();
 
         RenderSystem.setShaderColor((colour >> 16 & 255) / 255.0f, (float) (colour >> 8 & 255) / 255.0f, (float) (colour & 255) / 255.0f, 1.0f);
@@ -79,9 +79,9 @@ private static void drawFluid(GuiGraphics graphics, int x, int y, double ratio,
         int calcHeight = (int) ((FLUID_TANK_HEIGHT + 1) * ratio);
         // TODO: FIX THIS
         //try (var ignored = RenderUtils.createScissorBox(Minecraft.getInstance(), graphics.pose(), x, y + FLUID_TANK_HEIGHT - calcHeight, FLUID_TANK_WIDTH, calcHeight)) {
-        //    for (int i = 1; i < 4; i++) {
-        //        graphics.blit(x + 1, FLUID_TANK_HEIGHT + y - (spriteHeight * i), 0, FLUID_TANK_WIDTH - 2, spriteHeight, sprite);
-        //    }
+        for (int i = 1; i < 4; i++) {
+            graphics.blit(x + 1, FLUID_TANK_HEIGHT + y - (spriteHeight * i), 0, FLUID_TANK_WIDTH - 2, spriteHeight, sprite);
+        }
         //}
         RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
     }
@@ -102,7 +102,7 @@ public static void drawEnergyTooltip(GuiGraphics graphics, long energy, long ene
     }
 
     public static void drawTankTooltip(GuiGraphics graphics, FluidHolder tank, long capacity, int mouseX, int mouseY) {
-        graphics.renderTooltip(Minecraft.getInstance().font, Component.literal(FluidHooks.toMillibuckets(tank.getFluidAmount()) + "/" + FluidHooks.toMillibuckets(capacity)).setStyle(Style.EMPTY.withColor(ChatFormatting.GOLD)), mouseX, mouseY);
+        graphics.renderTooltip(Minecraft.getInstance().font, Component.literal(FluidUtils.toMillibuckets(tank.getFluidAmount()) + "/" + FluidUtils.toMillibuckets(capacity)).setStyle(Style.EMPTY.withColor(ChatFormatting.GOLD)), mouseX, mouseY);
     }
 
     public static Rectangle getFluidTankBounds(int x, int y) {