diff --git a/src/main/java/de/bixilon/minosoft/Minosoft.java b/src/main/java/de/bixilon/minosoft/Minosoft.java index d00fa21c3..a60637948 100644 --- a/src/main/java/de/bixilon/minosoft/Minosoft.java +++ b/src/main/java/de/bixilon/minosoft/Minosoft.java @@ -22,9 +22,9 @@ import de.bixilon.minosoft.data.accounts.Account; import de.bixilon.minosoft.data.assets.JarAssetsManager; import de.bixilon.minosoft.data.assets.Resources; import de.bixilon.minosoft.data.locale.LocaleManager; -import de.bixilon.minosoft.data.mappings.DefaultRegistries; -import de.bixilon.minosoft.data.mappings.ResourceLocation; -import de.bixilon.minosoft.data.mappings.versions.Versions; +import de.bixilon.minosoft.data.registries.DefaultRegistries; +import de.bixilon.minosoft.data.registries.ResourceLocation; +import de.bixilon.minosoft.data.registries.versions.Versions; import de.bixilon.minosoft.gui.main.GUITools; import de.bixilon.minosoft.gui.main.ServerList; import de.bixilon.minosoft.gui.main.ServerListCell; diff --git a/src/main/java/de/bixilon/minosoft/config/config/game/controls/KeyBindingsGameConfig.kt b/src/main/java/de/bixilon/minosoft/config/config/game/controls/KeyBindingsGameConfig.kt index 505090b38..b2a76360a 100644 --- a/src/main/java/de/bixilon/minosoft/config/config/game/controls/KeyBindingsGameConfig.kt +++ b/src/main/java/de/bixilon/minosoft/config/config/game/controls/KeyBindingsGameConfig.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.config.config.game.controls import de.bixilon.minosoft.config.config.game.controls.KeyBindingsNames.DEFAULT_KEY_BINDINGS import de.bixilon.minosoft.config.key.KeyBinding -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation data class KeyBindingsGameConfig( val entries: MutableMap = mutableMapOf(), diff --git a/src/main/java/de/bixilon/minosoft/config/config/game/controls/KeyBindingsNames.kt b/src/main/java/de/bixilon/minosoft/config/config/game/controls/KeyBindingsNames.kt index 3ac6a69e0..fc68b3fda 100644 --- a/src/main/java/de/bixilon/minosoft/config/config/game/controls/KeyBindingsNames.kt +++ b/src/main/java/de/bixilon/minosoft/config/config/game/controls/KeyBindingsNames.kt @@ -16,7 +16,7 @@ package de.bixilon.minosoft.config.config.game.controls import de.bixilon.minosoft.config.key.KeyAction import de.bixilon.minosoft.config.key.KeyBinding import de.bixilon.minosoft.config.key.KeyCodes -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation object KeyBindingsNames { diff --git a/src/main/java/de/bixilon/minosoft/data/Axes.kt b/src/main/java/de/bixilon/minosoft/data/Axes.kt index 6d921e597..479ad6b7b 100644 --- a/src/main/java/de/bixilon/minosoft/data/Axes.kt +++ b/src/main/java/de/bixilon/minosoft/data/Axes.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum import glm_.vec3.Vec3 diff --git a/src/main/java/de/bixilon/minosoft/data/DefaultEntityFactories.kt b/src/main/java/de/bixilon/minosoft/data/DefaultEntityFactories.kt index 96a1c226c..a8c16190a 100644 --- a/src/main/java/de/bixilon/minosoft/data/DefaultEntityFactories.kt +++ b/src/main/java/de/bixilon/minosoft/data/DefaultEntityFactories.kt @@ -37,9 +37,9 @@ import de.bixilon.minosoft.data.entities.entities.player.RemotePlayerEntity import de.bixilon.minosoft.data.entities.entities.projectile.* import de.bixilon.minosoft.data.entities.entities.vehicle.* import de.bixilon.minosoft.data.entities.meta.EntityMetaData -import de.bixilon.minosoft.data.mappings.DefaultFactory -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory +import de.bixilon.minosoft.data.registries.DefaultFactory +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/Directions.kt b/src/main/java/de/bixilon/minosoft/data/Directions.kt index abac5da38..c8ce494ba 100644 --- a/src/main/java/de/bixilon/minosoft/data/Directions.kt +++ b/src/main/java/de/bixilon/minosoft/data/Directions.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import de.bixilon.minosoft.gui.rendering.chunk.models.FaceSize import de.bixilon.minosoft.gui.rendering.chunk.models.loading.BlockModelElement import de.bixilon.minosoft.gui.rendering.util.VecUtil.get diff --git a/src/main/java/de/bixilon/minosoft/data/assets/AssetVersion.kt b/src/main/java/de/bixilon/minosoft/data/assets/AssetVersion.kt index 95db5133a..1ff063606 100644 --- a/src/main/java/de/bixilon/minosoft/data/assets/AssetVersion.kt +++ b/src/main/java/de/bixilon/minosoft/data/assets/AssetVersion.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.assets -import de.bixilon.minosoft.data.mappings.versions.Version +import de.bixilon.minosoft.data.registries.versions.Version data class AssetVersion( val version: Version, diff --git a/src/main/java/de/bixilon/minosoft/data/assets/AssetsManager.kt b/src/main/java/de/bixilon/minosoft/data/assets/AssetsManager.kt index 9b06697fb..67d41e4b9 100644 --- a/src/main/java/de/bixilon/minosoft/data/assets/AssetsManager.kt +++ b/src/main/java/de/bixilon/minosoft/data/assets/AssetsManager.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.assets import com.google.gson.JsonObject import com.google.gson.JsonParser -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.util.Util import de.matthiasmann.twl.utils.PNGDecoder diff --git a/src/main/java/de/bixilon/minosoft/data/assets/JarAssetsManager.kt b/src/main/java/de/bixilon/minosoft/data/assets/JarAssetsManager.kt index d88c7def2..8338faa32 100644 --- a/src/main/java/de/bixilon/minosoft/data/assets/JarAssetsManager.kt +++ b/src/main/java/de/bixilon/minosoft/data/assets/JarAssetsManager.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.assets -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import java.io.FileNotFoundException import java.io.InputStream import java.net.URL diff --git a/src/main/java/de/bixilon/minosoft/data/assets/MinecraftAssetsManager.kt b/src/main/java/de/bixilon/minosoft/data/assets/MinecraftAssetsManager.kt index bfab2db90..d1296090e 100644 --- a/src/main/java/de/bixilon/minosoft/data/assets/MinecraftAssetsManager.kt +++ b/src/main/java/de/bixilon/minosoft/data/assets/MinecraftAssetsManager.kt @@ -17,7 +17,7 @@ import com.google.gson.JsonObject import com.google.gson.JsonPrimitive import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.config.StaticConfiguration -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition import de.bixilon.minosoft.util.CountUpAndDownLatch import de.bixilon.minosoft.util.Util diff --git a/src/main/java/de/bixilon/minosoft/data/assets/MultiAssetsManager.kt b/src/main/java/de/bixilon/minosoft/data/assets/MultiAssetsManager.kt index 0a9168ffa..0670ed9f9 100644 --- a/src/main/java/de/bixilon/minosoft/data/assets/MultiAssetsManager.kt +++ b/src/main/java/de/bixilon/minosoft/data/assets/MultiAssetsManager.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.assets -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import java.io.FileNotFoundException import java.io.InputStream import java.net.URL diff --git a/src/main/java/de/bixilon/minosoft/data/assets/Resources.java b/src/main/java/de/bixilon/minosoft/data/assets/Resources.java index 84f039f81..676c6d7e5 100644 --- a/src/main/java/de/bixilon/minosoft/data/assets/Resources.java +++ b/src/main/java/de/bixilon/minosoft/data/assets/Resources.java @@ -17,9 +17,9 @@ import com.google.common.collect.HashBiMap; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import de.bixilon.minosoft.Minosoft; -import de.bixilon.minosoft.data.mappings.ResourceLocation; -import de.bixilon.minosoft.data.mappings.versions.Version; -import de.bixilon.minosoft.data.mappings.versions.Versions; +import de.bixilon.minosoft.data.registries.ResourceLocation; +import de.bixilon.minosoft.data.registries.versions.Version; +import de.bixilon.minosoft.data.registries.versions.Versions; import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition; import java.io.IOException; diff --git a/src/main/java/de/bixilon/minosoft/data/commands/CommandArgumentNode.java b/src/main/java/de/bixilon/minosoft/data/commands/CommandArgumentNode.java index 31cc14aff..96c056f53 100644 --- a/src/main/java/de/bixilon/minosoft/data/commands/CommandArgumentNode.java +++ b/src/main/java/de/bixilon/minosoft/data/commands/CommandArgumentNode.java @@ -17,7 +17,7 @@ import de.bixilon.minosoft.data.commands.parser.CommandParser; import de.bixilon.minosoft.data.commands.parser.CommandParsers; import de.bixilon.minosoft.data.commands.parser.exceptions.CommandParseException; import de.bixilon.minosoft.data.commands.parser.properties.ParserProperties; -import de.bixilon.minosoft.data.mappings.ResourceLocation; +import de.bixilon.minosoft.data.registries.ResourceLocation; import de.bixilon.minosoft.protocol.network.connection.PlayConnection; import de.bixilon.minosoft.protocol.protocol.InByteBuffer; import de.bixilon.minosoft.terminal.commands.CommandStack; diff --git a/src/main/java/de/bixilon/minosoft/data/commands/CommandStringReader.kt b/src/main/java/de/bixilon/minosoft/data/commands/CommandStringReader.kt index b365a5563..5240b7acb 100644 --- a/src/main/java/de/bixilon/minosoft/data/commands/CommandStringReader.kt +++ b/src/main/java/de/bixilon/minosoft/data/commands/CommandStringReader.kt @@ -29,7 +29,7 @@ import de.bixilon.minosoft.data.commands.parser.exceptions.number.LongCommandPar import de.bixilon.minosoft.data.commands.parser.exceptions.properties.BadPropertyMapCommandParseException import de.bixilon.minosoft.data.commands.parser.exceptions.properties.DuplicatedPropertyKeyCommandParseException import de.bixilon.minosoft.data.commands.parser.exceptions.resourcelocation.InvalidResourceLocationCommandParseException -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.util.Pair import de.bixilon.minosoft.util.Util import java.io.StringReader diff --git a/src/main/java/de/bixilon/minosoft/data/commands/parser/BlockStateParser.kt b/src/main/java/de/bixilon/minosoft/data/commands/parser/BlockStateParser.kt index 3a173596b..1a935a413 100644 --- a/src/main/java/de/bixilon/minosoft/data/commands/parser/BlockStateParser.kt +++ b/src/main/java/de/bixilon/minosoft/data/commands/parser/BlockStateParser.kt @@ -18,9 +18,9 @@ import de.bixilon.minosoft.data.commands.parser.exceptions.CommandParseException import de.bixilon.minosoft.data.commands.parser.exceptions.InvalidBlockPredicateCommandParseException import de.bixilon.minosoft.data.commands.parser.exceptions.UnknownBlockPropertyCommandParseException import de.bixilon.minosoft.data.commands.parser.properties.ParserProperties -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.WannabeBlockState -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.WannabeBlockState +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties import de.bixilon.minosoft.protocol.network.connection.PlayConnection class BlockStateParser : CommandParser() { diff --git a/src/main/java/de/bixilon/minosoft/data/commands/parser/CommandParsers.kt b/src/main/java/de/bixilon/minosoft/data/commands/parser/CommandParsers.kt index 5138957ae..1e9b7ecba 100644 --- a/src/main/java/de/bixilon/minosoft/data/commands/parser/CommandParsers.kt +++ b/src/main/java/de/bixilon/minosoft/data/commands/parser/CommandParsers.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.commands.parser import com.google.common.collect.HashBiMap -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import org.checkerframework.checker.nullness.qual.Nullable object CommandParsers { diff --git a/src/main/java/de/bixilon/minosoft/data/commands/parser/ParticleParser.kt b/src/main/java/de/bixilon/minosoft/data/commands/parser/ParticleParser.kt index fd19d7e3a..c462b8f63 100644 --- a/src/main/java/de/bixilon/minosoft/data/commands/parser/ParticleParser.kt +++ b/src/main/java/de/bixilon/minosoft/data/commands/parser/ParticleParser.kt @@ -15,10 +15,10 @@ package de.bixilon.minosoft.data.commands.parser import de.bixilon.minosoft.data.commands.CommandStringReader import de.bixilon.minosoft.data.commands.parser.exceptions.resourcelocation.ParticleNotFoundCommandParseException import de.bixilon.minosoft.data.commands.parser.properties.ParserProperties -import de.bixilon.minosoft.data.mappings.particle.data.BlockParticleData -import de.bixilon.minosoft.data.mappings.particle.data.DustParticleData -import de.bixilon.minosoft.data.mappings.particle.data.ItemParticleData -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.data.BlockParticleData +import de.bixilon.minosoft.data.registries.particle.data.DustParticleData +import de.bixilon.minosoft.data.registries.particle.data.ItemParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/commands/parser/ResourceLocationParser.kt b/src/main/java/de/bixilon/minosoft/data/commands/parser/ResourceLocationParser.kt index e875981b7..00ed70fcf 100644 --- a/src/main/java/de/bixilon/minosoft/data/commands/parser/ResourceLocationParser.kt +++ b/src/main/java/de/bixilon/minosoft/data/commands/parser/ResourceLocationParser.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.commands.parser import de.bixilon.minosoft.data.commands.CommandStringReader import de.bixilon.minosoft.data.commands.parser.properties.ParserProperties -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection object ResourceLocationParser : CommandParser() { diff --git a/src/main/java/de/bixilon/minosoft/data/commands/parser/entity/ResourceLocationSelectorArgumentParser.java b/src/main/java/de/bixilon/minosoft/data/commands/parser/entity/ResourceLocationSelectorArgumentParser.java index 13a03ddf7..912a55424 100644 --- a/src/main/java/de/bixilon/minosoft/data/commands/parser/entity/ResourceLocationSelectorArgumentParser.java +++ b/src/main/java/de/bixilon/minosoft/data/commands/parser/entity/ResourceLocationSelectorArgumentParser.java @@ -17,7 +17,7 @@ import de.bixilon.minosoft.data.DefaultEntityFactories; import de.bixilon.minosoft.data.commands.CommandStringReader; import de.bixilon.minosoft.data.commands.parser.exceptions.CommandParseException; import de.bixilon.minosoft.data.commands.parser.exceptions.entity.UnknownEntityCommandParseException; -import de.bixilon.minosoft.data.mappings.ResourceLocation; +import de.bixilon.minosoft.data.registries.ResourceLocation; import de.bixilon.minosoft.protocol.network.connection.PlayConnection; public class ResourceLocationSelectorArgumentParser extends EntitySelectorArgumentParser { diff --git a/src/main/java/de/bixilon/minosoft/data/commands/parser/minosoft/VersionParser.java b/src/main/java/de/bixilon/minosoft/data/commands/parser/minosoft/VersionParser.java index bcf386171..5cdc152ab 100644 --- a/src/main/java/de/bixilon/minosoft/data/commands/parser/minosoft/VersionParser.java +++ b/src/main/java/de/bixilon/minosoft/data/commands/parser/minosoft/VersionParser.java @@ -19,8 +19,8 @@ import de.bixilon.minosoft.data.commands.parser.exceptions.BlankStringCommandPar import de.bixilon.minosoft.data.commands.parser.exceptions.CommandParseException; import de.bixilon.minosoft.data.commands.parser.exceptions.minosoft.InvalidVersionCommandParseException; import de.bixilon.minosoft.data.commands.parser.properties.ParserProperties; -import de.bixilon.minosoft.data.mappings.versions.Version; -import de.bixilon.minosoft.data.mappings.versions.Versions; +import de.bixilon.minosoft.data.registries.versions.Version; +import de.bixilon.minosoft.data.registries.versions.Versions; import de.bixilon.minosoft.protocol.network.connection.PlayConnection; import javax.annotation.Nullable; diff --git a/src/main/java/de/bixilon/minosoft/data/entities/EntityMetaDataFields.kt b/src/main/java/de/bixilon/minosoft/data/entities/EntityMetaDataFields.kt index 5d59e052b..1064d0aa0 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/EntityMetaDataFields.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/EntityMetaDataFields.kt @@ -18,9 +18,9 @@ import de.bixilon.minosoft.data.entities.entities.npc.villager.data.VillagerData import de.bixilon.minosoft.data.entities.entities.npc.villager.data.VillagerLevels import de.bixilon.minosoft.data.entities.entities.npc.villager.data.VillagerTypes import de.bixilon.minosoft.data.entities.entities.vehicle.Boat -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.ParticleType -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.ParticleType +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.ChatComponent.Companion.of import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/entities/EntityObjectType.kt b/src/main/java/de/bixilon/minosoft/data/entities/EntityObjectType.kt index d46f2dda1..802c92cc1 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/EntityObjectType.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/EntityObjectType.kt @@ -14,10 +14,10 @@ package de.bixilon.minosoft.data.entities import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries class EntityObjectType( override val resourceLocation: ResourceLocation, diff --git a/src/main/java/de/bixilon/minosoft/data/entities/EvokerFangs.kt b/src/main/java/de/bixilon/minosoft/data/entities/EvokerFangs.kt index 4f6c2d3a6..01a48df46 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/EvokerFangs.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/EvokerFangs.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities import de.bixilon.minosoft.data.entities.entities.Entity -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/StatusEffectInstance.kt b/src/main/java/de/bixilon/minosoft/data/entities/StatusEffectInstance.kt index 82a126966..1289eab7c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/StatusEffectInstance.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/StatusEffectInstance.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities -import de.bixilon.minosoft.data.mappings.effects.StatusEffect +import de.bixilon.minosoft.data.registries.effects.StatusEffect data class StatusEffectInstance( val statusEffect: StatusEffect, diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/BannerBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/BannerBlockEntity.kt index 8e7c15fd7..274aa76f4 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/BannerBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/BannerBlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class BannerBlockEntity(connection: PlayConnection) : BlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/BeaconBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/BeaconBlockEntity.kt index 281605129..68795757b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/BeaconBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/BeaconBlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class BeaconBlockEntity(connection: PlayConnection) : BlockEntity(connection), BlockActionEntity { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/BedBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/BedBlockEntity.kt index 229aa2229..afd14169c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/BedBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/BedBlockEntity.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.MultiResourceLocationAble -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.MultiResourceLocationAble +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.text.ChatColors import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.toResourceLocationList diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/BeehiveBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/BeehiveBlockEntity.kt index 91c50f2a9..db3949109 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/BeehiveBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/BeehiveBlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class BeehiveBlockEntity(connection: PlayConnection) : BlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/BellBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/BellBlockEntity.kt index 4ac876118..8a9cc2af0 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/BellBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/BellBlockEntity.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.block import de.bixilon.minosoft.data.Directions -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class BellBlockEntity(connection: PlayConnection) : BlockEntity(connection), BlockActionEntity { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/BlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/BlockEntity.kt index d4413c158..80f3d62de 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/BlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/BlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/BlockEntityFactory.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/BlockEntityFactory.kt index 88663d3a1..e450d1822 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/BlockEntityFactory.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/BlockEntityFactory.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.CompanionResourceLocation +import de.bixilon.minosoft.data.registries.CompanionResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection interface BlockEntityFactory : CompanionResourceLocation { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/BlockEntityMetaType.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/BlockEntityMetaType.kt index 54dc0c843..42b7d0c38 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/BlockEntityMetaType.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/BlockEntityMetaType.kt @@ -14,10 +14,10 @@ package de.bixilon.minosoft.data.entities.block import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries class BlockEntityMetaType( diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/CampfireBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/CampfireBlockEntity.kt index 6d2db0f6a..6a073be07 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/CampfireBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/CampfireBlockEntity.kt @@ -15,10 +15,10 @@ package de.bixilon.minosoft.data.entities.block import de.bixilon.minosoft.data.Directions import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties -import de.bixilon.minosoft.data.mappings.blocks.types.CampfireBlock +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.blocks.types.CampfireBlock import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.fire.SmokeParticle import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/CommandBlockBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/CommandBlockBlockEntity.kt index 646c12a60..817815266 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/CommandBlockBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/CommandBlockBlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class CommandBlockBlockEntity(connection: PlayConnection) : BlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/ComparatorBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/ComparatorBlockEntity.kt index 5a92461de..984e57ec7 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/ComparatorBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/ComparatorBlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class ComparatorBlockEntity(connection: PlayConnection) : BlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/ConduitBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/ConduitBlockEntity.kt index 2ff31a337..edfa3aecc 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/ConduitBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/ConduitBlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class ConduitBlockEntity(connection: PlayConnection) : BlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/DaylightDetectorBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/DaylightDetectorBlockEntity.kt index 1a3fd19a0..edfc75b8a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/DaylightDetectorBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/DaylightDetectorBlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class DaylightDetectorBlockEntity(connection: PlayConnection) : BlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/DefaultBlockEntityMetaDataFactory.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/DefaultBlockEntityMetaDataFactory.kt index e5f56eabf..0dec73312 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/DefaultBlockEntityMetaDataFactory.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/DefaultBlockEntityMetaDataFactory.kt @@ -17,7 +17,7 @@ import de.bixilon.minosoft.data.entities.block.container.* import de.bixilon.minosoft.data.entities.block.container.storage.* import de.bixilon.minosoft.data.entities.block.piston.PistonBlockEntity import de.bixilon.minosoft.data.entities.block.piston.StickyPistonBlockEntity -import de.bixilon.minosoft.data.mappings.DefaultFactory +import de.bixilon.minosoft.data.registries.DefaultFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection object DefaultBlockEntityMetaDataFactory : DefaultFactory>( diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/EnchantingTableBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/EnchantingTableBlockEntity.kt index be6c2fd2d..c42b66073 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/EnchantingTableBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/EnchantingTableBlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class EnchantingTableBlockEntity(connection: PlayConnection) : BlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/EndGatewayBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/EndGatewayBlockEntity.kt index cd7cc2d46..d77b96258 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/EndGatewayBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/EndGatewayBlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class EndGatewayBlockEntity(connection: PlayConnection) : BlockEntity(connection), BlockActionEntity { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/JigsawBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/JigsawBlockEntity.kt index bcafdfa33..325d3d0c3 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/JigsawBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/JigsawBlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.nullCast diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/JukeboxBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/JukeboxBlockEntity.kt index 76e058149..74db86411 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/JukeboxBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/JukeboxBlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class JukeboxBlockEntity(connection: PlayConnection) : BlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/LecternBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/LecternBlockEntity.kt index 7b2657042..dbac5a5dd 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/LecternBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/LecternBlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class LecternBlockEntity(connection: PlayConnection) : BlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/MobSpawnerBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/MobSpawnerBlockEntity.kt index 245f6a467..0963d6a5e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/MobSpawnerBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/MobSpawnerBlockEntity.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.data.world.WorldEntities import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.fire.SmokeParticle import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.slowing.FlameParticle diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/NoteBlockBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/NoteBlockBlockEntity.kt index 5d8242ead..c03f603c9 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/NoteBlockBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/NoteBlockBlockEntity.kt @@ -13,11 +13,11 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.MultiResourceLocationAble -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties -import de.bixilon.minosoft.data.mappings.blocks.properties.Instruments +import de.bixilon.minosoft.data.registries.MultiResourceLocationAble +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.blocks.properties.Instruments import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.NoteParticle import de.bixilon.minosoft.gui.rendering.util.VecUtil.toVec3d import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/SignBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/SignBlockEntity.kt index 0e35faa4b..fe26c0ac9 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/SignBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/SignBlockEntity.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.MultiResourceLocationAble -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.MultiResourceLocationAble +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/SkullBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/SkullBlockEntity.kt index 9958e209e..4de5fbc7f 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/SkullBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/SkullBlockEntity.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.MultiResourceLocationAble -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.MultiResourceLocationAble +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.toResourceLocationList diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/StructureBlockBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/StructureBlockBlockEntity.kt index 254564380..c5f3bdc29 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/StructureBlockBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/StructureBlockBlockEntity.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.block -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class StructureBlockBlockEntity(connection: PlayConnection) : BlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/BlastFurnaceBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/BlastFurnaceBlockEntity.kt index ee6bea134..657a4f739 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/BlastFurnaceBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/BlastFurnaceBlockEntity.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.block.container import de.bixilon.minosoft.data.entities.block.BlockEntityFactory -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class BlastFurnaceBlockEntity(connection: PlayConnection) : ContainerBlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/BrewingStandBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/BrewingStandBlockEntity.kt index 176a4e1f2..7a2f4bbed 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/BrewingStandBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/BrewingStandBlockEntity.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.block.container import de.bixilon.minosoft.data.entities.block.BlockEntityFactory -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class BrewingStandBlockEntity(connection: PlayConnection) : ContainerBlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/DispenserBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/DispenserBlockEntity.kt index 1f75a93c3..909239217 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/DispenserBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/DispenserBlockEntity.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.block.container import de.bixilon.minosoft.data.entities.block.BlockEntityFactory -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class DispenserBlockEntity(connection: PlayConnection) : ContainerBlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/DropperBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/DropperBlockEntity.kt index 5d884df72..f62e171e5 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/DropperBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/DropperBlockEntity.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.block.container import de.bixilon.minosoft.data.entities.block.BlockEntityFactory -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class DropperBlockEntity(connection: PlayConnection) : ContainerBlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/FurnaceBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/FurnaceBlockEntity.kt index 04c47cd03..af7546ad5 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/FurnaceBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/FurnaceBlockEntity.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.block.container import de.bixilon.minosoft.data.entities.block.BlockEntityFactory -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class FurnaceBlockEntity(connection: PlayConnection) : ContainerBlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/HopperBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/HopperBlockEntity.kt index ad7e1d7c1..c3797d1ab 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/HopperBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/HopperBlockEntity.kt @@ -14,8 +14,8 @@ package de.bixilon.minosoft.data.entities.block.container import de.bixilon.minosoft.data.entities.block.BlockEntityFactory -import de.bixilon.minosoft.data.mappings.MultiResourceLocationAble -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.MultiResourceLocationAble +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.toResourceLocationList diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/SmokerBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/SmokerBlockEntity.kt index 7ecbfd866..eef05e237 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/SmokerBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/SmokerBlockEntity.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.block.container import de.bixilon.minosoft.data.entities.block.BlockEntityFactory -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class SmokerBlockEntity(connection: PlayConnection) : ContainerBlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/BarrelBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/BarrelBlockEntity.kt index 799c653d2..9ffd1e65f 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/BarrelBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/BarrelBlockEntity.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.block.container.storage import de.bixilon.minosoft.data.entities.block.BlockEntityFactory -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class BarrelBlockEntity(connection: PlayConnection) : StorageBlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ChestBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ChestBlockEntity.kt index a1394eaa1..8367e8945 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ChestBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ChestBlockEntity.kt @@ -14,8 +14,8 @@ package de.bixilon.minosoft.data.entities.block.container.storage import de.bixilon.minosoft.data.entities.block.BlockEntityFactory -import de.bixilon.minosoft.data.mappings.MultiResourceLocationAble -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.MultiResourceLocationAble +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.toResourceLocationList diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/EnderChestBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/EnderChestBlockEntity.kt index 5db72142f..df3151c40 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/EnderChestBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/EnderChestBlockEntity.kt @@ -14,8 +14,8 @@ package de.bixilon.minosoft.data.entities.block.container.storage import de.bixilon.minosoft.data.entities.block.BlockEntityFactory -import de.bixilon.minosoft.data.mappings.MultiResourceLocationAble -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.MultiResourceLocationAble +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.toResourceLocationList diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ShulkerBoxBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ShulkerBoxBlockEntity.kt index da2698f2e..21a6c3d0a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ShulkerBoxBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/ShulkerBoxBlockEntity.kt @@ -14,8 +14,8 @@ package de.bixilon.minosoft.data.entities.block.container.storage import de.bixilon.minosoft.data.entities.block.BlockEntityFactory -import de.bixilon.minosoft.data.mappings.MultiResourceLocationAble -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.MultiResourceLocationAble +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.toResourceLocationList diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/TrappedChestBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/TrappedChestBlockEntity.kt index 1797e105c..e9d55b7c7 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/TrappedChestBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/container/storage/TrappedChestBlockEntity.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.block.container.storage import de.bixilon.minosoft.data.entities.block.BlockEntityFactory -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class TrappedChestBlockEntity(connection: PlayConnection) : StorageBlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/piston/PistonBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/piston/PistonBlockEntity.kt index 855ba7908..510cd766a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/piston/PistonBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/piston/PistonBlockEntity.kt @@ -17,7 +17,7 @@ import de.bixilon.minosoft.data.Directions import de.bixilon.minosoft.data.entities.block.BlockActionEntity import de.bixilon.minosoft.data.entities.block.BlockEntity import de.bixilon.minosoft.data.entities.block.BlockEntityFactory -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/piston/StickyPistonBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/piston/StickyPistonBlockEntity.kt index 25a1f8901..647b99ca9 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/block/piston/StickyPistonBlockEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/block/piston/StickyPistonBlockEntity.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.block.piston import de.bixilon.minosoft.data.entities.block.BlockEntityFactory -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection class StickyPistonBlockEntity(connection: PlayConnection) : PistonBlockEntity(connection) { diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/AgeableMob.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/AgeableMob.kt index 9ec62e6cf..0d40a145a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/AgeableMob.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/AgeableMob.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.entities import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/AreaEffectCloud.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/AreaEffectCloud.kt index f9bf25f41..f43e1351c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/AreaEffectCloud.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/AreaEffectCloud.kt @@ -14,10 +14,10 @@ package de.bixilon.minosoft.data.entities.entities import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec2.Vec2 import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt index c907659f0..8b3b33c42 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt @@ -19,15 +19,15 @@ import de.bixilon.minosoft.data.entities.StatusEffectInstance import de.bixilon.minosoft.data.entities.meta.EntityMetaData import de.bixilon.minosoft.data.inventory.InventorySlots.EquipmentSlots import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.effects.StatusEffect -import de.bixilon.minosoft.data.mappings.effects.attributes.StatusEffectAttribute -import de.bixilon.minosoft.data.mappings.effects.attributes.StatusEffectAttributeInstance -import de.bixilon.minosoft.data.mappings.effects.attributes.StatusEffectOperations -import de.bixilon.minosoft.data.mappings.enchantment.Enchantment -import de.bixilon.minosoft.data.mappings.entities.EntityType -import de.bixilon.minosoft.data.mappings.particle.data.BlockParticleData import de.bixilon.minosoft.data.physics.PhysicsEntity +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.effects.StatusEffect +import de.bixilon.minosoft.data.registries.effects.attributes.StatusEffectAttribute +import de.bixilon.minosoft.data.registries.effects.attributes.StatusEffectAttributeInstance +import de.bixilon.minosoft.data.registries.effects.attributes.StatusEffectOperations +import de.bixilon.minosoft.data.registries.enchantment.Enchantment +import de.bixilon.minosoft.data.registries.entities.EntityType +import de.bixilon.minosoft.data.registries.particle.data.BlockParticleData import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.gui.rendering.chunk.models.AABB import de.bixilon.minosoft.gui.rendering.input.camera.EntityPositionInfo diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/ExperienceOrb.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/ExperienceOrb.kt index 1e85fb815..3b8c6460e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/ExperienceOrb.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/ExperienceOrb.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/FlyingMob.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/FlyingMob.kt index 9355872fc..9b83440a5 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/FlyingMob.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/FlyingMob.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.entities import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/LightningBolt.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/LightningBolt.kt index 33482c433..b04094c81 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/LightningBolt.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/LightningBolt.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt index 7696909fc..07fae9231 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.Poses -import de.bixilon.minosoft.data.mappings.effects.attributes.DefaultStatusEffectAttributeNames -import de.bixilon.minosoft.data.mappings.entities.EntityType import de.bixilon.minosoft.data.player.Hands +import de.bixilon.minosoft.data.registries.effects.attributes.DefaultStatusEffectAttributeNames +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.data.text.ChatColors import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.data.text.RGBColor.Companion.asRGBColor diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/Mob.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/Mob.kt index 074d4bbb8..c8c999eab 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/Mob.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/Mob.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.entities import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/PathfinderMob.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/PathfinderMob.kt index 22b8dd470..8575abf9c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/PathfinderMob.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/PathfinderMob.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.entities import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/TamableAnimal.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/TamableAnimal.kt index dcecb959a..4cd6facbb 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/TamableAnimal.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/TamableAnimal.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.animal.Animal -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d import java.util.* diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/AmbientCreature.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/AmbientCreature.kt index 002fd2353..774ea5028 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/AmbientCreature.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/AmbientCreature.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.entities.ambient import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.Mob -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/Bat.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/Bat.kt index 38c39bdf1..5fc626d67 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/Bat.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/Bat.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.ambient import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/AbstractGolem.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/AbstractGolem.kt index e9248df6e..6202f506c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/AbstractGolem.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/AbstractGolem.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.PathfinderMob -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Animal.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Animal.kt index 912a85efe..972ee26a1 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Animal.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Animal.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.AgeableMob -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Axolotl.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Axolotl.kt index 1e7f9753c..3baf168fb 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Axolotl.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Axolotl.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Bee.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Bee.kt index 3c8b61c0c..58258076b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Bee.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Bee.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cat.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cat.kt index 7c576dadc..855b5715c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cat.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cat.kt @@ -16,9 +16,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.TamableAnimal -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.data.text.ChatColors import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Chicken.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Chicken.kt index ed681f422..fd85a89c8 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Chicken.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Chicken.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cow.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cow.kt index 335e96210..16b58c6f6 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cow.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cow.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Fox.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Fox.kt index 6c58ea9c0..4f22851b1 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Fox.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Fox.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d import java.util.* diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Goat.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Goat.kt index d1857491e..55cbeb30c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Goat.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Goat.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/IronGolem.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/IronGolem.kt index 35b9ff2c0..3c7d8e7bf 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/IronGolem.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/IronGolem.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Mooshroom.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Mooshroom.kt index bf5462bcf..23cd008c8 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Mooshroom.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Mooshroom.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Ocelot.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Ocelot.kt index 5b500b330..be448c1db 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Ocelot.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Ocelot.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Panda.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Panda.kt index 2274afe35..b414d9e16 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Panda.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Panda.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Parrot.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Parrot.kt index cdf42210f..5167a3e05 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Parrot.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Parrot.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Pig.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Pig.kt index 8a80517e7..8876fbfae 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Pig.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Pig.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/PolarBear.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/PolarBear.kt index 2ddc4ede7..4c1f69def 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/PolarBear.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/PolarBear.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Rabbit.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Rabbit.kt index 1a464c9c7..4f876c0d9 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Rabbit.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Rabbit.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Sheep.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Sheep.kt index 25ff0cb13..51c1654a1 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Sheep.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Sheep.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.data.text.ChatColors import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/ShoulderRidingAnimal.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/ShoulderRidingAnimal.kt index 65c1c2212..1d9aa52cf 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/ShoulderRidingAnimal.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/ShoulderRidingAnimal.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.TamableAnimal -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/SnowGolem.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/SnowGolem.kt index 32b25ed93..bf6f5a66f 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/SnowGolem.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/SnowGolem.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Strider.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Strider.kt index 88f72aaf1..753c50ea0 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Strider.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Strider.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Turtle.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Turtle.kt index abe4e0025..8f989f50c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Turtle.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Turtle.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Wolf.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Wolf.kt index 40fe5b886..a09e143a5 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Wolf.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Wolf.kt @@ -16,9 +16,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.TamableAnimal -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.data.text.ChatColors import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/hoglin/Hoglin.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/hoglin/Hoglin.kt index 41d4fc0b5..bc8652b1d 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/hoglin/Hoglin.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/hoglin/Hoglin.kt @@ -16,9 +16,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.animal.Animal -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractChestedHorse.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractChestedHorse.kt index ce35cd25a..9444fec0c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractChestedHorse.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractChestedHorse.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal.horse import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractHorse.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractHorse.kt index 360140eff..ea3b54d8c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractHorse.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractHorse.kt @@ -16,7 +16,7 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.animal.Animal -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d import java.util.* diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Donkey.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Donkey.kt index a2da9e759..29715451e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Donkey.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Donkey.kt @@ -26,9 +26,9 @@ package de.bixilon.minosoft.data.entities.entities.animal.horse import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Horse.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Horse.kt index 8918862d4..ebdd1f4fb 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Horse.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Horse.kt @@ -15,10 +15,10 @@ package de.bixilon.minosoft.data.entities.entities.animal.horse import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType -import de.bixilon.minosoft.data.mappings.items.Item +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType +import de.bixilon.minosoft.data.registries.items.Item import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.protocol.ProtocolVersions import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Llama.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Llama.kt index 8c77eaa60..c2821969c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Llama.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Llama.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal.horse import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Mule.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Mule.kt index f25d5cb66..0736962bc 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Mule.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Mule.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.animal.horse import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/SkeletonHorse.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/SkeletonHorse.kt index 319e83151..587a3537e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/SkeletonHorse.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/SkeletonHorse.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.animal.horse import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/TraderLlama.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/TraderLlama.kt index 41da2c56d..095b6ca4a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/TraderLlama.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/TraderLlama.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.animal.horse import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/ZombieHorse.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/ZombieHorse.kt index 6783771e9..b0b39552f 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/ZombieHorse.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/ZombieHorse.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.animal.horse import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractFish.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractFish.kt index b758524d9..e338b1a03 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractFish.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractFish.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal.water import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractSchoolingFish.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractSchoolingFish.kt index 38efa4624..34b7ecac7 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractSchoolingFish.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractSchoolingFish.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.entities.animal.water import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Cod.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Cod.kt index 7870d29bb..bb1768f1b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Cod.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Cod.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.animal.water import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Dolphin.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Dolphin.kt index 6efeb0b19..ab38e9493 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Dolphin.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Dolphin.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal.water import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/GlowSquid.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/GlowSquid.kt index 15ba09b3b..d8fdd8d47 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/GlowSquid.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/GlowSquid.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal.water import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/PufferFish.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/PufferFish.kt index d470041c9..4f46c94fb 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/PufferFish.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/PufferFish.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal.water import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Salmon.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Salmon.kt index 2c792ae69..7b74d75de 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Salmon.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Salmon.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.animal.water import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Squid.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Squid.kt index 5cf744098..3a16e328d 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Squid.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Squid.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.animal.water import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/TropicalFish.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/TropicalFish.kt index 5baed531e..8edce20d8 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/TropicalFish.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/TropicalFish.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.animal.water import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/WaterAnimal.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/WaterAnimal.kt index 8932ef64d..301333afe 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/WaterAnimal.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/WaterAnimal.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.entities.animal.water import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.PathfinderMob -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EndCrystal.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EndCrystal.kt index a583be5b1..385090654 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EndCrystal.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EndCrystal.kt @@ -16,9 +16,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EnderDragon.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EnderDragon.kt index b2ab62702..929e62cbd 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EnderDragon.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EnderDragon.kt @@ -16,9 +16,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.Mob -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/wither/WitherBoss.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/wither/WitherBoss.kt index df46dab6c..28d691a05 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/wither/WitherBoss.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/boss/wither/WitherBoss.kt @@ -16,9 +16,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.monster.Monster -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/ArmorStand.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/ArmorStand.kt index bc0ae732e..9bb1d10cb 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/ArmorStand.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/ArmorStand.kt @@ -16,9 +16,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.LivingEntity -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/GlowItemFrame.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/GlowItemFrame.kt index a952ddb3d..5404a2182 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/GlowItemFrame.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/GlowItemFrame.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.decoration import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/HangingEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/HangingEntity.kt index b0d662f08..2e81af91b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/HangingEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/HangingEntity.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.entities.decoration import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.Entity -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/ItemFrame.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/ItemFrame.kt index addc71fe3..05790ec73 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/ItemFrame.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/ItemFrame.kt @@ -17,9 +17,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/LeashFenceKnotEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/LeashFenceKnotEntity.kt index 682ea2982..fbe671863 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/LeashFenceKnotEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/LeashFenceKnotEntity.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.decoration import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Marker.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Marker.kt index 7236c1371..917c60425 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Marker.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Marker.kt @@ -2,9 +2,9 @@ package de.bixilon.minosoft.data.entities.entities.decoration import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.LivingEntity -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Painting.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Painting.kt index 3bf60e481..b3c1763c6 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Painting.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Painting.kt @@ -16,10 +16,10 @@ import de.bixilon.minosoft.data.Directions import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.Motive -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.Motive +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.gui.rendering.util.VecUtil.entityPosition import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/item/FallingBlock.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/item/FallingBlock.kt index 68dd952d5..bb7322a3b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/item/FallingBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/item/FallingBlock.kt @@ -16,10 +16,10 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.kt index 8ddb6b401..a52d7f5bd 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.kt @@ -17,9 +17,9 @@ import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/item/PrimedTNT.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/item/PrimedTNT.kt index e5110646c..c73aad4c2 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/item/PrimedTNT.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/item/PrimedTNT.kt @@ -16,9 +16,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/AbstractSkeleton.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/AbstractSkeleton.kt index 2b384d0cf..c8b21815f 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/AbstractSkeleton.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/AbstractSkeleton.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Blaze.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Blaze.kt index adfaeb4a5..ce2146f56 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Blaze.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Blaze.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/CaveSpider.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/CaveSpider.kt index b83ab9aae..ca05f25cd 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/CaveSpider.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/CaveSpider.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Creeper.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Creeper.kt index e4bc6994a..bd886560a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Creeper.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Creeper.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Drowned.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Drowned.kt index f709feca9..e1dc24eec 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Drowned.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Drowned.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ElderGuardian.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ElderGuardian.kt index a815e86d2..77c499a3b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ElderGuardian.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ElderGuardian.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Enderman.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Enderman.kt index bccd6e683..1c3bb5018 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Enderman.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Enderman.kt @@ -15,10 +15,10 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.protocol.ProtocolVersions import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Endermite.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Endermite.kt index 5b761f98b..58f7af8dd 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Endermite.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Endermite.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Ghast.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Ghast.kt index e1951bb94..f49348b37 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Ghast.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Ghast.kt @@ -16,9 +16,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.FlyingMob -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Giant.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Giant.kt index 82058fd7b..ef94436a5 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Giant.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Giant.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Guardian.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Guardian.kt index c2773327d..9a2d34400 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Guardian.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Guardian.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Husk.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Husk.kt index e89da872f..25e554dc6 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Husk.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Husk.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/MagmaCube.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/MagmaCube.kt index 4b1844954..b6c692b40 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/MagmaCube.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/MagmaCube.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Monster.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Monster.kt index 3292a6e73..151de1b19 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Monster.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Monster.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.PathfinderMob -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/PatrollingMonster.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/PatrollingMonster.kt index 796deb92f..f2b3df22c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/PatrollingMonster.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/PatrollingMonster.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Phantom.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Phantom.kt index c9b05fc5d..02f8a9117 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Phantom.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Phantom.kt @@ -16,9 +16,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.FlyingMob -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Shulker.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Shulker.kt index d718c9eaf..84ee62ee9 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Shulker.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Shulker.kt @@ -17,9 +17,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.animal.AbstractGolem -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.data.text.ChatColors import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Silverfish.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Silverfish.kt index a5f589589..781616372 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Silverfish.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Silverfish.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Skeleton.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Skeleton.kt index e8c3646fe..b7e2523ec 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Skeleton.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Skeleton.kt @@ -14,9 +14,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Slime.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Slime.kt index 01ac8085f..4f6a1222f 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Slime.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Slime.kt @@ -16,9 +16,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.Mob -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d import org.checkerframework.common.value.qual.IntRange diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Spider.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Spider.kt index 6c81135c4..80fa09943 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Spider.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Spider.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Stray.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Stray.kt index 155f885b4..747d46e9c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Stray.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Stray.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Vex.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Vex.kt index 07bcd1b00..da4ce3f53 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Vex.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Vex.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/WitherSkeleton.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/WitherSkeleton.kt index 46ed966de..4cb8e4e3b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/WitherSkeleton.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/WitherSkeleton.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zoglin.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zoglin.kt index b2f584fc1..92be8d866 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zoglin.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zoglin.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zombie.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zombie.kt index c05094365..c1758be45 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zombie.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zombie.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombiePigman.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombiePigman.kt index 019abf53b..ff2370c24 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombiePigman.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombiePigman.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.decoration.LeashFenceKnotEntity import de.bixilon.minosoft.data.entities.meta.EntityMetaData -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombieVillager.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombieVillager.kt index 79e62f207..8875b3b8a 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombieVillager.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombieVillager.kt @@ -16,9 +16,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.npc.villager.data.VillagerData -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombifiedPiglin.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombifiedPiglin.kt index 5d199e186..d5c9c1795 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombifiedPiglin.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombifiedPiglin.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.monster import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/AbstractPiglin.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/AbstractPiglin.kt index df0ad2ac2..f2afff50e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/AbstractPiglin.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/AbstractPiglin.kt @@ -16,7 +16,7 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.monster.Monster -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/Piglin.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/Piglin.kt index d38796635..c5dff95b5 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/Piglin.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/Piglin.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.monster.piglin import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.protocol.ProtocolVersions import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/PiglinBrute.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/PiglinBrute.kt index 2086c9d3c..a47954b4c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/PiglinBrute.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/piglin/PiglinBrute.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.monster.piglin import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/AbstractIllager.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/AbstractIllager.kt index 679d507cd..ea3ea91df 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/AbstractIllager.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/AbstractIllager.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.entities.monster.raid import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Evoker.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Evoker.kt index c9cace660..db991eacb 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Evoker.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Evoker.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.monster.raid import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Illusioner.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Illusioner.kt index 51a05a106..e3cf25de3 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Illusioner.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Illusioner.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.monster.raid import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Pillager.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Pillager.kt index e434591e7..2c095f8df 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Pillager.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Pillager.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.monster.raid import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Raider.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Raider.kt index ed5658301..2b4911861 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Raider.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Raider.kt @@ -16,7 +16,7 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.monster.PatrollingMonster -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Ravager.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Ravager.kt index dce444d55..0ce5552c1 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Ravager.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Ravager.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.monster.raid import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/SpellcasterIllager.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/SpellcasterIllager.kt index 403935eb9..618577b25 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/SpellcasterIllager.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/SpellcasterIllager.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.monster.raid import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Vindicator.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Vindicator.kt index 8c38bf6a3..11e3ae101 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Vindicator.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Vindicator.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.monster.raid import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Witch.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Witch.kt index 5d4345bb2..1a67bfeb4 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Witch.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/raid/Witch.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.monster.raid import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/AbstractVillager.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/AbstractVillager.kt index f8d048b5c..4ae65882c 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/AbstractVillager.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/AbstractVillager.kt @@ -16,7 +16,7 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.AgeableMob import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/Villager.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/Villager.kt index 30b1ada74..f7007f6fe 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/Villager.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/Villager.kt @@ -16,9 +16,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.npc.villager.data.VillagerData -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/WanderingTrader.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/WanderingTrader.kt index dcc6d0f6f..ddbd54572 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/WanderingTrader.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/WanderingTrader.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.npc.villager import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/data/VillagerData.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/data/VillagerData.kt index 34df629ca..a09b153ca 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/data/VillagerData.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/npc/villager/data/VillagerData.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.entities.entities.npc.villager.data -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation data class VillagerData( val type: VillagerTypes, diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt index aa7faab53..f4aa9a5da 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt @@ -18,10 +18,10 @@ import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.Poses import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.LivingEntity -import de.bixilon.minosoft.data.mappings.entities.EntityType import de.bixilon.minosoft.data.player.Hands import de.bixilon.minosoft.data.player.PlayerProperty import de.bixilon.minosoft.data.player.tab.TabListItem +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.data.world.World import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY import de.bixilon.minosoft.gui.rendering.util.VecUtil.clamp diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/RemotePlayerEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/RemotePlayerEntity.kt index 2d3b58518..61aa81ee8 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/RemotePlayerEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/RemotePlayerEntity.kt @@ -15,11 +15,11 @@ package de.bixilon.minosoft.data.entities.entities.player import de.bixilon.minosoft.data.abilities.Gamemodes import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType import de.bixilon.minosoft.data.player.PlayerProperty import de.bixilon.minosoft.data.player.tab.TabListItem +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/AbstractArrow.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/AbstractArrow.kt index 3060495a5..1c13e8f65 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/AbstractArrow.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/AbstractArrow.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d import java.util.* diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/AbstractHurtingProjectile.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/AbstractHurtingProjectile.kt index b592757e6..8132033ff 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/AbstractHurtingProjectile.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/AbstractHurtingProjectile.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Arrow.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Arrow.kt index 877137d47..5a96f9056 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Arrow.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Arrow.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/DragonFireball.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/DragonFireball.kt index 5c4c0ac1e..d7521789d 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/DragonFireball.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/DragonFireball.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Fireball.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Fireball.kt index aca1860a4..4d9ca4871 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Fireball.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Fireball.kt @@ -16,7 +16,7 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FireworkRocketEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FireworkRocketEntity.kt index 931f906d7..e867899d4 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FireworkRocketEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FireworkRocketEntity.kt @@ -16,9 +16,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FishingBobber.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FishingBobber.kt index ab15c9748..9dc112b2d 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FishingBobber.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FishingBobber.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/LargeFireball.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/LargeFireball.kt index 636fe011c..3e27b17ce 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/LargeFireball.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/LargeFireball.kt @@ -14,9 +14,9 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/LlamaSpit.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/LlamaSpit.kt index 6c4c6ba6c..1a4225219 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/LlamaSpit.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/LlamaSpit.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Projectile.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Projectile.kt index 72b9539c3..29b0f13f5 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Projectile.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/Projectile.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ShulkerBullet.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ShulkerBullet.kt index bb3c9db45..2a49d28a6 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ShulkerBullet.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ShulkerBullet.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/SmallFireball.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/SmallFireball.kt index 005999e14..77104c2e0 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/SmallFireball.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/SmallFireball.kt @@ -14,9 +14,9 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/SpectralArrow.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/SpectralArrow.kt index a4791714c..d649ce172 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/SpectralArrow.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/SpectralArrow.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrowableItemProjectile.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrowableItemProjectile.kt index a772e84ec..2172b9dfc 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrowableItemProjectile.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrowableItemProjectile.kt @@ -16,7 +16,7 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrowableProjectile.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrowableProjectile.kt index 58f4e981f..14183aae3 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrowableProjectile.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrowableProjectile.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEgg.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEgg.kt index d1118dc27..a6b4cf396 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEgg.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEgg.kt @@ -14,9 +14,9 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEnderPearl.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEnderPearl.kt index f704fae89..5a36137f3 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEnderPearl.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEnderPearl.kt @@ -14,9 +14,9 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownExperienceBottle.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownExperienceBottle.kt index fcea237b9..f430811ee 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownExperienceBottle.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownExperienceBottle.kt @@ -14,9 +14,9 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEyeOfEnder.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEyeOfEnder.kt index e3f5b1fc5..b5fd839f5 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEyeOfEnder.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownEyeOfEnder.kt @@ -17,9 +17,9 @@ import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownPotion.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownPotion.kt index 8533fb828..edc1ce3b8 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownPotion.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownPotion.kt @@ -16,9 +16,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.protocol.ProtocolVersions import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownSnowball.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownSnowball.kt index 7b1312c0d..540357e62 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownSnowball.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownSnowball.kt @@ -14,9 +14,9 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownTrident.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownTrident.kt index 553cd8b71..b30d1a07b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownTrident.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/ThrownTrident.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/WitherSkull.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/WitherSkull.kt index 4f56fcd30..a9e1fdb5f 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/WitherSkull.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/WitherSkull.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.projectile import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/AbstractMinecart.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/AbstractMinecart.kt index a153894b5..8d1450483 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/AbstractMinecart.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/AbstractMinecart.kt @@ -16,7 +16,7 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/AbstractMinecartContainer.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/AbstractMinecartContainer.kt index 33ec80596..ad80030a9 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/AbstractMinecartContainer.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/AbstractMinecartContainer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.entities.entities.vehicle import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/Boat.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/Boat.kt index d8e8fb077..3ba8ecded 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/Boat.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/Boat.kt @@ -16,9 +16,9 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/ChestMinecart.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/ChestMinecart.kt index 460460c7a..05c53f856 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/ChestMinecart.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/ChestMinecart.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.vehicle import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/CommandBlockMinecart.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/CommandBlockMinecart.kt index 2f2ad9613..6a1f945e3 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/CommandBlockMinecart.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/CommandBlockMinecart.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.vehicle import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/FurnaceMinecart.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/FurnaceMinecart.kt index fded59de1..c8190d678 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/FurnaceMinecart.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/FurnaceMinecart.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.data.entities.entities.vehicle import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/HopperMinecart.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/HopperMinecart.kt index 197c81adc..c16d662ba 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/HopperMinecart.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/HopperMinecart.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.vehicle import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/Minecart.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/Minecart.kt index fb0ade1f7..78073197e 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/Minecart.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/Minecart.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.vehicle import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/SpawnerMinecart.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/SpawnerMinecart.kt index 6f0573eaf..2e1541d84 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/SpawnerMinecart.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/SpawnerMinecart.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.vehicle import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/TNTMinecart.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/TNTMinecart.kt index b520e260e..617c6a50b 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/TNTMinecart.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/vehicle/TNTMinecart.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.data.entities.entities.vehicle import de.bixilon.minosoft.data.entities.EntityRotation -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.entities.EntityFactory -import de.bixilon.minosoft.data.mappings.entities.EntityType +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.entities.EntityFactory +import de.bixilon.minosoft.data.registries.entities.EntityType import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/entities/meta/EntityMetaData.kt b/src/main/java/de/bixilon/minosoft/data/entities/meta/EntityMetaData.kt index 023f8100c..9c3a62a85 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/meta/EntityMetaData.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/meta/EntityMetaData.kt @@ -21,8 +21,8 @@ import de.bixilon.minosoft.data.entities.entities.npc.villager.data.VillagerData import de.bixilon.minosoft.data.entities.entities.npc.villager.data.VillagerLevels import de.bixilon.minosoft.data.entities.entities.npc.villager.data.VillagerTypes import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer diff --git a/src/main/java/de/bixilon/minosoft/data/inventory/ItemStack.kt b/src/main/java/de/bixilon/minosoft/data/inventory/ItemStack.kt index 5981eb518..75721e967 100644 --- a/src/main/java/de/bixilon/minosoft/data/inventory/ItemStack.kt +++ b/src/main/java/de/bixilon/minosoft/data/inventory/ItemStack.kt @@ -23,9 +23,9 @@ import de.bixilon.minosoft.data.inventory.ItemNBTValues.ENCHANTMENT_PRE_FLATTENI import de.bixilon.minosoft.data.inventory.ItemNBTValues.HIDE_FLAGS_TAG import de.bixilon.minosoft.data.inventory.ItemNBTValues.REPAIR_COST_TAG import de.bixilon.minosoft.data.inventory.ItemNBTValues.UNBREAKABLE_TAG -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.enchantment.Enchantment -import de.bixilon.minosoft.data.mappings.items.Item +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.enchantment.Enchantment +import de.bixilon.minosoft.data.registries.items.Item import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.BitByte.isBit diff --git a/src/main/java/de/bixilon/minosoft/data/locale/LocaleManager.java b/src/main/java/de/bixilon/minosoft/data/locale/LocaleManager.java index a6c166a4d..7f2ac0a0d 100644 --- a/src/main/java/de/bixilon/minosoft/data/locale/LocaleManager.java +++ b/src/main/java/de/bixilon/minosoft/data/locale/LocaleManager.java @@ -15,8 +15,8 @@ package de.bixilon.minosoft.data.locale; import de.bixilon.minosoft.Minosoft; import de.bixilon.minosoft.ShutdownReasons; -import de.bixilon.minosoft.data.mappings.ResourceLocation; -import de.bixilon.minosoft.data.mappings.versions.Versions; +import de.bixilon.minosoft.data.registries.ResourceLocation; +import de.bixilon.minosoft.data.registries.versions.Versions; import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition; import de.bixilon.minosoft.util.logging.Log; diff --git a/src/main/java/de/bixilon/minosoft/data/locale/minecraft/MinecraftLocaleManager.kt b/src/main/java/de/bixilon/minosoft/data/locale/minecraft/MinecraftLocaleManager.kt index 23b4d49fa..2b0958dca 100644 --- a/src/main/java/de/bixilon/minosoft/data/locale/minecraft/MinecraftLocaleManager.kt +++ b/src/main/java/de/bixilon/minosoft/data/locale/minecraft/MinecraftLocaleManager.kt @@ -12,8 +12,8 @@ */ package de.bixilon.minosoft.data.locale.minecraft -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.versions.Version +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.versions.Version import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.data.text.TextComponent import de.bixilon.minosoft.protocol.protocol.ProtocolVersions diff --git a/src/main/java/de/bixilon/minosoft/data/player/LocalPlayerEntity.kt b/src/main/java/de/bixilon/minosoft/data/player/LocalPlayerEntity.kt index c56156029..f20d3f4ed 100644 --- a/src/main/java/de/bixilon/minosoft/data/player/LocalPlayerEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/player/LocalPlayerEntity.kt @@ -20,18 +20,18 @@ import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.player.PlayerEntity import de.bixilon.minosoft.data.entities.entities.player.RemotePlayerEntity import de.bixilon.minosoft.data.inventory.InventorySlots -import de.bixilon.minosoft.data.mappings.blocks.DefaultBlocks -import de.bixilon.minosoft.data.mappings.blocks.types.Block -import de.bixilon.minosoft.data.mappings.effects.DefaultStatusEffects -import de.bixilon.minosoft.data.mappings.effects.attributes.DefaultStatusEffectAttributeNames -import de.bixilon.minosoft.data.mappings.effects.attributes.DefaultStatusEffectAttributes -import de.bixilon.minosoft.data.mappings.effects.attributes.StatusEffectAttributeInstance -import de.bixilon.minosoft.data.mappings.enchantment.DefaultEnchantments -import de.bixilon.minosoft.data.mappings.items.DefaultItems -import de.bixilon.minosoft.data.mappings.items.Item -import de.bixilon.minosoft.data.mappings.other.containers.Container -import de.bixilon.minosoft.data.mappings.other.containers.PlayerInventory import de.bixilon.minosoft.data.physics.PhysicsConstants +import de.bixilon.minosoft.data.registries.blocks.DefaultBlocks +import de.bixilon.minosoft.data.registries.blocks.types.Block +import de.bixilon.minosoft.data.registries.effects.DefaultStatusEffects +import de.bixilon.minosoft.data.registries.effects.attributes.DefaultStatusEffectAttributeNames +import de.bixilon.minosoft.data.registries.effects.attributes.DefaultStatusEffectAttributes +import de.bixilon.minosoft.data.registries.effects.attributes.StatusEffectAttributeInstance +import de.bixilon.minosoft.data.registries.enchantment.DefaultEnchantments +import de.bixilon.minosoft.data.registries.items.DefaultItems +import de.bixilon.minosoft.data.registries.items.Item +import de.bixilon.minosoft.data.registries.other.containers.Container +import de.bixilon.minosoft.data.registries.other.containers.PlayerInventory import de.bixilon.minosoft.data.tags.DefaultBlockTags import de.bixilon.minosoft.data.tags.Tag import de.bixilon.minosoft.gui.rendering.input.camera.MovementInput diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/CompanionResourceLocation.kt b/src/main/java/de/bixilon/minosoft/data/registries/CompanionResourceLocation.kt similarity index 95% rename from src/main/java/de/bixilon/minosoft/data/mappings/CompanionResourceLocation.kt rename to src/main/java/de/bixilon/minosoft/data/registries/CompanionResourceLocation.kt index 0a31687f1..d655e77b6 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/CompanionResourceLocation.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/CompanionResourceLocation.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings +package de.bixilon.minosoft.data.registries interface CompanionResourceLocation : ResourceLocationAble { val RESOURCE_LOCATION: ResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/DefaultFactory.kt b/src/main/java/de/bixilon/minosoft/data/registries/DefaultFactory.kt similarity index 97% rename from src/main/java/de/bixilon/minosoft/data/mappings/DefaultFactory.kt rename to src/main/java/de/bixilon/minosoft/data/registries/DefaultFactory.kt index 7b78109a4..927a153c7 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/DefaultFactory.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/DefaultFactory.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings +package de.bixilon.minosoft.data.registries open class DefaultFactory(vararg factories: T) { private val factoryMap: Map diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/DefaultRegistries.kt b/src/main/java/de/bixilon/minosoft/data/registries/DefaultRegistries.kt similarity index 92% rename from src/main/java/de/bixilon/minosoft/data/mappings/DefaultRegistries.kt rename to src/main/java/de/bixilon/minosoft/data/registries/DefaultRegistries.kt index 7021b710c..3cc083601 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/DefaultRegistries.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/DefaultRegistries.kt @@ -11,18 +11,18 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings +package de.bixilon.minosoft.data.registries import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.data.entities.EntityObjectType import de.bixilon.minosoft.data.entities.block.BlockEntityMetaType import de.bixilon.minosoft.data.entities.meta.EntityMetaData import de.bixilon.minosoft.data.inventory.InventorySlots -import de.bixilon.minosoft.data.mappings.other.containers.ContainerType -import de.bixilon.minosoft.data.mappings.other.game.event.GameEvent -import de.bixilon.minosoft.data.mappings.registry.PerVersionEnumRegistry -import de.bixilon.minosoft.data.mappings.registry.PerVersionRegistry -import de.bixilon.minosoft.data.mappings.registry.Registry +import de.bixilon.minosoft.data.registries.other.containers.ContainerType +import de.bixilon.minosoft.data.registries.other.game.event.GameEvent +import de.bixilon.minosoft.data.registries.registry.PerVersionEnumRegistry +import de.bixilon.minosoft.data.registries.registry.PerVersionRegistry +import de.bixilon.minosoft.data.registries.registry.Registry import de.bixilon.minosoft.protocol.packets.c2s.play.EntityActionC2SP import de.bixilon.minosoft.protocol.packets.s2c.play.EntityAnimationS2CP import de.bixilon.minosoft.protocol.packets.s2c.play.title.TitleS2CF diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/Dimension.kt b/src/main/java/de/bixilon/minosoft/data/registries/Dimension.kt similarity index 95% rename from src/main/java/de/bixilon/minosoft/data/mappings/Dimension.kt rename to src/main/java/de/bixilon/minosoft/data/registries/Dimension.kt index 603f16486..c568a843f 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/Dimension.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/Dimension.kt @@ -10,12 +10,12 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings +package de.bixilon.minosoft.data.registries import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition import de.bixilon.minosoft.util.KUtil.nullCast diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/LegacyResourceLocation.kt b/src/main/java/de/bixilon/minosoft/data/registries/LegacyResourceLocation.kt similarity index 96% rename from src/main/java/de/bixilon/minosoft/data/mappings/LegacyResourceLocation.kt rename to src/main/java/de/bixilon/minosoft/data/registries/LegacyResourceLocation.kt index a9c17f8ee..e65a7762d 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/LegacyResourceLocation.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/LegacyResourceLocation.kt @@ -10,7 +10,7 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings +package de.bixilon.minosoft.data.registries class LegacyResourceLocation(resourceLocation: String) : ResourceLocation("", resourceLocation) { override val full: String = path diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/Motive.kt b/src/main/java/de/bixilon/minosoft/data/registries/Motive.kt similarity index 84% rename from src/main/java/de/bixilon/minosoft/data/mappings/Motive.kt rename to src/main/java/de/bixilon/minosoft/data/registries/Motive.kt index 2830ea3d5..a12fadd0f 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/Motive.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/Motive.kt @@ -10,12 +10,12 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings +package de.bixilon.minosoft.data.registries import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries data class Motive( override val resourceLocation: ResourceLocation, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/MultiResourceLocationAble.kt b/src/main/java/de/bixilon/minosoft/data/registries/MultiResourceLocationAble.kt similarity index 95% rename from src/main/java/de/bixilon/minosoft/data/mappings/MultiResourceLocationAble.kt rename to src/main/java/de/bixilon/minosoft/data/registries/MultiResourceLocationAble.kt index 8acc40ea5..a7345e551 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/MultiResourceLocationAble.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/MultiResourceLocationAble.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings +package de.bixilon.minosoft.data.registries interface MultiResourceLocationAble { val ALIASES: Set diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/PluginChannel.kt b/src/main/java/de/bixilon/minosoft/data/registries/PluginChannel.kt similarity index 84% rename from src/main/java/de/bixilon/minosoft/data/mappings/PluginChannel.kt rename to src/main/java/de/bixilon/minosoft/data/registries/PluginChannel.kt index f4f7734cf..dd13efce6 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/PluginChannel.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/PluginChannel.kt @@ -11,12 +11,12 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings +package de.bixilon.minosoft.data.registries import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries data class PluginChannel( override val resourceLocation: ResourceLocation, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/MappingsLoadingException.java b/src/main/java/de/bixilon/minosoft/data/registries/RegistriesLoadingException.kt similarity index 55% rename from src/main/java/de/bixilon/minosoft/data/mappings/MappingsLoadingException.java rename to src/main/java/de/bixilon/minosoft/data/registries/RegistriesLoadingException.kt index 708035bc7..f0a88fffb 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/MappingsLoadingException.java +++ b/src/main/java/de/bixilon/minosoft/data/registries/RegistriesLoadingException.kt @@ -10,27 +10,12 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ +package de.bixilon.minosoft.data.registries -package de.bixilon.minosoft.data.mappings; - -public class MappingsLoadingException extends Exception { - - public MappingsLoadingException() { - } - - public MappingsLoadingException(String message) { - super(message); - } - - public MappingsLoadingException(String message, Throwable cause) { - super(message, cause); - } - - public MappingsLoadingException(Throwable cause) { - super(cause); - } - - public MappingsLoadingException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } +class RegistriesLoadingException : Exception { + constructor() + constructor(message: String?) : super(message) + constructor(message: String?, cause: Throwable?) : super(message, cause) + constructor(cause: Throwable?) : super(cause) + constructor(message: String?, cause: Throwable?, enableSuppression: Boolean, writableStackTrace: Boolean) : super(message, cause, enableSuppression, writableStackTrace) } diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/ResourceLocation.kt b/src/main/java/de/bixilon/minosoft/data/registries/ResourceLocation.kt similarity index 98% rename from src/main/java/de/bixilon/minosoft/data/mappings/ResourceLocation.kt rename to src/main/java/de/bixilon/minosoft/data/registries/ResourceLocation.kt index f8470c2f3..1cc4b2ff3 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/ResourceLocation.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/ResourceLocation.kt @@ -10,7 +10,7 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings +package de.bixilon.minosoft.data.registries import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition import de.bixilon.minosoft.util.Util diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/ResourceLocationAble.kt b/src/main/java/de/bixilon/minosoft/data/registries/ResourceLocationAble.kt similarity index 95% rename from src/main/java/de/bixilon/minosoft/data/mappings/ResourceLocationAble.kt rename to src/main/java/de/bixilon/minosoft/data/registries/ResourceLocationAble.kt index c60e9af25..98fbcadc0 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/ResourceLocationAble.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/ResourceLocationAble.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings +package de.bixilon.minosoft.data.registries interface ResourceLocationAble { val resourceLocation: ResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/biomes/Biome.kt b/src/main/java/de/bixilon/minosoft/data/registries/biomes/Biome.kt similarity index 93% rename from src/main/java/de/bixilon/minosoft/data/mappings/biomes/Biome.kt rename to src/main/java/de/bixilon/minosoft/data/registries/biomes/Biome.kt index 0915160ec..7ed7f8dd5 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/biomes/Biome.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/biomes/Biome.kt @@ -10,13 +10,13 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.biomes +package de.bixilon.minosoft.data.registries.biomes import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.data.text.RGBColor.Companion.asColor import de.bixilon.minosoft.data.text.RGBColor.Companion.asRGBColor diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/biomes/BiomeCategory.kt b/src/main/java/de/bixilon/minosoft/data/registries/biomes/BiomeCategory.kt similarity index 75% rename from src/main/java/de/bixilon/minosoft/data/mappings/biomes/BiomeCategory.kt rename to src/main/java/de/bixilon/minosoft/data/registries/biomes/BiomeCategory.kt index 7693b9a2c..790c9b4f4 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/biomes/BiomeCategory.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/biomes/BiomeCategory.kt @@ -11,19 +11,19 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.biomes +package de.bixilon.minosoft.data.registries.biomes import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.registry.IdDeserializer -import de.bixilon.minosoft.data.mappings.registry.RegistryFakeEnumerable -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.registry.IdDeserializer +import de.bixilon.minosoft.data.registries.registry.RegistryFakeEnumerable +import de.bixilon.minosoft.data.registries.versions.Registries data class BiomeCategory( override val name: String, ) : RegistryFakeEnumerable { companion object : IdDeserializer { - override fun deserialize(mappings: Registries, data: JsonObject): BiomeCategory { + override fun deserialize(registries: Registries, data: JsonObject): BiomeCategory { return BiomeCategory( name = data["name"].asString ) diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/biomes/BiomePrecipitation.kt b/src/main/java/de/bixilon/minosoft/data/registries/biomes/BiomePrecipitation.kt similarity index 75% rename from src/main/java/de/bixilon/minosoft/data/mappings/biomes/BiomePrecipitation.kt rename to src/main/java/de/bixilon/minosoft/data/registries/biomes/BiomePrecipitation.kt index be3fb64da..dde84adf5 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/biomes/BiomePrecipitation.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/biomes/BiomePrecipitation.kt @@ -11,19 +11,19 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.biomes +package de.bixilon.minosoft.data.registries.biomes import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.registry.IdDeserializer -import de.bixilon.minosoft.data.mappings.registry.RegistryFakeEnumerable -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.registry.IdDeserializer +import de.bixilon.minosoft.data.registries.registry.RegistryFakeEnumerable +import de.bixilon.minosoft.data.registries.versions.Registries data class BiomePrecipitation( override val name: String, ) : RegistryFakeEnumerable { companion object : IdDeserializer { - override fun deserialize(mappings: Registries, data: JsonObject): BiomePrecipitation { + override fun deserialize(registries: Registries, data: JsonObject): BiomePrecipitation { return BiomePrecipitation( name = data["name"].asString ) diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/BlockState.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/BlockState.kt similarity index 96% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/BlockState.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/BlockState.kt index 70078c9b6..4b81a7e23 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/BlockState.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/BlockState.kt @@ -10,19 +10,19 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks +package de.bixilon.minosoft.data.registries.blocks import com.google.gson.JsonArray import com.google.gson.JsonElement import com.google.gson.JsonObject import com.google.gson.JsonPrimitive import de.bixilon.minosoft.Minosoft -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties -import de.bixilon.minosoft.data.mappings.blocks.types.Block -import de.bixilon.minosoft.data.mappings.materials.Material -import de.bixilon.minosoft.data.mappings.sounds.SoundEvent -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.blocks.types.Block +import de.bixilon.minosoft.data.registries.materials.Material +import de.bixilon.minosoft.data.registries.sounds.SoundEvent +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.TintColorCalculator import de.bixilon.minosoft.gui.rendering.chunk.VoxelShape diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/BlockUsages.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/BlockUsages.kt similarity index 95% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/BlockUsages.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/BlockUsages.kt index ebeee1142..587caeb32 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/BlockUsages.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/BlockUsages.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks +package de.bixilon.minosoft.data.registries.blocks enum class BlockUsages { /** diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/DefaultBlocks.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/DefaultBlocks.kt similarity index 97% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/DefaultBlocks.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/DefaultBlocks.kt index e2257a80c..7ea20dfc7 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/DefaultBlocks.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/DefaultBlocks.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks +package de.bixilon.minosoft.data.registries.blocks import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/RandomOffsetTypes.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/RandomOffsetTypes.kt similarity index 95% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/RandomOffsetTypes.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/RandomOffsetTypes.kt index 88c56a656..aba6ba96c 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/RandomOffsetTypes.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/RandomOffsetTypes.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks +package de.bixilon.minosoft.data.registries.blocks import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/WannabeBlockState.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/WannabeBlockState.kt similarity index 83% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/WannabeBlockState.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/WannabeBlockState.kt index 4b7ee355c..13fda8f78 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/WannabeBlockState.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/WannabeBlockState.kt @@ -10,10 +10,10 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks +package de.bixilon.minosoft.data.registries.blocks -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties data class WannabeBlockState( val resourceLocation: ResourceLocation, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/entites/BlockEntityType.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/entites/BlockEntityType.kt similarity index 86% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/entites/BlockEntityType.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/entites/BlockEntityType.kt index 6e105ace8..b7e2baa69 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/entites/BlockEntityType.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/entites/BlockEntityType.kt @@ -11,17 +11,17 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.entites +package de.bixilon.minosoft.data.registries.blocks.entites import com.google.gson.JsonObject import de.bixilon.minosoft.data.entities.block.BlockEntity import de.bixilon.minosoft.data.entities.block.BlockEntityFactory import de.bixilon.minosoft.data.entities.block.DefaultBlockEntityMetaDataFactory -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.types.Block -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.types.Block +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.protocol.network.connection.PlayConnection data class BlockEntityType( diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/entites/BlockEntityTypeRegistry.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/entites/BlockEntityTypeRegistry.kt similarity index 85% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/entites/BlockEntityTypeRegistry.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/entites/BlockEntityTypeRegistry.kt index 069474365..9e57515f7 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/entites/BlockEntityTypeRegistry.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/entites/BlockEntityTypeRegistry.kt @@ -11,11 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.entites +package de.bixilon.minosoft.data.registries.blocks.entites -import de.bixilon.minosoft.data.mappings.blocks.types.Block -import de.bixilon.minosoft.data.mappings.registry.Registry -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.blocks.types.Block +import de.bixilon.minosoft.data.registries.registry.Registry +import de.bixilon.minosoft.data.registries.versions.Registries class BlockEntityTypeRegistry( parentRegistry: BlockEntityTypeRegistry? = null, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Attachments.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Attachments.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Attachments.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Attachments.kt index 6b10c9e74..7b5c74cd2 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Attachments.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Attachments.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/BambooLeaves.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/BambooLeaves.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/BambooLeaves.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/BambooLeaves.kt index ebce0c579..2a308fad5 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/BambooLeaves.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/BambooLeaves.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/BedParts.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/BedParts.kt similarity index 88% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/BedParts.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/BedParts.kt index 9bc9a13cd..719dfb282 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/BedParts.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/BedParts.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/BlockProperties.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/BlockProperties.kt similarity index 94% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/BlockProperties.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/BlockProperties.kt index 19c79a70b..659e6e6bc 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/BlockProperties.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/BlockProperties.kt @@ -11,13 +11,13 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties import de.bixilon.minosoft.data.Axes import de.bixilon.minosoft.data.Directions -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BooleanBlockPropertiesSerializer -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.IntBlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BooleanBlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.IntBlockPropertiesSerializer import java.util.* enum class BlockProperties { diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/ChestTypes.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/ChestTypes.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/ChestTypes.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/ChestTypes.kt index e524608b5..5599234e3 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/ChestTypes.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/ChestTypes.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Halves.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Halves.kt similarity index 90% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Halves.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Halves.kt index f928f313c..14890878c 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Halves.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Halves.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import java.util.* enum class Halves( diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Instruments.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Instruments.kt similarity index 91% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Instruments.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Instruments.kt index 0daf2a1e7..20ea158f0 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Instruments.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Instruments.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import java.util.* enum class Instruments( diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/MultipartDirectionParser.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/MultipartDirectionParser.kt similarity index 90% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/MultipartDirectionParser.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/MultipartDirectionParser.kt index f35efffdf..c6272377f 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/MultipartDirectionParser.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/MultipartDirectionParser.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import java.util.* enum class MultipartDirectionParser( diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Orientations.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Orientations.kt similarity index 90% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Orientations.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Orientations.kt index 03cdb8683..ec8e738d6 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Orientations.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Orientations.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/PistonTypes.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/PistonTypes.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/PistonTypes.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/PistonTypes.kt index 74de8a139..0adebd83c 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/PistonTypes.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/PistonTypes.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/SensorPhases.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/SensorPhases.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/SensorPhases.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/SensorPhases.kt index f20c7569f..1643c1fb7 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/SensorPhases.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/SensorPhases.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Shapes.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Shapes.kt similarity index 90% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Shapes.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Shapes.kt index eb4fa4468..bc44b3aa1 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Shapes.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Shapes.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Sides.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Sides.kt similarity index 88% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Sides.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Sides.kt index 87f84f0e9..8f739a715 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Sides.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Sides.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/StructureBlockModes.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/StructureBlockModes.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/StructureBlockModes.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/StructureBlockModes.kt index d190ace1f..d3359f75c 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/StructureBlockModes.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/StructureBlockModes.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Thicknesses.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Thicknesses.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Thicknesses.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Thicknesses.kt index 660a2baa3..1aa14a1d8 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Thicknesses.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Thicknesses.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Tilts.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Tilts.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Tilts.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Tilts.kt index 1ea71a7d2..5cf0b9024 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/Tilts.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Tilts.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/VerticalDirections.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/VerticalDirections.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/VerticalDirections.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/VerticalDirections.kt index 4a0ce14cf..eaa70473a 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/VerticalDirections.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/VerticalDirections.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties +package de.bixilon.minosoft.data.registries.blocks.properties -import de.bixilon.minosoft.data.mappings.blocks.properties.serializer.BlockPropertiesSerializer +import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/serializer/BlockPropertiesSerializer.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/serializer/BlockPropertiesSerializer.kt similarity index 92% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/serializer/BlockPropertiesSerializer.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/serializer/BlockPropertiesSerializer.kt index 75be24e38..4c91878ba 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/serializer/BlockPropertiesSerializer.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/serializer/BlockPropertiesSerializer.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties.serializer +package de.bixilon.minosoft.data.registries.blocks.properties.serializer interface BlockPropertiesSerializer { diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/serializer/BooleanBlockPropertiesSerializer.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/serializer/BooleanBlockPropertiesSerializer.kt similarity index 94% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/serializer/BooleanBlockPropertiesSerializer.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/serializer/BooleanBlockPropertiesSerializer.kt index 1be88fc63..71a1b425f 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/serializer/BooleanBlockPropertiesSerializer.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/serializer/BooleanBlockPropertiesSerializer.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties.serializer +package de.bixilon.minosoft.data.registries.blocks.properties.serializer object BooleanBlockPropertiesSerializer : BlockPropertiesSerializer { diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/serializer/IntBlockPropertiesSerializer.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/serializer/IntBlockPropertiesSerializer.kt similarity index 92% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/serializer/IntBlockPropertiesSerializer.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/serializer/IntBlockPropertiesSerializer.kt index 7d824fe25..e9e0f1b55 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/properties/serializer/IntBlockPropertiesSerializer.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/serializer/IntBlockPropertiesSerializer.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.properties.serializer +package de.bixilon.minosoft.data.registries.blocks.properties.serializer object IntBlockPropertiesSerializer : BlockPropertiesSerializer { diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/BedBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/BedBlock.kt similarity index 86% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/BedBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/BedBlock.kt index 289e229a0..917fa7abb 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/BedBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/BedBlock.kt @@ -11,13 +11,13 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types +package de.bixilon.minosoft.data.registries.blocks.types import com.google.gson.JsonObject import de.bixilon.minosoft.data.entities.entities.Entity -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/Block.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/Block.kt similarity index 88% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/Block.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/Block.kt index 2dd6b4f82..03bd68954 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/Block.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/Block.kt @@ -10,27 +10,27 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types +package de.bixilon.minosoft.data.registries.blocks.types import com.google.gson.JsonObject import de.bixilon.minosoft.data.entities.block.BlockEntity import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.BlockUsages -import de.bixilon.minosoft.data.mappings.blocks.RandomOffsetTypes -import de.bixilon.minosoft.data.mappings.blocks.entites.BlockEntityType -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties -import de.bixilon.minosoft.data.mappings.blocks.types.portal.NetherPortalBlock -import de.bixilon.minosoft.data.mappings.blocks.types.redstone.ComparatorBlock -import de.bixilon.minosoft.data.mappings.blocks.types.redstone.RepeaterBlock -import de.bixilon.minosoft.data.mappings.blocks.types.wall.LeverBlock -import de.bixilon.minosoft.data.mappings.items.Item -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries import de.bixilon.minosoft.data.player.Hands +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockUsages +import de.bixilon.minosoft.data.registries.blocks.RandomOffsetTypes +import de.bixilon.minosoft.data.registries.blocks.entites.BlockEntityType +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.blocks.types.portal.NetherPortalBlock +import de.bixilon.minosoft.data.registries.blocks.types.redstone.ComparatorBlock +import de.bixilon.minosoft.data.registries.blocks.types.redstone.RepeaterBlock +import de.bixilon.minosoft.data.registries.blocks.types.wall.LeverBlock +import de.bixilon.minosoft.data.registries.items.Item +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.TintColorCalculator import de.bixilon.minosoft.gui.rendering.chunk.models.renderable.BlockLikeRenderer diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/BrewingStandBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/BrewingStandBlock.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/BrewingStandBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/BrewingStandBlock.kt index 68b28f807..da4d31f21 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/BrewingStandBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/BrewingStandBlock.kt @@ -11,12 +11,12 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types +package de.bixilon.minosoft.data.registries.blocks.types import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.fire.SmokeParticle import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY import de.bixilon.minosoft.gui.rendering.util.VecUtil.horizontal diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/CampfireBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/CampfireBlock.kt similarity index 92% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/CampfireBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/CampfireBlock.kt index 46970359e..4f28f40cb 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/CampfireBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/CampfireBlock.kt @@ -11,17 +11,17 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types +package de.bixilon.minosoft.data.registries.blocks.types import com.google.gson.JsonObject import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.BlockUsages -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties -import de.bixilon.minosoft.data.mappings.items.tools.ShovelItem -import de.bixilon.minosoft.data.mappings.versions.Registries import de.bixilon.minosoft.data.player.Hands +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockUsages +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.items.tools.ShovelItem +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.input.camera.RaycastHit import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.campfire.CampfireSmokeParticle import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.fire.SmokeParticle diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/DoorBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/DoorBlock.kt similarity index 79% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/DoorBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/DoorBlock.kt index 3cc7ee278..0526bbe5e 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/DoorBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/DoorBlock.kt @@ -11,17 +11,17 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types +package de.bixilon.minosoft.data.registries.blocks.types import com.google.gson.JsonObject import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.BlockUsages -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties -import de.bixilon.minosoft.data.mappings.materials.DefaultMaterials -import de.bixilon.minosoft.data.mappings.versions.Registries import de.bixilon.minosoft.data.player.Hands +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockUsages +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.materials.DefaultMaterials +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.input.camera.RaycastHit import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/DoubleSizeBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/DoubleSizeBlock.kt similarity index 85% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/DoubleSizeBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/DoubleSizeBlock.kt index 8f3a23e10..385eff419 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/DoubleSizeBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/DoubleSizeBlock.kt @@ -11,16 +11,16 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types +package de.bixilon.minosoft.data.registries.blocks.types import com.google.gson.JsonObject import de.bixilon.minosoft.data.Directions import de.bixilon.minosoft.data.entities.block.BlockEntity -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties -import de.bixilon.minosoft.data.mappings.blocks.properties.Halves -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.blocks.properties.Halves +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.util.VecUtil.plus import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/EnderChestBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/EnderChestBlock.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/EnderChestBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/EnderChestBlock.kt index 6ace478bc..ec1e25205 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/EnderChestBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/EnderChestBlock.kt @@ -11,12 +11,12 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types +package de.bixilon.minosoft.data.registries.blocks.types import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.PortalParticle import de.bixilon.minosoft.gui.rendering.util.VecUtil.toVec3d import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/FluidBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/FluidBlock.kt similarity index 86% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/FluidBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/FluidBlock.kt index 98ca2c5f2..b82f63498 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/FluidBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/FluidBlock.kt @@ -11,12 +11,12 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types +package de.bixilon.minosoft.data.registries.blocks.types import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.fluid.Fluid -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.fluid.Fluid +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.chunk.models.renderable.BlockLikeRenderer import de.bixilon.minosoft.gui.rendering.chunk.models.renderable.FluidRenderer diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/HorizontalFacingBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/HorizontalFacingBlock.kt similarity index 52% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/HorizontalFacingBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/HorizontalFacingBlock.kt index 60e384396..b68368f63 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/HorizontalFacingBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/HorizontalFacingBlock.kt @@ -1,7 +1,7 @@ -package de.bixilon.minosoft.data.mappings.blocks.types +package de.bixilon.minosoft.data.registries.blocks.types import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.versions.Registries abstract class HorizontalFacingBlock(resourceLocation: ResourceLocation, registries: Registries, data: JsonObject) : Block(resourceLocation, registries, data) diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/NoteBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/NoteBlock.kt similarity index 82% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/NoteBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/NoteBlock.kt index 683764809..35c82ecf2 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/NoteBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/NoteBlock.kt @@ -11,15 +11,15 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types +package de.bixilon.minosoft.data.registries.blocks.types import com.google.gson.JsonObject import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.BlockUsages -import de.bixilon.minosoft.data.mappings.versions.Registries import de.bixilon.minosoft.data.player.Hands +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockUsages +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.input.camera.RaycastHit import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/RedstoneTorchBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/RedstoneTorchBlock.kt similarity index 83% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/RedstoneTorchBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/RedstoneTorchBlock.kt index 1517801c1..de2282b4d 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/RedstoneTorchBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/RedstoneTorchBlock.kt @@ -11,13 +11,13 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types +package de.bixilon.minosoft.data.registries.blocks.types import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY import de.bixilon.minosoft.gui.rendering.util.VecUtil.of import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/SlimeBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/SlimeBlock.kt similarity index 86% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/SlimeBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/SlimeBlock.kt index 3b9567a85..e0b78864a 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/SlimeBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/SlimeBlock.kt @@ -11,13 +11,13 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types +package de.bixilon.minosoft.data.registries.blocks.types import com.google.gson.JsonObject import de.bixilon.minosoft.data.entities.entities.Entity -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/TorchBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/TorchBlock.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/TorchBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/TorchBlock.kt index 4f401d0ee..ffe42641b 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/TorchBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/TorchBlock.kt @@ -11,12 +11,12 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types +package de.bixilon.minosoft.data.registries.blocks.types import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.fire.SmokeParticle import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.slowing.FlameParticle import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/portal/NetherPortalBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/portal/NetherPortalBlock.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/portal/NetherPortalBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/portal/NetherPortalBlock.kt index 503bf8af8..013c44d0a 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/portal/NetherPortalBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/portal/NetherPortalBlock.kt @@ -11,14 +11,14 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types.portal +package de.bixilon.minosoft.data.registries.blocks.types.portal import com.google.gson.JsonObject import de.bixilon.minosoft.data.Directions -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.types.Block -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.types.Block +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.PortalParticle import de.bixilon.minosoft.gui.rendering.util.VecUtil.of import de.bixilon.minosoft.gui.rendering.util.VecUtil.plus diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/redstone/ComparatorBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/redstone/ComparatorBlock.kt similarity index 73% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/redstone/ComparatorBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/redstone/ComparatorBlock.kt index 8381ca7c8..fc416df11 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/redstone/ComparatorBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/redstone/ComparatorBlock.kt @@ -11,21 +11,21 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types.redstone +package de.bixilon.minosoft.data.registries.blocks.types.redstone import com.google.gson.JsonObject import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.BlockUsages -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties -import de.bixilon.minosoft.data.mappings.versions.Registries import de.bixilon.minosoft.data.player.Hands +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockUsages +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.input.camera.RaycastHit import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3i -open class ComparatorBlock(resourceLocation: ResourceLocation, mappings: Registries, data: JsonObject) : RedstoneGateBlock(resourceLocation, mappings, data) { +open class ComparatorBlock(resourceLocation: ResourceLocation, registries: Registries, data: JsonObject) : RedstoneGateBlock(resourceLocation, registries, data) { override fun getPlacementState(connection: PlayConnection, raycastHit: RaycastHit): BlockState? { TODO() diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/redstone/RedstoneGateBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/redstone/RedstoneGateBlock.kt similarity index 70% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/redstone/RedstoneGateBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/redstone/RedstoneGateBlock.kt index 47fcc0e3d..eb62d13a8 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/redstone/RedstoneGateBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/redstone/RedstoneGateBlock.kt @@ -11,11 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types.redstone +package de.bixilon.minosoft.data.registries.blocks.types.redstone import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.types.HorizontalFacingBlock -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.types.HorizontalFacingBlock +import de.bixilon.minosoft.data.registries.versions.Registries -abstract class RedstoneGateBlock(resourceLocation: ResourceLocation, mappings: Registries, data: JsonObject) : HorizontalFacingBlock(resourceLocation, mappings, data) +abstract class RedstoneGateBlock(resourceLocation: ResourceLocation, registries: Registries, data: JsonObject) : HorizontalFacingBlock(resourceLocation, registries, data) diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/redstone/RepeaterBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/redstone/RepeaterBlock.kt similarity index 73% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/redstone/RepeaterBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/redstone/RepeaterBlock.kt index ceb476c33..2bdfd7f04 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/redstone/RepeaterBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/redstone/RepeaterBlock.kt @@ -11,21 +11,21 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types.redstone +package de.bixilon.minosoft.data.registries.blocks.types.redstone import com.google.gson.JsonObject import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.BlockUsages -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties -import de.bixilon.minosoft.data.mappings.versions.Registries import de.bixilon.minosoft.data.player.Hands +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockUsages +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.input.camera.RaycastHit import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3i -open class RepeaterBlock(resourceLocation: ResourceLocation, mappings: Registries, data: JsonObject) : RedstoneGateBlock(resourceLocation, mappings, data) { +open class RepeaterBlock(resourceLocation: ResourceLocation, registries: Registries, data: JsonObject) : RedstoneGateBlock(resourceLocation, registries, data) { override fun getPlacementState(connection: PlayConnection, raycastHit: RaycastHit): BlockState? { TODO() diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/wall/LeverBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wall/LeverBlock.kt similarity index 87% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/wall/LeverBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wall/LeverBlock.kt index 4a1ef3b2f..298d3edb7 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/wall/LeverBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wall/LeverBlock.kt @@ -11,18 +11,18 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types.wall +package de.bixilon.minosoft.data.registries.blocks.types.wall import com.google.gson.JsonObject import de.bixilon.minosoft.data.Directions import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.BlockUsages -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties -import de.bixilon.minosoft.data.mappings.particle.data.DustParticleData -import de.bixilon.minosoft.data.mappings.versions.Registries import de.bixilon.minosoft.data.player.Hands +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockUsages +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.particle.data.DustParticleData +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.data.text.Colors import de.bixilon.minosoft.gui.rendering.input.camera.RaycastHit import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.dust.DustParticle diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/wall/WallMountedBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wall/WallMountedBlock.kt similarity index 69% rename from src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/wall/WallMountedBlock.kt rename to src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wall/WallMountedBlock.kt index 4db6ef574..994ed44d4 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/types/wall/WallMountedBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wall/WallMountedBlock.kt @@ -11,18 +11,18 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.blocks.types.wall +package de.bixilon.minosoft.data.registries.blocks.types.wall import com.google.gson.JsonObject import de.bixilon.minosoft.data.Directions -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.properties.Attachments -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties -import de.bixilon.minosoft.data.mappings.blocks.types.Block -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.properties.Attachments +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.blocks.types.Block +import de.bixilon.minosoft.data.registries.versions.Registries -abstract class WallMountedBlock(resourceLocation: ResourceLocation, mappings: Registries, data: JsonObject) : Block(resourceLocation, mappings, data) { +abstract class WallMountedBlock(resourceLocation: ResourceLocation, registries: Registries, data: JsonObject) : Block(resourceLocation, registries, data) { fun getRealFacing(blockState: BlockState): Directions { return when (blockState.properties[BlockProperties.FACE]) { diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/effects/DefaultStatusEffects.kt b/src/main/java/de/bixilon/minosoft/data/registries/effects/DefaultStatusEffects.kt similarity index 96% rename from src/main/java/de/bixilon/minosoft/data/mappings/effects/DefaultStatusEffects.kt rename to src/main/java/de/bixilon/minosoft/data/registries/effects/DefaultStatusEffects.kt index ffec07e27..458d929af 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/effects/DefaultStatusEffects.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/effects/DefaultStatusEffects.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.effects +package de.bixilon.minosoft.data.registries.effects import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/effects/StatusEffect.kt b/src/main/java/de/bixilon/minosoft/data/registries/effects/StatusEffect.kt similarity index 84% rename from src/main/java/de/bixilon/minosoft/data/mappings/effects/StatusEffect.kt rename to src/main/java/de/bixilon/minosoft/data/registries/effects/StatusEffect.kt index f6e1c8636..fbb38a30a 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/effects/StatusEffect.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/effects/StatusEffect.kt @@ -10,15 +10,15 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.effects +package de.bixilon.minosoft.data.registries.effects import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.effects.attributes.StatusEffectAttribute -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.registry.Translatable -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.effects.attributes.StatusEffectAttribute +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.registry.Translatable +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.data.text.RGBColor.Companion.asRGBColor import de.bixilon.minosoft.datafixer.EntityAttributeFixer.fix diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/effects/StatusEffectCategories.kt b/src/main/java/de/bixilon/minosoft/data/registries/effects/StatusEffectCategories.kt similarity index 95% rename from src/main/java/de/bixilon/minosoft/data/mappings/effects/StatusEffectCategories.kt rename to src/main/java/de/bixilon/minosoft/data/registries/effects/StatusEffectCategories.kt index 83f15fcdb..f43bb3a9a 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/effects/StatusEffectCategories.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/effects/StatusEffectCategories.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.effects +package de.bixilon.minosoft.data.registries.effects import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/effects/attributes/DefaultStatusEffectAttributeNames.kt b/src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/DefaultStatusEffectAttributeNames.kt similarity index 95% rename from src/main/java/de/bixilon/minosoft/data/mappings/effects/attributes/DefaultStatusEffectAttributeNames.kt rename to src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/DefaultStatusEffectAttributeNames.kt index 716f3ddee..ada3a9961 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/effects/attributes/DefaultStatusEffectAttributeNames.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/DefaultStatusEffectAttributeNames.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.effects.attributes +package de.bixilon.minosoft.data.registries.effects.attributes import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/effects/attributes/DefaultStatusEffectAttributes.kt b/src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/DefaultStatusEffectAttributes.kt similarity index 94% rename from src/main/java/de/bixilon/minosoft/data/mappings/effects/attributes/DefaultStatusEffectAttributes.kt rename to src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/DefaultStatusEffectAttributes.kt index 42c0375b6..16fd14077 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/effects/attributes/DefaultStatusEffectAttributes.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/DefaultStatusEffectAttributes.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.effects.attributes +package de.bixilon.minosoft.data.registries.effects.attributes import de.bixilon.minosoft.util.KUtil.asUUID diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/effects/attributes/StatusEffectAttribute.kt b/src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/StatusEffectAttribute.kt similarity index 95% rename from src/main/java/de/bixilon/minosoft/data/mappings/effects/attributes/StatusEffectAttribute.kt rename to src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/StatusEffectAttribute.kt index 2cac6f1c6..e1f5e5161 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/effects/attributes/StatusEffectAttribute.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/StatusEffectAttribute.kt @@ -10,7 +10,7 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.effects.attributes +package de.bixilon.minosoft.data.registries.effects.attributes import com.google.gson.JsonObject import de.bixilon.minosoft.util.Util diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/effects/attributes/StatusEffectAttributeInstance.kt b/src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/StatusEffectAttributeInstance.kt similarity index 93% rename from src/main/java/de/bixilon/minosoft/data/mappings/effects/attributes/StatusEffectAttributeInstance.kt rename to src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/StatusEffectAttributeInstance.kt index d81a25566..335a9a5b4 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/effects/attributes/StatusEffectAttributeInstance.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/StatusEffectAttributeInstance.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.effects.attributes +package de.bixilon.minosoft.data.registries.effects.attributes class StatusEffectAttributeInstance( val statusEffectAttribute: StatusEffectAttribute, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/effects/attributes/StatusEffectOperations.kt b/src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/StatusEffectOperations.kt similarity index 94% rename from src/main/java/de/bixilon/minosoft/data/mappings/effects/attributes/StatusEffectOperations.kt rename to src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/StatusEffectOperations.kt index 6c6ac480c..7f0f74076 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/effects/attributes/StatusEffectOperations.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/effects/attributes/StatusEffectOperations.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.effects.attributes +package de.bixilon.minosoft.data.registries.effects.attributes import de.bixilon.minosoft.util.KUtil import de.bixilon.minosoft.util.enum.ValuesEnum diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/enchantment/DefaultEnchantments.kt b/src/main/java/de/bixilon/minosoft/data/registries/enchantment/DefaultEnchantments.kt similarity index 94% rename from src/main/java/de/bixilon/minosoft/data/mappings/enchantment/DefaultEnchantments.kt rename to src/main/java/de/bixilon/minosoft/data/registries/enchantment/DefaultEnchantments.kt index a4147abd9..a15b09c3e 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/enchantment/DefaultEnchantments.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/enchantment/DefaultEnchantments.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.enchantment +package de.bixilon.minosoft.data.registries.enchantment import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/enchantment/Enchantment.kt b/src/main/java/de/bixilon/minosoft/data/registries/enchantment/Enchantment.kt similarity index 79% rename from src/main/java/de/bixilon/minosoft/data/mappings/enchantment/Enchantment.kt rename to src/main/java/de/bixilon/minosoft/data/registries/enchantment/Enchantment.kt index 6a3859616..f61864b2f 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/enchantment/Enchantment.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/enchantment/Enchantment.kt @@ -10,13 +10,13 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.enchantment +package de.bixilon.minosoft.data.registries.enchantment import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries data class Enchantment( override val resourceLocation: ResourceLocation, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/entities/EntityFactory.kt b/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityFactory.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/mappings/entities/EntityFactory.kt rename to src/main/java/de/bixilon/minosoft/data/registries/entities/EntityFactory.kt index ed3653a58..5f03154bd 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/entities/EntityFactory.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityFactory.kt @@ -11,13 +11,13 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.entities +package de.bixilon.minosoft.data.registries.entities import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.entities.meta.EntityMetaData -import de.bixilon.minosoft.data.mappings.CompanionResourceLocation -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.CompanionResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/entities/EntityType.kt b/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityType.kt similarity index 90% rename from src/main/java/de/bixilon/minosoft/data/mappings/entities/EntityType.kt rename to src/main/java/de/bixilon/minosoft/data/registries/entities/EntityType.kt index 9d4124df2..c856e9f00 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/entities/EntityType.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityType.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.entities +package de.bixilon.minosoft.data.registries.entities import com.google.gson.JsonObject import de.bixilon.minosoft.data.DefaultEntityFactories @@ -19,11 +19,11 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.entities.meta.EntityMetaData -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.registry.Translatable -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.registry.Translatable +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.datafixer.EntityAttributeFixer.fix import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/entities/villagers/VillagerProfession.kt b/src/main/java/de/bixilon/minosoft/data/registries/entities/villagers/VillagerProfession.kt similarity index 80% rename from src/main/java/de/bixilon/minosoft/data/mappings/entities/villagers/VillagerProfession.kt rename to src/main/java/de/bixilon/minosoft/data/registries/entities/villagers/VillagerProfession.kt index 05ecf076c..6f522efc4 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/entities/villagers/VillagerProfession.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/entities/villagers/VillagerProfession.kt @@ -11,13 +11,13 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.entities.villagers +package de.bixilon.minosoft.data.registries.entities.villagers import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries data class VillagerProfession( override val resourceLocation: ResourceLocation, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/fluid/Fluid.kt b/src/main/java/de/bixilon/minosoft/data/registries/fluid/Fluid.kt similarity index 81% rename from src/main/java/de/bixilon/minosoft/data/mappings/fluid/Fluid.kt rename to src/main/java/de/bixilon/minosoft/data/registries/fluid/Fluid.kt index e4ebd5f60..08fa2171a 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/fluid/Fluid.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/fluid/Fluid.kt @@ -10,15 +10,15 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.fluid +package de.bixilon.minosoft.data.registries.fluid import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.items.Item -import de.bixilon.minosoft.data.mappings.particle.ParticleType -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.items.Item +import de.bixilon.minosoft.data.registries.particle.ParticleType +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries data class Fluid( override val resourceLocation: ResourceLocation, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/inventory/CreativeModeTab.kt b/src/main/java/de/bixilon/minosoft/data/registries/inventory/CreativeModeTab.kt similarity index 80% rename from src/main/java/de/bixilon/minosoft/data/mappings/inventory/CreativeModeTab.kt rename to src/main/java/de/bixilon/minosoft/data/registries/inventory/CreativeModeTab.kt index 30297b1a3..cd184c01b 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/inventory/CreativeModeTab.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/inventory/CreativeModeTab.kt @@ -10,12 +10,12 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.inventory +package de.bixilon.minosoft.data.registries.inventory import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.registry.IdDeserializer -import de.bixilon.minosoft.data.mappings.registry.RegistryFakeEnumerable -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.registry.IdDeserializer +import de.bixilon.minosoft.data.registries.registry.RegistryFakeEnumerable +import de.bixilon.minosoft.data.registries.versions.Registries data class CreativeModeTab( override val name: String, @@ -27,7 +27,7 @@ data class CreativeModeTab( companion object : IdDeserializer { - override fun deserialize(mappings: Registries, data: JsonObject): CreativeModeTab { + override fun deserialize(registries: Registries, data: JsonObject): CreativeModeTab { return CreativeModeTab( name = data["language_id"].asString, recipeFolderName = data["recipe_folder_name"].asString, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/BlockItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/BlockItem.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/BlockItem.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/BlockItem.kt index 4ade0a6a8..36f834456 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/BlockItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/BlockItem.kt @@ -11,17 +11,17 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items +package de.bixilon.minosoft.data.registries.items import com.google.gson.JsonObject import de.bixilon.minosoft.data.abilities.Gamemodes import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.BlockUsages -import de.bixilon.minosoft.data.mappings.blocks.types.Block -import de.bixilon.minosoft.data.mappings.versions.Registries import de.bixilon.minosoft.data.player.Hands +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockUsages +import de.bixilon.minosoft.data.registries.blocks.types.Block +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.input.camera.RaycastHit import de.bixilon.minosoft.gui.rendering.util.VecUtil.plus import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/BucketItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/BucketItem.kt similarity index 85% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/BucketItem.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/BucketItem.kt index fc291eb4f..2f2b828b5 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/BucketItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/BucketItem.kt @@ -11,11 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items +package de.bixilon.minosoft.data.registries.items import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.versions.Registries open class BucketItem( diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/DefaultItems.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/DefaultItems.kt similarity index 94% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/DefaultItems.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/DefaultItems.kt index 854881dc6..a3f3aab9f 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/DefaultItems.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/DefaultItems.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items +package de.bixilon.minosoft.data.registries.items import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/DyeItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/DyeItem.kt similarity index 85% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/DyeItem.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/DyeItem.kt index 22da9eda4..534394d76 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/DyeItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/DyeItem.kt @@ -11,11 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items +package de.bixilon.minosoft.data.registries.items import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.versions.Registries open class DyeItem( resourceLocation: ResourceLocation, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/Item.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/Item.kt similarity index 83% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/Item.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/Item.kt index c6d7aa141..c4fc38152 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/Item.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/Item.kt @@ -10,23 +10,23 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items +package de.bixilon.minosoft.data.registries.items import com.google.gson.JsonObject import de.bixilon.minosoft.data.Rarities import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.BlockUsages -import de.bixilon.minosoft.data.mappings.inventory.CreativeModeTab -import de.bixilon.minosoft.data.mappings.items.armor.ArmorItem -import de.bixilon.minosoft.data.mappings.items.armor.HorseArmorItem -import de.bixilon.minosoft.data.mappings.items.tools.* -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.registry.Translatable -import de.bixilon.minosoft.data.mappings.versions.Registries import de.bixilon.minosoft.data.player.Hands +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockUsages +import de.bixilon.minosoft.data.registries.inventory.CreativeModeTab +import de.bixilon.minosoft.data.registries.items.armor.ArmorItem +import de.bixilon.minosoft.data.registries.items.armor.HorseArmorItem +import de.bixilon.minosoft.data.registries.items.tools.* +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.registry.Translatable +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.input.camera.RaycastHit import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/ItemRegistry.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/ItemRegistry.kt similarity index 73% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/ItemRegistry.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/ItemRegistry.kt index d866ae8cc..fb63c72f0 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/ItemRegistry.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/ItemRegistry.kt @@ -11,13 +11,13 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items +package de.bixilon.minosoft.data.registries.items import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.registry.Registry -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.registry.Registry +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries class ItemRegistry( parentRegistry: Registry? = null, @@ -43,8 +43,8 @@ class ItemRegistry( } } - override fun initialize(data: Map?, mappings: Registries?, deserializer: ResourceLocationDeserializer, flattened: Boolean, metaType: MetaTypes, alternative: Registry?): Registry { + override fun initialize(data: Map?, registries: Registries?, deserializer: ResourceLocationDeserializer, flattened: Boolean, metaType: MetaTypes, alternative: Registry?): Registry { this.flattened = flattened - return super.initialize(data, mappings, deserializer, flattened, metaType, alternative) + return super.initialize(data, registries, deserializer, flattened, metaType, alternative) } } diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/MusicDiscItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/MusicDiscItem.kt similarity index 86% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/MusicDiscItem.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/MusicDiscItem.kt index 00c953e9f..e6587dda6 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/MusicDiscItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/MusicDiscItem.kt @@ -11,11 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items +package de.bixilon.minosoft.data.registries.items import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.versions.Registries open class MusicDiscItem( resourceLocation: ResourceLocation, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/SpawnEggItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/SpawnEggItem.kt similarity index 88% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/SpawnEggItem.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/SpawnEggItem.kt index 11b9c2e9a..3043e9800 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/SpawnEggItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/SpawnEggItem.kt @@ -11,11 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items +package de.bixilon.minosoft.data.registries.items import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.data.text.RGBColor.Companion.asRGBColor open class SpawnEggItem( diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/armor/ArmorItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/armor/ArmorItem.kt similarity index 84% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/armor/ArmorItem.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/armor/ArmorItem.kt index 557a8f4b8..8a971ceab 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/armor/ArmorItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/armor/ArmorItem.kt @@ -11,13 +11,13 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items.armor +package de.bixilon.minosoft.data.registries.items.armor import com.google.gson.JsonObject import de.bixilon.minosoft.data.inventory.InventorySlots -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.items.Item -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.items.Item +import de.bixilon.minosoft.data.registries.versions.Registries open class ArmorItem( resourceLocation: ResourceLocation, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/armor/HorseArmorItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/armor/HorseArmorItem.kt similarity index 82% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/armor/HorseArmorItem.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/armor/HorseArmorItem.kt index 1022d06a4..91d086405 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/armor/HorseArmorItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/armor/HorseArmorItem.kt @@ -11,12 +11,12 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items.armor +package de.bixilon.minosoft.data.registries.items.armor import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.items.Item -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.items.Item +import de.bixilon.minosoft.data.registries.versions.Registries open class HorseArmorItem( resourceLocation: ResourceLocation, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/tools/AxeItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/tools/AxeItem.kt similarity index 86% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/tools/AxeItem.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/tools/AxeItem.kt index 7edb33eeb..3ef633d02 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/tools/AxeItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/tools/AxeItem.kt @@ -11,17 +11,17 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items.tools +package de.bixilon.minosoft.data.registries.items.tools import com.google.gson.JsonObject import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.BlockUsages -import de.bixilon.minosoft.data.mappings.blocks.types.Block -import de.bixilon.minosoft.data.mappings.versions.Registries import de.bixilon.minosoft.data.player.Hands +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockUsages +import de.bixilon.minosoft.data.registries.blocks.types.Block +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.input.camera.RaycastHit import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/tools/HoeItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/tools/HoeItem.kt similarity index 87% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/tools/HoeItem.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/tools/HoeItem.kt index 422f462f0..e84da6183 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/tools/HoeItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/tools/HoeItem.kt @@ -11,18 +11,18 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items.tools +package de.bixilon.minosoft.data.registries.items.tools import com.google.gson.JsonObject import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.data.Directions import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.BlockUsages -import de.bixilon.minosoft.data.mappings.blocks.types.Block -import de.bixilon.minosoft.data.mappings.versions.Registries import de.bixilon.minosoft.data.player.Hands +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockUsages +import de.bixilon.minosoft.data.registries.blocks.types.Block +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.input.camera.RaycastHit import de.bixilon.minosoft.gui.rendering.util.VecUtil.plus import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/tools/MiningToolItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/tools/MiningToolItem.kt similarity index 90% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/tools/MiningToolItem.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/tools/MiningToolItem.kt index 7ed8a8c64..f0c0a1d20 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/tools/MiningToolItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/tools/MiningToolItem.kt @@ -11,15 +11,15 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items.tools +package de.bixilon.minosoft.data.registries.items.tools import com.google.gson.JsonObject import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.BlockUsages -import de.bixilon.minosoft.data.mappings.blocks.types.Block -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockUsages +import de.bixilon.minosoft.data.registries.blocks.types.Block +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.play.TagsS2CP import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/tools/PickaxeItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/tools/PickaxeItem.kt similarity index 87% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/tools/PickaxeItem.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/tools/PickaxeItem.kt index 6db86761d..56fffe384 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/tools/PickaxeItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/tools/PickaxeItem.kt @@ -11,11 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items.tools +package de.bixilon.minosoft.data.registries.items.tools import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.util.KUtil.asResourceLocation open class PickaxeItem( diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/tools/ShovelItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/tools/ShovelItem.kt similarity index 87% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/tools/ShovelItem.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/tools/ShovelItem.kt index a33803c33..54ce7871a 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/tools/ShovelItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/tools/ShovelItem.kt @@ -11,18 +11,18 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items.tools +package de.bixilon.minosoft.data.registries.items.tools import com.google.gson.JsonObject import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.data.Directions import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.BlockUsages -import de.bixilon.minosoft.data.mappings.blocks.types.Block -import de.bixilon.minosoft.data.mappings.versions.Registries import de.bixilon.minosoft.data.player.Hands +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockUsages +import de.bixilon.minosoft.data.registries.blocks.types.Block +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.input.camera.RaycastHit import de.bixilon.minosoft.gui.rendering.util.VecUtil.plus import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/tools/SwordItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/tools/SwordItem.kt similarity index 83% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/tools/SwordItem.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/tools/SwordItem.kt index 0fdd85517..48cb5d06c 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/tools/SwordItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/tools/SwordItem.kt @@ -11,14 +11,14 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items.tools +package de.bixilon.minosoft.data.registries.items.tools import com.google.gson.JsonObject import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.DefaultBlocks -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.DefaultBlocks +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/items/tools/ToolItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/tools/ToolItem.kt similarity index 84% rename from src/main/java/de/bixilon/minosoft/data/mappings/items/tools/ToolItem.kt rename to src/main/java/de/bixilon/minosoft/data/registries/items/tools/ToolItem.kt index 0d857cfeb..6ac6c0d32 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/items/tools/ToolItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/items/tools/ToolItem.kt @@ -11,12 +11,12 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.items.tools +package de.bixilon.minosoft.data.registries.items.tools import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.items.Item -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.items.Item +import de.bixilon.minosoft.data.registries.versions.Registries open class ToolItem( diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/materials/DefaultMaterials.kt b/src/main/java/de/bixilon/minosoft/data/registries/materials/DefaultMaterials.kt similarity index 94% rename from src/main/java/de/bixilon/minosoft/data/mappings/materials/DefaultMaterials.kt rename to src/main/java/de/bixilon/minosoft/data/registries/materials/DefaultMaterials.kt index 1624a0b1c..13ca6b4df 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/materials/DefaultMaterials.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/materials/DefaultMaterials.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.materials +package de.bixilon.minosoft.data.registries.materials import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/materials/Material.kt b/src/main/java/de/bixilon/minosoft/data/registries/materials/Material.kt similarity index 88% rename from src/main/java/de/bixilon/minosoft/data/mappings/materials/Material.kt rename to src/main/java/de/bixilon/minosoft/data/registries/materials/Material.kt index c10d61052..8e1adbc03 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/materials/Material.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/materials/Material.kt @@ -10,13 +10,13 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.materials +package de.bixilon.minosoft.data.registries.materials import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.TintColorCalculator import java.util.* diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/materials/PushReactions.kt b/src/main/java/de/bixilon/minosoft/data/registries/materials/PushReactions.kt similarity index 93% rename from src/main/java/de/bixilon/minosoft/data/mappings/materials/PushReactions.kt rename to src/main/java/de/bixilon/minosoft/data/registries/materials/PushReactions.kt index bd0ea1074..a2ec037cb 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/materials/PushReactions.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/materials/PushReactions.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.materials +package de.bixilon.minosoft.data.registries.materials enum class PushReactions { NORMAL, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/other/containers/Container.kt b/src/main/java/de/bixilon/minosoft/data/registries/other/containers/Container.kt similarity index 96% rename from src/main/java/de/bixilon/minosoft/data/mappings/other/containers/Container.kt rename to src/main/java/de/bixilon/minosoft/data/registries/other/containers/Container.kt index dca5f14fa..1ba1164aa 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/other/containers/Container.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/other/containers/Container.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.other.containers +package de.bixilon.minosoft.data.registries.other.containers import de.bixilon.minosoft.data.inventory.ItemStack import de.bixilon.minosoft.data.text.ChatComponent diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/other/containers/ContainerType.kt b/src/main/java/de/bixilon/minosoft/data/registries/other/containers/ContainerType.kt similarity index 79% rename from src/main/java/de/bixilon/minosoft/data/mappings/other/containers/ContainerType.kt rename to src/main/java/de/bixilon/minosoft/data/registries/other/containers/ContainerType.kt index 33a20e75a..765b1350a 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/other/containers/ContainerType.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/other/containers/ContainerType.kt @@ -10,13 +10,13 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.other.containers +package de.bixilon.minosoft.data.registries.other.containers import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries data class ContainerType( override val resourceLocation: ResourceLocation, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/other/containers/PlayerInventory.kt b/src/main/java/de/bixilon/minosoft/data/registries/other/containers/PlayerInventory.kt similarity index 95% rename from src/main/java/de/bixilon/minosoft/data/mappings/other/containers/PlayerInventory.kt rename to src/main/java/de/bixilon/minosoft/data/registries/other/containers/PlayerInventory.kt index 1ed0ce92c..b773c1901 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/other/containers/PlayerInventory.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/other/containers/PlayerInventory.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.other.containers +package de.bixilon.minosoft.data.registries.other.containers import de.bixilon.minosoft.data.inventory.ItemStack import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/other/game/event/DefaultGameEventHandlers.kt b/src/main/java/de/bixilon/minosoft/data/registries/other/game/event/DefaultGameEventHandlers.kt similarity index 74% rename from src/main/java/de/bixilon/minosoft/data/mappings/other/game/event/DefaultGameEventHandlers.kt rename to src/main/java/de/bixilon/minosoft/data/registries/other/game/event/DefaultGameEventHandlers.kt index 03de5e046..1cfe82e5c 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/other/game/event/DefaultGameEventHandlers.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/other/game/event/DefaultGameEventHandlers.kt @@ -11,11 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.other.game.event +package de.bixilon.minosoft.data.registries.other.game.event -import de.bixilon.minosoft.data.mappings.DefaultFactory -import de.bixilon.minosoft.data.mappings.other.game.event.handlers.GameEventHandler -import de.bixilon.minosoft.data.mappings.other.game.event.handlers.GameMoveChangeGameEventHandler +import de.bixilon.minosoft.data.registries.DefaultFactory +import de.bixilon.minosoft.data.registries.other.game.event.handlers.GameEventHandler +import de.bixilon.minosoft.data.registries.other.game.event.handlers.GameMoveChangeGameEventHandler object DefaultGameEventHandlers : DefaultFactory( GameMoveChangeGameEventHandler diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/other/game/event/GameEvent.kt b/src/main/java/de/bixilon/minosoft/data/registries/other/game/event/GameEvent.kt similarity index 79% rename from src/main/java/de/bixilon/minosoft/data/mappings/other/game/event/GameEvent.kt rename to src/main/java/de/bixilon/minosoft/data/registries/other/game/event/GameEvent.kt index 3bfe9f680..d014f6413 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/other/game/event/GameEvent.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/other/game/event/GameEvent.kt @@ -10,13 +10,13 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.other.game.event +package de.bixilon.minosoft.data.registries.other.game.event import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries data class GameEvent( override val resourceLocation: ResourceLocation, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/other/game/event/handlers/GameEventHandler.kt b/src/main/java/de/bixilon/minosoft/data/registries/other/game/event/handlers/GameEventHandler.kt similarity index 87% rename from src/main/java/de/bixilon/minosoft/data/mappings/other/game/event/handlers/GameEventHandler.kt rename to src/main/java/de/bixilon/minosoft/data/registries/other/game/event/handlers/GameEventHandler.kt index 13af6cef8..c240b519a 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/other/game/event/handlers/GameEventHandler.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/other/game/event/handlers/GameEventHandler.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.other.game.event.handlers +package de.bixilon.minosoft.data.registries.other.game.event.handlers -import de.bixilon.minosoft.data.mappings.CompanionResourceLocation +import de.bixilon.minosoft.data.registries.CompanionResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection interface GameEventHandler : CompanionResourceLocation { diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/other/game/event/handlers/GameMoveChangeGameEventHandler.kt b/src/main/java/de/bixilon/minosoft/data/registries/other/game/event/handlers/GameMoveChangeGameEventHandler.kt similarity index 90% rename from src/main/java/de/bixilon/minosoft/data/mappings/other/game/event/handlers/GameMoveChangeGameEventHandler.kt rename to src/main/java/de/bixilon/minosoft/data/registries/other/game/event/handlers/GameMoveChangeGameEventHandler.kt index e83c81971..a3554862e 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/other/game/event/handlers/GameMoveChangeGameEventHandler.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/other/game/event/handlers/GameMoveChangeGameEventHandler.kt @@ -11,10 +11,10 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.other.game.event.handlers +package de.bixilon.minosoft.data.registries.other.game.event.handlers import de.bixilon.minosoft.data.abilities.Gamemodes -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/particle/ParticleType.kt b/src/main/java/de/bixilon/minosoft/data/registries/particle/ParticleType.kt similarity index 86% rename from src/main/java/de/bixilon/minosoft/data/mappings/particle/ParticleType.kt rename to src/main/java/de/bixilon/minosoft/data/registries/particle/ParticleType.kt index f454b5809..df9b37c4b 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/particle/ParticleType.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/particle/ParticleType.kt @@ -10,14 +10,14 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.particle +package de.bixilon.minosoft.data.registries.particle import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.gui.rendering.particle.DefaultParticleFactory import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.gui.rendering.particle.types.Particle diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/particle/data/BlockParticleData.kt b/src/main/java/de/bixilon/minosoft/data/registries/particle/data/BlockParticleData.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/mappings/particle/data/BlockParticleData.kt rename to src/main/java/de/bixilon/minosoft/data/registries/particle/data/BlockParticleData.kt index c36909c64..b7d15af23 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/particle/data/BlockParticleData.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/particle/data/BlockParticleData.kt @@ -10,10 +10,10 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.particle.data +package de.bixilon.minosoft.data.registries.particle.data -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.particle.ParticleType +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.particle.ParticleType import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.protocol.protocol.ProtocolVersions diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/particle/data/DustParticleData.kt b/src/main/java/de/bixilon/minosoft/data/registries/particle/data/DustParticleData.kt similarity index 91% rename from src/main/java/de/bixilon/minosoft/data/mappings/particle/data/DustParticleData.kt rename to src/main/java/de/bixilon/minosoft/data/registries/particle/data/DustParticleData.kt index 7e21424b5..5e7922137 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/particle/data/DustParticleData.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/particle/data/DustParticleData.kt @@ -10,9 +10,9 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.particle.data +package de.bixilon.minosoft.data.registries.particle.data -import de.bixilon.minosoft.data.mappings.particle.ParticleType +import de.bixilon.minosoft.data.registries.particle.ParticleType import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/particle/data/ItemParticleData.kt b/src/main/java/de/bixilon/minosoft/data/registries/particle/data/ItemParticleData.kt similarity index 93% rename from src/main/java/de/bixilon/minosoft/data/mappings/particle/data/ItemParticleData.kt rename to src/main/java/de/bixilon/minosoft/data/registries/particle/data/ItemParticleData.kt index 2e14bf64f..a616215d3 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/particle/data/ItemParticleData.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/particle/data/ItemParticleData.kt @@ -10,10 +10,10 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.particle.data +package de.bixilon.minosoft.data.registries.particle.data import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.particle.ParticleType +import de.bixilon.minosoft.data.registries.particle.ParticleType import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.protocol.protocol.ProtocolVersions diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/particle/data/ParticleData.kt b/src/main/java/de/bixilon/minosoft/data/registries/particle/data/ParticleData.kt similarity index 88% rename from src/main/java/de/bixilon/minosoft/data/mappings/particle/data/ParticleData.kt rename to src/main/java/de/bixilon/minosoft/data/registries/particle/data/ParticleData.kt index 408e69126..52e1c7508 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/particle/data/ParticleData.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/particle/data/ParticleData.kt @@ -10,9 +10,9 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.particle.data +package de.bixilon.minosoft.data.registries.particle.data -import de.bixilon.minosoft.data.mappings.particle.ParticleType +import de.bixilon.minosoft.data.registries.particle.ParticleType open class ParticleData(val type: ParticleType) { diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/particle/data/ParticleDataFactory.kt b/src/main/java/de/bixilon/minosoft/data/registries/particle/data/ParticleDataFactory.kt similarity index 88% rename from src/main/java/de/bixilon/minosoft/data/mappings/particle/data/ParticleDataFactory.kt rename to src/main/java/de/bixilon/minosoft/data/registries/particle/data/ParticleDataFactory.kt index 1c66f0777..2c37dbb25 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/particle/data/ParticleDataFactory.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/particle/data/ParticleDataFactory.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.particle.data +package de.bixilon.minosoft.data.registries.particle.data -import de.bixilon.minosoft.data.mappings.particle.ParticleType +import de.bixilon.minosoft.data.registries.particle.ParticleType import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer interface ParticleDataFactory { diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/recipes/Ingredient.kt b/src/main/java/de/bixilon/minosoft/data/registries/recipes/Ingredient.kt similarity index 95% rename from src/main/java/de/bixilon/minosoft/data/mappings/recipes/Ingredient.kt rename to src/main/java/de/bixilon/minosoft/data/registries/recipes/Ingredient.kt index 3530aefc8..cc259d9cd 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/recipes/Ingredient.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/recipes/Ingredient.kt @@ -10,7 +10,7 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.recipes +package de.bixilon.minosoft.data.registries.recipes import de.bixilon.minosoft.data.inventory.ItemStack diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/recipes/Recipe.java b/src/main/java/de/bixilon/minosoft/data/registries/recipes/Recipe.java similarity index 98% rename from src/main/java/de/bixilon/minosoft/data/mappings/recipes/Recipe.java rename to src/main/java/de/bixilon/minosoft/data/registries/recipes/Recipe.java index 9cf3d66f6..47456f484 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/recipes/Recipe.java +++ b/src/main/java/de/bixilon/minosoft/data/registries/recipes/Recipe.java @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.recipes; +package de.bixilon.minosoft.data.registries.recipes; import de.bixilon.minosoft.data.inventory.ItemStack; diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/recipes/RecipeTypes.java b/src/main/java/de/bixilon/minosoft/data/registries/recipes/RecipeTypes.java similarity index 97% rename from src/main/java/de/bixilon/minosoft/data/mappings/recipes/RecipeTypes.java rename to src/main/java/de/bixilon/minosoft/data/registries/recipes/RecipeTypes.java index 5677ab621..8f6b4f16d 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/recipes/RecipeTypes.java +++ b/src/main/java/de/bixilon/minosoft/data/registries/recipes/RecipeTypes.java @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.recipes; +package de.bixilon.minosoft.data.registries.recipes; public enum RecipeTypes { SHAPELESS("crafting_shapeless"), diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/recipes/Recipes.java b/src/main/java/de/bixilon/minosoft/data/registries/recipes/Recipes.java similarity index 95% rename from src/main/java/de/bixilon/minosoft/data/mappings/recipes/Recipes.java rename to src/main/java/de/bixilon/minosoft/data/registries/recipes/Recipes.java index 92ed05ef9..ad438efde 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/recipes/Recipes.java +++ b/src/main/java/de/bixilon/minosoft/data/registries/recipes/Recipes.java @@ -11,11 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.recipes; +package de.bixilon.minosoft.data.registries.recipes; import com.google.common.collect.HashBiMap; import de.bixilon.minosoft.data.inventory.ItemStack; -import de.bixilon.minosoft.data.mappings.ResourceLocation; +import de.bixilon.minosoft.data.registries.ResourceLocation; import java.util.Arrays; import java.util.HashSet; diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/registry/EnumRegistry.kt b/src/main/java/de/bixilon/minosoft/data/registries/registry/EnumRegistry.kt similarity index 98% rename from src/main/java/de/bixilon/minosoft/data/mappings/registry/EnumRegistry.kt rename to src/main/java/de/bixilon/minosoft/data/registries/registry/EnumRegistry.kt index f3ce2e65d..aec442591 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/registry/EnumRegistry.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/registry/EnumRegistry.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.registry +package de.bixilon.minosoft.data.registries.registry import com.google.gson.JsonArray import com.google.gson.JsonElement diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/registry/FakeEnumRegistry.kt b/src/main/java/de/bixilon/minosoft/data/registries/registry/FakeEnumRegistry.kt similarity index 88% rename from src/main/java/de/bixilon/minosoft/data/mappings/registry/FakeEnumRegistry.kt rename to src/main/java/de/bixilon/minosoft/data/registries/registry/FakeEnumRegistry.kt index 118d47476..10098e268 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/registry/FakeEnumRegistry.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/registry/FakeEnumRegistry.kt @@ -11,10 +11,10 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.registry +package de.bixilon.minosoft.data.registries.registry import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.util.collections.Clearable class FakeEnumRegistry( @@ -42,7 +42,7 @@ class FakeEnumRegistry( this.parentRegistry = parent } - fun initialize(data: JsonObject?, mappings: Registries, deserializer: IdDeserializer): FakeEnumRegistry { + fun initialize(data: JsonObject?, registries: Registries, deserializer: IdDeserializer): FakeEnumRegistry { check(!initialized) { "Already initialized" } if (data == null) { @@ -53,7 +53,7 @@ class FakeEnumRegistry( check(value is JsonObject) var itemId = id.toInt() - val item = deserializer.deserialize(mappings, value) + val item = deserializer.deserialize(registries, value) value["id"]?.asInt?.let { providedItemId -> itemId = providedItemId } diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/registry/IdDeserializer.kt b/src/main/java/de/bixilon/minosoft/data/registries/registry/IdDeserializer.kt similarity index 82% rename from src/main/java/de/bixilon/minosoft/data/mappings/registry/IdDeserializer.kt rename to src/main/java/de/bixilon/minosoft/data/registries/registry/IdDeserializer.kt index b11649fb1..372f1ed0d 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/registry/IdDeserializer.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/registry/IdDeserializer.kt @@ -11,11 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.registry +package de.bixilon.minosoft.data.registries.registry import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.versions.Registries interface IdDeserializer { - fun deserialize(mappings: Registries, data: JsonObject): T + fun deserialize(registries: Registries, data: JsonObject): T } diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/registry/Parentable.kt b/src/main/java/de/bixilon/minosoft/data/registries/registry/Parentable.kt similarity index 94% rename from src/main/java/de/bixilon/minosoft/data/mappings/registry/Parentable.kt rename to src/main/java/de/bixilon/minosoft/data/registries/registry/Parentable.kt index eaf9328af..ebfdf1b48 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/registry/Parentable.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/registry/Parentable.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.registry +package de.bixilon.minosoft.data.registries.registry interface Parentable { diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/registry/PerVersionEnumRegistry.kt b/src/main/java/de/bixilon/minosoft/data/registries/registry/PerVersionEnumRegistry.kt similarity index 93% rename from src/main/java/de/bixilon/minosoft/data/mappings/registry/PerVersionEnumRegistry.kt rename to src/main/java/de/bixilon/minosoft/data/registries/registry/PerVersionEnumRegistry.kt index a9957549e..fcdab8466 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/registry/PerVersionEnumRegistry.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/registry/PerVersionEnumRegistry.kt @@ -11,10 +11,10 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.registry +package de.bixilon.minosoft.data.registries.registry import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.versions.Version +import de.bixilon.minosoft.data.registries.versions.Version import de.bixilon.minosoft.util.enum.ValuesEnum import java.util.* diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/registry/PerVersionRegistry.kt b/src/main/java/de/bixilon/minosoft/data/registries/registry/PerVersionRegistry.kt similarity index 94% rename from src/main/java/de/bixilon/minosoft/data/mappings/registry/PerVersionRegistry.kt rename to src/main/java/de/bixilon/minosoft/data/registries/registry/PerVersionRegistry.kt index de979908e..3e85e4526 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/registry/PerVersionRegistry.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/registry/PerVersionRegistry.kt @@ -11,10 +11,10 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.registry +package de.bixilon.minosoft.data.registries.registry import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.versions.Version +import de.bixilon.minosoft.data.registries.versions.Version import java.util.* class PerVersionRegistry { diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/registry/Registry.kt b/src/main/java/de/bixilon/minosoft/data/registries/registry/Registry.kt similarity index 86% rename from src/main/java/de/bixilon/minosoft/data/mappings/registry/Registry.kt rename to src/main/java/de/bixilon/minosoft/data/registries/registry/Registry.kt index eaf3eecc6..afec6e5bd 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/registry/Registry.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/registry/Registry.kt @@ -11,14 +11,14 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.registry +package de.bixilon.minosoft.data.registries.registry import com.google.gson.JsonElement import com.google.gson.JsonObject import com.google.gson.JsonPrimitive -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.ResourceLocationAble -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocationAble +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.util.KUtil.asResourceLocation import de.bixilon.minosoft.util.collections.Clearable import de.bixilon.minosoft.util.json.ResourceLocationJsonMap.toResourceLocationMap @@ -81,7 +81,7 @@ open class Registry( this.parentRegistry = parent } - open fun initialize(data: Map?, mappings: Registries?, deserializer: ResourceLocationDeserializer, flattened: Boolean = true, metaType: MetaTypes = MetaTypes.NONE, alternative: Registry? = null): Registry { + open fun initialize(data: Map?, registries: Registries?, deserializer: ResourceLocationDeserializer, flattened: Boolean = true, metaType: MetaTypes = MetaTypes.NONE, alternative: Registry? = null): Registry { check(!initialized) { "Already initialized" } if (data == null) { @@ -92,7 +92,7 @@ open class Registry( } for ((resourceLocation, value) in data) { - val item = deserializer.deserialize(mappings, resourceLocation, value) ?: continue + val item = deserializer.deserialize(registries, resourceLocation, value) ?: continue value["id"]?.asInt?.let { id -> var itemId = id if (!flattened) { @@ -122,8 +122,8 @@ open class Registry( return this } - open fun initialize(data: JsonObject?, mappings: Registries?, deserializer: ResourceLocationDeserializer, flattened: Boolean = true, metaType: MetaTypes = MetaTypes.NONE, alternative: Registry? = null): Registry { - return initialize(data?.toResourceLocationMap(), mappings, deserializer, flattened, metaType, alternative) + open fun initialize(data: JsonObject?, registries: Registries?, deserializer: ResourceLocationDeserializer, flattened: Boolean = true, metaType: MetaTypes = MetaTypes.NONE, alternative: Registry? = null): Registry { + return initialize(data?.toResourceLocationMap(), registries, deserializer, flattened, metaType, alternative) } diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/registry/RegistryFakeEnumerable.kt b/src/main/java/de/bixilon/minosoft/data/registries/registry/RegistryFakeEnumerable.kt similarity index 94% rename from src/main/java/de/bixilon/minosoft/data/mappings/registry/RegistryFakeEnumerable.kt rename to src/main/java/de/bixilon/minosoft/data/registries/registry/RegistryFakeEnumerable.kt index 9a346a50e..ae45565ed 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/registry/RegistryFakeEnumerable.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/registry/RegistryFakeEnumerable.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.registry +package de.bixilon.minosoft.data.registries.registry interface RegistryFakeEnumerable { val name: String diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/registry/RegistryItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/registry/RegistryItem.kt similarity index 82% rename from src/main/java/de/bixilon/minosoft/data/mappings/registry/RegistryItem.kt rename to src/main/java/de/bixilon/minosoft/data/registries/registry/RegistryItem.kt index 7bfadefbb..0c4cd0f6d 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/registry/RegistryItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/registry/RegistryItem.kt @@ -11,10 +11,10 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.registry +package de.bixilon.minosoft.data.registries.registry -import de.bixilon.minosoft.data.mappings.ResourceLocationAble -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocationAble +import de.bixilon.minosoft.data.registries.versions.Registries interface RegistryItem : ResourceLocationAble { diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/registry/ResourceLocationDeserializer.kt b/src/main/java/de/bixilon/minosoft/data/registries/registry/ResourceLocationDeserializer.kt similarity index 84% rename from src/main/java/de/bixilon/minosoft/data/mappings/registry/ResourceLocationDeserializer.kt rename to src/main/java/de/bixilon/minosoft/data/registries/registry/ResourceLocationDeserializer.kt index 9294596bd..4a9be21d3 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/registry/ResourceLocationDeserializer.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/registry/ResourceLocationDeserializer.kt @@ -11,11 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.registry +package de.bixilon.minosoft.data.registries.registry import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.versions.Registries interface ResourceLocationDeserializer { fun deserialize(registries: Registries?, resourceLocation: ResourceLocation, data: JsonObject): T? diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/registry/Translatable.kt b/src/main/java/de/bixilon/minosoft/data/registries/registry/Translatable.kt similarity index 94% rename from src/main/java/de/bixilon/minosoft/data/mappings/registry/Translatable.kt rename to src/main/java/de/bixilon/minosoft/data/registries/registry/Translatable.kt index de5346f3a..383f7e0df 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/registry/Translatable.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/registry/Translatable.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.registry +package de.bixilon.minosoft.data.registries.registry interface Translatable { val translationKey: String? diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/sounds/SoundEvent.kt b/src/main/java/de/bixilon/minosoft/data/registries/sounds/SoundEvent.kt similarity index 79% rename from src/main/java/de/bixilon/minosoft/data/mappings/sounds/SoundEvent.kt rename to src/main/java/de/bixilon/minosoft/data/registries/sounds/SoundEvent.kt index cd437ad62..fddfb4187 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/sounds/SoundEvent.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/sounds/SoundEvent.kt @@ -10,13 +10,13 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.sounds +package de.bixilon.minosoft.data.registries.sounds import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.ResourceLocationDeserializer -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.ResourceLocationDeserializer +import de.bixilon.minosoft.data.registries.versions.Registries data class SoundEvent( override val resourceLocation: ResourceLocation, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/statistics/Statistic.kt b/src/main/java/de/bixilon/minosoft/data/registries/statistics/Statistic.kt similarity index 81% rename from src/main/java/de/bixilon/minosoft/data/mappings/statistics/Statistic.kt rename to src/main/java/de/bixilon/minosoft/data/registries/statistics/Statistic.kt index 6a26f85c6..397b56cc3 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/statistics/Statistic.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/statistics/Statistic.kt @@ -10,11 +10,11 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.statistics +package de.bixilon.minosoft.data.registries.statistics -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.registry.RegistryItem -import de.bixilon.minosoft.data.mappings.registry.Translatable +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.registry.RegistryItem +import de.bixilon.minosoft.data.registries.registry.Translatable data class Statistic( override val resourceLocation: ResourceLocation, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/statistics/StatisticUnits.kt b/src/main/java/de/bixilon/minosoft/data/registries/statistics/StatisticUnits.kt similarity index 93% rename from src/main/java/de/bixilon/minosoft/data/mappings/statistics/StatisticUnits.kt rename to src/main/java/de/bixilon/minosoft/data/registries/statistics/StatisticUnits.kt index 9b7bfd90e..bcb4732d1 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/statistics/StatisticUnits.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/statistics/StatisticUnits.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.statistics +package de.bixilon.minosoft.data.registries.statistics enum class StatisticUnits { BLOCK, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/statistics/SubStatistic.kt b/src/main/java/de/bixilon/minosoft/data/registries/statistics/SubStatistic.kt similarity index 88% rename from src/main/java/de/bixilon/minosoft/data/mappings/statistics/SubStatistic.kt rename to src/main/java/de/bixilon/minosoft/data/registries/statistics/SubStatistic.kt index a70e506df..53391697c 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/statistics/SubStatistic.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/statistics/SubStatistic.kt @@ -11,9 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.statistics +package de.bixilon.minosoft.data.registries.statistics -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation data class SubStatistic( val resourceLocation: ResourceLocation, diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/tweaker/TweakBlocks.kt b/src/main/java/de/bixilon/minosoft/data/registries/tweaker/TweakBlocks.kt similarity index 81% rename from src/main/java/de/bixilon/minosoft/data/mappings/tweaker/TweakBlocks.kt rename to src/main/java/de/bixilon/minosoft/data/registries/tweaker/TweakBlocks.kt index 13cee6c58..af7f45178 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/tweaker/TweakBlocks.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/tweaker/TweakBlocks.kt @@ -10,11 +10,11 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.tweaker +package de.bixilon.minosoft.data.registries.tweaker -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.WannabeBlockState -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.WannabeBlockState +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties object TweakBlocks { val GRASS_BLOCK_SNOWY_YES = WannabeBlockState(ResourceLocation("grass"), mapOf(BlockProperties.SNOWY to true)) diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/tweaker/VersionTweaker.kt b/src/main/java/de/bixilon/minosoft/data/registries/tweaker/VersionTweaker.kt similarity index 97% rename from src/main/java/de/bixilon/minosoft/data/mappings/tweaker/VersionTweaker.kt rename to src/main/java/de/bixilon/minosoft/data/registries/tweaker/VersionTweaker.kt index 0ff7d1880..a3af8f62a 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/tweaker/VersionTweaker.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/tweaker/VersionTweaker.kt @@ -10,7 +10,7 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.tweaker +package de.bixilon.minosoft.data.registries.tweaker import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.entities.Entity @@ -18,7 +18,7 @@ import de.bixilon.minosoft.data.entities.entities.animal.horse.* import de.bixilon.minosoft.data.entities.entities.monster.* import de.bixilon.minosoft.data.entities.entities.vehicle.* import de.bixilon.minosoft.data.entities.meta.EntityMetaData -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.data.world.ChunkSection import de.bixilon.minosoft.data.world.ChunkSection.Companion.indexPosition import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/versions/Registries.kt b/src/main/java/de/bixilon/minosoft/data/registries/versions/Registries.kt similarity index 88% rename from src/main/java/de/bixilon/minosoft/data/mappings/versions/Registries.kt rename to src/main/java/de/bixilon/minosoft/data/registries/versions/Registries.kt index 4416f21cd..021989b67 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/versions/Registries.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/versions/Registries.kt @@ -10,7 +10,7 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.versions +package de.bixilon.minosoft.data.registries.versions import com.google.gson.JsonArray import com.google.gson.JsonElement @@ -19,32 +19,32 @@ import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.block.BlockEntityMetaType import de.bixilon.minosoft.data.entities.meta.EntityMetaData import de.bixilon.minosoft.data.inventory.InventorySlots -import de.bixilon.minosoft.data.mappings.DefaultRegistries -import de.bixilon.minosoft.data.mappings.Dimension -import de.bixilon.minosoft.data.mappings.Motive -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.biomes.Biome -import de.bixilon.minosoft.data.mappings.biomes.BiomeCategory -import de.bixilon.minosoft.data.mappings.biomes.BiomePrecipitation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.entites.BlockEntityType -import de.bixilon.minosoft.data.mappings.blocks.entites.BlockEntityTypeRegistry -import de.bixilon.minosoft.data.mappings.blocks.types.Block -import de.bixilon.minosoft.data.mappings.effects.StatusEffect -import de.bixilon.minosoft.data.mappings.enchantment.Enchantment -import de.bixilon.minosoft.data.mappings.entities.EntityType -import de.bixilon.minosoft.data.mappings.entities.villagers.VillagerProfession -import de.bixilon.minosoft.data.mappings.fluid.Fluid -import de.bixilon.minosoft.data.mappings.inventory.CreativeModeTab -import de.bixilon.minosoft.data.mappings.items.Item -import de.bixilon.minosoft.data.mappings.items.ItemRegistry -import de.bixilon.minosoft.data.mappings.materials.Material -import de.bixilon.minosoft.data.mappings.other.containers.ContainerType -import de.bixilon.minosoft.data.mappings.other.game.event.GameEvent -import de.bixilon.minosoft.data.mappings.particle.ParticleType -import de.bixilon.minosoft.data.mappings.registry.* -import de.bixilon.minosoft.data.mappings.sounds.SoundEvent -import de.bixilon.minosoft.data.mappings.statistics.Statistic +import de.bixilon.minosoft.data.registries.DefaultRegistries +import de.bixilon.minosoft.data.registries.Dimension +import de.bixilon.minosoft.data.registries.Motive +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.biomes.Biome +import de.bixilon.minosoft.data.registries.biomes.BiomeCategory +import de.bixilon.minosoft.data.registries.biomes.BiomePrecipitation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.entites.BlockEntityType +import de.bixilon.minosoft.data.registries.blocks.entites.BlockEntityTypeRegistry +import de.bixilon.minosoft.data.registries.blocks.types.Block +import de.bixilon.minosoft.data.registries.effects.StatusEffect +import de.bixilon.minosoft.data.registries.enchantment.Enchantment +import de.bixilon.minosoft.data.registries.entities.EntityType +import de.bixilon.minosoft.data.registries.entities.villagers.VillagerProfession +import de.bixilon.minosoft.data.registries.fluid.Fluid +import de.bixilon.minosoft.data.registries.inventory.CreativeModeTab +import de.bixilon.minosoft.data.registries.items.Item +import de.bixilon.minosoft.data.registries.items.ItemRegistry +import de.bixilon.minosoft.data.registries.materials.Material +import de.bixilon.minosoft.data.registries.other.containers.ContainerType +import de.bixilon.minosoft.data.registries.other.game.event.GameEvent +import de.bixilon.minosoft.data.registries.particle.ParticleType +import de.bixilon.minosoft.data.registries.registry.* +import de.bixilon.minosoft.data.registries.sounds.SoundEvent +import de.bixilon.minosoft.data.registries.statistics.Statistic import de.bixilon.minosoft.gui.rendering.chunk.VoxelShape import de.bixilon.minosoft.gui.rendering.chunk.models.AABB import de.bixilon.minosoft.gui.rendering.chunk.models.loading.BlockModel diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/versions/Version.kt b/src/main/java/de/bixilon/minosoft/data/registries/versions/Version.kt similarity index 94% rename from src/main/java/de/bixilon/minosoft/data/mappings/versions/Version.kt rename to src/main/java/de/bixilon/minosoft/data/registries/versions/Version.kt index e8c7d5b2f..d2b0ecad5 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/versions/Version.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/versions/Version.kt @@ -10,7 +10,7 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.versions +package de.bixilon.minosoft.data.registries.versions import com.google.common.collect.HashBiMap import com.google.gson.JsonObject @@ -84,7 +84,7 @@ data class Version( } } latch.inc() - Log.log(LogMessageType.VERSION_LOADING, level = LogLevels.INFO) { "Loading mappings for $this..." } + Log.log(LogMessageType.VERSION_LOADING, level = LogLevels.INFO) { "Loading registries for $this..." } initializeAssetManger(latch) val startTime = System.currentTimeMillis() @@ -111,9 +111,9 @@ data class Version( registries.load(this, pixlyzerData) latch.dec() if (pixlyzerData.size() > 0) { - Log.log(LogMessageType.VERSION_LOADING, level = LogLevels.INFO) { "Loaded mappings for $this (${versionName} in ${System.currentTimeMillis() - startTime}ms" } + Log.log(LogMessageType.VERSION_LOADING, level = LogLevels.INFO) { "Loaded registries for $this (${versionName} in ${System.currentTimeMillis() - startTime}ms" } } else { - Log.log(LogMessageType.VERSION_LOADING, level = LogLevels.WARN) { "Could not load mappings for $this (${versionName}. Some features might not work." } + Log.log(LogMessageType.VERSION_LOADING, level = LogLevels.WARN) { "Could not load registries for $this (${versionName}. Some features might not work." } } isLoaded = true latch.dec() diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/versions/Versions.java b/src/main/java/de/bixilon/minosoft/data/registries/versions/Versions.java similarity index 98% rename from src/main/java/de/bixilon/minosoft/data/mappings/versions/Versions.java rename to src/main/java/de/bixilon/minosoft/data/registries/versions/Versions.java index dc5acdca7..791533005 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/versions/Versions.java +++ b/src/main/java/de/bixilon/minosoft/data/registries/versions/Versions.java @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.mappings.versions; +package de.bixilon.minosoft.data.registries.versions; import com.google.common.collect.HashBiMap; import com.google.gson.JsonElement; diff --git a/src/main/java/de/bixilon/minosoft/data/tags/DefaultBlockTags.kt b/src/main/java/de/bixilon/minosoft/data/tags/DefaultBlockTags.kt index c4820d496..e8239fb53 100644 --- a/src/main/java/de/bixilon/minosoft/data/tags/DefaultBlockTags.kt +++ b/src/main/java/de/bixilon/minosoft/data/tags/DefaultBlockTags.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.tags -import de.bixilon.minosoft.data.mappings.blocks.DefaultBlocks +import de.bixilon.minosoft.data.registries.blocks.DefaultBlocks object DefaultBlockTags { val CLIMBABLE = setOf(DefaultBlocks.LADDER, DefaultBlocks.VINE, DefaultBlocks.SCAFFOLDING, DefaultBlocks.WEEPING_VINES, DefaultBlocks.WEEPING_VINES_PLANT, DefaultBlocks.TWISTING_VINES, DefaultBlocks.WEEPING_VINES_PLANT, DefaultBlocks.CAVE_VINES, DefaultBlocks.CAVE_VINES_PLANT) diff --git a/src/main/java/de/bixilon/minosoft/data/text/events/data/EntityHoverData.kt b/src/main/java/de/bixilon/minosoft/data/text/events/data/EntityHoverData.kt index ecc7cedb8..3a127048a 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/events/data/EntityHoverData.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/events/data/EntityHoverData.kt @@ -16,7 +16,7 @@ import com.google.gson.JsonElement import com.google.gson.JsonObject import com.google.gson.JsonParser import com.google.gson.JsonPrimitive -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.util.KUtil.asResourceLocation import de.bixilon.minosoft.util.KUtil.asUUID diff --git a/src/main/java/de/bixilon/minosoft/data/world/Chunk.kt b/src/main/java/de/bixilon/minosoft/data/world/Chunk.kt index 09d30562a..ec086b04d 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/Chunk.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/Chunk.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world import de.bixilon.minosoft.data.entities.block.BlockEntity -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.data.world.biome.source.BiomeSource import de.bixilon.minosoft.data.world.light.LightAccessor import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/data/world/ChunkSection.kt b/src/main/java/de/bixilon/minosoft/data/world/ChunkSection.kt index e8a5ec299..4e050115f 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/ChunkSection.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/ChunkSection.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world import de.bixilon.minosoft.data.entities.block.BlockEntity -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.data.world.block.entities.ArrayBlockEntityProvider import de.bixilon.minosoft.data.world.block.entities.BlockEntityProvider import de.bixilon.minosoft.data.world.block.entities.MapBlockEntityProvider diff --git a/src/main/java/de/bixilon/minosoft/data/world/World.kt b/src/main/java/de/bixilon/minosoft/data/world/World.kt index 512ff4762..0e9ca1a82 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/World.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/World.kt @@ -14,12 +14,12 @@ package de.bixilon.minosoft.data.world import de.bixilon.minosoft.data.Difficulties import de.bixilon.minosoft.data.entities.block.BlockEntity -import de.bixilon.minosoft.data.mappings.Dimension -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.biomes.Biome -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.sounds.SoundEvent -import de.bixilon.minosoft.data.mappings.tweaker.VersionTweaker +import de.bixilon.minosoft.data.registries.Dimension +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.biomes.Biome +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.sounds.SoundEvent +import de.bixilon.minosoft.data.registries.tweaker.VersionTweaker import de.bixilon.minosoft.data.world.biome.accessor.BiomeAccessor import de.bixilon.minosoft.data.world.biome.accessor.NullBiomeAccessor import de.bixilon.minosoft.data.world.light.WorldLightAccessor diff --git a/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/BiomeAccessor.kt b/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/BiomeAccessor.kt index a9284be8b..eb5162792 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/BiomeAccessor.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/BiomeAccessor.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.biome.accessor -import de.bixilon.minosoft.data.mappings.biomes.Biome +import de.bixilon.minosoft.data.registries.biomes.Biome import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/BlockBiomeAccessor.kt b/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/BlockBiomeAccessor.kt index a086537e5..b0bf4ed34 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/BlockBiomeAccessor.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/BlockBiomeAccessor.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.biome.accessor -import de.bixilon.minosoft.data.mappings.biomes.Biome +import de.bixilon.minosoft.data.registries.biomes.Biome import de.bixilon.minosoft.data.world.World import de.bixilon.minosoft.gui.rendering.util.VecUtil.chunkPosition diff --git a/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/NoiseBiomeAccessor.kt b/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/NoiseBiomeAccessor.kt index 7b99151c5..0b76c9b64 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/NoiseBiomeAccessor.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/NoiseBiomeAccessor.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.biome.accessor -import de.bixilon.minosoft.data.mappings.biomes.Biome +import de.bixilon.minosoft.data.registries.biomes.Biome import de.bixilon.minosoft.data.world.World import de.bixilon.minosoft.data.world.biome.noise.FuzzyNoiseBiomeCalculator diff --git a/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/NullBiomeAccessor.kt b/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/NullBiomeAccessor.kt index 4a6da40af..0eac7ffc7 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/NullBiomeAccessor.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/NullBiomeAccessor.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.biome.accessor -import de.bixilon.minosoft.data.mappings.biomes.Biome +import de.bixilon.minosoft.data.registries.biomes.Biome import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/data/world/biome/noise/FuzzyNoiseBiomeCalculator.kt b/src/main/java/de/bixilon/minosoft/data/world/biome/noise/FuzzyNoiseBiomeCalculator.kt index 3250fb504..c9ac7260d 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/biome/noise/FuzzyNoiseBiomeCalculator.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/biome/noise/FuzzyNoiseBiomeCalculator.kt @@ -1,6 +1,6 @@ package de.bixilon.minosoft.data.world.biome.noise -import de.bixilon.minosoft.data.mappings.biomes.Biome +import de.bixilon.minosoft.data.registries.biomes.Biome import de.bixilon.minosoft.data.world.World import de.bixilon.minosoft.util.MMath.square diff --git a/src/main/java/de/bixilon/minosoft/data/world/biome/source/BiomeSource.kt b/src/main/java/de/bixilon/minosoft/data/world/biome/source/BiomeSource.kt index 57c2412be..7af40e9eb 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/biome/source/BiomeSource.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/biome/source/BiomeSource.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.biome.source -import de.bixilon.minosoft.data.mappings.biomes.Biome +import de.bixilon.minosoft.data.registries.biomes.Biome import glm_.vec3.Vec3i interface BiomeSource { diff --git a/src/main/java/de/bixilon/minosoft/data/world/biome/source/DummyBiomeSource.kt b/src/main/java/de/bixilon/minosoft/data/world/biome/source/DummyBiomeSource.kt index 2fea2814f..bebcf79a7 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/biome/source/DummyBiomeSource.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/biome/source/DummyBiomeSource.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.biome.source -import de.bixilon.minosoft.data.mappings.biomes.Biome +import de.bixilon.minosoft.data.registries.biomes.Biome import glm_.vec3.Vec3i class DummyBiomeSource(private val biome: Biome) : BiomeSource { diff --git a/src/main/java/de/bixilon/minosoft/data/world/biome/source/SpatialBiomeArray.kt b/src/main/java/de/bixilon/minosoft/data/world/biome/source/SpatialBiomeArray.kt index 04d6e1ea0..546868faf 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/biome/source/SpatialBiomeArray.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/biome/source/SpatialBiomeArray.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.biome.source -import de.bixilon.minosoft.data.mappings.biomes.Biome +import de.bixilon.minosoft.data.registries.biomes.Biome import de.bixilon.minosoft.util.MMath import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/data/world/biome/source/XZBiomeArray.kt b/src/main/java/de/bixilon/minosoft/data/world/biome/source/XZBiomeArray.kt index f05b3917c..588ed8817 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/biome/source/XZBiomeArray.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/biome/source/XZBiomeArray.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.biome.source -import de.bixilon.minosoft.data.mappings.biomes.Biome +import de.bixilon.minosoft.data.registries.biomes.Biome import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/data/world/palette/DirectPalette.kt b/src/main/java/de/bixilon/minosoft/data/world/palette/DirectPalette.kt index b1c09b216..9770d1d18 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/palette/DirectPalette.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/palette/DirectPalette.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.world.palette -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.protocol.protocol.ProtocolVersions diff --git a/src/main/java/de/bixilon/minosoft/data/world/palette/IndirectPalette.kt b/src/main/java/de/bixilon/minosoft/data/world/palette/IndirectPalette.kt index 25df91b63..1a4f257e7 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/palette/IndirectPalette.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/palette/IndirectPalette.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.world.palette import de.bixilon.minosoft.config.StaticConfiguration -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition import de.bixilon.minosoft.util.logging.Log diff --git a/src/main/java/de/bixilon/minosoft/data/world/palette/Palette.kt b/src/main/java/de/bixilon/minosoft/data/world/palette/Palette.kt index 4899b8441..228161ce1 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/palette/Palette.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/palette/Palette.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.data.world.palette -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer interface Palette { diff --git a/src/main/java/de/bixilon/minosoft/datafixer/BlockEntityFixer.kt b/src/main/java/de/bixilon/minosoft/datafixer/BlockEntityFixer.kt index 6170f94c7..5c1bf8249 100644 --- a/src/main/java/de/bixilon/minosoft/datafixer/BlockEntityFixer.kt +++ b/src/main/java/de/bixilon/minosoft/datafixer/BlockEntityFixer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.datafixer -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.datafixer.DataFixerUtil.asResourceLocationMap object BlockEntityFixer { diff --git a/src/main/java/de/bixilon/minosoft/datafixer/DataFixerUtil.kt b/src/main/java/de/bixilon/minosoft/datafixer/DataFixerUtil.kt index b0fe81ab1..6f5193bed 100644 --- a/src/main/java/de/bixilon/minosoft/datafixer/DataFixerUtil.kt +++ b/src/main/java/de/bixilon/minosoft/datafixer/DataFixerUtil.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.datafixer -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation object DataFixerUtil { fun Map.asResourceLocationMap(): Map { diff --git a/src/main/java/de/bixilon/minosoft/datafixer/EntityAttributeFixer.kt b/src/main/java/de/bixilon/minosoft/datafixer/EntityAttributeFixer.kt index 1ebaa7b42..b0a3acb34 100644 --- a/src/main/java/de/bixilon/minosoft/datafixer/EntityAttributeFixer.kt +++ b/src/main/java/de/bixilon/minosoft/datafixer/EntityAttributeFixer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.datafixer -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.datafixer.DataFixerUtil.asResourceLocationMap object EntityAttributeFixer { diff --git a/src/main/java/de/bixilon/minosoft/generator/JarHashGenerator.java b/src/main/java/de/bixilon/minosoft/generator/JarHashGenerator.java index 247e44e3e..c5f235987 100644 --- a/src/main/java/de/bixilon/minosoft/generator/JarHashGenerator.java +++ b/src/main/java/de/bixilon/minosoft/generator/JarHashGenerator.java @@ -20,7 +20,7 @@ import de.bixilon.minosoft.Minosoft; import de.bixilon.minosoft.config.Configuration; import de.bixilon.minosoft.data.assets.MinecraftAssetsManager; import de.bixilon.minosoft.data.assets.Resources; -import de.bixilon.minosoft.data.mappings.versions.Version; +import de.bixilon.minosoft.data.registries.versions.Version; import java.io.*; import java.util.Collections; diff --git a/src/main/java/de/bixilon/minosoft/gui/main/AccountWindow.java b/src/main/java/de/bixilon/minosoft/gui/main/AccountWindow.java index 93fd3d817..db5e68bb2 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/AccountWindow.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/AccountWindow.java @@ -18,7 +18,7 @@ import de.bixilon.minosoft.ShutdownReasons; import de.bixilon.minosoft.data.accounts.Account; import de.bixilon.minosoft.data.locale.LocaleManager; import de.bixilon.minosoft.data.locale.Strings; -import de.bixilon.minosoft.data.mappings.ResourceLocation; +import de.bixilon.minosoft.data.registries.ResourceLocation; import de.bixilon.minosoft.gui.main.cells.AccountListCell; import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition; import javafx.collections.FXCollections; diff --git a/src/main/java/de/bixilon/minosoft/gui/main/GUITools.java b/src/main/java/de/bixilon/minosoft/gui/main/GUITools.java index eb9028e6a..af634b206 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/GUITools.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/GUITools.java @@ -15,9 +15,9 @@ package de.bixilon.minosoft.gui.main; import com.jfoenix.controls.JFXComboBox; import de.bixilon.minosoft.Minosoft; -import de.bixilon.minosoft.data.mappings.ResourceLocation; -import de.bixilon.minosoft.data.mappings.versions.Version; -import de.bixilon.minosoft.data.mappings.versions.Versions; +import de.bixilon.minosoft.data.registries.ResourceLocation; +import de.bixilon.minosoft.data.registries.versions.Version; +import de.bixilon.minosoft.data.registries.versions.Versions; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXMLLoader; diff --git a/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java b/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java index daefd38e2..04d33c52d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java @@ -22,8 +22,8 @@ import de.bixilon.minosoft.ShutdownReasons; import de.bixilon.minosoft.data.accounts.Account; import de.bixilon.minosoft.data.locale.LocaleManager; import de.bixilon.minosoft.data.locale.Strings; -import de.bixilon.minosoft.data.mappings.ResourceLocation; -import de.bixilon.minosoft.data.mappings.versions.Versions; +import de.bixilon.minosoft.data.registries.ResourceLocation; +import de.bixilon.minosoft.data.registries.versions.Versions; import de.bixilon.minosoft.data.text.ChatComponent; import de.bixilon.minosoft.protocol.protocol.LANServerListener; import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition; diff --git a/src/main/java/de/bixilon/minosoft/gui/main/Server.java b/src/main/java/de/bixilon/minosoft/gui/main/Server.java index b590c8368..cc395b60b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/Server.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/Server.java @@ -15,7 +15,7 @@ package de.bixilon.minosoft.gui.main; import com.google.common.collect.Sets; import de.bixilon.minosoft.Minosoft; -import de.bixilon.minosoft.data.mappings.versions.Version; +import de.bixilon.minosoft.data.registries.versions.Version; import de.bixilon.minosoft.data.text.BaseComponent; import de.bixilon.minosoft.data.text.ChatComponent; import de.bixilon.minosoft.protocol.network.connection.PlayConnection; diff --git a/src/main/java/de/bixilon/minosoft/gui/main/ServerList.java b/src/main/java/de/bixilon/minosoft/gui/main/ServerList.java index 5d4aae200..ab601bdc1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/ServerList.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/ServerList.java @@ -17,8 +17,8 @@ import de.bixilon.minosoft.Minosoft; import de.bixilon.minosoft.ShutdownReasons; import de.bixilon.minosoft.data.locale.LocaleManager; import de.bixilon.minosoft.data.locale.Strings; -import de.bixilon.minosoft.data.mappings.ResourceLocation; -import de.bixilon.minosoft.data.mappings.versions.Version; +import de.bixilon.minosoft.data.registries.ResourceLocation; +import de.bixilon.minosoft.data.registries.versions.Version; import de.bixilon.minosoft.protocol.protocol.LANServerListener; import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition; import de.bixilon.minosoft.util.logging.Log; diff --git a/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.kt b/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.kt index 8388b097d..10be59b22 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.kt +++ b/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.kt @@ -15,10 +15,10 @@ package de.bixilon.minosoft.gui.main import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.data.locale.LocaleManager import de.bixilon.minosoft.data.locale.Strings -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.versions.Version -import de.bixilon.minosoft.data.mappings.versions.Versions import de.bixilon.minosoft.data.player.tab.PingBars +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.versions.Version +import de.bixilon.minosoft.data.registries.versions.Versions import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.modding.event.CallbackEventInvoker import de.bixilon.minosoft.modding.event.events.ConnectionStateChangeEvent diff --git a/src/main/java/de/bixilon/minosoft/gui/main/SessionListCell.kt b/src/main/java/de/bixilon/minosoft/gui/main/SessionListCell.kt index eaf3572a3..e30331875 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/SessionListCell.kt +++ b/src/main/java/de/bixilon/minosoft/gui/main/SessionListCell.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.gui.main import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.data.locale.LocaleManager import de.bixilon.minosoft.data.locale.Strings -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.modding.event.CallbackEventInvoker import de.bixilon.minosoft.modding.event.events.ConnectionStateChangeEvent import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/main/cells/AccountListCell.java b/src/main/java/de/bixilon/minosoft/gui/main/cells/AccountListCell.java index feff8866f..a70992910 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/cells/AccountListCell.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/cells/AccountListCell.java @@ -18,7 +18,7 @@ import de.bixilon.minosoft.Minosoft; import de.bixilon.minosoft.data.accounts.Account; import de.bixilon.minosoft.data.locale.LocaleManager; import de.bixilon.minosoft.data.locale.Strings; -import de.bixilon.minosoft.data.mappings.ResourceLocation; +import de.bixilon.minosoft.data.registries.ResourceLocation; import de.bixilon.minosoft.gui.main.GUITools; import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition; import de.bixilon.minosoft.util.logging.Log; diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderConstants.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderConstants.kt index 2269f7ba4..b4ae19899 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderConstants.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderConstants.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.data.text.RGBColor.Companion.asColor import de.bixilon.minosoft.data.text.RGBColor.Companion.asRGBColor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt index 671a1a8b7..52da4d945 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt @@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.config.StaticConfiguration import de.bixilon.minosoft.config.config.game.controls.KeyBindingsNames -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.gui.rendering.chunk.WorldRenderer import de.bixilon.minosoft.gui.rendering.chunk.block.outline.BlockOutlineRenderer import de.bixilon.minosoft.gui.rendering.entities.EntityHitBoxRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/RendererBuilder.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/RendererBuilder.kt index 24ab825a7..ec1d1f733 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/RendererBuilder.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/RendererBuilder.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering -import de.bixilon.minosoft.data.mappings.CompanionResourceLocation +import de.bixilon.minosoft.data.registries.CompanionResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection interface RendererBuilder : CompanionResourceLocation { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/ShaderManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/ShaderManager.kt index 0caa5be44..3fbc69add 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/ShaderManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/ShaderManager.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.gui.rendering.shader.Shader import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/TintColorCalculator.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/TintColorCalculator.kt index 05cacfe85..2df49885d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/TintColorCalculator.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/TintColorCalculator.kt @@ -16,9 +16,9 @@ package de.bixilon.minosoft.gui.rendering import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.config.StaticConfiguration import de.bixilon.minosoft.data.assets.AssetsManager -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.biomes.Biome -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.biomes.Biome +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.data.text.RGBColor.Companion.asRGBColor import de.bixilon.minosoft.data.world.World diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldRenderer.kt index d181a7b32..d7720abc9 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldRenderer.kt @@ -16,11 +16,11 @@ package de.bixilon.minosoft.gui.rendering.chunk import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.config.config.game.controls.KeyBindingsNames import de.bixilon.minosoft.data.Directions -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties -import de.bixilon.minosoft.data.mappings.blocks.types.FluidBlock -import de.bixilon.minosoft.data.mappings.versions.Registries +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.blocks.types.FluidBlock +import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.data.world.Chunk import de.bixilon.minosoft.data.world.ChunkSection import de.bixilon.minosoft.data.world.ChunkSection.Companion.indexPosition diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/block/outline/BlockOutlineRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/block/outline/BlockOutlineRenderer.kt index 51b529195..59e66af32 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/block/outline/BlockOutlineRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/block/outline/BlockOutlineRenderer.kt @@ -15,8 +15,8 @@ package de.bixilon.minosoft.gui.rendering.chunk.block.outline import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.data.abilities.Gamemodes -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.RenderWindow import de.bixilon.minosoft.gui.rendering.Renderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/BlockLikeRenderContext.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/BlockLikeRenderContext.kt index 8d35e0da3..1880e4dbc 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/BlockLikeRenderContext.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/BlockLikeRenderContext.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.chunk.models.renderable -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.data.world.World import de.bixilon.minosoft.data.world.light.LightAccessor import de.bixilon.minosoft.gui.rendering.RenderWindow diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/BlockLikeRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/BlockLikeRenderer.kt index 6a47d4277..6648bfd35 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/BlockLikeRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/BlockLikeRenderer.kt @@ -1,6 +1,6 @@ package de.bixilon.minosoft.gui.rendering.chunk.models.renderable -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.gui.rendering.chunk.models.FaceSize import de.bixilon.minosoft.gui.rendering.textures.Texture diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/BlockRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/BlockRenderer.kt index e31f171c5..63f9b145b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/BlockRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/BlockRenderer.kt @@ -16,8 +16,8 @@ package de.bixilon.minosoft.gui.rendering.chunk.models.renderable import com.google.common.collect.HashBiMap import com.google.gson.JsonObject import de.bixilon.minosoft.data.Directions -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.biomes.Biome +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.biomes.Biome import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.chunk.models.FaceSize diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/FluidRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/FluidRenderer.kt index 797a5e080..cdf79692e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/FluidRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/FluidRenderer.kt @@ -1,12 +1,12 @@ package de.bixilon.minosoft.gui.rendering.chunk.models.renderable import de.bixilon.minosoft.data.Directions -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.biomes.Biome -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.blocks.properties.BlockProperties -import de.bixilon.minosoft.data.mappings.blocks.types.Block -import de.bixilon.minosoft.data.mappings.fluid.Fluid +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.biomes.Biome +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties +import de.bixilon.minosoft.data.registries.blocks.types.Block +import de.bixilon.minosoft.data.registries.fluid.Fluid import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.data.world.World import de.bixilon.minosoft.gui.rendering.RenderConstants diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/MultipartRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/MultipartRenderer.kt index 578b76bfc..1e84d185a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/MultipartRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/MultipartRenderer.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.gui.rendering.chunk.models.renderable import de.bixilon.minosoft.data.Directions -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.gui.rendering.chunk.models.FaceSize import de.bixilon.minosoft.gui.rendering.textures.Texture diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/EntityHitBoxRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/EntityHitBoxRenderer.kt index 513f9d094..f458e719d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/EntityHitBoxRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/EntityHitBoxRenderer.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.gui.rendering.entities import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.data.entities.entities.Entity -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.gui.rendering.RenderWindow import de.bixilon.minosoft.gui.rendering.Renderer import de.bixilon.minosoft.gui.rendering.RendererBuilder diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/Font.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/Font.kt index d29047451..f16bba25f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/Font.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/Font.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.gui.rendering.font import de.bixilon.minosoft.data.assets.AssetsManager -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.gui.rendering.textures.Texture class Font { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/FontLoader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/FontLoader.kt index d16f6ef07..b6676a2ef 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/FontLoader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/FontLoader.kt @@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.font import com.google.gson.JsonArray import com.google.gson.JsonObject import de.bixilon.minosoft.data.assets.AssetsManager -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.textures.Texture diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/HUDElementProperties.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/HUDElementProperties.kt index 8d71e6d9a..4ce296fdd 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/HUDElementProperties.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/HUDElementProperties.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.gui.rendering.hud import com.squareup.moshi.Json -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import glm_.vec2.Vec2 data class HUDElementProperties( diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/HUDRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/HUDRenderer.kt index c2fd9861d..396630925 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/HUDRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/HUDRenderer.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.gui.rendering.hud import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.config.config.game.controls.KeyBindingsNames -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.RenderWindow import de.bixilon.minosoft.gui.rendering.Renderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/atlas/HUDAtlasElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/atlas/HUDAtlasElement.kt index 9366a1751..5ac03bd51 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/atlas/HUDAtlasElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/atlas/HUDAtlasElement.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.gui.rendering.hud.atlas import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.textures.Texture import glm_.vec2.Vec2 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/LeftClickHandler.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/LeftClickHandler.kt index 290dd2ddc..13a63ba57 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/LeftClickHandler.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/LeftClickHandler.kt @@ -17,11 +17,11 @@ import de.bixilon.minosoft.config.config.game.controls.KeyBindingsNames import de.bixilon.minosoft.data.Directions import de.bixilon.minosoft.data.abilities.Gamemodes import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.effects.DefaultStatusEffects -import de.bixilon.minosoft.data.mappings.enchantment.DefaultEnchantments -import de.bixilon.minosoft.data.mappings.items.tools.MiningToolItem import de.bixilon.minosoft.data.player.Hands +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.effects.DefaultStatusEffects +import de.bixilon.minosoft.data.registries.enchantment.DefaultEnchantments +import de.bixilon.minosoft.data.registries.items.tools.MiningToolItem import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.RenderWindow import de.bixilon.minosoft.modding.event.CallbackEventInvoker diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/RightClickHandler.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/RightClickHandler.kt index a8a9c4a90..40bf8d026 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/RightClickHandler.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/RightClickHandler.kt @@ -14,8 +14,8 @@ package de.bixilon.minosoft.gui.rendering.input import de.bixilon.minosoft.config.config.game.controls.KeyBindingsNames -import de.bixilon.minosoft.data.mappings.blocks.BlockUsages import de.bixilon.minosoft.data.player.Hands +import de.bixilon.minosoft.data.registries.blocks.BlockUsages import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.RenderWindow import de.bixilon.minosoft.protocol.packets.c2s.play.ArmSwingC2SP diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/camera/EntityPositionInfo.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/camera/EntityPositionInfo.kt index 3b354270a..96821cb3f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/camera/EntityPositionInfo.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/camera/EntityPositionInfo.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.gui.rendering.input.camera import de.bixilon.minosoft.data.entities.entities.Entity -import de.bixilon.minosoft.data.mappings.biomes.Biome +import de.bixilon.minosoft.data.registries.biomes.Biome import de.bixilon.minosoft.gui.rendering.util.VecUtil.blockPosition import de.bixilon.minosoft.gui.rendering.util.VecUtil.chunkPosition import de.bixilon.minosoft.gui.rendering.util.VecUtil.inChunkSectionPosition diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/camera/RaycastHit.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/camera/RaycastHit.kt index e16bf325e..0d8c820a3 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/camera/RaycastHit.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/camera/RaycastHit.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.gui.rendering.input.camera import de.bixilon.minosoft.data.Directions -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockState import glm_.vec3.Vec3d import glm_.vec3.Vec3i diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/RenderWindowInputHandler.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/RenderWindowInputHandler.kt index 378e8e97b..6da675107 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/RenderWindowInputHandler.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/RenderWindowInputHandler.kt @@ -17,7 +17,7 @@ import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.config.config.game.controls.KeyBindingsNames import de.bixilon.minosoft.config.key.KeyAction import de.bixilon.minosoft.config.key.KeyCodes -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.RenderWindow import de.bixilon.minosoft.gui.rendering.hud.elements.input.KeyConsumer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/DefaultParticleFactory.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/DefaultParticleFactory.kt index 0abb8904a..922dfa025 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/DefaultParticleFactory.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/DefaultParticleFactory.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle -import de.bixilon.minosoft.data.mappings.DefaultFactory +import de.bixilon.minosoft.data.registries.DefaultFactory import de.bixilon.minosoft.gui.rendering.particle.types.Particle import de.bixilon.minosoft.gui.rendering.particle.types.norender.ExplosionEmitterParticle import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.advanced.block.BlockDustParticle diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleFactory.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleFactory.kt index dcc3a7b59..efa00bbfb 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleFactory.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleFactory.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle -import de.bixilon.minosoft.data.mappings.CompanionResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.CompanionResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.types.Particle import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt index c685f9ec4..8c7b009fe 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.RenderWindow import de.bixilon.minosoft.gui.rendering.Renderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/Particle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/Particle.kt index 5fdcabc3e..ccec7906c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/Particle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/Particle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData import de.bixilon.minosoft.data.physics.PhysicsEntity +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.chunk.models.AABB import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.gui.rendering.particle.ParticleMesh diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/ExplosionEmitterParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/ExplosionEmitterParticle.kt index db63daa73..adaa08a7c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/ExplosionEmitterParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/ExplosionEmitterParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.norender -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.ExplosionParticle import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/NoRenderParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/NoRenderParticle.kt index c76b792f8..55012b02e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/NoRenderParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/norender/NoRenderParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.norender -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleMesh import de.bixilon.minosoft.gui.rendering.particle.types.Particle import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/RenderParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/RenderParticle.kt index 76ef72f22..c54e8b983 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/RenderParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/RenderParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.ChatColors import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.particle.types.Particle diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/TextureParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/TextureParticle.kt index 7c2046cbd..a7c4a2407 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/TextureParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/TextureParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleMesh import de.bixilon.minosoft.gui.rendering.particle.types.render.RenderParticle import de.bixilon.minosoft.gui.rendering.textures.Texture diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/AdvancedTextureParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/AdvancedTextureParticle.kt index fb7fe38bd..d9f42e58b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/AdvancedTextureParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/AdvancedTextureParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.advanced -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleMesh import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.gui.rendering.textures.TextureTransparencies diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/block/BlockDustParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/block/BlockDustParticle.kt index f1f996197..44c124e96 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/block/BlockDustParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/block/BlockDustParticle.kt @@ -13,10 +13,10 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.advanced.block -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.blocks.DefaultBlocks -import de.bixilon.minosoft.data.mappings.particle.data.BlockParticleData -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.blocks.DefaultBlocks +import de.bixilon.minosoft.data.registries.particle.data.BlockParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.data.text.RGBColor.Companion.asGray import de.bixilon.minosoft.gui.rendering.chunk.models.renderable.BlockLikeRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/AscendingParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/AscendingParticle.kt index b487d8925..829b288f1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/AscendingParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/AscendingParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor.Companion.asGray import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/ExplosionParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/ExplosionParticle.kt index 35d5ef061..468311faa 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/ExplosionParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/ExplosionParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor.Companion.asGray import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/NoteParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/NoteParticle.kt index 2fb789a57..b9bf10e1f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/NoteParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/NoteParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/PortalParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/PortalParticle.kt index acadf67ac..e84e51814 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/PortalParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/PortalParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/SimpleTextureParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/SimpleTextureParticle.kt index 0e924008a..d559d0329 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/SimpleTextureParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/SimpleTextureParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.TextureParticle import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3d diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/AnimatedParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/AnimatedParticle.kt index 8418d1eab..4a9a1dfa3 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/AnimatedParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/AnimatedParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.animated -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/EndRodParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/EndRodParticle.kt index c5ca9f12e..3258177e8 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/EndRodParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/EndRodParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.animated -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor.Companion.asRGBColor import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.gui.rendering.util.VecUtil.assign diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/campfire/CampfireSmokeParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/campfire/CampfireSmokeParticle.kt index b92676d99..4a1f0d179 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/campfire/CampfireSmokeParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/campfire/CampfireSmokeParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.campfire -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/CloudParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/CloudParticle.kt index 7225d4b9c..db98dd825 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/CloudParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/CloudParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.cloud -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor.Companion.asGray import de.bixilon.minosoft.data.world.WorldEntities import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/SneezeParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/SneezeParticle.kt index 09ed14e06..bf042a718 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/SneezeParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/SneezeParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.cloud -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/CritParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/CritParticle.kt index a953a0473..6fcb60a04 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/CritParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/CritParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.damage -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageIndicatorParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageIndicatorParticle.kt index c78169a9a..acb707f8f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageIndicatorParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageIndicatorParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.damage -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageParticle.kt index e011c2cbf..1344f7c5d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.damage -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor.Companion.asGray import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/EnchantedHitParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/EnchantedHitParticle.kt index d4b064d19..d1a9dc8aa 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/EnchantedHitParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/EnchantedHitParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.damage -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/AbstractDustParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/AbstractDustParticle.kt index e2b7f3565..337f2e8cd 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/AbstractDustParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/AbstractDustParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.dust -import de.bixilon.minosoft.data.mappings.particle.data.DustParticleData +import de.bixilon.minosoft.data.registries.particle.data.DustParticleData import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/DustParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/DustParticle.kt index ac18ecd84..d19ac7d85 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/DustParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/DustParticle.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.dust -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.DustParticleData -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.DustParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/AngryVillagerParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/AngryVillagerParticle.kt index 24662a08c..d19931053 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/AngryVillagerParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/AngryVillagerParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.emotion -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.ChatColors import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/EmotionParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/EmotionParticle.kt index d20fb460e..630a9a9a9 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/EmotionParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/EmotionParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.emotion -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/HeartParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/HeartParticle.kt index 6148ec076..8faabcecd 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/HeartParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/HeartParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.emotion -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantParticle.kt index de6da6d92..6d8e7288f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.enchant -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantedGlyphParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantedGlyphParticle.kt index fe811f418..306766053 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantedGlyphParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantedGlyphParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.enchant -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/NautilusParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/NautilusParticle.kt index 228c8262f..7ba6bd598 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/NautilusParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/NautilusParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.enchant -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/fire/SmokeParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/fire/SmokeParticle.kt index c0b5bebb9..fc4fb56d4 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/fire/SmokeParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/fire/SmokeParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.fire -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.AscendingParticle import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/lava/LavaParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/lava/LavaParticle.kt index 72a5ae2c9..6756c1d3b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/lava/LavaParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/lava/LavaParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.lava -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.fire.SmokeParticle diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/FlameParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/FlameParticle.kt index 5a3c256f2..0e9e03a5b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/FlameParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/FlameParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.slowing -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SlowingParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SlowingParticle.kt index 46eb37b4b..7d52e4c8d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SlowingParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SlowingParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.slowing -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.gui.rendering.util.VecUtil.assign import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SmallFlameParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SmallFlameParticle.kt index f1368275e..799e3227b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SmallFlameParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SmallFlameParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.slowing -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SoulFireFlameParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SoulFireFlameParticle.kt index 8e8826a2c..a219801fc 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SoulFireFlameParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/slowing/SoulFireFlameParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.slowing -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/AmbientEntityEffectParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/AmbientEntityEffectParticle.kt index 8a4d8fd80..08be74d41 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/AmbientEntityEffectParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/AmbientEntityEffectParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.spell -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/EntityEffectParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/EntityEffectParticle.kt index 20334778a..443dfa961 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/EntityEffectParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/EntityEffectParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.spell -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/SpellParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/SpellParticle.kt index d4986413e..77e62b959 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/SpellParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/SpellParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.spell -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.gui.rendering.util.VecUtil import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/WitchParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/WitchParticle.kt index 26587835d..696e6956e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/WitchParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/WitchParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.spell -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/ComposterParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/ComposterParticle.kt index 7f79cf7b6..53325c13f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/ComposterParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/ComposterParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.suspend -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.ChatColors import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/DolphinParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/DolphinParticle.kt index 059026d80..41ec225a3 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/DolphinParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/DolphinParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.suspend -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/HappyVillagerParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/HappyVillagerParticle.kt index 96ec99ef2..3940ab635 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/HappyVillagerParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/HappyVillagerParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.suspend -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.ChatColors import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/MyceliumParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/MyceliumParticle.kt index bcea361d1..b6a1bf9cd 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/MyceliumParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/MyceliumParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.suspend -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.util.KUtil.asResourceLocation diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/SuspendParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/SuspendParticle.kt index eaf2c349b..5fb724c88 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/SuspendParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/SuspendParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.suspend -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor.Companion.asGray import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/CrimsonSporeParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/CrimsonSporeParticle.kt index eacc33337..a0d16a52a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/CrimsonSporeParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/CrimsonSporeParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.water -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.gui.rendering.util.VecUtil.times diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WarpedSporeParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WarpedSporeParticle.kt index dbfcff4c3..e4c0cc446 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WarpedSporeParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WarpedSporeParticle.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.water -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WaterSuspendParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WaterSuspendParticle.kt index 9b15b0822..9d404df91 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WaterSuspendParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WaterSuspendParticle.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.water -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.protocol.network.connection.PlayConnection import glm_.vec3.Vec3 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/shader/Shader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/shader/Shader.kt index 72b3a8ce8..9a3cf977c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/shader/Shader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/shader/Shader.kt @@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.shader import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.data.assets.AssetsManager import de.bixilon.minosoft.data.commands.CommandStringReader -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.Rendering import de.bixilon.minosoft.gui.rendering.exceptions.ShaderLoadingException diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt index 973fd1987..962a9a022 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.gui.rendering.sky -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.RenderWindow diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sound/AudioPlayer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sound/AudioPlayer.kt index 8e9664e71..b4caf2621 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sound/AudioPlayer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sound/AudioPlayer.kt @@ -17,8 +17,8 @@ import com.google.gson.JsonArray import com.google.gson.JsonObject import com.google.gson.JsonPrimitive import de.bixilon.minosoft.Minosoft -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.sounds.SoundEvent +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.sounds.SoundEvent import de.bixilon.minosoft.gui.rendering.Rendering import de.bixilon.minosoft.gui.rendering.input.camera.Camera import de.bixilon.minosoft.gui.rendering.modding.events.CameraPositionChangeEvent diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sound/sounds/Sound.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sound/sounds/Sound.kt index 5160ed3c2..f82eec308 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sound/sounds/Sound.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sound/sounds/Sound.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.gui.rendering.sound.sounds import de.bixilon.minosoft.data.assets.AssetsManager -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.util.logging.Log import de.bixilon.minosoft.util.logging.LogLevels import de.bixilon.minosoft.util.logging.LogMessageType diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sound/sounds/SoundList.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sound/sounds/SoundList.kt index b2b6fac71..f6148131e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sound/sounds/SoundList.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sound/sounds/SoundList.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.gui.rendering.sound.sounds -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.sounds.SoundEvent +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.sounds.SoundEvent data class SoundList( val soundEvent: SoundEvent, diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/textures/Texture.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/textures/Texture.kt index 3389af498..4fa9862fc 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/textures/Texture.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/textures/Texture.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.gui.rendering.textures import de.bixilon.minosoft.data.assets.AssetsManager -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.textures.properties.ImageProperties import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/textures/TextureArray.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/textures/TextureArray.kt index c1e94e0c7..6fcaa67a0 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/textures/TextureArray.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/textures/TextureArray.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.gui.rendering.textures import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.data.assets.AssetsManager -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.gui.rendering.shader.Shader import de.bixilon.minosoft.util.logging.Log diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/VecUtil.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/VecUtil.kt index 0cd30ed76..c7eda2062 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/VecUtil.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/VecUtil.kt @@ -20,8 +20,8 @@ import com.google.gson.JsonPrimitive import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.data.Axes import de.bixilon.minosoft.data.Directions -import de.bixilon.minosoft.data.mappings.blocks.RandomOffsetTypes -import de.bixilon.minosoft.data.mappings.blocks.types.Block +import de.bixilon.minosoft.data.registries.blocks.RandomOffsetTypes +import de.bixilon.minosoft.data.registries.blocks.types.Block import de.bixilon.minosoft.gui.rendering.chunk.models.AABB import de.bixilon.minosoft.gui.rendering.chunk.models.loading.BlockModelElement import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition diff --git a/src/main/java/de/bixilon/minosoft/modding/channels/DefaultPluginChannels.kt b/src/main/java/de/bixilon/minosoft/modding/channels/DefaultPluginChannels.kt index 3848c7e35..c0f21d246 100644 --- a/src/main/java/de/bixilon/minosoft/modding/channels/DefaultPluginChannels.kt +++ b/src/main/java/de/bixilon/minosoft/modding/channels/DefaultPluginChannels.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.modding.channels -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation object DefaultPluginChannels { val REGISTER = ResourceLocation("minecraft:register") diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/BlockBreakAckEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/BlockBreakAckEvent.kt index 31561c608..ea6fdcbb8 100644 --- a/src/main/java/de/bixilon/minosoft/modding/event/events/BlockBreakAckEvent.kt +++ b/src/main/java/de/bixilon/minosoft/modding/event/events/BlockBreakAckEvent.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.modding.event.events -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.c2s.play.BlockBreakC2SP import de.bixilon.minosoft.protocol.packets.s2c.play.BlockBreakAckS2CP diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/BlockEntityMetaDataChangeEvent.java b/src/main/java/de/bixilon/minosoft/modding/event/events/BlockEntityMetaDataChangeEvent.java index 8fc3f7ef3..2e6c6a234 100644 --- a/src/main/java/de/bixilon/minosoft/modding/event/events/BlockEntityMetaDataChangeEvent.java +++ b/src/main/java/de/bixilon/minosoft/modding/event/events/BlockEntityMetaDataChangeEvent.java @@ -13,7 +13,7 @@ package de.bixilon.minosoft.modding.event.events; -import de.bixilon.minosoft.data.mappings.ResourceLocation; +import de.bixilon.minosoft.data.registries.ResourceLocation; import de.bixilon.minosoft.protocol.network.connection.PlayConnection; import de.bixilon.minosoft.protocol.packets.s2c.play.BlockEntityMetaDataS2CP; import glm_.vec3.Vec3i; diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/BlockSetEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/BlockSetEvent.kt index d8ef3bb6c..6cc647059 100644 --- a/src/main/java/de/bixilon/minosoft/modding/event/events/BlockSetEvent.kt +++ b/src/main/java/de/bixilon/minosoft/modding/event/events/BlockSetEvent.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.modding.event.events -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.modding.event.EventInitiators import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.play.BlockSetS2CP diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/GameEventChangeEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/GameEventChangeEvent.kt index f0feda878..2da5fba9a 100644 --- a/src/main/java/de/bixilon/minosoft/modding/event/events/GameEventChangeEvent.kt +++ b/src/main/java/de/bixilon/minosoft/modding/event/events/GameEventChangeEvent.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.modding.event.events -import de.bixilon.minosoft.data.mappings.other.game.event.GameEvent +import de.bixilon.minosoft.data.registries.other.game.event.GameEvent import de.bixilon.minosoft.modding.event.EventInitiators import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.play.GameEventS2CP diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/JoinGameEvent.java b/src/main/java/de/bixilon/minosoft/modding/event/events/JoinGameEvent.java index 453fad18b..185fc9516 100644 --- a/src/main/java/de/bixilon/minosoft/modding/event/events/JoinGameEvent.java +++ b/src/main/java/de/bixilon/minosoft/modding/event/events/JoinGameEvent.java @@ -16,8 +16,8 @@ package de.bixilon.minosoft.modding.event.events; import com.google.common.collect.HashBiMap; import de.bixilon.minosoft.data.Difficulties; import de.bixilon.minosoft.data.abilities.Gamemodes; -import de.bixilon.minosoft.data.mappings.Dimension; -import de.bixilon.minosoft.data.mappings.ResourceLocation; +import de.bixilon.minosoft.data.registries.Dimension; +import de.bixilon.minosoft.data.registries.ResourceLocation; import de.bixilon.minosoft.protocol.network.connection.PlayConnection; import de.bixilon.minosoft.protocol.packets.s2c.play.JoinGameS2CP; diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/MassBlockSetEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/MassBlockSetEvent.kt index 92267c887..23e79330a 100644 --- a/src/main/java/de/bixilon/minosoft/modding/event/events/MassBlockSetEvent.kt +++ b/src/main/java/de/bixilon/minosoft/modding/event/events/MassBlockSetEvent.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.modding.event.events -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.modding.event.EventInitiators import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.play.MassBlockSetS2CP diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/ParticleSpawnEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/ParticleSpawnEvent.kt index f3380fca2..63c9f70de 100644 --- a/src/main/java/de/bixilon/minosoft/modding/event/events/ParticleSpawnEvent.kt +++ b/src/main/java/de/bixilon/minosoft/modding/event/events/ParticleSpawnEvent.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.modding.event.events -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.modding.event.EventInitiators import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.play.ParticleS2CP diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/PlaySoundEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/PlaySoundEvent.kt index fc70050cd..514ae2e29 100644 --- a/src/main/java/de/bixilon/minosoft/modding/event/events/PlaySoundEvent.kt +++ b/src/main/java/de/bixilon/minosoft/modding/event/events/PlaySoundEvent.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.modding.event.events import de.bixilon.minosoft.data.SoundCategories -import de.bixilon.minosoft.data.mappings.sounds.SoundEvent +import de.bixilon.minosoft.data.registries.sounds.SoundEvent import de.bixilon.minosoft.modding.event.EventInitiators import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.play.NamedSoundEventS2CP diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/PluginMessageReceiveEvent.kt b/src/main/java/de/bixilon/minosoft/modding/event/events/PluginMessageReceiveEvent.kt index 91f6a0205..0baceb5aa 100644 --- a/src/main/java/de/bixilon/minosoft/modding/event/events/PluginMessageReceiveEvent.kt +++ b/src/main/java/de/bixilon/minosoft/modding/event/events/PluginMessageReceiveEvent.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.modding.event.events -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.modding.event.EventInitiators import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.play.PluginMessageS2CP diff --git a/src/main/java/de/bixilon/minosoft/modding/event/events/RespawnEvent.java b/src/main/java/de/bixilon/minosoft/modding/event/events/RespawnEvent.java index d24854c50..81dc3d139 100644 --- a/src/main/java/de/bixilon/minosoft/modding/event/events/RespawnEvent.java +++ b/src/main/java/de/bixilon/minosoft/modding/event/events/RespawnEvent.java @@ -15,7 +15,7 @@ package de.bixilon.minosoft.modding.event.events; import de.bixilon.minosoft.data.Difficulties; import de.bixilon.minosoft.data.abilities.Gamemodes; -import de.bixilon.minosoft.data.mappings.Dimension; +import de.bixilon.minosoft.data.registries.Dimension; import de.bixilon.minosoft.protocol.network.connection.PlayConnection; import de.bixilon.minosoft.protocol.packets.s2c.play.RespawnS2CP; diff --git a/src/main/java/de/bixilon/minosoft/protocol/exceptions/PacketNotImplementedException.java b/src/main/java/de/bixilon/minosoft/protocol/exceptions/PacketNotImplementedException.java index 0d7ae87ec..2cc772d8c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/exceptions/PacketNotImplementedException.java +++ b/src/main/java/de/bixilon/minosoft/protocol/exceptions/PacketNotImplementedException.java @@ -13,7 +13,7 @@ package de.bixilon.minosoft.protocol.exceptions; -import de.bixilon.minosoft.data.mappings.versions.Version; +import de.bixilon.minosoft.data.registries.versions.Version; import de.bixilon.minosoft.protocol.protocol.ConnectionStates; import de.bixilon.minosoft.protocol.protocol.InByteBuffer; import de.bixilon.minosoft.protocol.protocol.PacketTypes; diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/Network.java b/src/main/java/de/bixilon/minosoft/protocol/network/Network.java index 112e247b7..9026ed461 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/Network.java +++ b/src/main/java/de/bixilon/minosoft/protocol/network/Network.java @@ -13,7 +13,7 @@ package de.bixilon.minosoft.protocol.network; -import de.bixilon.minosoft.data.mappings.versions.Version; +import de.bixilon.minosoft.data.registries.versions.Version; import de.bixilon.minosoft.protocol.exceptions.PacketNotImplementedException; import de.bixilon.minosoft.protocol.exceptions.PacketParseException; import de.bixilon.minosoft.protocol.exceptions.UnknownPacketException; diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/connection/PlayConnection.kt b/src/main/java/de/bixilon/minosoft/protocol/network/connection/PlayConnection.kt index 2dcb82881..fdba05c55 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/connection/PlayConnection.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/network/connection/PlayConnection.kt @@ -19,14 +19,14 @@ import de.bixilon.minosoft.data.ChatTextPositions import de.bixilon.minosoft.data.accounts.Account import de.bixilon.minosoft.data.assets.MultiAssetsManager import de.bixilon.minosoft.data.commands.CommandRootNode -import de.bixilon.minosoft.data.mappings.MappingsLoadingException -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.recipes.Recipes -import de.bixilon.minosoft.data.mappings.versions.Registries -import de.bixilon.minosoft.data.mappings.versions.Version import de.bixilon.minosoft.data.physics.CollisionDetector import de.bixilon.minosoft.data.player.LocalPlayerEntity import de.bixilon.minosoft.data.player.tab.TabList +import de.bixilon.minosoft.data.registries.RegistriesLoadingException +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.recipes.Recipes +import de.bixilon.minosoft.data.registries.versions.Registries +import de.bixilon.minosoft.data.registries.versions.Version import de.bixilon.minosoft.data.scoreboard.ScoreboardManager import de.bixilon.minosoft.data.tags.Tag import de.bixilon.minosoft.data.text.ChatComponent @@ -193,7 +193,7 @@ class PlayConnection( Log.log(LogMessageType.VERSION_LOADING, level = LogLevels.FATAL) { exception } Log.log(LogMessageType.VERSION_LOADING, level = LogLevels.FATAL) { "Could not load version $version. This version seems to be unsupported" } version.unload() - error = MappingsLoadingException("Mappings could not be loaded", exception) + error = RegistriesLoadingException("Mappings could not be loaded", exception) retry = false } latch.dec() diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/connection/StatusConnection.kt b/src/main/java/de/bixilon/minosoft/protocol/network/connection/StatusConnection.kt index 57838996f..3ccfec878 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/connection/StatusConnection.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/network/connection/StatusConnection.kt @@ -14,8 +14,8 @@ package de.bixilon.minosoft.protocol.network.connection import de.bixilon.minosoft.Minosoft -import de.bixilon.minosoft.data.mappings.versions.Version -import de.bixilon.minosoft.data.mappings.versions.Versions +import de.bixilon.minosoft.data.registries.versions.Version +import de.bixilon.minosoft.data.registries.versions.Versions import de.bixilon.minosoft.modding.event.EventInvoker import de.bixilon.minosoft.modding.event.events.ConnectionStateChangeEvent import de.bixilon.minosoft.modding.event.events.PacketReceiveEvent diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/PluginMessageC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/PluginMessageC2SP.kt index c71cb55d3..7a78501f8 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/PluginMessageC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/PluginMessageC2SP.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.c2s.play -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.packets.c2s.PlayC2SPacket import de.bixilon.minosoft.protocol.protocol.PlayOutByteBuffer import de.bixilon.minosoft.protocol.protocol.ProtocolVersions diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/crafting/DisplayRecipeSetC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/crafting/DisplayRecipeSetC2SP.kt index d5f6018d0..92bd4eae4 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/crafting/DisplayRecipeSetC2SP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/crafting/DisplayRecipeSetC2SP.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.c2s.play.crafting -import de.bixilon.minosoft.data.mappings.recipes.Recipe +import de.bixilon.minosoft.data.registries.recipes.Recipe import de.bixilon.minosoft.protocol.packets.c2s.PlayC2SPacket import de.bixilon.minosoft.protocol.protocol.PlayOutByteBuffer import de.bixilon.minosoft.util.logging.Log diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BlockActionS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BlockActionS2CP.kt index 3ee705457..b639b5fed 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BlockActionS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BlockActionS2CP.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play import de.bixilon.minosoft.data.entities.block.BlockActionEntity import de.bixilon.minosoft.data.entities.block.DefaultBlockEntityMetaDataFactory -import de.bixilon.minosoft.data.mappings.blocks.types.Block +import de.bixilon.minosoft.data.registries.blocks.types.Block import de.bixilon.minosoft.datafixer.BlockEntityFixer.fix import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BlockBreakAckS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BlockBreakAckS2CP.kt index 9212f796e..27b7aca85 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BlockBreakAckS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BlockBreakAckS2CP.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.modding.event.events.BlockBreakAckEvent import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.c2s.play.BlockBreakC2SP.BreakType diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BlockSetS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BlockSetS2CP.kt index 6915dc3dc..09089336b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BlockSetS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/BlockSetS2CP.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ChunkDataS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ChunkDataS2CP.kt index f2bbc1ad3..8ab54aa86 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ChunkDataS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ChunkDataS2CP.kt @@ -14,8 +14,8 @@ package de.bixilon.minosoft.protocol.packets.s2c.play import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.data.entities.block.BlockEntity -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.tweaker.VersionTweaker +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.tweaker.VersionTweaker import de.bixilon.minosoft.data.world.ChunkData import de.bixilon.minosoft.data.world.biome.source.SpatialBiomeArray import de.bixilon.minosoft.datafixer.BlockEntityFixer.fix diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ContainerOpenS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ContainerOpenS2CP.kt index a650f0f2c..db57abe36 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ContainerOpenS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ContainerOpenS2CP.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.protocol.packets.s2c.play import de.bixilon.minosoft.data.inventory.DefaultInventoryTypes -import de.bixilon.minosoft.data.mappings.other.containers.Container -import de.bixilon.minosoft.data.mappings.other.containers.ContainerType +import de.bixilon.minosoft.data.registries.other.containers.Container +import de.bixilon.minosoft.data.registries.other.containers.ContainerType import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/EntityEffectAttributesS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/EntityEffectAttributesS2CP.kt index c689d0883..d7d732934 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/EntityEffectAttributesS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/EntityEffectAttributesS2CP.kt @@ -12,9 +12,9 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play -import de.bixilon.minosoft.data.mappings.ResourceLocation -import de.bixilon.minosoft.data.mappings.effects.attributes.StatusEffectAttribute -import de.bixilon.minosoft.data.mappings.effects.attributes.StatusEffectOperations +import de.bixilon.minosoft.data.registries.ResourceLocation +import de.bixilon.minosoft.data.registries.effects.attributes.StatusEffectAttribute +import de.bixilon.minosoft.data.registries.effects.attributes.StatusEffectOperations import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_14W04A diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/EntityObjectSpawnS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/EntityObjectSpawnS2CP.kt index 1323f2942..b62c0ecb4 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/EntityObjectSpawnS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/EntityObjectSpawnS2CP.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.entities.Entity -import de.bixilon.minosoft.data.mappings.DefaultRegistries.ENTITY_OBJECT_REGISTRY +import de.bixilon.minosoft.data.registries.DefaultRegistries.ENTITY_OBJECT_REGISTRY import de.bixilon.minosoft.modding.event.events.EntitySpawnEvent import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/EntitySoundEventS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/EntitySoundEventS2CP.kt index 10ebf50c9..be6f27e78 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/EntitySoundEventS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/EntitySoundEventS2CP.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play import de.bixilon.minosoft.data.SoundCategories -import de.bixilon.minosoft.data.mappings.sounds.SoundEvent +import de.bixilon.minosoft.data.registries.sounds.SoundEvent import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.logging.Log diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/EntityStatusEffectRemoveS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/EntityStatusEffectRemoveS2CP.kt index de166d8b7..969bd417f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/EntityStatusEffectRemoveS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/EntityStatusEffectRemoveS2CP.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play -import de.bixilon.minosoft.data.mappings.effects.StatusEffect +import de.bixilon.minosoft.data.registries.effects.StatusEffect import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/GameEventS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/GameEventS2CP.kt index ccb1fdf74..6389bc86e 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/GameEventS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/GameEventS2CP.kt @@ -12,8 +12,8 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play -import de.bixilon.minosoft.data.mappings.other.game.event.DefaultGameEventHandlers -import de.bixilon.minosoft.data.mappings.other.game.event.GameEvent +import de.bixilon.minosoft.data.registries.other.game.event.DefaultGameEventHandlers +import de.bixilon.minosoft.data.registries.other.game.event.GameEvent import de.bixilon.minosoft.modding.event.events.GameEventChangeEvent import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/JoinGameS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/JoinGameS2CP.kt index 2b6517a58..9909a9952 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/JoinGameS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/JoinGameS2CP.kt @@ -15,9 +15,9 @@ package de.bixilon.minosoft.protocol.packets.s2c.play import com.google.common.collect.HashBiMap import de.bixilon.minosoft.data.Difficulties import de.bixilon.minosoft.data.abilities.Gamemodes -import de.bixilon.minosoft.data.mappings.DefaultRegistries -import de.bixilon.minosoft.data.mappings.Dimension -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.DefaultRegistries +import de.bixilon.minosoft.data.registries.Dimension +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.world.biome.accessor.BlockBiomeAccessor import de.bixilon.minosoft.data.world.biome.accessor.NoiseBiomeAccessor import de.bixilon.minosoft.modding.channels.DefaultPluginChannels diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/MassBlockSetS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/MassBlockSetS2CP.kt index 95b44d2bc..396cc30de 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/MassBlockSetS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/MassBlockSetS2CP.kt @@ -13,8 +13,8 @@ package de.bixilon.minosoft.protocol.packets.s2c.play -import de.bixilon.minosoft.data.mappings.blocks.BlockState -import de.bixilon.minosoft.data.mappings.tweaker.VersionTweaker +import de.bixilon.minosoft.data.registries.blocks.BlockState +import de.bixilon.minosoft.data.registries.tweaker.VersionTweaker import de.bixilon.minosoft.gui.rendering.util.VecUtil.inChunkSectionPosition import de.bixilon.minosoft.gui.rendering.util.VecUtil.sectionHeight import de.bixilon.minosoft.modding.event.events.MassBlockSetEvent diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/MassChunkDataS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/MassChunkDataS2CP.kt index d725b92f3..66717e4a2 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/MassChunkDataS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/MassChunkDataS2CP.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play import de.bixilon.minosoft.Minosoft -import de.bixilon.minosoft.data.mappings.tweaker.VersionTweaker +import de.bixilon.minosoft.data.registries.tweaker.VersionTweaker import de.bixilon.minosoft.data.world.ChunkData import de.bixilon.minosoft.modding.event.EventInitiators diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/NamedSoundEventS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/NamedSoundEventS2CP.kt index e5da6ff62..679d27542 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/NamedSoundEventS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/NamedSoundEventS2CP.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.data.SoundCategories -import de.bixilon.minosoft.data.mappings.sounds.SoundEvent +import de.bixilon.minosoft.data.registries.sounds.SoundEvent import de.bixilon.minosoft.modding.event.events.PlaySoundEvent import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketDeclareRecipes.java b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketDeclareRecipes.java index 68c7653fc..fad903b0b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketDeclareRecipes.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketDeclareRecipes.java @@ -15,10 +15,10 @@ package de.bixilon.minosoft.protocol.packets.s2c.play; import com.google.common.collect.HashBiMap; import de.bixilon.minosoft.data.inventory.ItemStack; -import de.bixilon.minosoft.data.mappings.ResourceLocation; -import de.bixilon.minosoft.data.mappings.recipes.Ingredient; -import de.bixilon.minosoft.data.mappings.recipes.Recipe; -import de.bixilon.minosoft.data.mappings.recipes.RecipeTypes; +import de.bixilon.minosoft.data.registries.ResourceLocation; +import de.bixilon.minosoft.data.registries.recipes.Ingredient; +import de.bixilon.minosoft.data.registries.recipes.Recipe; +import de.bixilon.minosoft.data.registries.recipes.RecipeTypes; import de.bixilon.minosoft.protocol.network.connection.PlayConnection; import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket; import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer; diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketSelectAdvancementTab.java b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketSelectAdvancementTab.java index 5561ea344..2e207e8eb 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketSelectAdvancementTab.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketSelectAdvancementTab.java @@ -13,7 +13,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play; -import de.bixilon.minosoft.data.mappings.ResourceLocation; +import de.bixilon.minosoft.data.registries.ResourceLocation; import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket; import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer; import de.bixilon.minosoft.util.logging.Log; diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketStatistics.java b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketStatistics.java index 0ca070e72..33224beab 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketStatistics.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketStatistics.java @@ -13,7 +13,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play; -import de.bixilon.minosoft.data.mappings.statistics.Statistic; +import de.bixilon.minosoft.data.registries.statistics.Statistic; import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket; import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer; import de.bixilon.minosoft.util.logging.Log; diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketUnlockRecipes.java b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketUnlockRecipes.java index 8d6709e35..bf7027689 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketUnlockRecipes.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketUnlockRecipes.java @@ -13,7 +13,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play; -import de.bixilon.minosoft.data.mappings.recipes.Recipe; +import de.bixilon.minosoft.data.registries.recipes.Recipe; import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket; import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer; import de.bixilon.minosoft.util.logging.Log; diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PaintingSpawnS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PaintingSpawnS2CP.kt index 10164875b..1adcf4ba8 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PaintingSpawnS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PaintingSpawnS2CP.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play import de.bixilon.minosoft.data.Directions import de.bixilon.minosoft.data.Directions.Companion.byId import de.bixilon.minosoft.data.entities.entities.decoration.Painting -import de.bixilon.minosoft.data.mappings.Motive +import de.bixilon.minosoft.data.registries.Motive import de.bixilon.minosoft.modding.event.events.EntitySpawnEvent import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ParticleS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ParticleS2CP.kt index 1539cebd7..006dd406c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ParticleS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/ParticleS2CP.kt @@ -12,8 +12,8 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play -import de.bixilon.minosoft.data.mappings.particle.ParticleType -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.particle.ParticleType +import de.bixilon.minosoft.data.registries.particle.data.ParticleData import de.bixilon.minosoft.modding.event.events.ParticleSpawnEvent import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PluginMessageS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PluginMessageS2CP.kt index 32b8a64af..21bbb1041 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PluginMessageS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PluginMessageS2CP.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.modding.event.events.PluginMessageReceiveEvent import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/RespawnS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/RespawnS2CP.kt index 6b1106f3c..3131077a1 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/RespawnS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/RespawnS2CP.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play import de.bixilon.minosoft.data.Difficulties import de.bixilon.minosoft.data.abilities.Gamemodes -import de.bixilon.minosoft.data.mappings.Dimension +import de.bixilon.minosoft.data.registries.Dimension import de.bixilon.minosoft.gui.rendering.util.VecUtil.EMPTY import de.bixilon.minosoft.modding.event.events.RespawnEvent import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/SoundEventS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/SoundEventS2CP.kt index af8be02c4..caba059d3 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/SoundEventS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/SoundEventS2CP.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play import de.bixilon.minosoft.Minosoft import de.bixilon.minosoft.data.SoundCategories -import de.bixilon.minosoft.data.mappings.sounds.SoundEvent +import de.bixilon.minosoft.data.registries.sounds.SoundEvent import de.bixilon.minosoft.modding.event.events.PlaySoundEvent import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/StopSoundS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/StopSoundS2CP.kt index b56760170..5903ccaf9 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/StopSoundS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/StopSoundS2CP.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play import de.bixilon.minosoft.data.SoundCategories -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.protocol.protocol.ProtocolVersions diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TagsS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TagsS2CP.kt index b76344aee..ed414c5d9 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TagsS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TagsS2CP.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play import de.bixilon.minosoft.Minosoft -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.tags.Tag import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VibrationSignalS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VibrationSignalS2CP.kt index 2b37f4bde..1c8fe255b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VibrationSignalS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VibrationSignalS2CP.kt @@ -12,7 +12,7 @@ */ package de.bixilon.minosoft.protocol.packets.s2c.play -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.logging.Log diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/PacketStatusResponse.java b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/PacketStatusResponse.java index a02b0bb4f..a4dcc934e 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/PacketStatusResponse.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/PacketStatusResponse.java @@ -13,8 +13,8 @@ package de.bixilon.minosoft.protocol.packets.s2c.status; -import de.bixilon.minosoft.data.mappings.versions.Version; -import de.bixilon.minosoft.data.mappings.versions.Versions; +import de.bixilon.minosoft.data.registries.versions.Version; +import de.bixilon.minosoft.data.registries.versions.Versions; import de.bixilon.minosoft.modding.event.events.StatusResponseEvent; import de.bixilon.minosoft.protocol.network.connection.StatusConnection; import de.bixilon.minosoft.protocol.packets.c2s.status.StatusPingC2SP; diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/InByteBuffer.kt b/src/main/java/de/bixilon/minosoft/protocol/protocol/InByteBuffer.kt index 9b3400f75..e0c2a87d0 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/InByteBuffer.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/InByteBuffer.kt @@ -20,7 +20,7 @@ import de.bixilon.minosoft.data.commands.CommandLiteralNode import de.bixilon.minosoft.data.commands.CommandNode import de.bixilon.minosoft.data.commands.CommandRootNode import de.bixilon.minosoft.data.entities.Poses -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.tags.Tag import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.network.connection.Connection diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/OutByteBuffer.kt b/src/main/java/de/bixilon/minosoft/protocol/protocol/OutByteBuffer.kt index d19d17988..38144af16 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/OutByteBuffer.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/OutByteBuffer.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.protocol.protocol import com.google.gson.JsonObject import com.sun.javafx.geom.Vec3f -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.network.connection.Connection import de.bixilon.minosoft.util.Util diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayInByteBuffer.kt b/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayInByteBuffer.kt index 2a8889ff5..07ac4a53a 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayInByteBuffer.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayInByteBuffer.kt @@ -14,13 +14,13 @@ package de.bixilon.minosoft.protocol.protocol import de.bixilon.minosoft.data.entities.meta.EntityMetaData import de.bixilon.minosoft.data.inventory.ItemStack -import de.bixilon.minosoft.data.mappings.biomes.Biome -import de.bixilon.minosoft.data.mappings.particle.ParticleType -import de.bixilon.minosoft.data.mappings.particle.data.BlockParticleData -import de.bixilon.minosoft.data.mappings.particle.data.DustParticleData -import de.bixilon.minosoft.data.mappings.particle.data.ItemParticleData -import de.bixilon.minosoft.data.mappings.particle.data.ParticleData -import de.bixilon.minosoft.data.mappings.recipes.Ingredient +import de.bixilon.minosoft.data.registries.biomes.Biome +import de.bixilon.minosoft.data.registries.particle.ParticleType +import de.bixilon.minosoft.data.registries.particle.data.BlockParticleData +import de.bixilon.minosoft.data.registries.particle.data.DustParticleData +import de.bixilon.minosoft.data.registries.particle.data.ItemParticleData +import de.bixilon.minosoft.data.registries.particle.data.ParticleData +import de.bixilon.minosoft.data.registries.recipes.Ingredient import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.data.text.ChatComponent.Companion.of import de.bixilon.minosoft.protocol.network.connection.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolDefinition.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolDefinition.java index da6ddf02f..a45f25a99 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolDefinition.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolDefinition.java @@ -13,7 +13,7 @@ package de.bixilon.minosoft.protocol.protocol; -import de.bixilon.minosoft.data.mappings.ResourceLocation; +import de.bixilon.minosoft.data.registries.ResourceLocation; import de.bixilon.minosoft.data.text.ChatColors; import de.bixilon.minosoft.data.text.RGBColor; diff --git a/src/main/java/de/bixilon/minosoft/terminal/commands/commands/CommandServer.java b/src/main/java/de/bixilon/minosoft/terminal/commands/commands/CommandServer.java index 82e293704..e1b49a2ab 100644 --- a/src/main/java/de/bixilon/minosoft/terminal/commands/commands/CommandServer.java +++ b/src/main/java/de/bixilon/minosoft/terminal/commands/commands/CommandServer.java @@ -23,8 +23,8 @@ import de.bixilon.minosoft.data.commands.parser.StringParser; import de.bixilon.minosoft.data.commands.parser.minosoft.VersionParser; import de.bixilon.minosoft.data.commands.parser.properties.IntegerParserProperties; import de.bixilon.minosoft.data.commands.parser.properties.StringParserProperties; -import de.bixilon.minosoft.data.mappings.versions.Version; -import de.bixilon.minosoft.data.mappings.versions.Versions; +import de.bixilon.minosoft.data.registries.versions.Version; +import de.bixilon.minosoft.data.registries.versions.Versions; import de.bixilon.minosoft.data.text.ChatComponent; import de.bixilon.minosoft.gui.main.Server; import de.bixilon.minosoft.gui.main.ServerListCell; diff --git a/src/main/java/de/bixilon/minosoft/util/GitInfo.kt b/src/main/java/de/bixilon/minosoft/util/GitInfo.kt index eaa91f21b..fb933de0e 100644 --- a/src/main/java/de/bixilon/minosoft/util/GitInfo.kt +++ b/src/main/java/de/bixilon/minosoft/util/GitInfo.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.util import de.bixilon.minosoft.Minosoft -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition import de.bixilon.minosoft.util.logging.Log import de.bixilon.minosoft.util.logging.LogLevels diff --git a/src/main/java/de/bixilon/minosoft/util/KUtil.kt b/src/main/java/de/bixilon/minosoft/util/KUtil.kt index e9a8adfab..329e92e47 100644 --- a/src/main/java/de/bixilon/minosoft/util/KUtil.kt +++ b/src/main/java/de/bixilon/minosoft/util/KUtil.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.util import de.bixilon.minosoft.data.entities.entities.Entity -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.protocol.network.connection.PlayConnection import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition import de.bixilon.minosoft.util.collections.SynchronizedMap diff --git a/src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt b/src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt index 6dec89167..3177fb9cd 100644 --- a/src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt +++ b/src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt @@ -13,9 +13,9 @@ package de.bixilon.minosoft.util.chunk -import de.bixilon.minosoft.data.mappings.Dimension -import de.bixilon.minosoft.data.mappings.biomes.Biome -import de.bixilon.minosoft.data.mappings.blocks.BlockState +import de.bixilon.minosoft.data.registries.Dimension +import de.bixilon.minosoft.data.registries.biomes.Biome +import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.data.world.ChunkData import de.bixilon.minosoft.data.world.ChunkSection import de.bixilon.minosoft.data.world.biome.source.XZBiomeArray diff --git a/src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt b/src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt index 6b674a36e..233ef6b28 100644 --- a/src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt +++ b/src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt @@ -13,7 +13,7 @@ package de.bixilon.minosoft.util.chunk -import de.bixilon.minosoft.data.mappings.Dimension +import de.bixilon.minosoft.data.registries.Dimension import de.bixilon.minosoft.data.world.light.ChunkLightAccessor import de.bixilon.minosoft.data.world.light.LightAccessor import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer diff --git a/src/main/java/de/bixilon/minosoft/util/json/ResourceLocationJsonMap.kt b/src/main/java/de/bixilon/minosoft/util/json/ResourceLocationJsonMap.kt index 2c186bfb3..389a77712 100644 --- a/src/main/java/de/bixilon/minosoft/util/json/ResourceLocationJsonMap.kt +++ b/src/main/java/de/bixilon/minosoft/util/json/ResourceLocationJsonMap.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.util.json import com.google.gson.JsonObject -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation object ResourceLocationJsonMap { diff --git a/src/main/java/de/bixilon/minosoft/util/json/ResourceLocationSerializer.kt b/src/main/java/de/bixilon/minosoft/util/json/ResourceLocationSerializer.kt index 4a76d360f..7bd3487df 100644 --- a/src/main/java/de/bixilon/minosoft/util/json/ResourceLocationSerializer.kt +++ b/src/main/java/de/bixilon/minosoft/util/json/ResourceLocationSerializer.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.util.json import com.squareup.moshi.* -import de.bixilon.minosoft.data.mappings.ResourceLocation +import de.bixilon.minosoft.data.registries.ResourceLocation object ResourceLocationSerializer : JsonAdapter() { @FromJson