From ebd2f270c385e3cbf0bfd3ee5db8bc4b65700c98 Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Thu, 6 Mar 2025 20:24:25 +0100 Subject: feat: Load mining islands from repo --- .../jade/java/moe/nea/firmament/compat/jade/utils.kt | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'src/compat/jade/java') diff --git a/src/compat/jade/java/moe/nea/firmament/compat/jade/utils.kt b/src/compat/jade/java/moe/nea/firmament/compat/jade/utils.kt index 520190b..0d949d8 100644 --- a/src/compat/jade/java/moe/nea/firmament/compat/jade/utils.kt +++ b/src/compat/jade/java/moe/nea/firmament/compat/jade/utils.kt @@ -1,13 +1,11 @@ package moe.nea.firmament.compat.jade -import snownee.jade.api.IWailaClientRegistration import snownee.jade.api.ui.IElement import snownee.jade.api.ui.IElementHelper import net.minecraft.item.ItemStack import net.minecraft.item.Items import net.minecraft.util.Identifier import moe.nea.firmament.util.SBData -import moe.nea.firmament.util.SkyBlockIsland import moe.nea.firmament.util.SkyblockId import moe.nea.firmament.util.setSkyBlockId @@ -17,16 +15,6 @@ fun String.jadeId(): Identifier = Identifier.of("firmament", this) // This drill icon should work for CIT resource packs val drillItem: ItemStack = Items.PRISMARINE_SHARD.defaultStack.setSkyBlockId(SkyblockId("TITANIUM_DRILL_1")) val drillIcon: IElement = IElementHelper.get().item(drillItem, 0.5f).message(null) -fun IWailaClientRegistration.registerGemstone(type: String) { -} - -fun isOnMiningIsland(): Boolean { - if (!SBData.isOnSkyblock) return false - // how does a when loop work - if (SBData.skyblockLocation == SkyBlockIsland.forMode("dwarven_mines")) return true - if (SBData.skyblockLocation == SkyBlockIsland.MINESHAFT) return true - if (SBData.skyblockLocation == SkyBlockIsland.forMode("crystal_hollows")) return true - if (SBData.skyblockLocation == SkyBlockIsland.forMode("crimson_isle")) return true - return false -} +fun isOnMiningIsland(): Boolean = + SBData.skyblockLocation?.hasCustomMining ?: false -- cgit