diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/RecipeRegistry.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/RecipeRegistry.kt index 72b9e670..4da3aa5b 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/RecipeRegistry.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/RecipeRegistry.kt @@ -4,7 +4,7 @@ import com.google.gson.JsonElement import it.unimi.dsi.fastutil.objects.Object2ObjectFunction import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap 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.concurrent.ConcurrentLinkedQueue import java.util.concurrent.ExecutorService diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt index b421ad49..b69839a2 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt @@ -30,7 +30,7 @@ import ru.dbotthepony.kstarbound.defs.npc.NpcTypeDefinition import ru.dbotthepony.kstarbound.defs.npc.TenantDefinition import ru.dbotthepony.kstarbound.defs.`object`.ObjectDefinition 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.quest.QuestTemplate import ru.dbotthepony.kstarbound.defs.tile.LiquidDefinition diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt index 1c912eff..0cf6db83 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt @@ -31,7 +31,7 @@ import ru.dbotthepony.kstarbound.defs.item.InventoryIcon import ru.dbotthepony.kstarbound.defs.item.TreasurePoolDefinition import ru.dbotthepony.kstarbound.defs.`object`.ObjectDefinition 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.VisitableWorldParametersType import ru.dbotthepony.kstarbound.defs.world.terrain.BiomePlaceables diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/Species.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/Species.kt index 90dd6dbe..25628902 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/Species.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/Species.kt @@ -5,7 +5,7 @@ import com.google.common.collect.ImmutableSet import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.defs.image.SpriteReference 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 @JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/ActorMovementModifiers.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/ActorMovementModifiers.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/ActorMovementModifiers.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/ActorMovementModifiers.kt index 6284c9b8..d83ac72f 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/ActorMovementModifiers.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/ActorMovementModifiers.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.defs.player +package ru.dbotthepony.kstarbound.defs.actor.player import ru.dbotthepony.kstarbound.json.builder.JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BagFilterConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/BagFilterConfig.kt similarity index 93% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BagFilterConfig.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/BagFilterConfig.kt index 3601d781..4b4bc091 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BagFilterConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/BagFilterConfig.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.defs.player +package ru.dbotthepony.kstarbound.defs.actor.player import com.google.common.collect.ImmutableSet import ru.dbotthepony.kstarbound.json.builder.JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BlueprintLearnList.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/BlueprintLearnList.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BlueprintLearnList.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/BlueprintLearnList.kt index f0cf7a8f..90ed33cb 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BlueprintLearnList.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/BlueprintLearnList.kt @@ -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.gson.Gson diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/CompanionsConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/CompanionsConfig.kt similarity index 93% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/CompanionsConfig.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/CompanionsConfig.kt index 7b8a707b..ef453d68 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/CompanionsConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/CompanionsConfig.kt @@ -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.ImmutableMap diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/DeploymentConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/DeploymentConfig.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/DeploymentConfig.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/DeploymentConfig.kt index ade683db..e4cd814c 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/DeploymentConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/DeploymentConfig.kt @@ -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.ImmutableMap diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/InventoryConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/InventoryConfig.kt similarity index 89% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/InventoryConfig.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/InventoryConfig.kt index 84bd48e1..2fcc49b6 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/InventoryConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/InventoryConfig.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.defs.player +package ru.dbotthepony.kstarbound.defs.actor.player import com.google.common.collect.ImmutableMap import ru.dbotthepony.kstarbound.json.builder.JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/MatterManipulatorConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/MatterManipulatorConfig.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/MatterManipulatorConfig.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/MatterManipulatorConfig.kt index fb74bc81..9139c806 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/MatterManipulatorConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/MatterManipulatorConfig.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.defs.player +package ru.dbotthepony.kstarbound.defs.actor.player import com.google.common.collect.ImmutableList import ru.dbotthepony.kommons.vector.Vector2d diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/PlayerConfig.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerDefinition.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/PlayerConfig.kt index 3a0a5fb8..f90d2c67 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/PlayerConfig.kt @@ -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.ImmutableMap @@ -17,7 +17,7 @@ import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory -data class PlayerDefinition( +data class PlayerConfig( val defaultHumanoidIdentity: JsonObject, val blueprintUnlock: SBPattern, val blueprintAlreadyKnown: SBPattern, diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/RecipeDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/RecipeDefinition.kt similarity index 91% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/RecipeDefinition.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/RecipeDefinition.kt index 0110f4f6..83c290ea 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/RecipeDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/RecipeDefinition.kt @@ -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.ImmutableMap diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/ShipUpgrades.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/ShipUpgrades.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/ShipUpgrades.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/ShipUpgrades.kt index 4b33e08f..b3e23563 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/ShipUpgrades.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/ShipUpgrades.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.defs.player +package ru.dbotthepony.kstarbound.defs.actor.player import com.google.common.collect.ImmutableSet import ru.dbotthepony.kommons.guava.immutableSet diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/SplashConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/SplashConfig.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/SplashConfig.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/SplashConfig.kt index 9d10e498..184a7f0d 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/SplashConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/SplashConfig.kt @@ -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.vector.Vector2d diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/StatusControllerSettings.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/StatusControllerSettings.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/StatusControllerSettings.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/StatusControllerSettings.kt index 6d5a4332..93621b6c 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/StatusControllerSettings.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/StatusControllerSettings.kt @@ -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.ImmutableMap diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/TechDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/TechDefinition.kt similarity index 88% rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/TechDefinition.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/TechDefinition.kt index af7032dd..c9a2672d 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/TechDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/TechDefinition.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.defs.player +package ru.dbotthepony.kstarbound.defs.actor.player import com.google.common.collect.ImmutableList import ru.dbotthepony.kstarbound.defs.AssetPath diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/ProtocolResponsePacket.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/ProtocolResponsePacket.kt index 85548ecc..3428e865 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/ProtocolResponsePacket.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/ProtocolResponsePacket.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.network.packets 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.packets.serverbound.ClientConnectPacket import java.io.DataInputStream diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/ClientConnectPacket.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/ClientConnectPacket.kt index c718c10f..e2aca3a4 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/ClientConnectPacket.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/ClientConnectPacket.kt @@ -15,7 +15,7 @@ import ru.dbotthepony.kommons.io.writeKOptional import ru.dbotthepony.kommons.io.writeMap import ru.dbotthepony.kommons.io.writeUUID 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.packets.clientbound.ConnectSuccessPacket import ru.dbotthepony.kstarbound.network.packets.clientbound.UniverseTimeUpdatePacket diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/player/Avatar.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/player/Avatar.kt index 69c4e69e..5e929c4a 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/player/Avatar.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/player/Avatar.kt @@ -10,7 +10,7 @@ import ru.dbotthepony.kommons.guava.immutableMap import ru.dbotthepony.kstarbound.Registries import ru.dbotthepony.kstarbound.Registry 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.luaFunction import ru.dbotthepony.kstarbound.lua.luaFunction0String diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/player/AvatarBag.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/player/AvatarBag.kt index 0da0e32a..54f7da49 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/player/AvatarBag.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/player/AvatarBag.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.player 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 java.util.function.Predicate diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/ActorMovementController.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/ActorMovementController.kt index 107d71d8..b1785bec 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/ActorMovementController.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/ActorMovementController.kt @@ -7,7 +7,7 @@ import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.defs.ActorMovementParameters import ru.dbotthepony.kstarbound.defs.JumpProfile 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.networkedEnum import ru.dbotthepony.kstarbound.util.GameTimer