From 3cbcd9e2802e1a6bc00759924ac2dc9819ce7d3b Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 30 Mar 2025 18:42:42 +0700 Subject: [PATCH] Use immutableMap provided by kommons --- .../mc/otm/block/entity/MatteryDeviceBlockEntity.kt | 2 +- .../block/entity/decorative/PainterBlockEntity.kt | 2 +- .../ru/dbotthepony/mc/otm/client/render/Widgets18.kt | 2 +- .../ru/dbotthepony/mc/otm/item/FluidCapsuleItem.kt | 2 +- .../mc/otm/menu/input/EnergyConfigPlayerInput.kt | 2 +- .../mc/otm/menu/input/FluidConfigPlayerInput.kt | 2 +- .../mc/otm/menu/input/ItemConfigPlayerInput.kt | 2 +- src/main/kotlin/ru/dbotthepony/mc/otm/util/Utils.kt | 12 ------------ 8 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryDeviceBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryDeviceBlockEntity.kt index e0c639863..a57dbb5e4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryDeviceBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryDeviceBlockEntity.kt @@ -32,7 +32,7 @@ import ru.dbotthepony.mc.otm.capability.moveEnergy import ru.dbotthepony.mc.otm.capability.moveFluid import ru.dbotthepony.mc.otm.util.TextComponent import ru.dbotthepony.mc.otm.util.getValue -import ru.dbotthepony.mc.otm.util.immutableMap +import ru.dbotthepony.kommons.guava.immutableMap import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.util.math.RelativeSide import ru.dbotthepony.mc.otm.util.ITickable diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt index 00ea3e27b..fea003667 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt @@ -21,7 +21,7 @@ import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.container.slotted.ContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer import ru.dbotthepony.kommons.guava.immutableList -import ru.dbotthepony.mc.otm.util.immutableMap +import ru.dbotthepony.kommons.guava.immutableMap import ru.dbotthepony.mc.otm.util.isNotEmpty import ru.dbotthepony.mc.otm.util.mapPresent import ru.dbotthepony.mc.otm.util.set diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt index 484b140b6..51ccf72fa 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.client.render import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.util.immutableMap +import ru.dbotthepony.kommons.guava.immutableMap import ru.dbotthepony.mc.otm.util.math.RelativeSide object Widgets18 { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/FluidCapsuleItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/FluidCapsuleItem.kt index 0f979e94a..1bbc0cc33 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/FluidCapsuleItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/FluidCapsuleItem.kt @@ -36,7 +36,7 @@ import ru.dbotthepony.mc.otm.container.get import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.util.collect.any import ru.dbotthepony.kommons.guava.immutableList -import ru.dbotthepony.mc.otm.util.immutableMap +import ru.dbotthepony.kommons.guava.immutableMap import ru.dbotthepony.mc.otm.util.isNotEmpty import ru.dbotthepony.mc.otm.registry.CapabilitiesRegisterListener import java.util.function.IntSupplier diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/EnergyConfigPlayerInput.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/EnergyConfigPlayerInput.kt index a7558eafe..020b9826e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/EnergyConfigPlayerInput.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/EnergyConfigPlayerInput.kt @@ -4,7 +4,7 @@ import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.util.immutableMap +import ru.dbotthepony.kommons.guava.immutableMap import ru.dbotthepony.mc.otm.util.math.RelativeSide import ru.dbotthepony.mc.otm.menu.MatteryMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/FluidConfigPlayerInput.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/FluidConfigPlayerInput.kt index a314ddb57..6f64912f8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/FluidConfigPlayerInput.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/FluidConfigPlayerInput.kt @@ -4,7 +4,7 @@ import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.util.immutableMap +import ru.dbotthepony.kommons.guava.immutableMap import ru.dbotthepony.mc.otm.util.math.RelativeSide import ru.dbotthepony.mc.otm.menu.MatteryMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/ItemConfigPlayerInput.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/ItemConfigPlayerInput.kt index 40485851a..dadacdbf7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/ItemConfigPlayerInput.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/ItemConfigPlayerInput.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.menu.input import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity -import ru.dbotthepony.mc.otm.util.immutableMap +import ru.dbotthepony.kommons.guava.immutableMap import ru.dbotthepony.mc.otm.util.math.RelativeSide import ru.dbotthepony.mc.otm.menu.MatteryMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/util/Utils.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/Utils.kt index 61ff0a4c3..f18c09f9e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/util/Utils.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/Utils.kt @@ -155,18 +155,6 @@ inline var Entity.position: Vec3 get() = position() set(value) { setPos(value) } -inline fun immutableMap(initializer: ImmutableMap.Builder.() -> Unit): ImmutableMap { - val builder = ImmutableMap.Builder() - initializer.invoke(builder) - return builder.build() -} - -inline fun immutableMultimap(initializer: ImmutableMultimap.Builder.() -> Unit): ImmutableMultimap { - val builder = ImmutableMultimap.Builder() - initializer.invoke(builder) - return builder.build() -} - inline fun itemAttributes(builder: ItemAttributeModifiers.Builder.() -> Unit): ItemAttributeModifiers { val value = ItemAttributeModifiers.builder() builder(value)