diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9859f81..cf12214 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ cache:
stages:
- build
- latest
- - 1.18.1
+ - 1.18.2
- 1.17.1
- 1.16.5
- 1.15.2
@@ -23,18 +23,18 @@ stages:
build:
stage: build
script:
- - "cd wrapper && python3 PixLyzer.py --only-version=1.18.2 --dont-compile --only-map"
+ - "cd wrapper && python3 PixLyzer.py --only-version=22w11a --dont-compile --only-map"
- 'cd ../ && mvn clean $MAVEN_CLI_OPTS verify'
latest:
stage: latest
script:
- - "cd wrapper && python3 PixLyzer.py --only-version=1.18.2 --dont-compile"
+ - "cd wrapper && python3 PixLyzer.py --only-version=22w11a --dont-compile"
-1.18.1:
- stage: 1.18.1
+1.18.2:
+ stage: 1.18.2
script:
- - "cd wrapper && python3 PixLyzer.py --only-version=1.18.1 --dont-compile"
+ - "cd wrapper && python3 PixLyzer.py --only-version=1.18.2 --dont-compile"
1.17.1:
stage: 1.17.1
diff --git a/pom.xml b/pom.xml
index 7b6c418..72cd8a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
1.8
1.8
1.8
- 1.18.2
+ 22w11a
diff --git a/src/main/kotlin/de/bixilon/pixlyzer/PixLyzer.kt b/src/main/kotlin/de/bixilon/pixlyzer/PixLyzer.kt
index ba2bd5e..82e516f 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/PixLyzer.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/PixLyzer.kt
@@ -82,9 +82,10 @@ object PixLyzer {
} else {
error("${generator.name} has 0 entries!")
}
+ } else {
+ generator.test()
+ println("Tests succeeded for ${generator.name}")
}
- generator.test()
- println("Tests succeeded for ${generator.name}")
println("Saving to ${outputDirectory.absolutePath}/${generator.name}.json")
diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/Generators.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/Generators.kt
index 44af642..b4c0eaf 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/Generators.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/Generators.kt
@@ -31,7 +31,6 @@ object Generators {
PointOfInterestGenerator,
VillagerProfessionGenerator,
SoundEventGenerator,
- BiomeCategoryGenerator,
BiomePrecipitationsGenerator,
EnchantmentTargetsGenerator,
diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BiomeCategoryGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BiomeCategoryGenerator.kt
deleted file mode 100644
index b50e1e4..0000000
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BiomeCategoryGenerator.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package de.bixilon.pixlyzer.generator.generators
-
-import de.bixilon.pixlyzer.generator.Generator
-import net.minecraft.world.biome.Biome
-
-object BiomeCategoryGenerator : Generator(
- "biome_categories"
-) {
- override fun generate() {
- for (biomeCategory in Biome.Category.values()) {
- data[biomeCategory.ordinal] = mutableMapOf(
- "name" to biomeCategory.name
- )
- }
- }
-
-}
diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BiomeGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BiomeGenerator.kt
index 3e8f671..df63a9f 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BiomeGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BiomeGenerator.kt
@@ -22,7 +22,6 @@ object BiomeGenerator : Generator(
"id" to id,
"water_color" to biome.getWaterColor(), // do not cleanuo!
"water_fog_color" to biome.getWaterFogColor(), // do not cleanuo!
- "category" to biome.category.ordinal,
)
BIOME_DEPTH_FIELD?.let { biomeData["depth"] = it.getFloat(biome) }
BIOME_SCALE_FIELD?.let { biomeData["scale"] = it.getFloat(biome) }
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 d574b6c..4edd9fc 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/DimensionGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/DimensionGenerator.kt
@@ -14,7 +14,8 @@ import java.lang.reflect.Modifier
import java.util.*
object DimensionGenerator : Generator(
- "dimensions"
+ "dimensions",
+ allowEmpty = true,
) {
override fun generate() {
for ((resourceLocation, id, dimension) in getDimensions()) {
diff --git a/src/main/resources/entities_metadata_mappings.json b/src/main/resources/entities_metadata_mappings.json
index 28d8228..db2143f 100644
--- a/src/main/resources/entities_metadata_mappings.json
+++ b/src/main/resources/entities_metadata_mappings.json
@@ -566,5 +566,11 @@
"field_33486": "GOAT_IS_SCREAMING",
"SCREAMING": "GOAT_IS_SCREAMING"
}
+ },
+ "class_7102": {
+ "data": {
+ "field_37457": "FROG_TYPE",
+ "field_37458": "FROG_FIREWORK"
+ }
}
}