remove biome categories, fix stuff, 22w11a

.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

pom.xml

@@ -17,7 +17,7 @@
         <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <minecraft.version>1.18.2</minecraft.version>
+        <minecraft.version>22w11a</minecraft.version>
     </properties>
 
     <repositories>

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}")
+            }
 
             println("Saving to ${outputDirectory.absolutePath}/${generator.name}.json")
 

src/main/kotlin/de/bixilon/pixlyzer/generator/Generators.kt

@@ -31,7 +31,6 @@ object Generators {
         PointOfInterestGenerator,
         VillagerProfessionGenerator,
         SoundEventGenerator,
-        BiomeCategoryGenerator,
         BiomePrecipitationsGenerator,
 
         EnchantmentTargetsGenerator,

src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BiomeCategoryGenerator.kt

@@ -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
-            )
-        }
-    }
-
-}

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) }

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()) {

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"
+    }
   }
 }