From bb501e2c7e83a5e74f0831cd3b241a3c7347e263 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Thu, 10 Apr 2025 08:31:26 +0700 Subject: [PATCH] Mark "is mod loaded" as internal property, so it don't bleed into other namespaces --- .../ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt | 2 +- .../kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt | 2 +- .../dbotthepony/mc/otm/compat/ironchest/IronChestMenuTypes.kt | 2 +- .../mc/otm/compat/ironshulkerbox/IronShulkersMenuTypes.kt | 2 +- .../dbotthepony/mc/otm/compat/itemborders/ItemBordersCompat.kt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt index 0cb56a423..1106b0819 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt @@ -31,7 +31,7 @@ import ru.dbotthepony.mc.otm.menu.MatteryMenuSlot import java.util.Collections.emptyIterator import java.util.stream.Stream -val isCosmeticArmorLoaded by lazy { +internal val isCosmeticArmorLoaded by lazy { ModList.get().isLoaded("cosmeticarmorreworked") } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt index d236113c1..ee2652365 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt @@ -35,7 +35,7 @@ import java.util.Collections.emptyIterator import java.util.stream.Stream import kotlin.collections.ArrayList -val isCuriosLoaded by lazy { +internal val isCuriosLoaded by lazy { ModList.get().isLoaded(CuriosApi.MODID) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/ironchest/IronChestMenuTypes.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/ironchest/IronChestMenuTypes.kt index c7203ff6b..ca612deee 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/ironchest/IronChestMenuTypes.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/ironchest/IronChestMenuTypes.kt @@ -22,7 +22,7 @@ import ru.dbotthepony.mc.otm.menu.MatteryMenuSlot import ru.dbotthepony.mc.otm.menu.makeSlots import ru.dbotthepony.mc.otm.registry.MDeferredRegister -val isIronChestLoaded by lazy { +internal val isIronChestLoaded by lazy { ModList.get().isLoaded(IronChests.MODID) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/ironshulkerbox/IronShulkersMenuTypes.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/ironshulkerbox/IronShulkersMenuTypes.kt index ad49080e7..cebcc5a3f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/ironshulkerbox/IronShulkersMenuTypes.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/ironshulkerbox/IronShulkersMenuTypes.kt @@ -24,7 +24,7 @@ import ru.dbotthepony.mc.otm.menu.makeSlots import ru.dbotthepony.mc.otm.registry.MDeferredRegister import kotlin.collections.toTypedArray -val isIronShulkersLoaded by lazy { +internal val isIronShulkersLoaded by lazy { ModList.get().isLoaded(IronShulkerBoxes.MODID) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/itemborders/ItemBordersCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/itemborders/ItemBordersCompat.kt index 7464294ae..02619a2e6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/itemborders/ItemBordersCompat.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/itemborders/ItemBordersCompat.kt @@ -5,7 +5,7 @@ import net.minecraft.world.inventory.Slot import net.neoforged.fml.ModList import ru.dbotthepony.mc.otm.client.render.MGUIGraphics -val isItemBordersLoaded by lazy { +internal val isItemBordersLoaded by lazy { ModList.get().isLoaded("itemborders") }