From 72d4cdf29b61e291408b633fa3a25a833f803c06 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Fri, 24 Mar 2023 23:30:29 +0700
Subject: [PATCH] Move JsonArraySpliterator to proper package

---
 .../ru/dbotthepony/mc/otm/android/AndroidResearchType.kt       | 3 +--
 .../mc/otm/{data => core/collect}/JsonArraySpliterator.kt      | 2 +-
 .../ru/dbotthepony/mc/otm/data/loot/CopyTileNbtFunction.kt     | 2 +-
 src/main/kotlin/ru/dbotthepony/mc/otm/matter/ComputeAction.kt  | 3 +--
 src/main/kotlin/ru/dbotthepony/mc/otm/matter/UpdateAction.kt   | 3 +--
 src/main/kotlin/ru/dbotthepony/mc/otm/recipe/UpgradeRecipe.kt  | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)
 rename src/main/kotlin/ru/dbotthepony/mc/otm/{data => core/collect}/JsonArraySpliterator.kt (96%)

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt
index 3dd3c0c58..2386bb3bc 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt
@@ -27,10 +27,9 @@ import ru.dbotthepony.mc.otm.core.collect.ListSet
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.core.isActuallyEmpty
 import ru.dbotthepony.mc.otm.core.registryName
-import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.core.set
 import ru.dbotthepony.mc.otm.core.toImmutableList
-import ru.dbotthepony.mc.otm.data.stream
+import ru.dbotthepony.mc.otm.core.collect.stream
 import ru.dbotthepony.mc.otm.isClient
 import ru.dbotthepony.mc.otm.registry.MRegistry
 import java.util.LinkedList
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/data/JsonArraySpliterator.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/JsonArraySpliterator.kt
similarity index 96%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/data/JsonArraySpliterator.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/JsonArraySpliterator.kt
index 9e4b2ed30..c6ac299d3 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/data/JsonArraySpliterator.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/JsonArraySpliterator.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.data
+package ru.dbotthepony.mc.otm.core.collect
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/data/loot/CopyTileNbtFunction.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/data/loot/CopyTileNbtFunction.kt
index c1958d418..8b84bc86e 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/data/loot/CopyTileNbtFunction.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/data/loot/CopyTileNbtFunction.kt
@@ -17,7 +17,7 @@ import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.core.set
 import ru.dbotthepony.mc.otm.core.stream
 import ru.dbotthepony.mc.otm.core.tagNotNull
-import ru.dbotthepony.mc.otm.data.stream
+import ru.dbotthepony.mc.otm.core.collect.stream
 import ru.dbotthepony.mc.otm.registry.MItemFunctionTypes
 import java.util.stream.Stream
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/ComputeAction.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/ComputeAction.kt
index bdb723c09..ba23936bd 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/ComputeAction.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/ComputeAction.kt
@@ -12,9 +12,8 @@ import net.minecraft.world.level.ItemLike
 import net.minecraftforge.registries.ForgeRegistries
 import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.core.registryName
-import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.core.set
-import ru.dbotthepony.mc.otm.data.stream
+import ru.dbotthepony.mc.otm.core.collect.stream
 import java.util.stream.Stream
 
 class ComputeAction : AbstractRegistryAction {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/UpdateAction.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/UpdateAction.kt
index e1a0d0799..ffa1ee732 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/UpdateAction.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/UpdateAction.kt
@@ -9,9 +9,8 @@ import net.minecraft.resources.ResourceLocation
 import net.minecraft.tags.TagKey
 import net.minecraft.world.item.Item
 import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.core.set
-import ru.dbotthepony.mc.otm.data.stream
+import ru.dbotthepony.mc.otm.core.collect.stream
 
 class UpdateAction : AbstractRegistryAction {
 	companion object {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/UpgradeRecipe.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/UpgradeRecipe.kt
index 6131ac60b..08d766c8a 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/UpgradeRecipe.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/UpgradeRecipe.kt
@@ -21,7 +21,7 @@ import ru.dbotthepony.mc.otm.core.set
 import ru.dbotthepony.mc.otm.core.tagNotNull
 import ru.dbotthepony.mc.otm.core.util.readJson
 import ru.dbotthepony.mc.otm.core.util.writeJson
-import ru.dbotthepony.mc.otm.data.stream
+import ru.dbotthepony.mc.otm.core.collect.stream
 import java.util.stream.Stream
 
 class UpgradeRecipe(