SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität

Regenerate Material enum

Quellcode durchsuchen 
By: md_5 <git@md-5.net>
Dieser Commit ist enthalten in:
Bukkit/Spigot 2019-04-23 20:59:33 +10:00
Ursprung e9ae9842f0
Commit ac299a4180
1 geänderte Dateien mit 13 neuen und 12 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

25
paper-api/src/main/java/org/bukkit/Material.java
Datei anzeigen

@ -528,6 +528,10 @@ public enum Material implements Keyed {
*/ */
COMPARATOR(18911, Comparator.class), COMPARATOR(18911, Comparator.class),
COMPASS(24139), COMPASS(24139),
/**
* BlockData: {@link Levelled}
*/
COMPOSTER(31247, Levelled.class),
/** /**
* BlockData: {@link Waterlogged} * BlockData: {@link Waterlogged}
*/ */
@ -559,12 +563,12 @@ public enum Material implements Keyed {
/** /**
* BlockData: {@link Slab} * BlockData: {@link Slab}
*/ */
CUT_RED_SANDSTONE_SLAB(-11, Slab.class), CUT_RED_SANDSTONE_SLAB(7220, Slab.class),
CUT_SANDSTONE(6118), CUT_SANDSTONE(6118),
/** /**
* BlockData: {@link Slab} * BlockData: {@link Slab}
*/ */
CUT_SANDSTONE_SLAB(-10, Slab.class), CUT_SANDSTONE_SLAB(30944, Slab.class),
/** /**
* BlockData: {@link Rotatable} * BlockData: {@link Rotatable}
*/ */
@ -871,7 +875,7 @@ public enum Material implements Keyed {
FLINT_AND_STEEL(28620, 1, 64), FLINT_AND_STEEL(28620, 1, 64),
FLOWER_BANNER_PATTERN(5762, 1), FLOWER_BANNER_PATTERN(5762, 1),
FLOWER_POT(30567), FLOWER_POT(30567),
FOX_SPAWN_EGG(-1), FOX_SPAWN_EGG(22376),
/** /**
* BlockData: {@link Ageable} * BlockData: {@link Ageable}
*/ */
@ -890,7 +894,7 @@ public enum Material implements Keyed {
*/ */
GLASS_PANE(5709, Fence.class), GLASS_PANE(5709, Fence.class),
GLISTERING_MELON_SLICE(20158), GLISTERING_MELON_SLICE(20158),
GLOBE_BANNER_PATTERN(-99, 1), GLOBE_BANNER_PATTERN(27753, 1),
GLOWSTONE(32713), GLOWSTONE(32713),
GLOWSTONE_DUST(6665), GLOWSTONE_DUST(6665),
GOLDEN_APPLE(27732), GOLDEN_APPLE(27732),
@ -1162,7 +1166,7 @@ public enum Material implements Keyed {
LEATHER_BOOTS(15282, 1, 65), LEATHER_BOOTS(15282, 1, 65),
LEATHER_CHESTPLATE(29275, 1, 80), LEATHER_CHESTPLATE(29275, 1, 80),
LEATHER_HELMET(11624, 1, 55), LEATHER_HELMET(11624, 1, 55),
LEATHER_HORSE_ARMOR(-2, 1), LEATHER_HORSE_ARMOR(30667, 1),
LEATHER_LEGGINGS(28210, 1, 75), LEATHER_LEGGINGS(28210, 1, 75),
/** /**
* BlockData: {@link Lectern} * BlockData: {@link Lectern}
@ -1749,11 +1753,11 @@ public enum Material implements Keyed {
RABBIT_HIDE(12467), RABBIT_HIDE(12467),
RABBIT_SPAWN_EGG(26496), RABBIT_SPAWN_EGG(26496),
RABBIT_STEW(10611, 1), RABBIT_STEW(10611, 1),
RAVAGER_SPAWN_EGG(31284),
/** /**
* BlockData: {@link Rail} * BlockData: {@link Rail}
*/ */
RAIL(13285, Rail.class), RAIL(13285, Rail.class),
RAVAGER_SPAWN_EGG(8726),
REDSTONE(11233), REDSTONE(11233),
REDSTONE_BLOCK(19496), REDSTONE_BLOCK(19496),
/** /**
@ -2146,7 +2150,7 @@ public enum Material implements Keyed {
TNT_MINECART(4277, 1), TNT_MINECART(4277, 1),
TORCH(6063), TORCH(6063),
TOTEM_OF_UNDYING(10139, 1), TOTEM_OF_UNDYING(10139, 1),
TRADER_LLAMA_SPAWN_EGG(13512), TRADER_LLAMA_SPAWN_EGG(8439),
/** /**
* BlockData: {@link Chest} * BlockData: {@link Chest}
*/ */
@ -2190,11 +2194,11 @@ public enum Material implements Keyed {
*/ */
VINE(14564, MultipleFacing.class), VINE(14564, MultipleFacing.class),
VOID_AIR(13668), VOID_AIR(13668),
WANDERING_TRADER_SPAWN_EGG(12312),
/** /**
* BlockData: {@link Directional} * BlockData: {@link Directional}
*/ */
WALL_TORCH(25890, Directional.class), WALL_TORCH(25890, Directional.class),
WANDERING_TRADER_SPAWN_EGG(17904),
/** /**
* BlockData: {@link Levelled} * BlockData: {@link Levelled}
*/ */
@ -2300,10 +2304,6 @@ public enum Material implements Keyed {
* BlockData: {@link Directional} * BlockData: {@link Directional}
*/ */
ZOMBIE_WALL_HEAD(16296, Directional.class), ZOMBIE_WALL_HEAD(16296, Directional.class),
/**
* BlockData: {@link Levelled}
*/
COMPOSTER(-4, Levelled.class),
// ----- Legacy Separator ----- // ----- Legacy Separator -----
@Deprecated @Deprecated
LEGACY_AIR(0, 0), LEGACY_AIR(0, 0),
@ -3299,6 +3299,7 @@ public enum Material implements Keyed {
*/ */
@Deprecated @Deprecated
public int getId() { public int getId() {
Validate.isTrue(legacy, "Cannot get ID of Modern Material");
return id; return id;
} }