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

Fix wrong package

Browse Source
This commit is contained in:
DBotThePony 2024-02-03 19:15:36 +07:00
parent 56d8ab1b7a
commit b20e1fede9
Signed by: DBot
GPG Key ID: DCC23B5715498507
6 changed files with 36 additions and 7 deletions
gradle.properties
gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson
AABBTypeAdapter.ktAABBiTypeAdapter.kt
gson/src/main/kotlin/ru/dbotthepony/kommons/gson
JsonArrayCollector.kt
linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/util
AABB.ktAABBi.kt

2
gradle.properties
View File

@ -4,7 +4,7 @@ kotlin.code.style=official
specifyKotlinAsDependency=false
projectGroup=ru.dbotthepony.kommons
projectVersion=1.4.0
projectVersion=1.5.0
guavaDepVersion=33.0.0
gsonDepVersion=2.8.9

2
gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBTypeAdapter.kt
View File

@ -4,7 +4,7 @@ import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kvector.util2d.AABB
import ru.dbotthepony.kommons.util.AABB
object AABBTypeAdapter : TypeAdapter<AABB>() {
override fun write(out: JsonWriter, value: AABB) {

2
gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBiTypeAdapter.kt
View File

@ -4,7 +4,7 @@ import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kommons.vector.Vector2i
import ru.dbotthepony.kvector.util2d.AABBi
import ru.dbotthepony.kommons.util.AABBi
object AABBiTypeAdapter : TypeAdapter<AABBi>() {
override fun write(out: JsonWriter, value: AABBi) {

31
gson/src/main/kotlin/ru/dbotthepony/kommons/gson/JsonArrayCollector.kt Normal file
View File

@ -0,0 +1,31 @@
package ru.dbotthepony.kommons.gson
import com.google.gson.JsonArray
import com.google.gson.JsonElement
import java.util.function.BiConsumer
import java.util.function.BinaryOperator
import java.util.function.Function
import java.util.function.Supplier
import java.util.stream.Collector
object JsonArrayCollector : Collector<JsonElement, JsonArray, JsonArray> {
override fun supplier(): Supplier<JsonArray> {
return Supplier { JsonArray() }
}
override fun accumulator(): BiConsumer<JsonArray, JsonElement> {
return BiConsumer { t, u -> t.add(u) }
}
override fun combiner(): BinaryOperator<JsonArray> {
return BinaryOperator { t, u -> t.addAll(u); t }
}
override fun finisher(): Function<JsonArray, JsonArray> {
return Function.identity()
}
override fun characteristics(): Set<Collector.Characteristics> {
return setOf(Collector.Characteristics.IDENTITY_FINISH)
}
}

3
linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/util/AABB.kt
View File

@ -1,10 +1,9 @@
@file:Suppress("unused", "LiftReturnOrAssignment", "MemberVisibilityCanBePrivate")
package ru.dbotthepony.kvector.util2d
package ru.dbotthepony.kommons.util
import ru.dbotthepony.kommons.core.IStruct2d
import ru.dbotthepony.kommons.core.IStruct2i
import ru.dbotthepony.kommons.math.intersectRectangles
import ru.dbotthepony.kommons.math.rectangleContainsRectangle
import ru.dbotthepony.kommons.vector.Vector2d

3
linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/util/AABBi.kt
View File

@ -1,9 +1,8 @@
package ru.dbotthepony.kvector.util2d
package ru.dbotthepony.kommons.util
import ru.dbotthepony.kommons.core.IStruct2i
import ru.dbotthepony.kommons.math.intersectRectangles
import ru.dbotthepony.kommons.math.rectangleContainsRectangle
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kommons.vector.Vector2i
data class AABBi(val mins: Vector2i, val maxs: Vector2i) {