From f9821aa5520407d11390d58a18dc5bad9d904a56 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Fri, 21 Mar 2025 13:36:46 +0700
Subject: [PATCH] Use GJRAND64 in menus

---
 .../dbotthepony/mc/otm/client/screen/panels/EditablePanel.kt | 5 +++--
 .../mc/otm/client/screen/tech/AndroidStationScreen.kt        | 4 ++--
 src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt    | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.kt
index f828af807..1b3c0da7f 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.kt
@@ -29,6 +29,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.input.QueryUserPanel
 import ru.dbotthepony.mc.otm.core.RandomSource2Generator
 import ru.dbotthepony.mc.otm.core.collect.concatIterators
 import ru.dbotthepony.mc.otm.core.collect.flatMap
+import ru.dbotthepony.mc.otm.core.util.GJRAND64RandomSource
 import java.util.*
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.function.Predicate
@@ -224,11 +225,11 @@ open class EditablePanel<out S : Screen>(
 		}
 	}
 
-	val random: RandomSource by lazy {
+	val random: GJRAND64RandomSource by lazy {
 		if (screen is MatteryScreen<*>) {
 			screen.menu.random
 		} else {
-			RandomSource.create()
+			GJRAND64RandomSource()
 		}
 	}
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidStationScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidStationScreen.kt
index 0b52df472..09ef63314 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidStationScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidStationScreen.kt
@@ -445,8 +445,8 @@ private class AndroidResearchButton(
 }
 
 private enum class PreviewScrollers(
-	val init: (EditablePanel<*>, RandomSource) -> Unit,
-	val scroll: (EditablePanel<*>, RandomSource) -> Boolean
+	val init: (EditablePanel<*>, RandomGenerator) -> Unit,
+	val scroll: (EditablePanel<*>, RandomGenerator) -> Boolean
 ) {
 	LEFT_TO_RIGHT(
 		init = { it, random ->
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt
index 8a3711faa..3568f9ecf 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt
@@ -44,6 +44,7 @@ import ru.dbotthepony.mc.otm.container.sortWithIndices
 import ru.dbotthepony.mc.otm.core.ResourceLocation
 import ru.dbotthepony.mc.otm.core.collect.ConditionalSet
 import ru.dbotthepony.mc.otm.core.math.Decimal
+import ru.dbotthepony.mc.otm.core.util.GJRAND64RandomSource
 import ru.dbotthepony.mc.otm.menu.input.BooleanInputWithFeedback
 import ru.dbotthepony.mc.otm.menu.widget.ProfiledLevelGaugeWidget
 import ru.dbotthepony.mc.otm.network.MatteryStreamCodec
@@ -81,7 +82,7 @@ abstract class MatteryMenu(
 	val mSynchronizer = SynchableGroup()
 	val synchronizerRemote = mSynchronizer.Remote()
 	val player: Player get() = inventory.player
-	val random: RandomSource = RandomSource.create()
+	val random = GJRAND64RandomSource()
 
 	private val _playerInventorySlots = ArrayList<InventorySlot>()
 	private val _playerHotbarSlots = ArrayList<InventorySlot>()