From c066950a7512a50a15bee25781734c6b50647572 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Tue, 1 Oct 2024 19:52:56 +0200 Subject: [PATCH 1/2] move the Loader.ismoloaded call out of the References class to avoid class loading issues if that class is referenced too early --- .../brandon3055/draconicevolution/common/lib/References.java | 3 --- .../draconicevolution/common/utills/InventoryUtils.java | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java b/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java index 4d57648ae..b495ad60e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java @@ -1,7 +1,5 @@ package com.brandon3055.draconicevolution.common.lib; -import cpw.mods.fml.common.Loader; - public final class References { public static final String MODID = "DraconicEvolution"; @@ -12,7 +10,6 @@ public final class References { public static final String SERVERPROXYLOCATION = "com.brandon3055.draconicevolution.common.CommonProxy"; public static final String GUIFACTORY = "com.brandon3055.draconicevolution.client.gui.DEGUIFactory"; public static final String RESOURCESPREFIX = MODID.toLowerCase() + ":"; - public static final boolean BAUBLES_MOD_IS_LOADED = Loader.isModLoaded("Baubles"); // ======================Render IDs========================// public static int idTeleporterStand = -1; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/utills/InventoryUtils.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/InventoryUtils.java index eb935d55f..565e6ad4a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/utills/InventoryUtils.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/InventoryUtils.java @@ -1,7 +1,5 @@ package com.brandon3055.draconicevolution.common.utills; -import static com.brandon3055.draconicevolution.common.lib.References.BAUBLES_MOD_IS_LOADED; - import java.util.Optional; import net.minecraft.entity.player.EntityPlayer; @@ -9,9 +7,12 @@ import net.minecraft.item.ItemStack; import baubles.common.lib.PlayerHandler; +import cpw.mods.fml.common.Loader; public final class InventoryUtils { + private static final boolean BAUBLES_MOD_IS_LOADED = Loader.isModLoaded("Baubles"); + private InventoryUtils() {} public static Optional getItemInAnyPlayerInventory(EntityPlayer player, From 4eee40893d615105258a5283a13afe868a946206 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Tue, 1 Oct 2024 21:07:26 +0200 Subject: [PATCH 2/2] update baubles dep to the new baubles mod --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 1169ad0a3..474f058ed 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -19,7 +19,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.7.0:dev") { transitive = false } - compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') { + implementation('com.github.GTNewHorizons:Baubles-Expanded:2.0.3:dev') { transitive = false }