DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Bump kommons

Browse Source
This commit is contained in:
DBotThePony 2024-02-08 20:23:40 +07:00
parent 8671c4bfad
commit 1e04b7e777
Signed by: DBot
GPG Key ID: DCC23B5715498507
42 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -2,7 +2,7 @@ kotlin.code.style=official
org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m
kotlinVersion=1.9.0 kotlinVersion=1.9.0
kommonsVersion=1.7.9 kommonsVersion=2.0.0
ffiVersion=2.2.13 ffiVersion=2.2.13
lwjglVersion=3.3.0 lwjglVersion=3.3.0

2
src/main/kotlin/ru/dbotthepony/kstarbound/Ext.kt
View File

@ -7,7 +7,7 @@ import com.google.gson.TypeAdapter
import com.google.gson.TypeAdapterFactory import com.google.gson.TypeAdapterFactory
import com.google.gson.reflect.TypeToken import com.google.gson.reflect.TypeToken
import com.google.gson.stream.JsonReader 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.Arrays
import java.util.concurrent.Callable import java.util.concurrent.Callable
import java.util.concurrent.ForkJoinPool import java.util.concurrent.ForkJoinPool

2
src/main/kotlin/ru/dbotthepony/kstarbound/Registry.kt
View File

@ -20,7 +20,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectMap
import it.unimi.dsi.fastutil.objects.Object2ObjectMaps import it.unimi.dsi.fastutil.objects.Object2ObjectMaps
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
import org.apache.logging.log4j.LogManager 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 ru.dbotthepony.kstarbound.json.consumeNull
import java.lang.reflect.ParameterizedType import java.lang.reflect.ParameterizedType
import java.util.concurrent.locks.ReentrantLock import java.util.concurrent.locks.ReentrantLock

2
src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt
View File

@ -19,7 +19,7 @@ import org.lwjgl.system.MemoryStack
import org.lwjgl.system.MemoryUtil import org.lwjgl.system.MemoryUtil
import org.lwjgl.system.MemoryUtil.memAddressSafe import org.lwjgl.system.MemoryUtil.memAddressSafe
import ru.dbotthepony.kommons.collect.forValidRefs 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.math.RGBAColor
import ru.dbotthepony.kommons.matrix.Matrix3f import ru.dbotthepony.kommons.matrix.Matrix3f
import ru.dbotthepony.kommons.matrix.Matrix3fStack import ru.dbotthepony.kommons.matrix.Matrix3fStack

2
src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/GLTexture.kt
View File

@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.client.gl
import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.LogManager
import org.lwjgl.opengl.GL45.* import org.lwjgl.opengl.GL45.*
import ru.dbotthepony.kommons.core.IStruct2i import ru.dbotthepony.kommons.util.IStruct2i
import ru.dbotthepony.kstarbound.client.StarboundClient import ru.dbotthepony.kstarbound.client.StarboundClient
import java.nio.ByteBuffer import java.nio.ByteBuffer
import kotlin.reflect.KProperty import kotlin.reflect.KProperty

6
src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/GLShaderProgram.kt
View File

@ -5,9 +5,9 @@ import it.unimi.dsi.fastutil.objects.Object2BooleanFunction
import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap
import it.unimi.dsi.fastutil.objects.Object2ObjectFunction import it.unimi.dsi.fastutil.objects.Object2ObjectFunction
import org.lwjgl.opengl.GL45.* import org.lwjgl.opengl.GL45.*
import ru.dbotthepony.kommons.core.IStruct2f import ru.dbotthepony.kommons.util.IStruct2f
import ru.dbotthepony.kommons.core.IStruct3f import ru.dbotthepony.kommons.util.IStruct3f
import ru.dbotthepony.kommons.core.IStruct4f import ru.dbotthepony.kommons.util.IStruct4f
import ru.dbotthepony.kommons.matrix.Matrix3f import ru.dbotthepony.kommons.matrix.Matrix3f
import ru.dbotthepony.kommons.matrix.Matrix4f import ru.dbotthepony.kommons.matrix.Matrix4f
import ru.dbotthepony.kommons.vector.Vector2f import ru.dbotthepony.kommons.vector.Vector2f

2
src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/Programs.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.client.gl.shader 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.math.RGBAColor
import ru.dbotthepony.kommons.matrix.Matrix3f import ru.dbotthepony.kommons.matrix.Matrix3f
import ru.dbotthepony.kstarbound.client.StarboundClient import ru.dbotthepony.kstarbound.client.StarboundClient

2
src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/shader/UberShader.kt
View File

@ -8,7 +8,7 @@ import it.unimi.dsi.fastutil.objects.ObjectArraySet
import it.unimi.dsi.fastutil.objects.Reference2ObjectFunction import it.unimi.dsi.fastutil.objects.Reference2ObjectFunction
import org.lwjgl.opengl.GL20.GL_FRAGMENT_SHADER import org.lwjgl.opengl.GL20.GL_FRAGMENT_SHADER
import org.lwjgl.opengl.GL20.GL_VERTEX_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.math.RGBAColor
import ru.dbotthepony.kommons.matrix.Matrix3f import ru.dbotthepony.kommons.matrix.Matrix3f
import ru.dbotthepony.kstarbound.client.StarboundClient import ru.dbotthepony.kstarbound.client.StarboundClient

6
src/main/kotlin/ru/dbotthepony/kstarbound/client/gl/vertex/VertexBuilder.kt
View File

@ -4,9 +4,9 @@ import org.lwjgl.opengl.GL45
import org.lwjgl.opengl.GL45.GL_UNSIGNED_INT import org.lwjgl.opengl.GL45.GL_UNSIGNED_INT
import org.lwjgl.opengl.GL45.GL_UNSIGNED_SHORT import org.lwjgl.opengl.GL45.GL_UNSIGNED_SHORT
import org.lwjgl.opengl.GL45.GL_UNSIGNED_BYTE import org.lwjgl.opengl.GL45.GL_UNSIGNED_BYTE
import ru.dbotthepony.kommons.core.IStruct2d import ru.dbotthepony.kommons.util.IStruct2d
import ru.dbotthepony.kommons.core.IStruct2f import ru.dbotthepony.kommons.util.IStruct2f
import ru.dbotthepony.kommons.core.IStruct4f import ru.dbotthepony.kommons.util.IStruct4f
import ru.dbotthepony.kommons.matrix.Matrix3f import ru.dbotthepony.kommons.matrix.Matrix3f
import ru.dbotthepony.kstarbound.client.gl.BufferObject import ru.dbotthepony.kstarbound.client.gl.BufferObject
import java.nio.ByteBuffer import java.nio.ByteBuffer

2
src/main/kotlin/ru/dbotthepony/kstarbound/client/world/ClientWorld.kt
View File

@ -5,7 +5,7 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectFunction
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap
import it.unimi.dsi.fastutil.longs.LongArraySet import it.unimi.dsi.fastutil.longs.LongArraySet
import it.unimi.dsi.fastutil.objects.ReferenceArraySet 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.math.RGBAColor
import ru.dbotthepony.kommons.util.AABB import ru.dbotthepony.kommons.util.AABB
import ru.dbotthepony.kommons.vector.Vector2f import ru.dbotthepony.kommons.vector.Vector2f

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/Drawable.kt
View File

@ -8,7 +8,7 @@ import com.google.gson.reflect.TypeToken
import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter import com.google.gson.stream.JsonWriter
import org.apache.logging.log4j.LogManager 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.math.RGBAColor
import ru.dbotthepony.kommons.matrix.Matrix3f import ru.dbotthepony.kommons.matrix.Matrix3f
import ru.dbotthepony.kommons.vector.Vector2f import ru.dbotthepony.kommons.vector.Vector2f

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonDriven.kt
View File

@ -5,7 +5,7 @@ import com.google.gson.JsonObject
import com.google.gson.TypeAdapter import com.google.gson.TypeAdapter
import com.google.gson.reflect.TypeToken import com.google.gson.reflect.TypeToken
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap 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.Starbound
import ru.dbotthepony.kstarbound.util.AssetPathStack import ru.dbotthepony.kstarbound.util.AssetPathStack
import ru.dbotthepony.kstarbound.json.set import ru.dbotthepony.kstarbound.json.set

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/MovementParameters.kt
View File

@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.defs
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import com.google.common.collect.ImmutableSet 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.JsonAlias
import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.json.builder.JsonFactory
import ru.dbotthepony.kstarbound.world.physics.Poly import ru.dbotthepony.kstarbound.world.physics.Poly

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AnimationDefinition.kt
View File

@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.defs.animation
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import com.google.common.collect.ImmutableMap 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.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.defs.image.SpriteReference import ru.dbotthepony.kstarbound.defs.image.SpriteReference
import ru.dbotthepony.kstarbound.defs.particle.ParticleEmitter import ru.dbotthepony.kstarbound.defs.particle.ParticleEmitter

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/IUVCoordinates.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.defs.image package ru.dbotthepony.kstarbound.defs.image
import ru.dbotthepony.kommons.core.IStruct4f import ru.dbotthepony.kommons.util.IStruct4f
interface IUVCoordinates : IStruct4f { interface IUVCoordinates : IStruct4f {
val u0: Float val u0: Float

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemDescriptor.kt
View File

@ -10,7 +10,7 @@ import org.classdump.luna.ByteString
import org.classdump.luna.LuaRuntimeException import org.classdump.luna.LuaRuntimeException
import org.classdump.luna.Table import org.classdump.luna.Table
import org.classdump.luna.TableFactory 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.StateMachine
import ru.dbotthepony.kstarbound.lua.from import ru.dbotthepony.kstarbound.lua.from
import ru.dbotthepony.kstarbound.lua.toJsonObject import ru.dbotthepony.kstarbound.lua.toJsonObject

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/TreasurePoolDefinition.kt
View File

@ -12,7 +12,7 @@ import com.google.gson.internal.bind.JsonTreeReader
import com.google.gson.reflect.TypeToken import com.google.gson.reflect.TypeToken
import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter 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.Registry
import ru.dbotthepony.kstarbound.defs.ItemReference import ru.dbotthepony.kstarbound.defs.ItemReference
import ru.dbotthepony.kstarbound.json.consumeNull import ru.dbotthepony.kstarbound.json.consumeNull

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/ILiquidItem.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.defs.item.api package ru.dbotthepony.kstarbound.defs.item.api
import ru.dbotthepony.kommons.core.Either import ru.dbotthepony.kommons.util.Either
interface ILiquidItem : IItemDefinition { interface ILiquidItem : IItemDefinition {
/** /**

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IMaterialItem.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.defs.item.api package ru.dbotthepony.kstarbound.defs.item.api
import ru.dbotthepony.kommons.core.Either import ru.dbotthepony.kommons.util.Either
interface IMaterialItem : IItemDefinition { interface IMaterialItem : IItemDefinition {
/** /**

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/LiquidItemDefinition.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.defs.item.impl 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.IItemDefinition
import ru.dbotthepony.kstarbound.defs.item.api.ILiquidItem import ru.dbotthepony.kstarbound.defs.item.api.ILiquidItem
import ru.dbotthepony.kstarbound.json.builder.JsonAlias import ru.dbotthepony.kstarbound.json.builder.JsonAlias

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/MaterialItemDefinition.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.defs.item.impl 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.IItemDefinition
import ru.dbotthepony.kstarbound.defs.item.api.IMaterialItem import ru.dbotthepony.kstarbound.defs.item.api.IMaterialItem
import ru.dbotthepony.kstarbound.json.builder.JsonAlias import ru.dbotthepony.kstarbound.json.builder.JsonAlias

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/monster/MonsterTypeDefinition.kt
View File

@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.defs.monster
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import com.google.common.collect.ImmutableMap import com.google.common.collect.ImmutableMap
import com.google.common.collect.ImmutableSet 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.Registry
import ru.dbotthepony.kstarbound.defs.ActorMovementParameters import ru.dbotthepony.kstarbound.defs.ActorMovementParameters
import ru.dbotthepony.kstarbound.defs.AssetReference import ru.dbotthepony.kstarbound.defs.AssetReference

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectDefinition.kt
View File

@ -11,7 +11,7 @@ import com.google.gson.JsonSyntaxException
import com.google.gson.TypeAdapter import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter 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.kommons.math.RGBAColor
import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.Registry
import ru.dbotthepony.kstarbound.defs.AssetPath import ru.dbotthepony.kstarbound.defs.AssetPath

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleCreator.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.defs.particle 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.Registry
import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.json.builder.JsonFactory

4
src/main/kotlin/ru/dbotthepony/kstarbound/io/Streams.kt
View File

@ -1,8 +1,8 @@
package ru.dbotthepony.kstarbound.io package ru.dbotthepony.kstarbound.io
import it.unimi.dsi.fastutil.bytes.ByteArrayList import it.unimi.dsi.fastutil.bytes.ByteArrayList
import ru.dbotthepony.kommons.core.IStruct2d import ru.dbotthepony.kommons.util.IStruct2d
import ru.dbotthepony.kommons.core.IStruct2i import ru.dbotthepony.kommons.util.IStruct2i
import ru.dbotthepony.kommons.io.readDouble import ru.dbotthepony.kommons.io.readDouble
import ru.dbotthepony.kommons.io.readLong import ru.dbotthepony.kommons.io.readLong
import ru.dbotthepony.kommons.io.readSignedVarInt import ru.dbotthepony.kommons.io.readSignedVarInt

2
src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/FactoryAdapter.kt
View File

@ -22,7 +22,7 @@ import it.unimi.dsi.fastutil.ints.IntArrayList
import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap
import it.unimi.dsi.fastutil.objects.ObjectArraySet import it.unimi.dsi.fastutil.objects.ObjectArraySet
import org.apache.logging.log4j.LogManager 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.Starbound
import ru.dbotthepony.kstarbound.defs.util.enrollList import ru.dbotthepony.kstarbound.defs.util.enrollList
import ru.dbotthepony.kstarbound.defs.util.enrollMap import ru.dbotthepony.kstarbound.defs.util.enrollMap

2
src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/Properties.kt
View File

@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.json.builder
import com.google.gson.Gson import com.google.gson.Gson
import com.google.gson.TypeAdapter import com.google.gson.TypeAdapter
import com.google.gson.reflect.TypeToken import com.google.gson.reflect.TypeToken
import ru.dbotthepony.kommons.core.KOptional import ru.dbotthepony.kommons.util.KOptional
import kotlin.properties.Delegates import kotlin.properties.Delegates
import kotlin.reflect.KMutableProperty1 import kotlin.reflect.KMutableProperty1
import kotlin.reflect.KProperty1 import kotlin.reflect.KProperty1

6
src/main/kotlin/ru/dbotthepony/kstarbound/lua/Functions.kt
View File

@ -24,9 +24,9 @@ import org.classdump.luna.runtime.AbstractFunction4
import org.classdump.luna.runtime.AbstractFunctionAnyArg import org.classdump.luna.runtime.AbstractFunctionAnyArg
import org.classdump.luna.runtime.ExecutionContext import org.classdump.luna.runtime.ExecutionContext
import org.classdump.luna.runtime.LuaFunction import org.classdump.luna.runtime.LuaFunction
import ru.dbotthepony.kommons.core.IStruct2i import ru.dbotthepony.kommons.util.IStruct2i
import ru.dbotthepony.kommons.core.IStruct3i import ru.dbotthepony.kommons.util.IStruct3i
import ru.dbotthepony.kommons.core.IStruct4i import ru.dbotthepony.kommons.util.IStruct4i
import ru.dbotthepony.kstarbound.json.InternedJsonElementAdapter import ru.dbotthepony.kstarbound.json.InternedJsonElementAdapter
fun ArgumentIterator.nextOptionalFloat(): Double? { fun ArgumentIterator.nextOptionalFloat(): Double? {

2
src/main/kotlin/ru/dbotthepony/kstarbound/lua/StateMachine.kt
View File

@ -6,7 +6,7 @@ import org.classdump.luna.runtime.Dispatch
import org.classdump.luna.runtime.ExecutionContext import org.classdump.luna.runtime.ExecutionContext
import org.classdump.luna.runtime.Resumable import org.classdump.luna.runtime.Resumable
import org.classdump.luna.runtime.UnresolvedControlThrowable 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 ru.dbotthepony.kommons.vector.Vector2i
import java.util.function.Supplier import java.util.function.Supplier

2
src/main/kotlin/ru/dbotthepony/kstarbound/server/world/IChunkSource.kt
View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.server.world package ru.dbotthepony.kstarbound.server.world
import ru.dbotthepony.kommons.arrays.Object2DArray 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.CHUNK_SIZE
import ru.dbotthepony.kstarbound.world.ChunkPos import ru.dbotthepony.kstarbound.world.ChunkPos
import ru.dbotthepony.kstarbound.world.api.AbstractCell import ru.dbotthepony.kstarbound.world.api.AbstractCell

2
src/main/kotlin/ru/dbotthepony/kstarbound/server/world/LegacyChunkSource.kt
View File

@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.server.world
import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kommons.arrays.Object2DArray 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.io.readVarInt
import ru.dbotthepony.kommons.vector.Vector2i import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.Starbound

2
src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorld.kt
View File

@ -6,7 +6,7 @@ import it.unimi.dsi.fastutil.objects.ObjectAVLTreeSet
import it.unimi.dsi.fastutil.objects.ReferenceLinkedOpenHashSet import it.unimi.dsi.fastutil.objects.ReferenceLinkedOpenHashSet
import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet
import ru.dbotthepony.kommons.collect.chainOptionalFutures 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.Starbound
import ru.dbotthepony.kstarbound.client.network.packets.JoinWorldPacket import ru.dbotthepony.kstarbound.client.network.packets.JoinWorldPacket
import ru.dbotthepony.kstarbound.server.StarboundServer import ru.dbotthepony.kstarbound.server.StarboundServer

2
src/main/kotlin/ru/dbotthepony/kstarbound/util/Utils.kt
View File

@ -6,7 +6,7 @@ import com.google.common.collect.ImmutableSet
import com.google.gson.JsonArray import com.google.gson.JsonArray
import com.google.gson.JsonElement import com.google.gson.JsonElement
import com.google.gson.JsonObject import com.google.gson.JsonObject
import ru.dbotthepony.kommons.core.KOptional import ru.dbotthepony.kommons.util.KOptional
import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.Starbound
import java.lang.ref.Reference import java.lang.ref.Reference
import java.util.* import java.util.*

2
src/main/kotlin/ru/dbotthepony/kstarbound/world/ChunkPos.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.world package ru.dbotthepony.kstarbound.world
import ru.dbotthepony.kommons.core.IStruct2i import ru.dbotthepony.kommons.util.IStruct2i
import ru.dbotthepony.kommons.vector.Vector2i import ru.dbotthepony.kommons.vector.Vector2i
private fun circulate(value: Int, bounds: Int): Int { private fun circulate(value: Int, bounds: Int): Int {

2
src/main/kotlin/ru/dbotthepony/kstarbound/world/LightCalculator.kt
View File

@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.world
import it.unimi.dsi.fastutil.ints.IntArraySet import it.unimi.dsi.fastutil.ints.IntArraySet
import org.lwjgl.BufferUtils import org.lwjgl.BufferUtils
import ru.dbotthepony.kommons.arrays.Object2DArray 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.RGBAColor
import ru.dbotthepony.kommons.math.linearInterpolation import ru.dbotthepony.kommons.math.linearInterpolation
import ru.dbotthepony.kstarbound.world.api.ICellAccess import ru.dbotthepony.kstarbound.world.api.ICellAccess

4
src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt
View File

@ -5,8 +5,8 @@ import it.unimi.dsi.fastutil.objects.ObjectArraySet
import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet
import ru.dbotthepony.kommons.arrays.Object2DArray import ru.dbotthepony.kommons.arrays.Object2DArray
import ru.dbotthepony.kommons.collect.filterNotNull import ru.dbotthepony.kommons.collect.filterNotNull
import ru.dbotthepony.kommons.core.IStruct2d import ru.dbotthepony.kommons.util.IStruct2d
import ru.dbotthepony.kommons.core.IStruct2i import ru.dbotthepony.kommons.util.IStruct2i
import ru.dbotthepony.kommons.util.AABB import ru.dbotthepony.kommons.util.AABB
import ru.dbotthepony.kommons.util.MailboxExecutorService import ru.dbotthepony.kommons.util.MailboxExecutorService
import ru.dbotthepony.kommons.vector.Vector2d import ru.dbotthepony.kommons.vector.Vector2d

6
src/main/kotlin/ru/dbotthepony/kstarbound/world/WorldGeometry.kt
View File

@ -1,8 +1,8 @@
package ru.dbotthepony.kstarbound.world package ru.dbotthepony.kstarbound.world
import ru.dbotthepony.kommons.core.IStruct2d import ru.dbotthepony.kommons.util.IStruct2d
import ru.dbotthepony.kommons.core.IStruct2f import ru.dbotthepony.kommons.util.IStruct2f
import ru.dbotthepony.kommons.core.IStruct2i import ru.dbotthepony.kommons.util.IStruct2i
import ru.dbotthepony.kommons.vector.Vector2d import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2i import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kstarbound.io.readVec2i import ru.dbotthepony.kstarbound.io.readVec2i

2
src/main/kotlin/ru/dbotthepony/kstarbound/world/api/ICellAccess.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.world.api package ru.dbotthepony.kstarbound.world.api
import ru.dbotthepony.kommons.core.IStruct2i import ru.dbotthepony.kommons.util.IStruct2i
import ru.dbotthepony.kommons.vector.Vector2i import ru.dbotthepony.kommons.vector.Vector2i
interface ICellAccess { interface ICellAccess {

2
src/main/kotlin/ru/dbotthepony/kstarbound/world/api/ITileAccess.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.world.api 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.CollisionType
import ru.dbotthepony.kstarbound.world.physics.CollisionTypeGetter import ru.dbotthepony.kstarbound.world.physics.CollisionTypeGetter

2
src/main/kotlin/ru/dbotthepony/kstarbound/world/api/OffsetCellAccess.kt
View File

@ -1,6 +1,6 @@
package ru.dbotthepony.kstarbound.world.api package ru.dbotthepony.kstarbound.world.api
import ru.dbotthepony.kommons.core.IStruct2i import ru.dbotthepony.kommons.util.IStruct2i
import ru.dbotthepony.kommons.vector.Vector2i import ru.dbotthepony.kommons.vector.Vector2i
class OffsetCellAccess(private val parent: ICellAccess, var x: Int, var y: Int) : ICellAccess { class OffsetCellAccess(private val parent: ICellAccess, var x: Int, var y: Int) : ICellAccess {

2
src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/ItemEntity.kt
View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.world.entities package ru.dbotthepony.kstarbound.world.entities
import com.google.gson.JsonObject 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.util.AABB
import ru.dbotthepony.kommons.vector.Vector2d import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition

2
src/main/kotlin/ru/dbotthepony/kstarbound/world/physics/Poly.kt
View File

@ -9,7 +9,7 @@ import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter import com.google.gson.stream.JsonWriter
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet
import org.lwjgl.opengl.GL11.GL_LINES 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.RGBAColor
import ru.dbotthepony.kommons.math.intersectSegments import ru.dbotthepony.kommons.math.intersectSegments
import ru.dbotthepony.kommons.matrix.Matrix3f import ru.dbotthepony.kommons.matrix.Matrix3f