From cae74c5e5e016bc11d92edfa04357b4b3b3a2e5e Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Fri, 20 Jan 2023 22:24:55 +0700
Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=89=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B9=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kotlin/ru/dbotthepony/kstarbound/defs/RawPrototype.kt   | 1 +
 .../dbotthepony/kstarbound/defs/item/ArmorItemPrototype.kt  | 2 +-
 .../kstarbound/defs/item/CurrencyItemPrototype.kt           | 3 +--
 .../ru/dbotthepony/kstarbound/defs/item/ItemPrototype.kt    | 2 +-
 .../dbotthepony/kstarbound/defs/item/LiquidItemPrototype.kt | 2 +-
 .../kstarbound/defs/item/MaterialItemPrototype.kt           | 2 +-
 .../kstarbound/defs/{ => util}/ImmutableEnroller.kt         | 2 +-
 .../dbotthepony/kstarbound/defs/{ => util}/JsonFlattener.kt | 3 +--
 .../ru/dbotthepony/kstarbound/io/json/BuilderAdapter.kt     | 2 +-
 .../ru/dbotthepony/kstarbound/io/json/FactoryAdapter.kt     | 6 +++---
 10 files changed, 12 insertions(+), 13 deletions(-)
 rename src/main/kotlin/ru/dbotthepony/kstarbound/defs/{ => util}/ImmutableEnroller.kt (96%)
 rename src/main/kotlin/ru/dbotthepony/kstarbound/defs/{ => util}/JsonFlattener.kt (95%)

diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/RawPrototype.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/RawPrototype.kt
index 46a72306..4f524d1f 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/RawPrototype.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/RawPrototype.kt
@@ -3,6 +3,7 @@ package ru.dbotthepony.kstarbound.defs
 import com.google.common.collect.ImmutableMap
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap
 import ru.dbotthepony.kstarbound.Starbound
+import ru.dbotthepony.kstarbound.defs.util.enrollMap
 import ru.dbotthepony.kstarbound.io.json.INativeJsonHolder
 
 /**
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ArmorItemPrototype.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ArmorItemPrototype.kt
index 637a4397..4ba60377 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ArmorItemPrototype.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ArmorItemPrototype.kt
@@ -1,7 +1,7 @@
 package ru.dbotthepony.kstarbound.defs.item
 
 import ru.dbotthepony.kstarbound.Starbound
-import ru.dbotthepony.kstarbound.defs.enrollMap
+import ru.dbotthepony.kstarbound.defs.util.enrollMap
 import ru.dbotthepony.kstarbound.io.json.BuilderAdapter
 import ru.dbotthepony.kstarbound.io.json.asJsonObject
 import ru.dbotthepony.kstarbound.io.json.asList
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/CurrencyItemPrototype.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/CurrencyItemPrototype.kt
index 27fdabf1..3ca6d4ad 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/CurrencyItemPrototype.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/CurrencyItemPrototype.kt
@@ -1,7 +1,6 @@
 package ru.dbotthepony.kstarbound.defs.item
 
-import ru.dbotthepony.kstarbound.defs.ThingDescription
-import ru.dbotthepony.kstarbound.defs.enrollMap
+import ru.dbotthepony.kstarbound.defs.util.enrollMap
 import ru.dbotthepony.kstarbound.io.json.BuilderAdapter
 import ru.dbotthepony.kstarbound.util.NotNullVar
 
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemPrototype.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemPrototype.kt
index f66e9c09..2cf923d5 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemPrototype.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemPrototype.kt
@@ -1,7 +1,7 @@
 package ru.dbotthepony.kstarbound.defs.item
 
 import ru.dbotthepony.kstarbound.defs.ThingDescription
-import ru.dbotthepony.kstarbound.defs.enrollMap
+import ru.dbotthepony.kstarbound.defs.util.enrollMap
 import ru.dbotthepony.kstarbound.io.json.BuilderAdapter
 import ru.dbotthepony.kstarbound.io.json.INativeJsonHolder
 import ru.dbotthepony.kstarbound.util.NotNullVar
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/LiquidItemPrototype.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/LiquidItemPrototype.kt
index 741fad4d..26d82630 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/LiquidItemPrototype.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/LiquidItemPrototype.kt
@@ -1,7 +1,7 @@
 package ru.dbotthepony.kstarbound.defs.item
 
 import ru.dbotthepony.kstarbound.defs.MaterialReference
-import ru.dbotthepony.kstarbound.defs.enrollMap
+import ru.dbotthepony.kstarbound.defs.util.enrollMap
 import ru.dbotthepony.kstarbound.io.json.BuilderAdapter
 
 class LiquidItemPrototype : ItemPrototype() {
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/MaterialItemPrototype.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/MaterialItemPrototype.kt
index 6924a111..ba9f7575 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/MaterialItemPrototype.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/MaterialItemPrototype.kt
@@ -1,7 +1,7 @@
 package ru.dbotthepony.kstarbound.defs.item
 
 import ru.dbotthepony.kstarbound.defs.MaterialReference
-import ru.dbotthepony.kstarbound.defs.enrollMap
+import ru.dbotthepony.kstarbound.defs.util.enrollMap
 import ru.dbotthepony.kstarbound.io.json.BuilderAdapter
 
 class MaterialItemPrototype : ItemPrototype() {
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/ImmutableEnroller.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/util/ImmutableEnroller.kt
similarity index 96%
rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/ImmutableEnroller.kt
rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/util/ImmutableEnroller.kt
index 153022a0..4ce79ce8 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/ImmutableEnroller.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/util/ImmutableEnroller.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.kstarbound.defs
+package ru.dbotthepony.kstarbound.defs.util
 
 import com.google.common.collect.ImmutableList
 import com.google.common.collect.ImmutableMap
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonFlattener.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/util/JsonFlattener.kt
similarity index 95%
rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonFlattener.kt
rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/util/JsonFlattener.kt
index 49c978c5..3a8323d1 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonFlattener.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/util/JsonFlattener.kt
@@ -1,11 +1,10 @@
-package ru.dbotthepony.kstarbound.defs
+package ru.dbotthepony.kstarbound.defs.util
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.google.gson.JsonNull
 import com.google.gson.JsonObject
 import com.google.gson.JsonPrimitive
-import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
 
 private fun flattenJsonPrimitive(input: JsonPrimitive, interner: (String) -> String = String::intern): Any {
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/BuilderAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/BuilderAdapter.kt
index dba7e5c9..17ccde97 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/BuilderAdapter.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/BuilderAdapter.kt
@@ -14,7 +14,7 @@ import it.unimi.dsi.fastutil.objects.ObjectArraySet
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet
 import org.apache.logging.log4j.LogManager
 import ru.dbotthepony.kstarbound.Starbound
-import ru.dbotthepony.kstarbound.defs.flattenJsonElement
+import ru.dbotthepony.kstarbound.defs.util.flattenJsonElement
 import ru.dbotthepony.kstarbound.util.NotNullVar
 import kotlin.properties.Delegates
 import kotlin.reflect.KClass
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/FactoryAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/FactoryAdapter.kt
index 129b34c6..7ca8f9a9 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/FactoryAdapter.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/FactoryAdapter.kt
@@ -16,9 +16,9 @@ import it.unimi.dsi.fastutil.objects.Object2IntArrayMap
 import it.unimi.dsi.fastutil.objects.ObjectArraySet
 import org.apache.logging.log4j.LogManager
 import ru.dbotthepony.kstarbound.Starbound
-import ru.dbotthepony.kstarbound.defs.enrollList
-import ru.dbotthepony.kstarbound.defs.enrollMap
-import ru.dbotthepony.kstarbound.defs.flattenJsonElement
+import ru.dbotthepony.kstarbound.defs.util.enrollList
+import ru.dbotthepony.kstarbound.defs.util.enrollMap
+import ru.dbotthepony.kstarbound.defs.util.flattenJsonElement
 import ru.dbotthepony.kstarbound.getValue
 import ru.dbotthepony.kstarbound.setValue
 import java.lang.reflect.Constructor