From 40edfdffcc7be4c150a86142555a16d6eb0f3438 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Wed, 24 Mar 2021 16:27:44 +0100 Subject: [PATCH] fix dimension skylight reading --- .../pixlyzer/generator/generators/DimensionGenerator.kt | 4 ++-- wrapper/PixLyzer.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/DimensionGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/DimensionGenerator.kt index 70bfd96..85ba64e 100644 --- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/DimensionGenerator.kt +++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/DimensionGenerator.kt @@ -27,7 +27,7 @@ object DimensionGenerator : Generator( dimensionData.addProperty("fixed_time", it.asLong) } } - HAS_SKYLIGHT_FIELD?.let { + HAS_SKYLIGHT_FIELD.let { dimensionData.addProperty("has_sky_light", it.getBoolean(dimension)) } HAS_CEILING_FIELD?.let { @@ -83,7 +83,7 @@ object DimensionGenerator : Generator( private val DIMENSION_TYPE_CLASS = DimensionType::class.java private val FIXED_TIME_FIELD = getField(DIMENSION_TYPE_CLASS, "fixedTime") - private val HAS_SKYLIGHT_FIELD = getField(DIMENSION_TYPE_CLASS, "hasSkylight") + private val HAS_SKYLIGHT_FIELD = getField(DIMENSION_TYPE_CLASS, "hasSkylight", "hasSkyLight")!! private val HAS_CEILING_FIELD = getField(DIMENSION_TYPE_CLASS, "hasCeiling") private val ULTRA_WARM_FIELD = getField(DIMENSION_TYPE_CLASS, "ultraWarm") private val NATURAL_FIELD = getField(DIMENSION_TYPE_CLASS, "natural") diff --git a/wrapper/PixLyzer.py b/wrapper/PixLyzer.py index 6afed8a..d391ab6 100755 --- a/wrapper/PixLyzer.py +++ b/wrapper/PixLyzer.py @@ -6,11 +6,11 @@ from pathlib import Path import ujson -# ToDo: "19w35a", "19w34a","19w11a", "19w09a", "19w08b", "19w08a", "19w07a", "19w06a", "19w05a", "19w04b", "19w04a", "19w03c", "19w03b", "19w03a", "19w02a", "18w50a", "18w49a", "18w48b" "18w48a", "18w47b", "18w47a", "18w46a", "18w45a", "18w44a", "18w43c", "18w43b" +# ToDo: "19w35a", "19w34a", "19w11b", "19w11a", "19w09a", "19w08b", "19w08a", "19w07a", "19w06a", "19w05a", "19w04b", "19w04a", "19w03c", "19w03b", "19w03a", "19w02a", "18w50a", "18w49a", "18w48b" "18w48a", "18w47b", "18w47a", "18w46a", "18w45a", "18w44a", "18w43c", "18w43b" VERSIONS_DO_GENERATE = ["1.14.4-pre7", "1.14.4-pre6", "1.14.4-pre5", "1.14.4-pre4", "1.14.4-pre3", "1.14.4-pre2", "1.14.4-pre1", "1.14.3", "1.14.3", "1.14.3-pre4", "1.14.3-pre3", "1.14.3-pre2", "1.14.3-pre1", "1.14.2", "1.14.2 Pre-Release 4", "1.14.2 Pre-Release 3", "1.14.2 Pre-Release 2", "1.14.2 Pre-Release 1", "1.14.1", "1.14.1 Pre-Release 2", "1.14.1 Pre-Release 1", "1.14", "1.14 Pre-Release 5", "1.14 Pre-Release 4", "1.14 Pre-Release 3", "1.14 Pre-Release 2", "1.14 Pre-Release 1", - "19w14b", "19w14a", "3D Shareware v1.34", "19w13b", "19w13a", "19w12b", "19w12a", "19w11b"] + "19w14b", "19w14a", "3D Shareware v1.34", "19w13b", "19w13a", "19w12b", "19w12a"] HASH_FOLDER = os.path.abspath("data/hash/") + "/" ASSETS_HASH_INDEX_FILE = os.path.abspath("data/index")