diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/PhysicsTestUtil.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/PhysicsTestUtil.kt index 9fab3e4ae..6b8dc2182 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/PhysicsTestUtil.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/physics/PhysicsTestUtil.kt @@ -19,7 +19,6 @@ import de.bixilon.kutil.primitive.DoubleUtil.matches import de.bixilon.kutil.primitive.FloatUtil import de.bixilon.kutil.primitive.FloatUtil.matches import de.bixilon.kutil.reflection.ReflectionUtil.field -import de.bixilon.kutil.reflection.ReflectionUtil.jvmField import de.bixilon.minosoft.camera.ConnectionCamera import de.bixilon.minosoft.data.entities.StatusEffectInstance import de.bixilon.minosoft.data.entities.entities.Entity @@ -42,9 +41,9 @@ object PhysicsTestUtil { const val MATCH_EXACTLY = true val VALUE_MARGIN = if (MATCH_EXACTLY) 0.0 else DoubleUtil.DEFAULT_MARGIN - private val PLAYER_ATTRIBUTES = LocalPlayerEntity::attributes.jvmField.field - private val CONNECTION_PLAYER = PlayConnection::player.jvmField.field - private val CONNECTION_CAMERA = PlayConnection::camera.jvmField.field + private val PLAYER_ATTRIBUTES = LocalPlayerEntity::attributes.field + private val CONNECTION_PLAYER = PlayConnection::player.field + private val CONNECTION_CAMERA = PlayConnection::camera.field fun createPlayer(connection: PlayConnection = createConnection(light = false)): LocalPlayerEntity { diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/protocol/network/connection/play/ConnectionTestUtil.kt b/src/integration-test/kotlin/de/bixilon/minosoft/protocol/network/connection/play/ConnectionTestUtil.kt index 273c61383..9877422a7 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/protocol/network/connection/play/ConnectionTestUtil.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/protocol/network/connection/play/ConnectionTestUtil.kt @@ -16,7 +16,6 @@ package de.bixilon.minosoft.protocol.network.connection.play import de.bixilon.kotlinglm.pow import de.bixilon.kutil.observer.DataObserver import de.bixilon.kutil.reflection.ReflectionUtil.field -import de.bixilon.kutil.reflection.ReflectionUtil.jvmField import de.bixilon.minosoft.assets.connection.ConnectionAssetsManager import de.bixilon.minosoft.assets.minecraft.MinecraftPackFormat.packFormat import de.bixilon.minosoft.assets.properties.manager.AssetsManagerProperties @@ -51,21 +50,21 @@ object ConnectionTestUtil { reference() } - private val LANGUAGE = PlayConnection::language.jvmField.field - private val SEQUENCE = PlayConnection::sequence.jvmField.field - private val ACCOUNT = PlayConnection::account.jvmField.field - private val VERSION = PlayConnection::version.jvmField.field - private val REGISTRIES = PlayConnection::registries.jvmField.field - private val WORLD = PlayConnection::world.jvmField.field - private val PLAYER = PlayConnection::player.jvmField.field - private val NETWORK = PlayConnection::network.jvmField.field - private val EVENTS = PlayConnection::events.jvmField.field - private val PROFILES = PlayConnection::profiles.jvmField.field - private val ASSETS_MANAGER = PlayConnection::assetsManager.jvmField.field - private val STATE = PlayConnection::state.jvmField.field - private val TAGS = PlayConnection::tags.jvmField.field - private val LEGACY_TAGS = PlayConnection::legacyTags.jvmField.field - private val CAMERA = PlayConnection::camera.jvmField.field + private val LANGUAGE = PlayConnection::language.field + private val SEQUENCE = PlayConnection::sequence.field + private val ACCOUNT = PlayConnection::account.field + private val VERSION = PlayConnection::version.field + private val REGISTRIES = PlayConnection::registries.field + private val WORLD = PlayConnection::world.field + private val PLAYER = PlayConnection::player.field + private val NETWORK = PlayConnection::network.field + private val EVENTS = PlayConnection::events.field + private val PROFILES = PlayConnection::profiles.field + private val ASSETS_MANAGER = PlayConnection::assetsManager.field + private val STATE = PlayConnection::state.field + private val TAGS = PlayConnection::tags.field + private val LEGACY_TAGS = PlayConnection::legacyTags.field + private val CAMERA = PlayConnection::camera.field private val language = LanguageManager() private val signature = OBJENESIS.newInstance(SignatureKeyManagement::class.java) 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 ca019b920..6df8ae5da 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 @@ -21,7 +21,6 @@ import de.bixilon.kutil.cast.CastUtil.unsafeNull import de.bixilon.kutil.primitive.BooleanUtil.toBoolean import de.bixilon.kutil.reflection.ReflectionUtil.field import de.bixilon.kutil.reflection.ReflectionUtil.getFieldOrNull -import de.bixilon.kutil.reflection.ReflectionUtil.jvmField import de.bixilon.kutil.time.TimeUtil.millis import de.bixilon.minosoft.data.abilities.Gamemodes import de.bixilon.minosoft.data.entities.EntityAnimations @@ -262,8 +261,8 @@ abstract class Entity( companion object { - private val RENDER_INFO = Entity::renderInfo.jvmField.field - private val DEFAULT_AABB = Entity::defaultAABB.jvmField.field + private val RENDER_INFO = Entity::renderInfo.field + private val DEFAULT_AABB = Entity::defaultAABB.field private val PHYSICS = Entity::class.java.getFieldOrNull("physics")!!.field val FLAGS_DATA = EntityDataField("ENTITY_FLAGS") diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt index 7610cb91a..7c5ebc1e2 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt @@ -22,7 +22,6 @@ import de.bixilon.kutil.primitive.BooleanUtil.toBoolean import de.bixilon.kutil.primitive.FloatUtil.toFloat import de.bixilon.kutil.primitive.IntUtil.toInt import de.bixilon.kutil.reflection.ReflectionUtil.field -import de.bixilon.kutil.reflection.ReflectionUtil.jvmField import de.bixilon.minosoft.data.registries.blocks.factory.PixLyzerBlockFactories import de.bixilon.minosoft.data.registries.blocks.factory.PixLyzerBlockFactory import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties @@ -129,7 +128,7 @@ open class PixLyzerBlock( companion object : IdentifierCodec, PixLyzerBlockFactory, MultiClassFactory { private val NULL_OFFSET_XYZ = Vec3i(0, 0, 0).getWorldOffset(RandomOffsetTypes.XYZ) private val NULL_OFFSET_XZ = Vec3i(0, 0, 0).getWorldOffset(RandomOffsetTypes.XZ) - private val ITEM_FIELD = PixLyzerBlock::item.jvmField.field + private val ITEM_FIELD = PixLyzerBlock::item.field override val ALIASES: Set = setOf("Block") override fun deserialize(registries: Registries?, identifier: ResourceLocation, data: Map): Block { diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/entity/PixLyzerBlockWithEntity.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/entity/PixLyzerBlockWithEntity.kt index f3d10c8f4..8e568514e 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/entity/PixLyzerBlockWithEntity.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/entity/PixLyzerBlockWithEntity.kt @@ -15,7 +15,6 @@ package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.entity import de.bixilon.kutil.cast.CastUtil.unsafeNull import de.bixilon.kutil.reflection.ReflectionUtil.field -import de.bixilon.kutil.reflection.ReflectionUtil.jvmField import de.bixilon.minosoft.data.entities.block.BlockEntity import de.bixilon.minosoft.data.registries.blocks.entites.BlockEntityType import de.bixilon.minosoft.data.registries.blocks.types.entity.BlockWithEntity @@ -36,6 +35,6 @@ abstract class PixLyzerBlockWithEntity(resourceLocation: Resour override fun createBlockEntity(connection: PlayConnection) = blockEntity?.factory?.build(connection) private companion object { - val FACTORY_FIELD = PixLyzerBlockWithEntity<*>::blockEntity.jvmField.field + val FACTORY_FIELD = PixLyzerBlockWithEntity<*>::blockEntity.field } } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/LeavesBlock.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/LeavesBlock.kt index e06786a13..014654a17 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/LeavesBlock.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/LeavesBlock.kt @@ -14,7 +14,6 @@ package de.bixilon.minosoft.data.registries.blocks.types.wood import de.bixilon.kutil.reflection.ReflectionUtil.field -import de.bixilon.kutil.reflection.ReflectionUtil.jvmField import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.blocks.light.CustomLightProperties @@ -74,7 +73,7 @@ abstract class LeavesBlock(identifier: ResourceLocation, settings: BlockSettings } companion object { - private val TINT_PROVIDER = LeavesBlock::tintProvider.jvmField.field + private val TINT_PROVIDER = LeavesBlock::tintProvider.field val LIGHT_PROPERTIES = CustomLightProperties(true, false, true) } } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/item/items/block/BlockItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/item/items/block/BlockItem.kt index ff5fcfdce..48ae7dc87 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/item/items/block/BlockItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/item/items/block/BlockItem.kt @@ -15,7 +15,6 @@ package de.bixilon.minosoft.data.registries.item.items.block import de.bixilon.kutil.cast.CastUtil.unsafeNull import de.bixilon.kutil.reflection.ReflectionUtil.field -import de.bixilon.kutil.reflection.ReflectionUtil.jvmField import de.bixilon.minosoft.camera.target.targets.BlockTarget import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.registries.blocks.types.Block @@ -45,6 +44,6 @@ abstract class BlockItem(identifier: ResourceLocation) : Item(identif private companion object { - private val BLOCK_FIELD = BlockItem<*>::block.jvmField.field + private val BLOCK_FIELD = BlockItem<*>::block.field } } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/item/items/block/legacy/PixLyzerBlockItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/item/items/block/legacy/PixLyzerBlockItem.kt index d7836207b..7854d2eb9 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/item/items/block/legacy/PixLyzerBlockItem.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/item/items/block/legacy/PixLyzerBlockItem.kt @@ -15,7 +15,6 @@ package de.bixilon.minosoft.data.registries.item.items.block.legacy import de.bixilon.kutil.cast.CastUtil.unsafeNull import de.bixilon.kutil.reflection.ReflectionUtil.field -import de.bixilon.kutil.reflection.ReflectionUtil.jvmField import de.bixilon.minosoft.camera.target.targets.BlockTarget import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.registries.blocks.state.BlockState @@ -53,7 +52,7 @@ open class PixLyzerBlockItem( companion object : PixLyzerItemFactory, MultiClassFactory { override val ALIASES = setOf("BlockItem", "AliasedBlockItem") - private val BLOCK_FIELD = PixLyzerBlockItem::block.jvmField.field + private val BLOCK_FIELD = PixLyzerBlockItem::block.field override fun build(resourceLocation: ResourceLocation, registries: Registries, data: Map): PixLyzerBlockItem { return PixLyzerBlockItem(resourceLocation, registries, data) 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 69e5ac42e..f0dd8ffa9 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 @@ -87,6 +87,6 @@ abstract class RegistryItem : Identified { } companion object { - private val INJECTS_FIELD = RegistryItem::injects.jvmField.field + private val INJECTS_FIELD = RegistryItem::injects.field } }