1.21.4 Support (#38)

* feat: 1.21.4

* feat: world events generator (#36)

* fix: include default light emission again (#37)

* chore: bump to 1.21.4

Author: mworzala

DataGenerator/src/main/java/net/minestom/datagen/DataGenType.java

@@ -23,6 +23,7 @@ public enum DataGenType {
     FEATURE_FLAGS("feature_flags", new FeatureFlagGenerator()),
     FLUIDS("fluids", new FluidGenerator()),
     GAME_EVENTS("game_events", new GameEventGenerator()),
+    WORLD_EVENTS("world_events", new WorldEventGenerator()),
     MATERIALS("items", new MaterialGenerator()),
     MAP_COLORS("map_colors", new MapColorGenerator()),
     PARTICLES("particles", new ParticleGenerator()),

DataGenerator/src/main/java/net/minestom/generators/BlockGenerator.java

@@ -131,7 +131,8 @@ private void writeState(ResourceLocation location, Block block, BlockState block
         if (location.toString().equals("minecraft:light")) {
             // This is a bad special case for light blocks. minecraft:light[level=0] has an emission value of 0, but the default
             // state has an emission value of 15 meaning if this is omitted light 0 will have an emission of 15.
-            appendState(blockJson, state, "lightEmission", blockState.getLightEmission(), 15, int.class);
+            // Switch to include it no matter what in this case.
+            appendState(blockJson, state, "lightEmission", blockState.getLightEmission(), int.class);
         } else {
             appendState(blockJson, state, "lightEmission", blockState.getLightEmission(), 0, int.class);
         }

DataGenerator/src/main/java/net/minestom/generators/MaterialGenerator.java

@@ -62,7 +62,7 @@ public JsonObject generate() {
             // Spawn egg properties
             if (item instanceof SpawnEggItem spawnEggItem) {
                 JsonObject spawnEggProperties = new JsonObject();
-                spawnEggProperties.addProperty("entityType", entityTypeRegistry.getKey(spawnEggItem.getType(ItemStack.EMPTY)).toString());
+                spawnEggProperties.addProperty("entityType", entityTypeRegistry.getKey(spawnEggItem.getType(registryAccess, ItemStack.EMPTY)).toString());
                 itemJson.add("spawnEggProperties", spawnEggProperties);
             }
 

DataGenerator/src/main/java/net/minestom/generators/WorldEventGenerator.java

@@ -0,0 +1,37 @@
+package net.minestom.generators;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.world.entity.ai.attributes.RangedAttribute;
+import net.minecraft.world.level.block.LevelEvent;
+import net.minestom.datagen.DataGenerator;
+
+import java.lang.reflect.Modifier;
+
+public final class WorldEventGenerator extends DataGenerator {
+    @Override
+    public JsonArray generate() {
+        JsonArray worldEvents = new JsonArray();
+
+        try {
+            for (var field : LevelEvent.class.getDeclaredFields()) {
+                if ((field.getModifiers() & Modifier.STATIC) == 0) continue;
+                if (!field.getType().equals(int.class)) continue;
+                if (!field.getName().equals(field.getName().toUpperCase())) continue;
+
+                int id = field.getInt(null);
+                String name = field.getName().toLowerCase();
+                JsonObject worldEvent = new JsonObject();
+                worldEvent.addProperty("name", name);
+                worldEvent.addProperty("id", id);
+                worldEvents.add(worldEvent);
+            }
+        } catch (Throwable e) {
+            throw new RuntimeException(e);
+        }
+
+        return worldEvents;
+    }
+}

gradle/libs.versions.toml

@@ -2,7 +2,7 @@ metadata.format.version = "1.1"
 
 [versions]
 gson = "2.10.1"
-minecraft = "1.21.3"
+minecraft = "1.21.4"
 
 slf4j-api = "2.0.7"
 logback = "1.4.5"