From 3bd53fdba015a10fd2bf7696039a9420d2f32cfc Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sat, 13 Jan 2024 13:30:28 +0700 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D1=81=D1=82=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=D1=83=D1=81=D1=82=D1=80=D0=BE=D0=B9=D1=81=D1=82=D0=B2?= =?UTF-8?q?=D0=B0=20=D0=B4=D0=B0=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B0?= =?UTF-8?q?=D0=BA=D0=BA=D1=83=D0=BC=D1=83=D0=BB=D1=8F=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=B0=20=D0=BF=D0=BE=D0=B7=D0=B2=D0=BE=D0=BB=D1=8F=D0=B5=D1=82?= =?UTF-8?q?=20=D0=B2=D0=B0=D0=BC=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt index ac29a0196..579fac976 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt @@ -199,7 +199,7 @@ private fun misc(provider: MatteryLanguageProvider) { gui("exopack_upgrades.smelting_upgrade", "Активация данного улучшения даст плавильню в вашем Экзопаке.") gui("exopack_upgrades.ender_access_upgrade", "Активация данного улучшения даст доступ к сундуку края в вашем Экзопаке.") - gui("crude_battery.replace_in_world", "Простота устройства данного аккумулятора позволяет вам заменить .") + gui("crude_battery.replace_in_world", "Простота устройства данного аккумулятора позволяет вам заменить ваш внутренний источник питания без станции андроида.") gui("crude_battery.replace_in_world_warning", "Данная операция крайне рискованная и может нанести огромный урон вашим системам!") gui("power_supplier.active_nodes", "Узлы сети, требующие питания: %s") From 87a7c2961f727b550ef65348b9039e67b8fd5637 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sat, 13 Jan 2024 19:40:15 +0700 Subject: [PATCH 2/3] Use volatileEnergyValues in BatteryBankBlockEntity --- .../mc/otm/block/entity/tech/BatteryBankBlockEntity.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BatteryBankBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BatteryBankBlockEntity.kt index fa1f08a61..f92896414 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BatteryBankBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BatteryBankBlockEntity.kt @@ -178,7 +178,8 @@ class BatteryBankBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : Matte leftDefault = FlowDirection.INPUT, rightDefault = FlowDirection.INPUT, topDefault = FlowDirection.INPUT, - bottomDefault = FlowDirection.INPUT + bottomDefault = FlowDirection.INPUT, + volatileEnergyValues = true ) init { From f7e3166ca0af2759aa4741f22f341ca0eee12ad0 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 14 Jan 2024 00:28:06 +0700 Subject: [PATCH 3/3] Fix wrong argument order inside children panels --- .../mc/otm/client/screen/matter/MatterPanelScreen.kt | 2 +- .../mc/otm/client/screen/tech/EssenceStorageScreen.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt index b1d960325..b8cc65f16 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt @@ -109,7 +109,7 @@ class MatterPanelScreen( placeholder = TranslatableComponent("otm.gui.quicksearch") } - override fun onTextChanged(old: String, new: String) { + override fun onTextChanged(new: String, old: String) { if (new == "") { menu.filter = Predicate { true } } else { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EssenceStorageScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EssenceStorageScreen.kt index 011dc31de..970f19148 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EssenceStorageScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EssenceStorageScreen.kt @@ -223,7 +223,7 @@ class EssenceStorageScreen(menu: EssenceStorageMenu, inventory: Inventory, title playGuiClickSound() } - override fun onTextChanged(old: String, new: String) { + override fun onTextChanged(new: String, old: String) { customDispense = (new.toIntOrNull() ?: 30).coerceAtLeast(1) } }