From 5d0a74ce575fc61ff0ac82dc39c87125dc1a840a Mon Sep 17 00:00:00 2001 From: Bixilon Date: Wed, 12 Oct 2022 13:09:52 +0200 Subject: [PATCH] rename rsl datafixer to rls --- .../de/bixilon/minosoft/config/StaticConfiguration.kt | 2 +- .../bixilon/minosoft/data/registries/blocks/BlockState.kt | 4 ---- .../minosoft/data/registries/effects/StatusEffect.kt | 2 +- .../minosoft/data/registries/entities/EntityType.kt | 2 +- .../minosoft/data/registries/registries/Registries.kt | 2 +- .../minosoft/datafixer/{rsl => rls}/BlockEntityFixer.kt | 2 +- .../datafixer/{rsl => rls}/EntityAttributeFixer.kt | 2 +- .../minosoft/datafixer/{rsl => rls}/RegistryFixer.kt | 2 +- .../datafixer/{rsl => rls}/ResourceLocationFixer.kt | 2 +- .../minosoft/protocol/packets/s2c/play/chunk/ChunkS2CP.kt | 2 +- .../minosoft/data/registries/shapes/side/VoxelSideTest.kt | 8 ++++---- 11 files changed, 13 insertions(+), 17 deletions(-) rename src/main/java/de/bixilon/minosoft/datafixer/{rsl => rls}/BlockEntityFixer.kt (98%) rename src/main/java/de/bixilon/minosoft/datafixer/{rsl => rls}/EntityAttributeFixer.kt (97%) rename src/main/java/de/bixilon/minosoft/datafixer/{rsl => rls}/RegistryFixer.kt (96%) rename src/main/java/de/bixilon/minosoft/datafixer/{rsl => rls}/ResourceLocationFixer.kt (96%) diff --git a/src/main/java/de/bixilon/minosoft/config/StaticConfiguration.kt b/src/main/java/de/bixilon/minosoft/config/StaticConfiguration.kt index ca84cd847..c7d9fddcc 100644 --- a/src/main/java/de/bixilon/minosoft/config/StaticConfiguration.kt +++ b/src/main/java/de/bixilon/minosoft/config/StaticConfiguration.kt @@ -22,5 +22,5 @@ object StaticConfiguration { const val IGNORE_SERVER_LIGHT = true - const val LIGHT_DEBUG_MODE = true + const val LIGHT_DEBUG_MODE = false } diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/BlockState.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/BlockState.kt index afc2727bf..87fb9dc49 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/BlockState.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/BlockState.kt @@ -104,10 +104,6 @@ data class BlockState( getProperties(it) } ?: emptyMap() - if (block.resourceLocation.path == "oak_stairs") { - println() - } - val material = registries.materialRegistry[ResourceLocation(data["material"].unsafeCast())]!! diff --git a/src/main/java/de/bixilon/minosoft/data/registries/effects/StatusEffect.kt b/src/main/java/de/bixilon/minosoft/data/registries/effects/StatusEffect.kt index fc6390b6d..964fa3c9c 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/effects/StatusEffect.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/effects/StatusEffect.kt @@ -23,7 +23,7 @@ import de.bixilon.minosoft.data.registries.registries.registry.RegistryItem import de.bixilon.minosoft.data.registries.registries.registry.codec.ResourceLocationCodec import de.bixilon.minosoft.data.text.formatting.color.RGBColor import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asRGBColor -import de.bixilon.minosoft.datafixer.rsl.EntityAttributeFixer.fix +import de.bixilon.minosoft.datafixer.rls.EntityAttributeFixer.fix import de.bixilon.minosoft.util.KUtil.toResourceLocation import java.util.* diff --git a/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityType.kt b/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityType.kt index 97f6a02c9..11c78ff83 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityType.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/entities/EntityType.kt @@ -29,7 +29,7 @@ import de.bixilon.minosoft.data.registries.item.items.SpawnEggItem import de.bixilon.minosoft.data.registries.registries.Registries import de.bixilon.minosoft.data.registries.registries.registry.RegistryItem import de.bixilon.minosoft.data.registries.registries.registry.codec.ResourceLocationCodec -import de.bixilon.minosoft.datafixer.rsl.EntityAttributeFixer.fix +import de.bixilon.minosoft.datafixer.rls.EntityAttributeFixer.fix import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.util.KUtil.toResourceLocation import de.bixilon.minosoft.util.logging.Log diff --git a/src/main/java/de/bixilon/minosoft/data/registries/registries/Registries.kt b/src/main/java/de/bixilon/minosoft/data/registries/registries/Registries.kt index 7b5fdacee..a39033111 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/registries/Registries.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/registries/Registries.kt @@ -54,7 +54,7 @@ import de.bixilon.minosoft.data.registries.sound.SoundGroup import de.bixilon.minosoft.data.registries.statistics.Statistic import de.bixilon.minosoft.data.registries.versions.Version import de.bixilon.minosoft.datafixer.enumeration.EntityDataTypesFixer -import de.bixilon.minosoft.datafixer.rsl.RegistryFixer.fix +import de.bixilon.minosoft.datafixer.rls.RegistryFixer.fix import de.bixilon.minosoft.protocol.packets.c2s.play.entity.EntityActionC2SP import de.bixilon.minosoft.protocol.packets.s2c.play.title.TitleS2CF import de.bixilon.minosoft.recipes.RecipeRegistry diff --git a/src/main/java/de/bixilon/minosoft/datafixer/rsl/BlockEntityFixer.kt b/src/main/java/de/bixilon/minosoft/datafixer/rls/BlockEntityFixer.kt similarity index 98% rename from src/main/java/de/bixilon/minosoft/datafixer/rsl/BlockEntityFixer.kt rename to src/main/java/de/bixilon/minosoft/datafixer/rls/BlockEntityFixer.kt index 9cab50255..6635b4f80 100644 --- a/src/main/java/de/bixilon/minosoft/datafixer/rsl/BlockEntityFixer.kt +++ b/src/main/java/de/bixilon/minosoft/datafixer/rls/BlockEntityFixer.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.datafixer.rsl +package de.bixilon.minosoft.datafixer.rls import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.datafixer.DataFixerUtil.asResourceLocationMap diff --git a/src/main/java/de/bixilon/minosoft/datafixer/rsl/EntityAttributeFixer.kt b/src/main/java/de/bixilon/minosoft/datafixer/rls/EntityAttributeFixer.kt similarity index 97% rename from src/main/java/de/bixilon/minosoft/datafixer/rsl/EntityAttributeFixer.kt rename to src/main/java/de/bixilon/minosoft/datafixer/rls/EntityAttributeFixer.kt index e006351b2..7748cd307 100644 --- a/src/main/java/de/bixilon/minosoft/datafixer/rsl/EntityAttributeFixer.kt +++ b/src/main/java/de/bixilon/minosoft/datafixer/rls/EntityAttributeFixer.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.datafixer.rsl +package de.bixilon.minosoft.datafixer.rls import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.datafixer.DataFixerUtil.asResourceLocationMap diff --git a/src/main/java/de/bixilon/minosoft/datafixer/rsl/RegistryFixer.kt b/src/main/java/de/bixilon/minosoft/datafixer/rls/RegistryFixer.kt similarity index 96% rename from src/main/java/de/bixilon/minosoft/datafixer/rsl/RegistryFixer.kt rename to src/main/java/de/bixilon/minosoft/datafixer/rls/RegistryFixer.kt index 0cea5dbb2..6d1a37e3c 100644 --- a/src/main/java/de/bixilon/minosoft/datafixer/rsl/RegistryFixer.kt +++ b/src/main/java/de/bixilon/minosoft/datafixer/rls/RegistryFixer.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.datafixer.rsl +package de.bixilon.minosoft.datafixer.rls import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.datafixer.DataFixerUtil.asResourceLocationMap diff --git a/src/main/java/de/bixilon/minosoft/datafixer/rsl/ResourceLocationFixer.kt b/src/main/java/de/bixilon/minosoft/datafixer/rls/ResourceLocationFixer.kt similarity index 96% rename from src/main/java/de/bixilon/minosoft/datafixer/rsl/ResourceLocationFixer.kt rename to src/main/java/de/bixilon/minosoft/datafixer/rls/ResourceLocationFixer.kt index b2ec3230e..4547db75d 100644 --- a/src/main/java/de/bixilon/minosoft/datafixer/rsl/ResourceLocationFixer.kt +++ b/src/main/java/de/bixilon/minosoft/datafixer/rls/ResourceLocationFixer.kt @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.datafixer.rsl +package de.bixilon.minosoft.datafixer.rls import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.datafixer.Fixer diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkS2CP.kt index 424e0b9bb..aeb677bc7 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chunk/ChunkS2CP.kt @@ -23,7 +23,7 @@ import de.bixilon.minosoft.data.entities.block.BlockEntity import de.bixilon.minosoft.data.registries.dimension.DimensionProperties import de.bixilon.minosoft.data.world.biome.source.SpatialBiomeArray import de.bixilon.minosoft.data.world.chunk.ChunkData -import de.bixilon.minosoft.datafixer.rsl.BlockEntityFixer.fix +import de.bixilon.minosoft.datafixer.rls.BlockEntityFixer.fix import de.bixilon.minosoft.gui.rendering.util.VecUtil.of import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3iUtil.EMPTY import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection diff --git a/src/test/java/de/bixilon/minosoft/data/registries/shapes/side/VoxelSideTest.kt b/src/test/java/de/bixilon/minosoft/data/registries/shapes/side/VoxelSideTest.kt index 35082d67a..6a2f700cc 100644 --- a/src/test/java/de/bixilon/minosoft/data/registries/shapes/side/VoxelSideTest.kt +++ b/src/test/java/de/bixilon/minosoft/data/registries/shapes/side/VoxelSideTest.kt @@ -72,7 +72,7 @@ internal class VoxelSideTest { assertEquals(emptySet(), result.sides) } - fun testOr1() { + private fun testOr1() { val a = VoxelSide(0.0f, 0.0f, 1.0f, 1.0f) val b = VoxelSide(0.0f, 0.0f, 0.5f, 0.5f) @@ -80,7 +80,7 @@ internal class VoxelSideTest { assertEquals(or, b) } - fun testOr2() { + private fun testOr2() { val a = VoxelSide(0.0f, 0.0f, 3.0f, 3.0f) val b = VoxelSide(1.0f, 1.0f, 2.0f, 2.0f) @@ -88,7 +88,7 @@ internal class VoxelSideTest { assertEquals(or, b) } - fun testOr3() { + private fun testOr3() { val a = VoxelSide(1.0f, 1.0f, 2.0f, 2.0f) val b = VoxelSide(0.0f, 0.0f, 3.0f, 3.0f) @@ -96,7 +96,7 @@ internal class VoxelSideTest { assertEquals(or, a) } - fun testOr4() { + private fun testOr4() { val a = VoxelSide(0.0f, 0.0f, 1.0f, 1.0f) val b = VoxelSide(0.0f, 0.0f, 0.5f, 1.0f)