diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/XRotationTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/XRotationTest.kt index 4797a3c18..c6d717cb2 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/XRotationTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/XRotationTest.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.gui.rendering.models.baked.rotation import de.bixilon.kotlinglm.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions -import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.block import de.bixilon.minosoft.gui.rendering.models.baked.BakedModelTestUtil import de.bixilon.minosoft.gui.rendering.models.baked.BakedModelTestUtil.assertFace @@ -36,7 +36,7 @@ class XRotationTest { val to = Vec3(10, 16, 16) / ModelElement.BLOCK_SIZE fun bake(rotation: Int): BakedModel { - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.DOWN to createFaces(from, to)[Directions.DOWN]!!))), textures = mapOf("test" to Namespaces.minecraft("block/test").texture())), x = rotation) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.DOWN to createFaces(from, to)[Directions.DOWN]!!))), textures = mapOf("test" to minecraft("block/test").texture())), x = rotation) return model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! } @@ -50,7 +50,7 @@ class XRotationTest { val to = Vec3(10, 16, 16) / ModelElement.BLOCK_SIZE fun bake(rotation: Int): BakedModel { - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.UP to createFaces(from, to)[Directions.UP]!!))), textures = mapOf("test" to Namespaces.minecraft("block/test").texture())), x = rotation) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.UP to createFaces(from, to)[Directions.UP]!!))), textures = mapOf("test" to minecraft("block/test").texture())), x = rotation) return model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! } @@ -64,7 +64,7 @@ class XRotationTest { val to = Vec3(10, 16, 16) / ModelElement.BLOCK_SIZE fun bake(rotation: Int): BakedModel { - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.NORTH to createFaces(from, to)[Directions.NORTH]!!))), textures = mapOf("test" to Namespaces.minecraft("block/test").texture())), x = rotation) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.NORTH to createFaces(from, to)[Directions.NORTH]!!))), textures = mapOf("test" to minecraft("block/test").texture())), x = rotation) return model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! } @@ -78,7 +78,7 @@ class XRotationTest { val to = Vec3(10, 16, 16) / ModelElement.BLOCK_SIZE fun bake(rotation: Int): BakedModel { - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.SOUTH to createFaces(from, to)[Directions.SOUTH]!!))), textures = mapOf("test" to Namespaces.minecraft("block/test").texture())), x = rotation) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.SOUTH to createFaces(from, to)[Directions.SOUTH]!!))), textures = mapOf("test" to minecraft("block/test").texture())), x = rotation) return model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! } @@ -92,7 +92,7 @@ class XRotationTest { val to = Vec3(10, 16, 16) / ModelElement.BLOCK_SIZE fun bake(rotation: Int): BakedModel { - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.WEST to createFaces(from, to)[Directions.WEST]!!))), textures = mapOf("test" to Namespaces.minecraft("block/test").texture())), x = rotation) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.WEST to createFaces(from, to)[Directions.WEST]!!))), textures = mapOf("test" to minecraft("block/test").texture())), x = rotation) return model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! } @@ -108,7 +108,7 @@ class XRotationTest { val to = Vec3(10, 16, 16) / ModelElement.BLOCK_SIZE fun bake(rotation: Int): BakedModel { - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.EAST to createFaces(from, to)[Directions.EAST]!!))), textures = mapOf("test" to Namespaces.minecraft("block/test").texture())), x = rotation) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.EAST to createFaces(from, to)[Directions.EAST]!!))), textures = mapOf("test" to minecraft("block/test").texture())), x = rotation) return model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! } diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/XYRotationTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/XYRotationTest.kt index 79f628f2a..ac43e1984 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/XYRotationTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/XYRotationTest.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.gui.rendering.models.baked.rotation import de.bixilon.kotlinglm.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions -import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.block import de.bixilon.minosoft.gui.rendering.models.baked.BakedModelTestUtil import de.bixilon.minosoft.gui.rendering.models.baked.BakedModelTestUtil.assertFace @@ -33,7 +33,7 @@ class XYRotationTest { val from = Vec3(6, 0, 6) / ModelElement.BLOCK_SIZE val to = Vec3(10, 16, 16) / ModelElement.BLOCK_SIZE - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = createFaces(from, to))), textures = mapOf("test" to Namespaces.minecraft("block/test").texture())), x = 1, y = 1) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = createFaces(from, to))), textures = mapOf("test" to minecraft("block/test").texture())), x = 1, y = 1) val baked = model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! baked.assertFace(Directions.DOWN, block(0, 6, 6, 0, 6, 10, 16, 6, 10, 16, 6, 6)) @@ -48,7 +48,7 @@ class XYRotationTest { val from = Vec3(6, 0, 6) / ModelElement.BLOCK_SIZE val to = Vec3(10, 16, 16) / ModelElement.BLOCK_SIZE - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = createFaces(from, to))), textures = mapOf("test" to Namespaces.minecraft("block/test").texture())), x = 1, y = 3) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = createFaces(from, to))), textures = mapOf("test" to minecraft("block/test").texture())), x = 1, y = 3) val baked = model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! baked.assertFace(Directions.DOWN, block(0, 6, 6, 0, 6, 10, 16, 6, 10, 16, 6, 6)) diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/YRotationTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/YRotationTest.kt index f11d46d73..b404dbdf9 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/YRotationTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/rotation/YRotationTest.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.gui.rendering.models.baked.rotation import de.bixilon.kotlinglm.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions -import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.block import de.bixilon.minosoft.gui.rendering.models.baked.BakedModelTestUtil import de.bixilon.minosoft.gui.rendering.models.baked.BakedModelTestUtil.assertFace @@ -36,7 +36,7 @@ class YRotationTest { val to = Vec3(10, 16, 16) / ModelElement.BLOCK_SIZE fun bake(rotation: Int): BakedModel { - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.DOWN to createFaces(from, to)[Directions.DOWN]!!))), textures = mapOf("test" to Namespaces.minecraft("block/test").texture())), y = rotation) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.DOWN to createFaces(from, to)[Directions.DOWN]!!))), textures = mapOf("test" to minecraft("block/test").texture())), y = rotation) return model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! } @@ -53,7 +53,7 @@ class YRotationTest { val to = Vec3(10, 16, 16) / ModelElement.BLOCK_SIZE fun bake(rotation: Int): BakedModel { - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.UP to createFaces(from, to)[Directions.UP]!!))), textures = mapOf("test" to Namespaces.minecraft("block/test").texture())), y = rotation) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.UP to createFaces(from, to)[Directions.UP]!!))), textures = mapOf("test" to minecraft("block/test").texture())), y = rotation) return model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! } @@ -70,7 +70,7 @@ class YRotationTest { val to = Vec3(10, 16, 16) / ModelElement.BLOCK_SIZE fun bake(rotation: Int): BakedModel { - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.NORTH to createFaces(from, to)[Directions.NORTH]!!))), textures = mapOf("test" to Namespaces.minecraft("block/test").texture())), y = rotation) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.NORTH to createFaces(from, to)[Directions.NORTH]!!))), textures = mapOf("test" to minecraft("block/test").texture())), y = rotation) return model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! } @@ -87,7 +87,7 @@ class YRotationTest { val to = Vec3(10, 16, 16) / ModelElement.BLOCK_SIZE fun bake(rotation: Int): BakedModel { - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.SOUTH to createFaces(from, to)[Directions.SOUTH]!!))), textures = mapOf("test" to Namespaces.minecraft("block/test").texture())), y = rotation) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.SOUTH to createFaces(from, to)[Directions.SOUTH]!!))), textures = mapOf("test" to minecraft("block/test").texture())), y = rotation) return model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! } @@ -104,7 +104,7 @@ class YRotationTest { val to = Vec3(10, 16, 16) / ModelElement.BLOCK_SIZE fun bake(rotation: Int): BakedModel { - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.WEST to createFaces(from, to)[Directions.WEST]!!))), textures = mapOf("test" to Namespaces.minecraft("block/test").texture())), y = rotation) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.WEST to createFaces(from, to)[Directions.WEST]!!))), textures = mapOf("test" to minecraft("block/test").texture())), y = rotation) return model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! } @@ -121,7 +121,7 @@ class YRotationTest { val to = Vec3(10, 16, 16) / ModelElement.BLOCK_SIZE fun bake(rotation: Int): BakedModel { - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.EAST to createFaces(from, to)[Directions.EAST]!!))), textures = mapOf("test" to Namespaces.minecraft("block/test").texture())), y = rotation) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.EAST to createFaces(from, to)[Directions.EAST]!!))), textures = mapOf("test" to minecraft("block/test").texture())), y = rotation) return model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! } diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FacePropertiesTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FacePropertiesTest.kt index 1c62e23dd..8ff5e8ca4 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FacePropertiesTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FacePropertiesTest.kt @@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.models.block.state.baked.cull import de.bixilon.kotlinglm.vec2.Vec2 import de.bixilon.kotlinglm.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions -import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.models.baked.BakedModelTestUtil import de.bixilon.minosoft.gui.rendering.models.block.BlockModel import de.bixilon.minosoft.gui.rendering.models.block.element.ModelElement @@ -34,7 +34,7 @@ class FacePropertiesTest { fun fullBlock() { val from = Vec3(0.0f) val to = Vec3(1.0f) - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = BakedModelTestUtil.createFaces())), textures = mapOf("test" to Namespaces.minecraft("block/test").texture()))) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = BakedModelTestUtil.createFaces())), textures = mapOf("test" to minecraft("block/test").texture()))) val baked = model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! @@ -49,7 +49,7 @@ class FacePropertiesTest { fun lowerSlab() { val from = Vec3(0.0f, 0.0f, 0.0f) val to = Vec3(1.0f, 0.5f, 1.0f) - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = BakedModelTestUtil.createFaces())), textures = mapOf("test" to Namespaces.minecraft("block/test").texture()))) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = BakedModelTestUtil.createFaces())), textures = mapOf("test" to minecraft("block/test").texture()))) val baked = model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! @@ -64,7 +64,7 @@ class FacePropertiesTest { fun upperSlab() { val from = Vec3(0.0f, 0.5f, 0.0f) val to = Vec3(1.0f, 1.0f, 1.0f) - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = BakedModelTestUtil.createFaces())), textures = mapOf("test" to Namespaces.minecraft("block/test").texture()))) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = BakedModelTestUtil.createFaces())), textures = mapOf("test" to minecraft("block/test").texture()))) val baked = model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! @@ -79,7 +79,7 @@ class FacePropertiesTest { fun northSlab() { val from = Vec3(0.0f, 0.0f, 0.0f) val to = Vec3(1.0f, 1.0f, 0.5f) - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = BakedModelTestUtil.createFaces())), textures = mapOf("test" to Namespaces.minecraft("block/test").texture()))) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = BakedModelTestUtil.createFaces())), textures = mapOf("test" to minecraft("block/test").texture()))) val baked = model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! @@ -95,7 +95,7 @@ class FacePropertiesTest { fun southSlab() { val from = Vec3(0.0f, 0.0f, 0.5f) val to = Vec3(1.0f, 1.0f, 1.0f) - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = BakedModelTestUtil.createFaces())), textures = mapOf("test" to Namespaces.minecraft("block/test").texture()))) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = BakedModelTestUtil.createFaces())), textures = mapOf("test" to minecraft("block/test").texture()))) val baked = model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! @@ -111,7 +111,7 @@ class FacePropertiesTest { fun westSlab() { val from = Vec3(0.0f, 0.0f, 0.0f) val to = Vec3(0.5f, 1.0f, 1.0f) - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = BakedModelTestUtil.createFaces())), textures = mapOf("test" to Namespaces.minecraft("block/test").texture()))) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = BakedModelTestUtil.createFaces())), textures = mapOf("test" to minecraft("block/test").texture()))) val baked = model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! @@ -127,7 +127,7 @@ class FacePropertiesTest { fun eastSlab() { val from = Vec3(0.5f, 0.0f, 0.0f) val to = Vec3(1.0f, 1.0f, 1.0f) - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = BakedModelTestUtil.createFaces())), textures = mapOf("test" to Namespaces.minecraft("block/test").texture()))) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = BakedModelTestUtil.createFaces())), textures = mapOf("test" to minecraft("block/test").texture()))) val baked = model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! @@ -143,7 +143,7 @@ class FacePropertiesTest { fun `mini cube`() { val from = Vec3(0.1f, 0.2f, 0.3f) val to = Vec3(0.7f, 0.8f, 0.9f) - val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = BakedModelTestUtil.createFaces())), textures = mapOf("test" to Namespaces.minecraft("block/test").texture()))) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = BakedModelTestUtil.createFaces())), textures = mapOf("test" to minecraft("block/test").texture()))) val baked = model.bake(BakedModelTestUtil.createTextureManager("block/test"))!! diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/InteractionTestUtil.kt b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/InteractionTestUtil.kt index 00c32fbc6..12bf8e023 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/InteractionTestUtil.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/InteractionTestUtil.kt @@ -28,7 +28,7 @@ import de.bixilon.minosoft.data.entities.entities.player.RemotePlayerEntity import de.bixilon.minosoft.data.entities.entities.player.additional.PlayerAdditional import de.bixilon.minosoft.data.physics.PhysicsTestUtil.createPlayer import de.bixilon.minosoft.data.registries.entities.EntityType -import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY import de.bixilon.minosoft.protocol.network.connection.play.ConnectionTestUtil import de.bixilon.minosoft.protocol.network.connection.play.PacketTestUtil.assertPacket @@ -42,7 +42,7 @@ object InteractionTestUtil { private val TICK = KeyHandler::class.java.getDeclaredMethod("onTick").apply { isAccessible = true } private val RELEASE = KeyHandler::class.java.getDeclaredMethod("onRelease").apply { isAccessible = true } - private val pig = EntityType(Pig.identifier, Namespaces.minecraft(""), 1.0f, 1.0f, true, false, mapOf(), Pig, null) + private val pig = EntityType(Pig.identifier, minecraft(""), 1.0f, 1.0f, true, false, mapOf(), Pig, null) fun createConnection(): PlayConnection { val connection = ConnectionTestUtil.createConnection(0) diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/EntityUseIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/EntityUseIT.kt index 34845828f..eff85f77c 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/EntityUseIT.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/input/interaction/short/EntityUseIT.kt @@ -26,7 +26,7 @@ import de.bixilon.minosoft.data.entities.data.EntityData import de.bixilon.minosoft.data.entities.entities.animal.Pig import de.bixilon.minosoft.data.entities.entities.player.Hands import de.bixilon.minosoft.data.registries.entities.EntityType -import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.registries.items.CoalTest0 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.EMPTY import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY @@ -44,7 +44,7 @@ import org.testng.annotations.Test @Test(groups = ["interaction"], dependsOnGroups = ["item", "block"]) class EntityUseIT { - private val pig = EntityType(Pig.identifier, Namespaces.minecraft(""), 1.0f, 1.0f, true, false, mapOf(), Pig, null) + private val pig = EntityType(Pig.identifier, minecraft(""), 1.0f, 1.0f, true, false, mapOf(), Pig, null) fun testAirOnPig() { diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Acacia.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Acacia.kt index f99fc21aa..731bbeca1 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Acacia.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Acacia.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.wood import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings -import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.registries.Registries @@ -24,7 +24,7 @@ interface Acacia { class Leaves(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : LeavesBlock(identifier, settings), Acacia { companion object : BlockFactory { - override val identifier = Namespaces.minecraft("acacia_leaves") + override val identifier = minecraft("acacia_leaves") override fun build(registries: Registries, settings: BlockSettings) = Leaves(settings = settings) } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Azalea.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Azalea.kt index 0f7a678f3..1b88e3787 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Azalea.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Azalea.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.wood import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings -import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.registries.Registries @@ -24,7 +24,7 @@ interface Azalea { class Leaves(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : LeavesBlock(identifier, settings), Azalea { companion object : BlockFactory { - override val identifier = Namespaces.minecraft("azalea_leaves") + override val identifier = minecraft("azalea_leaves") override fun build(registries: Registries, settings: BlockSettings) = Leaves(settings = settings) } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Birch.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Birch.kt index e5bfc4c2c..b3f4a6f8c 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Birch.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Birch.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.wood import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings -import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.registries.Registries @@ -24,7 +24,7 @@ interface Birch { class Leaves(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : LeavesBlock(identifier, settings), Birch { companion object : BlockFactory { - override val identifier = Namespaces.minecraft("birch_leaves") + override val identifier = minecraft("birch_leaves") override fun build(registries: Registries, settings: BlockSettings) = Leaves(settings = settings) } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Cherry.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Cherry.kt index 40667f5c0..84fcfd1f4 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Cherry.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Cherry.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.wood import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings -import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.registries.Registries @@ -24,7 +24,7 @@ interface Cherry { class Leaves(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : LeavesBlock(identifier, settings), Cherry { companion object : BlockFactory { - override val identifier = Namespaces.minecraft("cherry_leaves") + override val identifier = minecraft("cherry_leaves") override fun build(registries: Registries, settings: BlockSettings) = Leaves(settings = settings) } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/DarkOak.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/DarkOak.kt index f0d7dc126..94f6ecccc 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/DarkOak.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/DarkOak.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.wood import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings -import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.registries.Registries @@ -24,7 +24,7 @@ interface DarkOak { class Leaves(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : LeavesBlock(identifier, settings), DarkOak { companion object : BlockFactory { - override val identifier = Namespaces.minecraft("dark_oak_leaves") + override val identifier = minecraft("dark_oak_leaves") override fun build(registries: Registries, settings: BlockSettings) = Leaves(settings = settings) } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/FloweringAzalea.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/FloweringAzalea.kt index aff4619d9..b7224e48a 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/FloweringAzalea.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/FloweringAzalea.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.wood import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings -import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.registries.Registries @@ -24,7 +24,7 @@ interface FloweringAzalea { class Leaves(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : LeavesBlock(identifier, settings), FloweringAzalea { companion object : BlockFactory { - override val identifier = Namespaces.minecraft("flowering_azalea_leaves") + override val identifier = minecraft("flowering_azalea_leaves") override fun build(registries: Registries, settings: BlockSettings) = Leaves(settings = settings) } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Jungle.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Jungle.kt index 1c768fddc..958f73be0 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Jungle.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Jungle.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.wood import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings -import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.registries.Registries @@ -24,7 +24,7 @@ interface Jungle { class Leaves(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : LeavesBlock(identifier, settings), Jungle { companion object : BlockFactory { - override val identifier = Namespaces.minecraft("jungle_leaves") + override val identifier = minecraft("jungle_leaves") override fun build(registries: Registries, settings: BlockSettings) = Leaves(settings = settings) } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Mangrove.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Mangrove.kt index 2e445ac52..e7222f7da 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Mangrove.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Mangrove.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.wood import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings -import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.registries.Registries @@ -24,7 +24,7 @@ interface Mangrove { class Leaves(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : LeavesBlock(identifier, settings), Mangrove { companion object : BlockFactory { - override val identifier = Namespaces.minecraft("mangrove_leaves") + override val identifier = minecraft("mangrove_leaves") override fun build(registries: Registries, settings: BlockSettings) = Leaves(settings = settings) } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Oak.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Oak.kt index 09c75b4f0..8167f3d64 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Oak.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Oak.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.wood import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings -import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.registries.Registries @@ -24,7 +24,7 @@ interface Oak { class Leaves(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : LeavesBlock(identifier, settings), Oak { companion object : BlockFactory { - override val identifier = Namespaces.minecraft("oak_leaves") + override val identifier = minecraft("oak_leaves") override fun build(registries: Registries, settings: BlockSettings) = Leaves(settings = settings) } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Spruce.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Spruce.kt index c84e00f0f..07fcb3d2d 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Spruce.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wood/Spruce.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.wood import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings -import de.bixilon.minosoft.data.registries.identified.Namespaces +import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.registries.Registries @@ -24,7 +24,7 @@ interface Spruce { class Leaves(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : LeavesBlock(identifier, settings), Spruce { companion object : BlockFactory { - override val identifier = Namespaces.minecraft("spruce_leaves") + override val identifier = minecraft("spruce_leaves") override fun build(registries: Registries, settings: BlockSettings) = Leaves(settings = settings) }