From 830ac91521ebabd28f5184147148ebfbf498142a Mon Sep 17 00:00:00 2001
From: lordIcocain <62835225+lordIcocain@users.noreply.github.com>
Date: Fri, 23 May 2025 12:14:36 +0300
Subject: [PATCH] make baubles optional (#296)

---
 .../java/com/glodblock/github/FluidCraft.java |  2 +-
 .../java/com/glodblock/github/util/Util.java  | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java
index 4a6a51af..5c20a21a 100644
--- a/src/main/java/com/glodblock/github/FluidCraft.java
+++ b/src/main/java/com/glodblock/github/FluidCraft.java
@@ -33,7 +33,7 @@ import cpw.mods.fml.common.network.NetworkRegistry;
         modid = FluidCraft.MODID,
         version = FluidCraft.VERSION,
         name = FluidCraft.MODNAME,
-        dependencies = "required-after:appliedenergistics2@[rv3-beta-238,);required-after:CoFHCore;required-after:Baubles;after:waila;after:thaumicenergistics;after:ae2wct")
+        dependencies = "required-after:appliedenergistics2@[rv3-beta-238,);required-after:CoFHCore;after:waila;after:thaumicenergistics;after:ae2wct")
 public class FluidCraft {
 
     public static final String MODID = "ae2fc";
diff --git a/src/main/java/com/glodblock/github/util/Util.java b/src/main/java/com/glodblock/github/util/Util.java
index 6b3de0b2..d478c524 100644
--- a/src/main/java/com/glodblock/github/util/Util.java
+++ b/src/main/java/com/glodblock/github/util/Util.java
@@ -59,12 +59,15 @@ import appeng.util.Platform;
 import appeng.util.item.AEFluidStack;
 import baubles.api.BaublesApi;
 import codechicken.nei.recipe.StackInfo;
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.registry.GameData;
 import io.netty.buffer.ByteBuf;
 
 public final class Util {
 
+    public static boolean isBaublesLoaded = Loader.isModLoaded("Baubles");
+
     public static int drainItemPower(AEBaseContainer c, InventoryPlayer ip, int slot, int ticks, double pm,
             IFluidPortableCell wt) {
         if (slot != -1) {
@@ -181,16 +184,20 @@ public final class Util {
                 return new ImmutablePair<>(i, is);
             }
         }
-        IInventory handler = BaublesApi.getBaubles(player);
-        if (handler != null) {
-            invSize = handler.getSizeInventory();
-            for (int i = 0; i < invSize; ++i) {
-                ItemStack is = handler.getStackInSlot(i);
-                if (is != null && is.getItem() instanceof ItemWirelessUltraTerminal) {
-                    return new ImmutablePair<>(GuiHelper.encodeType(i, GuiHelper.InvType.PLAYER_BAUBLES), is);
+
+        if (isBaublesLoaded) {
+            IInventory handler = BaublesApi.getBaubles(player);
+            if (handler != null) {
+                invSize = handler.getSizeInventory();
+                for (int i = 0; i < invSize; ++i) {
+                    ItemStack is = handler.getStackInSlot(i);
+                    if (is != null && is.getItem() instanceof ItemWirelessUltraTerminal) {
+                        return new ImmutablePair<>(GuiHelper.encodeType(i, GuiHelper.InvType.PLAYER_BAUBLES), is);
+                    }
                 }
             }
         }
+
         return null;
     }