diff --git a/src/main/java/de/bixilon/minosoft/data/registries/Motif.kt b/src/main/java/de/bixilon/minosoft/data/registries/Motif.kt index 678d3e1fb..24b928151 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/Motif.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/Motif.kt @@ -24,7 +24,7 @@ data class Motif( ) : RegistryItem() { override fun toString(): String { - return identifier.full + return identifier.toString() } companion object : ResourceLocationCodec { diff --git a/src/main/java/de/bixilon/minosoft/data/registries/PluginChannel.kt b/src/main/java/de/bixilon/minosoft/data/registries/PluginChannel.kt index 08c95afe5..d3155152a 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/PluginChannel.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/PluginChannel.kt @@ -24,7 +24,7 @@ data class PluginChannel( ) : RegistryItem() { override fun toString(): String { - return identifier.full + return identifier.toString() } companion object : ResourceLocationCodec { diff --git a/src/main/java/de/bixilon/minosoft/data/registries/biomes/Biome.kt b/src/main/java/de/bixilon/minosoft/data/registries/biomes/Biome.kt index 249279641..3cdda0007 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/biomes/Biome.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/biomes/Biome.kt @@ -45,7 +45,7 @@ data class Biome( } override fun toString(): String { - return identifier.full + return identifier.toString() } companion object : ResourceLocationCodec { diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/Block.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/Block.kt index 104fc8830..1e3f7157c 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/Block.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/Block.kt @@ -72,7 +72,7 @@ open class Block( } override fun toString(): String { - return identifier.full + return identifier.toString() } open fun getPlacementState(connection: PlayConnection, target: BlockTarget): BlockState? = defaultState diff --git a/src/main/java/de/bixilon/minosoft/data/registries/dimension/Dimension.kt b/src/main/java/de/bixilon/minosoft/data/registries/dimension/Dimension.kt index 02a726313..aa386da93 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/dimension/Dimension.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/dimension/Dimension.kt @@ -23,7 +23,7 @@ data class Dimension( ) : RegistryItem() { override fun toString(): String { - return identifier.full + return identifier.toString() } companion object : ResourceLocationCodec { diff --git a/src/main/java/de/bixilon/minosoft/data/registries/effects/PixlyzerStatusEffectType.kt b/src/main/java/de/bixilon/minosoft/data/registries/effects/PixlyzerStatusEffectType.kt index 6a0713ae7..00ab09cec 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/effects/PixlyzerStatusEffectType.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/effects/PixlyzerStatusEffectType.kt @@ -29,7 +29,7 @@ class PixlyzerStatusEffectType( ) : StatusEffectType(), Colored, CategorizedEffect { override fun toString(): String { - return identifier.full + return identifier.toString() } companion object : ResourceLocationCodec { diff --git a/src/main/java/de/bixilon/minosoft/data/registries/enchantment/Enchantment.kt b/src/main/java/de/bixilon/minosoft/data/registries/enchantment/Enchantment.kt index 08d5012ba..71d4d2ffa 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/enchantment/Enchantment.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/enchantment/Enchantment.kt @@ -18,7 +18,7 @@ abstract class Enchantment : RegistryItem() { override val injectable: Boolean get() = false override fun toString(): String { - return identifier.full + return identifier.toString() } override fun hashCode(): Int { diff --git a/src/main/java/de/bixilon/minosoft/data/registries/entities/variants/AbstractEntityVariant.kt b/src/main/java/de/bixilon/minosoft/data/registries/entities/variants/AbstractEntityVariant.kt index 6d218343d..d30ccf786 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/entities/variants/AbstractEntityVariant.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/entities/variants/AbstractEntityVariant.kt @@ -25,6 +25,6 @@ abstract class AbstractEntityVariant( val texture = data["texture"].toResourceLocation().texture() override fun toString(): String { - return identifier.full + return identifier.toString() } } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/entities/villagers/VillagerProfession.kt b/src/main/java/de/bixilon/minosoft/data/registries/entities/villagers/VillagerProfession.kt index 7503b7b43..13cc9e7cf 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/entities/villagers/VillagerProfession.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/entities/villagers/VillagerProfession.kt @@ -20,11 +20,11 @@ import de.bixilon.minosoft.data.registries.registries.registry.codec.ResourceLoc data class VillagerProfession( override val identifier: ResourceLocation, - // ToDo + // TODO ) : RegistryItem() { override fun toString(): String { - return identifier.full + return identifier.toString() } companion object : ResourceLocationCodec { diff --git a/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/Fluid.kt b/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/Fluid.kt index d6ff444ab..0833ea41a 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/Fluid.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/Fluid.kt @@ -33,7 +33,7 @@ open class Fluid(override val identifier: ResourceLocation) : RegistryItem() { open var model: FluidModel? = null override fun toString(): String { - return identifier.full + return identifier.toString() } open fun matches(other: Fluid): Boolean { diff --git a/src/main/java/de/bixilon/minosoft/data/registries/materials/Material.kt b/src/main/java/de/bixilon/minosoft/data/registries/materials/Material.kt index 93cde4140..ee82ebd53 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/materials/Material.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/materials/Material.kt @@ -37,7 +37,7 @@ data class Material( ) : RegistryItem() { override fun toString(): String { - return identifier.full + return identifier.toString() } companion object : ResourceLocationCodec { diff --git a/src/main/java/de/bixilon/minosoft/data/registries/particle/ParticleType.kt b/src/main/java/de/bixilon/minosoft/data/registries/particle/ParticleType.kt index 2c8325601..4ee9a8d4c 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/particle/ParticleType.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/particle/ParticleType.kt @@ -34,7 +34,7 @@ data class ParticleType( ) : RegistryItem() { override fun toString(): String { - return identifier.full + return identifier.toString() } fun default(): ParticleData { diff --git a/src/main/java/de/bixilon/minosoft/data/registries/registries/registry/RegistryItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/registries/registry/RegistryItem.kt index dd177d346..d05bc5760 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/registries/registry/RegistryItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/registries/registry/RegistryItem.kt @@ -62,6 +62,6 @@ abstract class RegistryItem : Identified { override fun toString(): String { - return identifier.full + return identifier.toString() } } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/statistics/Statistic.kt b/src/main/java/de/bixilon/minosoft/data/registries/statistics/Statistic.kt index 61dc8863c..b8bbdef96 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/statistics/Statistic.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/statistics/Statistic.kt @@ -27,7 +27,7 @@ open class Statistic( ) : RegistryItem(), Translatable { override fun toString(): String { - return identifier.full + return identifier.toString() } companion object : ResourceLocationCodec { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/SpriteTexture.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/SpriteTexture.kt index faf6ba462..8aecf4f5e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/SpriteTexture.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/SpriteTexture.kt @@ -57,7 +57,7 @@ class SpriteTexture(private val original: AbstractTexture) : AbstractTexture { val bytesPerTexture = size.x * size.y * PNGDecoder.Format.RGBA.numComponents for (i in 0 until animationProperties.frameCount) { - val splitTexture = MemoryTexture(resourceLocation = ResourceLocation.of(resourceLocation.full + "_animated_$i"), size) + val splitTexture = MemoryTexture(resourceLocation = ResourceLocation.of(resourceLocation.toString() + "_animated_$i"), size) splitTexture.data!!.let { it.copyFrom(original.data!!, bytesPerTexture * i, 0, bytesPerTexture) diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VibrationS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VibrationS2CP.kt index ab89187d4..03b82cf57 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VibrationS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VibrationS2CP.kt @@ -29,7 +29,7 @@ class VibrationS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { /** * @return Depends on vibration target type, if block: block postion, if entity: entity id */ - val targetData: Any = when (targetType.full) { + val targetData: Any = when (targetType.toString()) { "minecraft:block" -> buffer.readBlockPosition() "minecraft:entity" -> buffer.readEntityId() else -> error("Unknown target type: $targetType") 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 e2a1a03e3..6cf8b7d8d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/OutByteBuffer.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/OutByteBuffer.kt @@ -294,7 +294,7 @@ open class OutByteBuffer() { } fun writeResourceLocation(resourceLocation: ResourceLocation) { - writeString(resourceLocation.full) + writeString(resourceLocation.toString()) } fun writeVec3d(vec3: Vec3) { 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 27bc3d051..b4a6b0c6a 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayInByteBuffer.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayInByteBuffer.kt @@ -117,14 +117,14 @@ class PlayInByteBuffer : InByteBuffer { fun readParticleData(type: ParticleType): ParticleData { // ToDo: Replace with dynamic particle type calling if (this.versionId < V_17W45A) { - return when (type.identifier.full) { + return when (type.identifier.toString()) { "minecraft:iconcrack" -> ItemParticleData.read(this, type) "minecraft:blockcrack", "minecraft:blockdust", "minecraft:falling_dust" -> BlockParticleData.read(this, type) else -> ParticleData(type) } } - return when (type.identifier.full) { + return when (type.identifier.toString()) { "minecraft:block", "minecraft:falling_dust" -> BlockParticleData.read(this, type) "minecraft:dust" -> DustParticleData.read(this, type) "minecraft:item" -> ItemParticleData.read(this, type) 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 ab4755ac3..2de4f149e 100644 --- a/src/main/java/de/bixilon/minosoft/util/json/ResourceLocationSerializer.kt +++ b/src/main/java/de/bixilon/minosoft/util/json/ResourceLocationSerializer.kt @@ -40,7 +40,7 @@ object ResourceLocationSerializer : SimpleModule() { object Serializer : StdSerializer(ResourceLocation::class.java) { override fun serialize(value: ResourceLocation?, generator: JsonGenerator, provider: SerializerProvider?) { - generator.writeString(value?.full) + generator.writeString(value?.toString()) } } }