Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-03-02 11:21:15 +01:00
Code Issues Projects Releases Wiki Activity

Cave air and void air must be classified as air

Browse Source
This commit is contained in:
jglrxavpok 2020-09-20 14:54:03 +02:00
parent 1261974420
commit 99c48c8ee1
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prismarine-minecraft-data

@ -1 +1 @@
Subproject commit 5466efe528108c7228ebe737ad5ac70af243e2e7
Subproject commit a805a48c98a345941c095aac7865f1af30c6abf0

10
src/autogenerated/java/net/minestom/server/instance/block/Block.java
View File

@ -2,14 +2,12 @@
// AUTOGENERATED BY EnumGenerator
//==============================
package net.minestom.server.instance.block;
import net.minestom.server.instance.block.states.*;
import net.minestom.server.registry.Registries;
import net.minestom.server.utils.NamespaceID;
import java.util.List;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import net.minestom.server.instance.block.states.*;
@SuppressWarnings({"deprecation"})
public enum Block {
@ -637,8 +635,8 @@ public enum Block {
BAMBOO_SAPLING("minecraft:bamboo_sapling", (short) 9655, 1.0, 1.0, false, false, null, true),
BAMBOO("minecraft:bamboo", (short) 9656, 1.0, 1.0, false, true, null, false),
POTTED_BAMBOO("minecraft:potted_bamboo", (short) 9668, 0.0, 0.0, false, true, null, true),
VOID_AIR("minecraft:void_air", (short) 9669, 0.0, 0.0, false, false, null, true),
CAVE_AIR("minecraft:cave_air", (short) 9670, 0.0, 0.0, false, false, null, true),
VOID_AIR("minecraft:void_air", (short) 9669, 0.0, 0.0, true, false, null, true),
CAVE_AIR("minecraft:cave_air", (short) 9670, 0.0, 0.0, true, false, null, true),
BUBBLE_COLUMN("minecraft:bubble_column", (short) 9671, 0.0, 0.0, false, false, null, false),
POLISHED_GRANITE_STAIRS("minecraft:polished_granite_stairs", (short) 9684, 0.0, 0.0, false, true, null, false),
SMOOTH_RED_SANDSTONE_STAIRS("minecraft:smooth_red_sandstone_stairs", (short) 9764, 0.0, 0.0, false, true, null, false),

2
src/generators/java/net/minestom/codegen/AllGenerators.java
View File

@ -16,7 +16,7 @@ import java.io.IOException;
public class AllGenerators {
public static void main(String[] args) throws IOException {
//BlockEnumGenerator.main(args);
BlockEnumGenerator.main(args);
ItemEnumGenerator.main(args); // must be done after block
PotionEnumGenerator.main(args);
EnchantmentEnumGenerator.main(args);

1
src/generators/java/net/minestom/codegen/RegistriesGenerator.java
View File

@ -42,7 +42,6 @@ public class RegistriesGenerator implements CodeGenerator {
"AIR",
"AIR",
null,
null,
"PIG",
null,
null,

3
src/generators/java/net/minestom/codegen/blocks/BlockEnumGenerator.java
View File

@ -111,7 +111,8 @@ public class BlockEnumGenerator extends MinestomEnumGenerator<BlockContainer> {
if (data.name.equals(NamespaceID.from("minecraft:water")) || data.name.equals(NamespaceID.from("minecraft:lava"))) {
block.setLiquid();
}
if (data.name.equals(NamespaceID.from("minecraft:air"))) {
boolean isAir = data.name.equals(NamespaceID.from("minecraft:air")) || data.name.getPath().endsWith("_air");
if (isAir) {
block.setAir();
}