From 1e04b7e777023cd64d9d73226a49d44028fbd6b6 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Thu, 8 Feb 2024 20:23:40 +0700 Subject: [PATCH] Bump kommons --- gradle.properties | 2 +- src/main/kotlin/ru/dbotthepony/kstarbound/Ext.kt | 2 +- src/main/kotlin/ru/dbotthepony/kstarbound/Registry.kt | 2 +- .../ru/dbotthepony/kstarbound/client/StarboundClient.kt | 2 +- .../kotlin/ru/dbotthepony/kstarbound/client/gl/GLTexture.kt | 2 +- .../kstarbound/client/gl/shader/GLShaderProgram.kt | 6 +++--- .../ru/dbotthepony/kstarbound/client/gl/shader/Programs.kt | 2 +- .../dbotthepony/kstarbound/client/gl/shader/UberShader.kt | 2 +- .../kstarbound/client/gl/vertex/VertexBuilder.kt | 6 +++--- .../ru/dbotthepony/kstarbound/client/world/ClientWorld.kt | 2 +- src/main/kotlin/ru/dbotthepony/kstarbound/defs/Drawable.kt | 2 +- .../kotlin/ru/dbotthepony/kstarbound/defs/JsonDriven.kt | 2 +- .../ru/dbotthepony/kstarbound/defs/MovementParameters.kt | 2 +- .../kstarbound/defs/animation/AnimationDefinition.kt | 2 +- .../ru/dbotthepony/kstarbound/defs/image/IUVCoordinates.kt | 2 +- .../ru/dbotthepony/kstarbound/defs/item/ItemDescriptor.kt | 2 +- .../kstarbound/defs/item/TreasurePoolDefinition.kt | 2 +- .../ru/dbotthepony/kstarbound/defs/item/api/ILiquidItem.kt | 2 +- .../dbotthepony/kstarbound/defs/item/api/IMaterialItem.kt | 2 +- .../kstarbound/defs/item/impl/LiquidItemDefinition.kt | 2 +- .../kstarbound/defs/item/impl/MaterialItemDefinition.kt | 2 +- .../kstarbound/defs/monster/MonsterTypeDefinition.kt | 2 +- .../dbotthepony/kstarbound/defs/object/ObjectDefinition.kt | 2 +- .../dbotthepony/kstarbound/defs/particle/ParticleCreator.kt | 2 +- src/main/kotlin/ru/dbotthepony/kstarbound/io/Streams.kt | 4 ++-- .../dbotthepony/kstarbound/json/builder/FactoryAdapter.kt | 2 +- .../ru/dbotthepony/kstarbound/json/builder/Properties.kt | 2 +- src/main/kotlin/ru/dbotthepony/kstarbound/lua/Functions.kt | 6 +++--- .../kotlin/ru/dbotthepony/kstarbound/lua/StateMachine.kt | 2 +- .../ru/dbotthepony/kstarbound/server/world/IChunkSource.kt | 2 +- .../kstarbound/server/world/LegacyChunkSource.kt | 2 +- .../ru/dbotthepony/kstarbound/server/world/ServerWorld.kt | 2 +- src/main/kotlin/ru/dbotthepony/kstarbound/util/Utils.kt | 2 +- src/main/kotlin/ru/dbotthepony/kstarbound/world/ChunkPos.kt | 2 +- .../ru/dbotthepony/kstarbound/world/LightCalculator.kt | 2 +- src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt | 4 ++-- .../kotlin/ru/dbotthepony/kstarbound/world/WorldGeometry.kt | 6 +++--- .../ru/dbotthepony/kstarbound/world/api/ICellAccess.kt | 2 +- .../ru/dbotthepony/kstarbound/world/api/ITileAccess.kt | 2 +- .../ru/dbotthepony/kstarbound/world/api/OffsetCellAccess.kt | 2 +- .../ru/dbotthepony/kstarbound/world/entities/ItemEntity.kt | 2 +- .../kotlin/ru/dbotthepony/kstarbound/world/physics/Poly.kt | 2 +- 42 files changed, 52 insertions(+), 52 deletions(-) diff --git a/gradle.properties b/gradle.properties index cf16460b..b0e03977 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ kotlin.code.style=official org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m kotlinVersion=1.9.0 -kommonsVersion=1.7.9 +kommonsVersion=2.0.0 ffiVersion=2.2.13 lwjglVersion=3.3.0 diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Ext.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Ext.kt index 051f0850..eb2b717c 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/Ext.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Ext.kt @@ -7,7 +7,7 @@ import com.google.gson.TypeAdapter import com.google.gson.TypeAdapterFactory import com.google.gson.reflect.TypeToken import com.google.gson.stream.JsonReader -import ru.dbotthepony.kommons.core.KOptional +import ru.dbotthepony.kommons.util.KOptional import java.util.Arrays import java.util.concurrent.Callable import java.util.concurrent.ForkJoinPool diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Registry.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Registry.kt index fd65c15d..c67dbfef 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/Registry.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Registry.kt @@ -20,7 +20,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectMap import it.unimi.dsi.fastutil.objects.Object2ObjectMaps import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap import org.apache.logging.log4j.LogManager -import ru.dbotthepony.kommons.core.Either +import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kstarbound.json.consumeNull import java.lang.reflect.ParameterizedType import java.util.concurrent.locks.ReentrantLock diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt index d4a612f1..1ae59def 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt @@ -19,7 +19,7 @@ import org.lwjgl.system.MemoryStack import org.lwjgl.system.MemoryUtil import org.lwjgl.system.MemoryUtil.memAddressSafe import ru.dbotthepony.kommons.collect.forValidRefs -import ru.dbotthepony.kommons.core.IStruct4f +import ru.dbotthepony.kommons.util.IStruct4f import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.kommons.matrix.Matrix3f import ru.dbotthepony.kommons.matrix.Matrix3fStack diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/GLTexture.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/GLTexture.kt index 9dcaaa2f..11762f03 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/GLTexture.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/GLTexture.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.client.gl import org.apache.logging.log4j.LogManager import org.lwjgl.opengl.GL45.* -import ru.dbotthepony.kommons.core.IStruct2i +import ru.dbotthepony.kommons.util.IStruct2i import ru.dbotthepony.kstarbound.client.StarboundClient import java.nio.ByteBuffer import kotlin.reflect.KProperty diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/GLShaderProgram.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/GLShaderProgram.kt index 636923b9..0e0e98d5 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/GLShaderProgram.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/GLShaderProgram.kt @@ -5,9 +5,9 @@ import it.unimi.dsi.fastutil.objects.Object2BooleanFunction import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap import it.unimi.dsi.fastutil.objects.Object2ObjectFunction import org.lwjgl.opengl.GL45.* -import ru.dbotthepony.kommons.core.IStruct2f -import ru.dbotthepony.kommons.core.IStruct3f -import ru.dbotthepony.kommons.core.IStruct4f +import ru.dbotthepony.kommons.util.IStruct2f +import ru.dbotthepony.kommons.util.IStruct3f +import ru.dbotthepony.kommons.util.IStruct4f import ru.dbotthepony.kommons.matrix.Matrix3f import ru.dbotthepony.kommons.matrix.Matrix4f import ru.dbotthepony.kommons.vector.Vector2f diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/Programs.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/Programs.kt index 732da4f0..c21720ac 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/Programs.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/Programs.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.client.gl.shader -import ru.dbotthepony.kommons.core.IStruct4f +import ru.dbotthepony.kommons.util.IStruct4f import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.kommons.matrix.Matrix3f import ru.dbotthepony.kstarbound.client.StarboundClient diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/UberShader.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/UberShader.kt index 7ab93945..a79b0ef7 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/UberShader.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/UberShader.kt @@ -8,7 +8,7 @@ import it.unimi.dsi.fastutil.objects.ObjectArraySet import it.unimi.dsi.fastutil.objects.Reference2ObjectFunction import org.lwjgl.opengl.GL20.GL_FRAGMENT_SHADER import org.lwjgl.opengl.GL20.GL_VERTEX_SHADER -import ru.dbotthepony.kommons.core.IStruct4f +import ru.dbotthepony.kommons.util.IStruct4f import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.kommons.matrix.Matrix3f import ru.dbotthepony.kstarbound.client.StarboundClient diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/vertex/VertexBuilder.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/vertex/VertexBuilder.kt index 02e6aef8..38122943 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/vertex/VertexBuilder.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/vertex/VertexBuilder.kt @@ -4,9 +4,9 @@ import org.lwjgl.opengl.GL45 import org.lwjgl.opengl.GL45.GL_UNSIGNED_INT import org.lwjgl.opengl.GL45.GL_UNSIGNED_SHORT import org.lwjgl.opengl.GL45.GL_UNSIGNED_BYTE -import ru.dbotthepony.kommons.core.IStruct2d -import ru.dbotthepony.kommons.core.IStruct2f -import ru.dbotthepony.kommons.core.IStruct4f +import ru.dbotthepony.kommons.util.IStruct2d +import ru.dbotthepony.kommons.util.IStruct2f +import ru.dbotthepony.kommons.util.IStruct4f import ru.dbotthepony.kommons.matrix.Matrix3f import ru.dbotthepony.kstarbound.client.gl.BufferObject import java.nio.ByteBuffer diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/world/ClientWorld.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/world/ClientWorld.kt index 92ee702c..90b77ce6 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/world/ClientWorld.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/world/ClientWorld.kt @@ -5,7 +5,7 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectFunction import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap import it.unimi.dsi.fastutil.longs.LongArraySet import it.unimi.dsi.fastutil.objects.ReferenceArraySet -import ru.dbotthepony.kommons.core.IStruct2i +import ru.dbotthepony.kommons.util.IStruct2i import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.kommons.util.AABB import ru.dbotthepony.kommons.vector.Vector2f diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/Drawable.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/Drawable.kt index 3db66bd3..ecb66569 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/Drawable.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/Drawable.kt @@ -8,7 +8,7 @@ import com.google.gson.reflect.TypeToken import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonWriter import org.apache.logging.log4j.LogManager -import ru.dbotthepony.kommons.core.Either +import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.kommons.matrix.Matrix3f import ru.dbotthepony.kommons.vector.Vector2f diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonDriven.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonDriven.kt index 9b51541e..73d003a6 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonDriven.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonDriven.kt @@ -5,7 +5,7 @@ import com.google.gson.JsonObject import com.google.gson.TypeAdapter import com.google.gson.reflect.TypeToken import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap -import ru.dbotthepony.kommons.core.Either +import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.util.AssetPathStack import ru.dbotthepony.kstarbound.json.set diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/MovementParameters.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/MovementParameters.kt index bd8c634b..d1a3bd13 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/MovementParameters.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/MovementParameters.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.defs import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableSet -import ru.dbotthepony.kommons.core.Either +import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kstarbound.json.builder.JsonAlias import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.world.physics.Poly diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AnimationDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AnimationDefinition.kt index 21ca71d7..32e5abd5 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AnimationDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AnimationDefinition.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.defs.animation import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap -import ru.dbotthepony.kommons.core.Either +import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kommons.vector.Vector2d import ru.dbotthepony.kstarbound.defs.image.SpriteReference import ru.dbotthepony.kstarbound.defs.particle.ParticleEmitter diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/IUVCoordinates.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/IUVCoordinates.kt index 7dcace97..5e3803dc 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/IUVCoordinates.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/IUVCoordinates.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.defs.image -import ru.dbotthepony.kommons.core.IStruct4f +import ru.dbotthepony.kommons.util.IStruct4f interface IUVCoordinates : IStruct4f { val u0: Float diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemDescriptor.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemDescriptor.kt index cec98b3e..493929cc 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemDescriptor.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemDescriptor.kt @@ -10,7 +10,7 @@ import org.classdump.luna.ByteString import org.classdump.luna.LuaRuntimeException import org.classdump.luna.Table import org.classdump.luna.TableFactory -import ru.dbotthepony.kommons.core.KOptional +import ru.dbotthepony.kommons.util.KOptional import ru.dbotthepony.kstarbound.lua.StateMachine import ru.dbotthepony.kstarbound.lua.from import ru.dbotthepony.kstarbound.lua.toJsonObject diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/TreasurePoolDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/TreasurePoolDefinition.kt index 97df7917..69d11074 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/TreasurePoolDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/TreasurePoolDefinition.kt @@ -12,7 +12,7 @@ import com.google.gson.internal.bind.JsonTreeReader import com.google.gson.reflect.TypeToken import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonWriter -import ru.dbotthepony.kommons.core.Either +import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.defs.ItemReference import ru.dbotthepony.kstarbound.json.consumeNull diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/ILiquidItem.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/ILiquidItem.kt index 79bbaec7..9948b4ea 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/ILiquidItem.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/ILiquidItem.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.defs.item.api -import ru.dbotthepony.kommons.core.Either +import ru.dbotthepony.kommons.util.Either interface ILiquidItem : IItemDefinition { /** diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IMaterialItem.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IMaterialItem.kt index 3382d0bc..e06a9688 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IMaterialItem.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IMaterialItem.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.defs.item.api -import ru.dbotthepony.kommons.core.Either +import ru.dbotthepony.kommons.util.Either interface IMaterialItem : IItemDefinition { /** diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/LiquidItemDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/LiquidItemDefinition.kt index 6500a12b..418760cc 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/LiquidItemDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/LiquidItemDefinition.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.defs.item.impl -import ru.dbotthepony.kommons.core.Either +import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition import ru.dbotthepony.kstarbound.defs.item.api.ILiquidItem import ru.dbotthepony.kstarbound.json.builder.JsonAlias diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/MaterialItemDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/MaterialItemDefinition.kt index 2fe9b865..359901a0 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/MaterialItemDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/MaterialItemDefinition.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.defs.item.impl -import ru.dbotthepony.kommons.core.Either +import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition import ru.dbotthepony.kstarbound.defs.item.api.IMaterialItem import ru.dbotthepony.kstarbound.json.builder.JsonAlias diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/monster/MonsterTypeDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/monster/MonsterTypeDefinition.kt index b9664668..59337ab5 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/monster/MonsterTypeDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/monster/MonsterTypeDefinition.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.defs.monster import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap import com.google.common.collect.ImmutableSet -import ru.dbotthepony.kommons.core.Either +import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.defs.ActorMovementParameters import ru.dbotthepony.kstarbound.defs.AssetReference diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectDefinition.kt index 30599b5f..0c382b6e 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectDefinition.kt @@ -11,7 +11,7 @@ import com.google.gson.JsonSyntaxException import com.google.gson.TypeAdapter import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonWriter -import ru.dbotthepony.kommons.core.Either +import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.defs.AssetPath diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleCreator.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleCreator.kt index 0ca40046..004a2268 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleCreator.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleCreator.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.defs.particle -import ru.dbotthepony.kommons.core.Either +import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.json.builder.JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/Streams.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/io/Streams.kt index 4772d01c..073601eb 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/Streams.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/io/Streams.kt @@ -1,8 +1,8 @@ package ru.dbotthepony.kstarbound.io import it.unimi.dsi.fastutil.bytes.ByteArrayList -import ru.dbotthepony.kommons.core.IStruct2d -import ru.dbotthepony.kommons.core.IStruct2i +import ru.dbotthepony.kommons.util.IStruct2d +import ru.dbotthepony.kommons.util.IStruct2i import ru.dbotthepony.kommons.io.readDouble import ru.dbotthepony.kommons.io.readLong import ru.dbotthepony.kommons.io.readSignedVarInt diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/FactoryAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/FactoryAdapter.kt index cab570b9..27c2a202 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/FactoryAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/FactoryAdapter.kt @@ -22,7 +22,7 @@ import it.unimi.dsi.fastutil.ints.IntArrayList import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap import it.unimi.dsi.fastutil.objects.ObjectArraySet import org.apache.logging.log4j.LogManager -import ru.dbotthepony.kommons.core.Either +import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.defs.util.enrollList import ru.dbotthepony.kstarbound.defs.util.enrollMap diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/Properties.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/Properties.kt index bafb9622..81f477b3 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/Properties.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/Properties.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.json.builder import com.google.gson.Gson import com.google.gson.TypeAdapter import com.google.gson.reflect.TypeToken -import ru.dbotthepony.kommons.core.KOptional +import ru.dbotthepony.kommons.util.KOptional import kotlin.properties.Delegates import kotlin.reflect.KMutableProperty1 import kotlin.reflect.KProperty1 diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/lua/Functions.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/lua/Functions.kt index f63098a1..9b490dc0 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/lua/Functions.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/lua/Functions.kt @@ -24,9 +24,9 @@ import org.classdump.luna.runtime.AbstractFunction4 import org.classdump.luna.runtime.AbstractFunctionAnyArg import org.classdump.luna.runtime.ExecutionContext import org.classdump.luna.runtime.LuaFunction -import ru.dbotthepony.kommons.core.IStruct2i -import ru.dbotthepony.kommons.core.IStruct3i -import ru.dbotthepony.kommons.core.IStruct4i +import ru.dbotthepony.kommons.util.IStruct2i +import ru.dbotthepony.kommons.util.IStruct3i +import ru.dbotthepony.kommons.util.IStruct4i import ru.dbotthepony.kstarbound.json.InternedJsonElementAdapter fun ArgumentIterator.nextOptionalFloat(): Double? { diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/lua/StateMachine.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/lua/StateMachine.kt index 7543d0a9..d4ff7682 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/lua/StateMachine.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/lua/StateMachine.kt @@ -6,7 +6,7 @@ import org.classdump.luna.runtime.Dispatch import org.classdump.luna.runtime.ExecutionContext import org.classdump.luna.runtime.Resumable import org.classdump.luna.runtime.UnresolvedControlThrowable -import ru.dbotthepony.kommons.core.KOptional +import ru.dbotthepony.kommons.util.KOptional import ru.dbotthepony.kommons.vector.Vector2i import java.util.function.Supplier diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/IChunkSource.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/IChunkSource.kt index 7c53d59a..1c030b52 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/IChunkSource.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/IChunkSource.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.server.world import ru.dbotthepony.kommons.arrays.Object2DArray -import ru.dbotthepony.kommons.core.KOptional +import ru.dbotthepony.kommons.util.KOptional import ru.dbotthepony.kstarbound.world.CHUNK_SIZE import ru.dbotthepony.kstarbound.world.ChunkPos import ru.dbotthepony.kstarbound.world.api.AbstractCell diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/LegacyChunkSource.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/LegacyChunkSource.kt index 8e26ae8a..c01c89a1 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/LegacyChunkSource.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/LegacyChunkSource.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.server.world import org.apache.logging.log4j.LogManager import ru.dbotthepony.kommons.arrays.Object2DArray -import ru.dbotthepony.kommons.core.KOptional +import ru.dbotthepony.kommons.util.KOptional import ru.dbotthepony.kommons.io.readVarInt import ru.dbotthepony.kommons.vector.Vector2i import ru.dbotthepony.kstarbound.Starbound diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorld.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorld.kt index 502e7e4d..6ed15f24 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorld.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorld.kt @@ -6,7 +6,7 @@ import it.unimi.dsi.fastutil.objects.ObjectAVLTreeSet import it.unimi.dsi.fastutil.objects.ReferenceLinkedOpenHashSet import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet import ru.dbotthepony.kommons.collect.chainOptionalFutures -import ru.dbotthepony.kommons.core.KOptional +import ru.dbotthepony.kommons.util.KOptional import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.client.network.packets.JoinWorldPacket import ru.dbotthepony.kstarbound.server.StarboundServer diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/util/Utils.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/util/Utils.kt index b6ab28aa..23bbadcd 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/util/Utils.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/util/Utils.kt @@ -6,7 +6,7 @@ import com.google.common.collect.ImmutableSet import com.google.gson.JsonArray import com.google.gson.JsonElement import com.google.gson.JsonObject -import ru.dbotthepony.kommons.core.KOptional +import ru.dbotthepony.kommons.util.KOptional import ru.dbotthepony.kstarbound.Starbound import java.lang.ref.Reference import java.util.* diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/ChunkPos.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/ChunkPos.kt index 621bdd15..df7b75e5 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/ChunkPos.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/ChunkPos.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.world -import ru.dbotthepony.kommons.core.IStruct2i +import ru.dbotthepony.kommons.util.IStruct2i import ru.dbotthepony.kommons.vector.Vector2i private fun circulate(value: Int, bounds: Int): Int { diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/LightCalculator.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/LightCalculator.kt index c7c83285..a91e77ad 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/LightCalculator.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/LightCalculator.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.world import it.unimi.dsi.fastutil.ints.IntArraySet import org.lwjgl.BufferUtils import ru.dbotthepony.kommons.arrays.Object2DArray -import ru.dbotthepony.kommons.core.IStruct4f +import ru.dbotthepony.kommons.util.IStruct4f import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.kommons.math.linearInterpolation import ru.dbotthepony.kstarbound.world.api.ICellAccess diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt index 39045873..a939b71c 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt @@ -5,8 +5,8 @@ import it.unimi.dsi.fastutil.objects.ObjectArraySet import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet import ru.dbotthepony.kommons.arrays.Object2DArray import ru.dbotthepony.kommons.collect.filterNotNull -import ru.dbotthepony.kommons.core.IStruct2d -import ru.dbotthepony.kommons.core.IStruct2i +import ru.dbotthepony.kommons.util.IStruct2d +import ru.dbotthepony.kommons.util.IStruct2i import ru.dbotthepony.kommons.util.AABB import ru.dbotthepony.kommons.util.MailboxExecutorService import ru.dbotthepony.kommons.vector.Vector2d diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/WorldGeometry.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/WorldGeometry.kt index 72deb0f3..3a96ca4d 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/WorldGeometry.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/WorldGeometry.kt @@ -1,8 +1,8 @@ package ru.dbotthepony.kstarbound.world -import ru.dbotthepony.kommons.core.IStruct2d -import ru.dbotthepony.kommons.core.IStruct2f -import ru.dbotthepony.kommons.core.IStruct2i +import ru.dbotthepony.kommons.util.IStruct2d +import ru.dbotthepony.kommons.util.IStruct2f +import ru.dbotthepony.kommons.util.IStruct2i import ru.dbotthepony.kommons.vector.Vector2d import ru.dbotthepony.kommons.vector.Vector2i import ru.dbotthepony.kstarbound.io.readVec2i diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/api/ICellAccess.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/api/ICellAccess.kt index 4e3c1a9f..24bd6cab 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/api/ICellAccess.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/api/ICellAccess.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.world.api -import ru.dbotthepony.kommons.core.IStruct2i +import ru.dbotthepony.kommons.util.IStruct2i import ru.dbotthepony.kommons.vector.Vector2i interface ICellAccess { diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/api/ITileAccess.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/api/ITileAccess.kt index ea475508..458a9c7c 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/api/ITileAccess.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/api/ITileAccess.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.world.api -import ru.dbotthepony.kommons.core.IStruct2i +import ru.dbotthepony.kommons.util.IStruct2i import ru.dbotthepony.kstarbound.world.physics.CollisionType import ru.dbotthepony.kstarbound.world.physics.CollisionTypeGetter diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/api/OffsetCellAccess.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/api/OffsetCellAccess.kt index e1f5eb27..45a906d0 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/api/OffsetCellAccess.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/api/OffsetCellAccess.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.world.api -import ru.dbotthepony.kommons.core.IStruct2i +import ru.dbotthepony.kommons.util.IStruct2i import ru.dbotthepony.kommons.vector.Vector2i class OffsetCellAccess(private val parent: ICellAccess, var x: Int, var y: Int) : ICellAccess { diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/ItemEntity.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/ItemEntity.kt index c6579341..044a092b 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/ItemEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/ItemEntity.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.world.entities import com.google.gson.JsonObject -import ru.dbotthepony.kommons.core.Either +import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kommons.util.AABB import ru.dbotthepony.kommons.vector.Vector2d import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/physics/Poly.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/physics/Poly.kt index 32bdb41e..3dba544e 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/physics/Poly.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/physics/Poly.kt @@ -9,7 +9,7 @@ import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonWriter import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet import org.lwjgl.opengl.GL11.GL_LINES -import ru.dbotthepony.kommons.core.IStruct2d +import ru.dbotthepony.kommons.util.IStruct2d import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.kommons.math.intersectSegments import ru.dbotthepony.kommons.matrix.Matrix3f