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

move defs/player to defs/actor/player

Browse Source
This commit is contained in:
DBotThePony 2024-03-20 20:23:50 +07:00
parent 8149fcb48d
commit 551eac4072
Signed by: DBot
GPG Key ID: DCC23B5715498507
22 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ import com.google.gson.JsonElement
import it.unimi.dsi.fastutil.objects.Object2ObjectFunction import it.unimi.dsi.fastutil.objects.Object2ObjectFunction
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.kstarbound.defs.player.RecipeDefinition import ru.dbotthepony.kstarbound.defs.actor.player.RecipeDefinition
import java.util.* import java.util.*
import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.ConcurrentLinkedQueue
import java.util.concurrent.ExecutorService import java.util.concurrent.ExecutorService

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

@ -30,7 +30,7 @@ import ru.dbotthepony.kstarbound.defs.npc.NpcTypeDefinition
import ru.dbotthepony.kstarbound.defs.npc.TenantDefinition import ru.dbotthepony.kstarbound.defs.npc.TenantDefinition
import ru.dbotthepony.kstarbound.defs.`object`.ObjectDefinition import ru.dbotthepony.kstarbound.defs.`object`.ObjectDefinition
import ru.dbotthepony.kstarbound.defs.particle.ParticleDefinition import ru.dbotthepony.kstarbound.defs.particle.ParticleDefinition
import ru.dbotthepony.kstarbound.defs.player.TechDefinition import ru.dbotthepony.kstarbound.defs.actor.player.TechDefinition
import ru.dbotthepony.kstarbound.defs.projectile.ProjectileDefinition import ru.dbotthepony.kstarbound.defs.projectile.ProjectileDefinition
import ru.dbotthepony.kstarbound.defs.quest.QuestTemplate import ru.dbotthepony.kstarbound.defs.quest.QuestTemplate
import ru.dbotthepony.kstarbound.defs.tile.LiquidDefinition import ru.dbotthepony.kstarbound.defs.tile.LiquidDefinition

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

@ -31,7 +31,7 @@ import ru.dbotthepony.kstarbound.defs.item.InventoryIcon
import ru.dbotthepony.kstarbound.defs.item.TreasurePoolDefinition import ru.dbotthepony.kstarbound.defs.item.TreasurePoolDefinition
import ru.dbotthepony.kstarbound.defs.`object`.ObjectDefinition import ru.dbotthepony.kstarbound.defs.`object`.ObjectDefinition
import ru.dbotthepony.kstarbound.defs.`object`.ObjectOrientation import ru.dbotthepony.kstarbound.defs.`object`.ObjectOrientation
import ru.dbotthepony.kstarbound.defs.player.BlueprintLearnList import ru.dbotthepony.kstarbound.defs.actor.player.BlueprintLearnList
import ru.dbotthepony.kstarbound.defs.world.CelestialParameters import ru.dbotthepony.kstarbound.defs.world.CelestialParameters
import ru.dbotthepony.kstarbound.defs.world.VisitableWorldParametersType import ru.dbotthepony.kstarbound.defs.world.VisitableWorldParametersType
import ru.dbotthepony.kstarbound.defs.world.terrain.BiomePlaceables import ru.dbotthepony.kstarbound.defs.world.terrain.BiomePlaceables

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

@ -5,7 +5,7 @@ import com.google.common.collect.ImmutableSet
import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.Registry
import ru.dbotthepony.kstarbound.defs.image.SpriteReference import ru.dbotthepony.kstarbound.defs.image.SpriteReference
import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition
import ru.dbotthepony.kstarbound.defs.player.BlueprintLearnList import ru.dbotthepony.kstarbound.defs.actor.player.BlueprintLearnList
import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.json.builder.JsonFactory
@JsonFactory @JsonFactory

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/ActorMovementModifiers.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/ActorMovementModifiers.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.player package ru.dbotthepony.kstarbound.defs.actor.player
import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.json.builder.JsonFactory

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BagFilterConfig.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/BagFilterConfig.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.player package ru.dbotthepony.kstarbound.defs.actor.player
import com.google.common.collect.ImmutableSet import com.google.common.collect.ImmutableSet
import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.json.builder.JsonFactory

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BlueprintLearnList.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/BlueprintLearnList.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.player package ru.dbotthepony.kstarbound.defs.actor.player
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import com.google.gson.Gson import com.google.gson.Gson

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/CompanionsConfig.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/CompanionsConfig.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.player package ru.dbotthepony.kstarbound.defs.actor.player
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import com.google.common.collect.ImmutableMap import com.google.common.collect.ImmutableMap

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/DeploymentConfig.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/DeploymentConfig.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.player package ru.dbotthepony.kstarbound.defs.actor.player
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import com.google.common.collect.ImmutableMap import com.google.common.collect.ImmutableMap

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/InventoryConfig.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/InventoryConfig.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.player package ru.dbotthepony.kstarbound.defs.actor.player
import com.google.common.collect.ImmutableMap import com.google.common.collect.ImmutableMap
import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.json.builder.JsonFactory

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/MatterManipulatorConfig.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/MatterManipulatorConfig.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.player package ru.dbotthepony.kstarbound.defs.actor.player
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import ru.dbotthepony.kommons.vector.Vector2d import ru.dbotthepony.kommons.vector.Vector2d

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerDefinition.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/PlayerConfig.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.player package ru.dbotthepony.kstarbound.defs.actor.player
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import com.google.common.collect.ImmutableMap import com.google.common.collect.ImmutableMap
@ -17,7 +17,7 @@ import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition
import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.json.builder.JsonFactory
@JsonFactory @JsonFactory
data class PlayerDefinition( data class PlayerConfig(
val defaultHumanoidIdentity: JsonObject, val defaultHumanoidIdentity: JsonObject,
val blueprintUnlock: SBPattern, val blueprintUnlock: SBPattern,
val blueprintAlreadyKnown: SBPattern, val blueprintAlreadyKnown: SBPattern,

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/RecipeDefinition.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/RecipeDefinition.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.player package ru.dbotthepony.kstarbound.defs.actor.player
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import com.google.common.collect.ImmutableMap import com.google.common.collect.ImmutableMap

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/ShipUpgrades.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/ShipUpgrades.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.player package ru.dbotthepony.kstarbound.defs.actor.player
import com.google.common.collect.ImmutableSet import com.google.common.collect.ImmutableSet
import ru.dbotthepony.kommons.guava.immutableSet import ru.dbotthepony.kommons.guava.immutableSet

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/SplashConfig.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/SplashConfig.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.player package ru.dbotthepony.kstarbound.defs.actor.player
import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kommons.vector.Vector2d import ru.dbotthepony.kommons.vector.Vector2d

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/StatusControllerSettings.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/StatusControllerSettings.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.player package ru.dbotthepony.kstarbound.defs.actor.player
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import com.google.common.collect.ImmutableMap import com.google.common.collect.ImmutableMap

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/TechDefinition.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/TechDefinition.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.defs.player package ru.dbotthepony.kstarbound.defs.actor.player
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import ru.dbotthepony.kstarbound.defs.AssetPath import ru.dbotthepony.kstarbound.defs.AssetPath

2
src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/ProtocolResponsePacket.kt
View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.network.packets package ru.dbotthepony.kstarbound.network.packets
import ru.dbotthepony.kstarbound.client.ClientConnection import ru.dbotthepony.kstarbound.client.ClientConnection
import ru.dbotthepony.kstarbound.defs.player.ShipUpgrades import ru.dbotthepony.kstarbound.defs.actor.player.ShipUpgrades
import ru.dbotthepony.kstarbound.network.IClientPacket import ru.dbotthepony.kstarbound.network.IClientPacket
import ru.dbotthepony.kstarbound.network.packets.serverbound.ClientConnectPacket import ru.dbotthepony.kstarbound.network.packets.serverbound.ClientConnectPacket
import java.io.DataInputStream import java.io.DataInputStream

2
src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/ClientConnectPacket.kt
View File

@ -15,7 +15,7 @@ import ru.dbotthepony.kommons.io.writeKOptional
import ru.dbotthepony.kommons.io.writeMap import ru.dbotthepony.kommons.io.writeMap
import ru.dbotthepony.kommons.io.writeUUID import ru.dbotthepony.kommons.io.writeUUID
import ru.dbotthepony.kommons.util.KOptional import ru.dbotthepony.kommons.util.KOptional
import ru.dbotthepony.kstarbound.defs.player.ShipUpgrades import ru.dbotthepony.kstarbound.defs.actor.player.ShipUpgrades
import ru.dbotthepony.kstarbound.network.IServerPacket import ru.dbotthepony.kstarbound.network.IServerPacket
import ru.dbotthepony.kstarbound.network.packets.clientbound.ConnectSuccessPacket import ru.dbotthepony.kstarbound.network.packets.clientbound.ConnectSuccessPacket
import ru.dbotthepony.kstarbound.network.packets.clientbound.UniverseTimeUpdatePacket import ru.dbotthepony.kstarbound.network.packets.clientbound.UniverseTimeUpdatePacket

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

@ -10,7 +10,7 @@ import ru.dbotthepony.kommons.guava.immutableMap
import ru.dbotthepony.kstarbound.Registries import ru.dbotthepony.kstarbound.Registries
import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.Registry
import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.defs.player.TechDefinition import ru.dbotthepony.kstarbound.defs.actor.player.TechDefinition
import ru.dbotthepony.kstarbound.lua.NewLuaState import ru.dbotthepony.kstarbound.lua.NewLuaState
import ru.dbotthepony.kstarbound.lua.luaFunction import ru.dbotthepony.kstarbound.lua.luaFunction
import ru.dbotthepony.kstarbound.lua.luaFunction0String import ru.dbotthepony.kstarbound.lua.luaFunction0String

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

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.player package ru.dbotthepony.kstarbound.player
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import ru.dbotthepony.kstarbound.defs.player.InventoryConfig import ru.dbotthepony.kstarbound.defs.actor.player.InventoryConfig
import ru.dbotthepony.kstarbound.util.ItemStack import ru.dbotthepony.kstarbound.util.ItemStack
import java.util.function.Predicate import java.util.function.Predicate

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

@ -7,7 +7,7 @@ import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.defs.ActorMovementParameters import ru.dbotthepony.kstarbound.defs.ActorMovementParameters
import ru.dbotthepony.kstarbound.defs.JumpProfile import ru.dbotthepony.kstarbound.defs.JumpProfile
import ru.dbotthepony.kstarbound.defs.MovementParameters import ru.dbotthepony.kstarbound.defs.MovementParameters
import ru.dbotthepony.kstarbound.defs.player.ActorMovementModifiers import ru.dbotthepony.kstarbound.defs.actor.player.ActorMovementModifiers
import ru.dbotthepony.kstarbound.network.syncher.networkedBoolean import ru.dbotthepony.kstarbound.network.syncher.networkedBoolean
import ru.dbotthepony.kstarbound.network.syncher.networkedEnum import ru.dbotthepony.kstarbound.network.syncher.networkedEnum
import ru.dbotthepony.kstarbound.util.GameTimer import ru.dbotthepony.kstarbound.util.GameTimer