mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2025-06-12 04:23:54 +00:00
feat: Add support for 1.19 (#1783)
* feat: Add support for 1.19 * build: Update paperweight version * fix: obfuscated names, invalid method signatures * avoid NPE on config access * build: Update paperweight * implement no-op light engine to avoid stalled tasks that never complete * Apply DelegateSemaphore fixes to 1.19 (#1782) * Apply DelegateSemaphore fixes to 1.19 * Fixes * Avoid using PalettedContainerRO#recreate as much as possible. Show an error or warning when we're forced to use it to help fix (#1784) Co-authored-by: Pierre Maurice Schwang <mail@pschwang.eu> Co-authored-by: SirYwell <hannesgreule@outlook.de> Co-authored-by: Jordan <dordsor21@gmail.com>
This commit is contained in:
Alexander Brandes
committed by
GitHub
GitHub
parent
da3fc2e6ea
commit
aa94612b70
@ -30,6 +30,7 @@ import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.util.collection.BlockMap;
|
||||
import com.sk89q.worldedit.world.block.BaseBlock;
|
||||
import com.sk89q.worldedit.world.block.BlockCategories;
|
||||
import com.sk89q.worldedit.world.block.BlockCategory;
|
||||
import com.sk89q.worldedit.world.block.BlockState;
|
||||
import com.sk89q.worldedit.world.block.BlockStateHolder;
|
||||
import com.sk89q.worldedit.world.block.BlockType;
|
||||
@ -60,7 +61,11 @@ public class MultiStageReorder extends AbstractBufferingExtent implements Reorde
|
||||
BlockCategories.BUTTONS.getAll().forEach(type -> priorityMap.put(type, PlacementPriority.LAST));
|
||||
BlockCategories.ANVIL.getAll().forEach(type -> priorityMap.put(type, PlacementPriority.LAST));
|
||||
BlockCategories.WOODEN_PRESSURE_PLATES.getAll().forEach(type -> priorityMap.put(type, PlacementPriority.LAST));
|
||||
BlockCategories.CARPETS.getAll().forEach(type -> priorityMap.put(type, PlacementPriority.LAST));
|
||||
// Keeping CARPETS for pre-1.19 compatibility
|
||||
@SuppressWarnings("deprecation")
|
||||
BlockCategory carpets = BlockCategories.CARPETS;
|
||||
carpets.getAll().forEach(type -> priorityMap.put(type, PlacementPriority.LAST));
|
||||
BlockCategories.WOOL_CARPETS.getAll().forEach(type -> priorityMap.put(type, PlacementPriority.LAST));
|
||||
BlockCategories.RAILS.getAll().forEach(type -> priorityMap.put(type, PlacementPriority.LAST));
|
||||
BlockCategories.BEDS.getAll().forEach(type -> priorityMap.put(type, PlacementPriority.LAST));
|
||||
BlockCategories.SMALL_FLOWERS.getAll().forEach(type -> priorityMap.put(type, PlacementPriority.LAST));
|
||||
@ -132,6 +137,7 @@ public class MultiStageReorder extends AbstractBufferingExtent implements Reorde
|
||||
BlockCategories.DOORS.getAll().forEach(type -> priorityMap.put(type, PlacementPriority.FINAL));
|
||||
BlockCategories.BANNERS.getAll().forEach(type -> priorityMap.put(type, PlacementPriority.FINAL));
|
||||
BlockCategories.SIGNS.getAll().forEach(type -> priorityMap.put(type, PlacementPriority.FINAL));
|
||||
// Keeping sign and wall_sign for 1.13 compatibility
|
||||
@SuppressWarnings("deprecation")
|
||||
BlockType sign = BlockTypes.SIGN;
|
||||
priorityMap.put(sign, PlacementPriority.FINAL);
|
||||
|
||||
@ -76,4 +76,9 @@ public final class Constants {
|
||||
*/
|
||||
public static final int DATA_VERSION_MC_1_18 = 2860;
|
||||
|
||||
/**
|
||||
* The DataVersion for Minecraft 1.19
|
||||
*/
|
||||
public static final int DATA_VERSION_MC_1_19 = 3105;
|
||||
|
||||
}
|
||||
|
||||
@ -33,10 +33,12 @@ public final class BiomeTypes {
|
||||
@Nullable
|
||||
public static final BiomeType BADLANDS = get("minecraft:badlands");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType BADLANDS_PLATEAU = get("minecraft:badlands_plateau");
|
||||
@Nullable
|
||||
public static final BiomeType BAMBOO_JUNGLE = get("minecraft:bamboo_jungle");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType BAMBOO_JUNGLE_HILLS = get("minecraft:bamboo_jungle_hills");
|
||||
@Nullable
|
||||
public static final BiomeType BASALT_DELTAS = get("minecraft:basalt_deltas");
|
||||
@ -45,6 +47,7 @@ public final class BiomeTypes {
|
||||
@Nullable
|
||||
public static final BiomeType BIRCH_FOREST = get("minecraft:birch_forest");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType BIRCH_FOREST_HILLS = get("minecraft:birch_forest_hills");
|
||||
@Nullable
|
||||
public static final BiomeType COLD_OCEAN = get("minecraft:cold_ocean");
|
||||
@ -53,22 +56,28 @@ public final class BiomeTypes {
|
||||
@Nullable
|
||||
public static final BiomeType DARK_FOREST = get("minecraft:dark_forest");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType DARK_FOREST_HILLS = get("minecraft:dark_forest_hills");
|
||||
@Nullable
|
||||
public static final BiomeType DEEP_COLD_OCEAN = get("minecraft:deep_cold_ocean");
|
||||
@Nullable
|
||||
public static final BiomeType DEEP_DARK = get("minecraft:deep_dark");
|
||||
@Nullable
|
||||
public static final BiomeType DEEP_FROZEN_OCEAN = get("minecraft:deep_frozen_ocean");
|
||||
@Nullable
|
||||
public static final BiomeType DEEP_LUKEWARM_OCEAN = get("minecraft:deep_lukewarm_ocean");
|
||||
@Nullable
|
||||
public static final BiomeType DEEP_OCEAN = get("minecraft:deep_ocean");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType DEEP_WARM_OCEAN = get("minecraft:deep_warm_ocean");
|
||||
@Nullable
|
||||
public static final BiomeType DESERT = get("minecraft:desert");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType DESERT_HILLS = get("minecraft:desert_hills");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType DESERT_LAKES = get("minecraft:desert_lakes");
|
||||
@Nullable
|
||||
public static final BiomeType DRIPSTONE_CAVES = get("minecraft:dripstone_caves");
|
||||
@ -89,42 +98,65 @@ public final class BiomeTypes {
|
||||
@Nullable
|
||||
public static final BiomeType FROZEN_RIVER = get("minecraft:frozen_river");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType GIANT_SPRUCE_TAIGA = get("minecraft:giant_spruce_taiga");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType GIANT_SPRUCE_TAIGA_HILLS = get("minecraft:giant_spruce_taiga_hills");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType GIANT_TREE_TAIGA = get("minecraft:giant_tree_taiga");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType GIANT_TREE_TAIGA_HILLS = get("minecraft:giant_tree_taiga_hills");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType GRAVELLY_MOUNTAINS = get("minecraft:gravelly_mountains");
|
||||
@Nullable
|
||||
public static final BiomeType GROVE = get("minecraft:grove");
|
||||
@Nullable
|
||||
public static final BiomeType ICE_SPIKES = get("minecraft:ice_spikes");
|
||||
@Nullable
|
||||
public static final BiomeType JAGGED_PEAKS = get("minecraft:jagged_peaks");
|
||||
@Nullable
|
||||
public static final BiomeType JUNGLE = get("minecraft:jungle");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType JUNGLE_EDGE = get("minecraft:jungle_edge");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType JUNGLE_HILLS = get("minecraft:jungle_hills");
|
||||
@Nullable
|
||||
public static final BiomeType LUKEWARM_OCEAN = get("minecraft:lukewarm_ocean");
|
||||
@Nullable
|
||||
public static final BiomeType LUSH_CAVES = get("minecraft:lush_caves");
|
||||
@Nullable
|
||||
public static final BiomeType MANGROVE_SWAMP = get("minecraft:mangrove_swamp");
|
||||
@Nullable
|
||||
public static final BiomeType MEADOW = get("minecraft:meadow");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType MODIFIED_BADLANDS_PLATEAU = get("minecraft:modified_badlands_plateau");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType MODIFIED_GRAVELLY_MOUNTAINS = get("minecraft:modified_gravelly_mountains");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType MODIFIED_JUNGLE = get("minecraft:modified_jungle");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType MODIFIED_JUNGLE_EDGE = get("minecraft:modified_jungle_edge");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType MODIFIED_WOODED_BADLANDS_PLATEAU = get("minecraft:modified_wooded_badlands_plateau");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType MOUNTAIN_EDGE = get("minecraft:mountain_edge");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType MOUNTAINS = get("minecraft:mountains");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType MUSHROOM_FIELD_SHORE = get("minecraft:mushroom_field_shore");
|
||||
@Nullable
|
||||
public static final BiomeType MUSHROOM_FIELDS = get("minecraft:mushroom_fields");
|
||||
@ -136,6 +168,12 @@ public final class BiomeTypes {
|
||||
@Nullable
|
||||
public static final BiomeType OCEAN = get("minecraft:ocean");
|
||||
@Nullable
|
||||
public static final BiomeType OLD_GROWTH_BIRCH_FOREST = get("minecraft:old_growth_birch_forest");
|
||||
@Nullable
|
||||
public static final BiomeType OLD_GROWTH_PINE_TAIGA = get("minecraft:old_growth_pine_taiga");
|
||||
@Nullable
|
||||
public static final BiomeType OLD_GROWTH_SPRUCE_TAIGA = get("minecraft:old_growth_spruce_taiga");
|
||||
@Nullable
|
||||
public static final BiomeType PLAINS = get("minecraft:plains");
|
||||
@Nullable
|
||||
public static final BiomeType RIVER = get("minecraft:river");
|
||||
@ -144,42 +182,64 @@ public final class BiomeTypes {
|
||||
@Nullable
|
||||
public static final BiomeType SAVANNA_PLATEAU = get("minecraft:savanna_plateau");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType SHATTERED_SAVANNA = get("minecraft:shattered_savanna");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType SHATTERED_SAVANNA_PLATEAU = get("minecraft:shattered_savanna_plateau");
|
||||
@Nullable
|
||||
public static final BiomeType SMALL_END_ISLANDS = get("minecraft:small_end_islands");
|
||||
@Nullable
|
||||
public static final BiomeType SNOWY_BEACH = get("minecraft:snowy_beach");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType SNOWY_MOUNTAINS = get("minecraft:snowy_mountains");
|
||||
@Nullable
|
||||
public static final BiomeType SNOWY_PLAINS = get("minecraft:snowy_plains");
|
||||
@Nullable
|
||||
public static final BiomeType SNOWY_SLOPES = get("minecraft:snowy_slopes");
|
||||
@Nullable
|
||||
public static final BiomeType SNOWY_TAIGA = get("minecraft:snowy_taiga");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType SNOWY_TAIGA_HILLS = get("minecraft:snowy_taiga_hills");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType SNOWY_TAIGA_MOUNTAINS = get("minecraft:snowy_taiga_mountains");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType SNOWY_TUNDRA = get("minecraft:snowy_tundra");
|
||||
@Nullable
|
||||
public static final BiomeType SOUL_SAND_VALLEY = get("minecraft:soul_sand_valley");
|
||||
@Nullable
|
||||
public static final BiomeType SPARSE_JUNGLE = get("minecraft:sparse_jungle");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType STONE_SHORE = get("minecraft:stone_shore");
|
||||
@Nullable
|
||||
public static final BiomeType STONY_PEAKS = get("minecraft:stony_peaks");
|
||||
@Nullable
|
||||
public static final BiomeType STONY_SHORE = get("minecraft:stony_shore");
|
||||
@Nullable
|
||||
public static final BiomeType SUNFLOWER_PLAINS = get("minecraft:sunflower_plains");
|
||||
@Nullable
|
||||
public static final BiomeType SWAMP = get("minecraft:swamp");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType SWAMP_HILLS = get("minecraft:swamp_hills");
|
||||
@Nullable
|
||||
public static final BiomeType TAIGA = get("minecraft:taiga");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType TAIGA_HILLS = get("minecraft:taiga_hills");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType TAIGA_MOUNTAINS = get("minecraft:taiga_mountains");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType TALL_BIRCH_FOREST = get("minecraft:tall_birch_forest");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType TALL_BIRCH_HILLS = get("minecraft:tall_birch_hills");
|
||||
@Nullable
|
||||
public static final BiomeType THE_END = get("minecraft:the_end");
|
||||
@ -190,10 +250,23 @@ public final class BiomeTypes {
|
||||
@Nullable
|
||||
public static final BiomeType WARPED_FOREST = get("minecraft:warped_forest");
|
||||
@Nullable
|
||||
public static final BiomeType WINDSWEPT_FOREST = get("minecraft:windswept_forest");
|
||||
@Nullable
|
||||
public static final BiomeType WINDSWEPT_GRAVELLY_HILLS = get("minecraft:windswept_gravelly_hills");
|
||||
@Nullable
|
||||
public static final BiomeType WINDSWEPT_HILLS = get("minecraft:windswept_hills");
|
||||
@Nullable
|
||||
public static final BiomeType WINDSWEPT_SAVANNA = get("minecraft:windswept_savanna");
|
||||
@Nullable
|
||||
public static final BiomeType WOODED_BADLANDS = get("minecraft:wooded_badlands");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType WOODED_BADLANDS_PLATEAU = get("minecraft:wooded_badlands_plateau");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType WOODED_HILLS = get("minecraft:wooded_hills");
|
||||
@Nullable
|
||||
@Deprecated
|
||||
public static final BiomeType WOODED_MOUNTAINS = get("minecraft:wooded_mountains");
|
||||
|
||||
private BiomeTypes() {
|
||||
|
||||
@ -28,7 +28,12 @@ package com.sk89q.worldedit.world.block;
|
||||
public final class BlockCategories {
|
||||
|
||||
public static final BlockCategory ACACIA_LOGS = get("minecraft:acacia_logs");
|
||||
public static final BlockCategory ANCIENT_CITY_REPLACEABLE = get("minecraft:ancient_city_replaceable");
|
||||
public static final BlockCategory ANIMALS_SPAWNABLE_ON = get("minecraft:animals_spawnable_on");
|
||||
public static final BlockCategory ANVIL = get("minecraft:anvil");
|
||||
public static final BlockCategory AXOLOTLS_SPAWNABLE_ON = get("minecraft:axolotls_spawnable_on");
|
||||
public static final BlockCategory AZALEA_GROWS_ON = get("minecraft:azalea_grows_on");
|
||||
public static final BlockCategory AZALEA_ROOT_REPLACEABLE = get("minecraft:azalea_root_replaceable");
|
||||
public static final BlockCategory BAMBOO_PLANTABLE_ON = get("minecraft:bamboo_plantable_on");
|
||||
public static final BlockCategory BANNERS = get("minecraft:banners");
|
||||
public static final BlockCategory BASE_STONE_NETHER = get("minecraft:base_stone_nether");
|
||||
@ -37,16 +42,19 @@ public final class BlockCategories {
|
||||
public static final BlockCategory BEDS = get("minecraft:beds");
|
||||
public static final BlockCategory BEE_GROWABLES = get("minecraft:bee_growables");
|
||||
public static final BlockCategory BEEHIVES = get("minecraft:beehives");
|
||||
public static final BlockCategory BIG_DRIPLEAF_PLACEABLE = get("minecraft:big_dripleaf_placeable");
|
||||
public static final BlockCategory BIRCH_LOGS = get("minecraft:birch_logs");
|
||||
public static final BlockCategory BUTTONS = get("minecraft:buttons");
|
||||
public static final BlockCategory CAMPFIRES = get("minecraft:campfires");
|
||||
public static final BlockCategory CANDLE_CAKES = get("minecraft:candle_cakes");
|
||||
public static final BlockCategory CANDLES = get("minecraft:candles");
|
||||
public static final BlockCategory CARPETS = get("minecraft:carpets");
|
||||
@Deprecated public static final BlockCategory CARPETS = get("minecraft:carpets");
|
||||
public static final BlockCategory CAULDRONS = get("minecraft:cauldrons");
|
||||
public static final BlockCategory CAVE_VINES = get("minecraft:cave_vines");
|
||||
public static final BlockCategory CLIMBABLE = get("minecraft:climbable");
|
||||
public static final BlockCategory COAL_ORES = get("minecraft:coal_ores");
|
||||
public static final BlockCategory COMPLETES_FIND_TREE_TUTORIAL = get("minecraft:completes_find_tree_tutorial");
|
||||
public static final BlockCategory CONVERTABLE_TO_MUD = get("minecraft:convertable_to_mud");
|
||||
public static final BlockCategory COPPER_ORES = get("minecraft:copper_ores");
|
||||
public static final BlockCategory CORAL_BLOCKS = get("minecraft:coral_blocks");
|
||||
public static final BlockCategory CORAL_PLANTS = get("minecraft:coral_plants");
|
||||
@ -54,7 +62,9 @@ public final class BlockCategories {
|
||||
public static final BlockCategory CRIMSON_STEMS = get("minecraft:crimson_stems");
|
||||
public static final BlockCategory CROPS = get("minecraft:crops");
|
||||
public static final BlockCategory CRYSTAL_SOUND_BLOCKS = get("minecraft:crystal_sound_blocks");
|
||||
public static final BlockCategory DAMPENS_VIBRATIONS = get("minecraft:dampens_vibrations");
|
||||
public static final BlockCategory DARK_OAK_LOGS = get("minecraft:dark_oak_logs");
|
||||
public static final BlockCategory DEAD_BUSH_MAY_PLACE_ON = get("minecraft:dead_bush_may_place_on");
|
||||
public static final BlockCategory DEEPSLATE_ORE_REPLACEABLES = get("minecraft:deepslate_ore_replaceables");
|
||||
public static final BlockCategory DIAMOND_ORES = get("minecraft:diamond_ores");
|
||||
public static final BlockCategory DIRT = get("minecraft:dirt");
|
||||
@ -62,15 +72,21 @@ public final class BlockCategories {
|
||||
public static final BlockCategory DIRT_LIKE = get("minecraft:dirt_like");
|
||||
public static final BlockCategory DOORS = get("minecraft:doors");
|
||||
public static final BlockCategory DRAGON_IMMUNE = get("minecraft:dragon_immune");
|
||||
public static final BlockCategory DRAGON_TRANSPARENT = get("minecraft:dragon_transparent");
|
||||
public static final BlockCategory DRIPSTONE_REPLACEABLE_BLOCKS = get("minecraft:dripstone_replaceable_blocks");
|
||||
public static final BlockCategory EMERALD_ORES = get("minecraft:emerald_ores");
|
||||
public static final BlockCategory ENDERMAN_HOLDABLE = get("minecraft:enderman_holdable");
|
||||
public static final BlockCategory FALL_DAMAGE_RESETTING = get("minecraft:fall_damage_resetting");
|
||||
public static final BlockCategory FEATURES_CANNOT_REPLACE = get("minecraft:features_cannot_replace");
|
||||
public static final BlockCategory FENCE_GATES = get("minecraft:fence_gates");
|
||||
public static final BlockCategory FENCES = get("minecraft:fences");
|
||||
public static final BlockCategory FIRE = get("minecraft:fire");
|
||||
public static final BlockCategory FLOWER_POTS = get("minecraft:flower_pots");
|
||||
public static final BlockCategory FLOWERS = get("minecraft:flowers");
|
||||
public static final BlockCategory FOXES_SPAWNABLE_ON = get("minecraft:foxes_spawnable_on");
|
||||
public static final BlockCategory FROG_PREFER_JUMP_TO = get("minecraft:frog_prefer_jump_to");
|
||||
public static final BlockCategory FROGS_SPAWNABLE_ON = get("minecraft:frogs_spawnable_on");
|
||||
public static final BlockCategory GOATS_SPAWNABLE_ON = get("minecraft:goats_spawnable_on");
|
||||
public static final BlockCategory GEODE_INVALID_BLOCKS = get("minecraft:geode_invalid_blocks");
|
||||
public static final BlockCategory GOLD_ORES = get("minecraft:gold_ores");
|
||||
public static final BlockCategory GUARDED_BY_PIGLINS = get("minecraft:guarded_by_piglins");
|
||||
@ -84,39 +100,56 @@ public final class BlockCategories {
|
||||
public static final BlockCategory IRON_ORES = get("minecraft:iron_ores");
|
||||
public static final BlockCategory JUNGLE_LOGS = get("minecraft:jungle_logs");
|
||||
public static final BlockCategory LAPIS_ORES = get("minecraft:lapis_ores");
|
||||
public static final BlockCategory LAVA_POOL_STONE_REPLACEABLES = get("minecraft:lava_pool_stone_replaceables");
|
||||
public static final BlockCategory LAVA_POOL_STONE_CANNOT_REPLACE = get("minecraft:lava_pool_stone_cannot_replace");
|
||||
@Deprecated public static final BlockCategory LAVA_POOL_STONE_REPLACEABLES = get("minecraft:lava_pool_stone_replaceables");
|
||||
public static final BlockCategory LEAVES = get("minecraft:leaves");
|
||||
public static final BlockCategory LOGS = get("minecraft:logs");
|
||||
public static final BlockCategory LOGS_THAT_BURN = get("minecraft:logs_that_burn");
|
||||
public static final BlockCategory LUSH_GROUND_REPLACEABLE = get("minecraft:lush_ground_replaceable");
|
||||
public static final BlockCategory MANGROVE_LOGS = get("minecraft:mangrove_logs");
|
||||
public static final BlockCategory MANGROVE_LOGS_CAN_GROW_THROUGH = get("minecraft:mangrove_logs_can_grow_through");
|
||||
public static final BlockCategory MANGROVE_ROOTS_CAN_GROW_THROUGH = get("minecraft:mangrove_roots_can_grow_through");
|
||||
public static final BlockCategory MINEABLE_AXE = get("minecraft:mineable/axe");
|
||||
public static final BlockCategory MINEABLE_HOE = get("minecraft:mineable/hoe");
|
||||
public static final BlockCategory MINEABLE_PICKAXE = get("minecraft:mineable/pickaxe");
|
||||
public static final BlockCategory MINEABLE_SHOVEL = get("minecraft:mineable/shovel");
|
||||
public static final BlockCategory MOOSHROOMS_SPAWNABLE_ON = get("minecraft:mooshrooms_spawnable_on");
|
||||
public static final BlockCategory MOSS_REPLACEABLE = get("minecraft:moss_replaceable");
|
||||
public static final BlockCategory MUSHROOM_GROW_BLOCK = get("minecraft:mushroom_grow_block");
|
||||
public static final BlockCategory NEEDS_DIAMOND_TOOL = get("minecraft:needs_diamond_tool");
|
||||
public static final BlockCategory NEEDS_IRON_TOOL = get("minecraft:needs_iron_tool");
|
||||
public static final BlockCategory NEEDS_STONE_TOOL = get("minecraft:needs_stone_tool");
|
||||
public static final BlockCategory NETHER_CARVER_REPLACEABLES = get("minecraft:nether_carver_replaceables");
|
||||
public static final BlockCategory NON_FLAMMABLE_WOOD = get("minecraft:non_flammable_wood");
|
||||
public static final BlockCategory NYLIUM = get("minecraft:nylium");
|
||||
public static final BlockCategory OAK_LOGS = get("minecraft:oak_logs");
|
||||
public static final BlockCategory OCCLUDES_VIBRATION_SIGNALS = get("minecraft:occludes_vibration_signals");
|
||||
public static final BlockCategory OVERWORLD_CARVER_REPLACEABLES = get("minecraft:overworld_carver_replaceables");
|
||||
public static final BlockCategory OVERWORLD_NATURAL_LOGS = get("minecraft:overworld_natural_logs");
|
||||
public static final BlockCategory PARROTS_SPAWNABLE_ON = get("minecraft:parrots_spawnable_on");
|
||||
public static final BlockCategory PIGLIN_REPELLENTS = get("minecraft:piglin_repellents");
|
||||
public static final BlockCategory PLANKS = get("minecraft:planks");
|
||||
public static final BlockCategory POLAR_BEARS_SPAWNABLE_ON_ALTERNATE = get("minecraft:polar_bears_spawnable_on_alternate");
|
||||
public static final BlockCategory PORTALS = get("minecraft:portals");
|
||||
public static final BlockCategory PRESSURE_PLATES = get("minecraft:pressure_plates");
|
||||
public static final BlockCategory PREVENT_MOB_SPAWNING_INSIDE = get("minecraft:prevent_mob_spawning_inside");
|
||||
public static final BlockCategory RABBITS_SPAWNABLE_ON = get("minecraft:rabbits_spawnable_on");
|
||||
public static final BlockCategory RAILS = get("minecraft:rails");
|
||||
public static final BlockCategory REDSTONE_ORES = get("minecraft:redstone_ores");
|
||||
public static final BlockCategory REPLACEABLE_PLANTS = get("minecraft:replaceable_plants");
|
||||
public static final BlockCategory SAND = get("minecraft:sand");
|
||||
public static final BlockCategory SAPLINGS = get("minecraft:saplings");
|
||||
public static final BlockCategory SCULK_REPLACEABLE = get("minecraft:sculk_replaceable");
|
||||
public static final BlockCategory SCULK_REPLACEABLE_WORLD_GEN = get("minecraft:sculk_replaceable_world_gen");
|
||||
public static final BlockCategory SHULKER_BOXES = get("minecraft:shulker_boxes");
|
||||
public static final BlockCategory SIGNS = get("minecraft:signs");
|
||||
public static final BlockCategory SLABS = get("minecraft:slabs");
|
||||
public static final BlockCategory SMALL_DRIPLEAF_PLACEABLE = get("minecraft:small_dripleaf_placeable");
|
||||
public static final BlockCategory SMALL_FLOWERS = get("minecraft:small_flowers");
|
||||
public static final BlockCategory SNAPS_GOAT_HORN = get("minecraft:snaps_goat_horn");
|
||||
public static final BlockCategory SNOW = get("minecraft:snow");
|
||||
public static final BlockCategory SNOW_LAYER_CAN_SURVIVE_ON = get("minecraft:snow_layer_can_survive_on");
|
||||
public static final BlockCategory SNOW_LAYER_CANNOT_SURVIVE_ON = get("minecraft:snow_layer_cannot_survive_on");
|
||||
public static final BlockCategory SOUL_FIRE_BASE_BLOCKS = get("minecraft:soul_fire_base_blocks");
|
||||
public static final BlockCategory SOUL_SPEED_BLOCKS = get("minecraft:soul_speed_blocks");
|
||||
public static final BlockCategory SPRUCE_LOGS = get("minecraft:spruce_logs");
|
||||
@ -127,6 +160,7 @@ public final class BlockCategories {
|
||||
public static final BlockCategory STONE_PRESSURE_PLATES = get("minecraft:stone_pressure_plates");
|
||||
public static final BlockCategory STRIDER_WARM_BLOCKS = get("minecraft:strider_warm_blocks");
|
||||
public static final BlockCategory TALL_FLOWERS = get("minecraft:tall_flowers");
|
||||
public static final BlockCategory TERRACOTTA = get("minecraft:terracotta");
|
||||
public static final BlockCategory TRAPDOORS = get("minecraft:trapdoors");
|
||||
public static final BlockCategory UNDERWATER_BONEMEALS = get("minecraft:underwater_bonemeals");
|
||||
public static final BlockCategory UNSTABLE_BOTTOM_CENTER = get("minecraft:unstable_bottom_center");
|
||||
@ -139,6 +173,7 @@ public final class BlockCategories {
|
||||
public static final BlockCategory WART_BLOCKS = get("minecraft:wart_blocks");
|
||||
public static final BlockCategory WITHER_IMMUNE = get("minecraft:wither_immune");
|
||||
public static final BlockCategory WITHER_SUMMON_BASE_BLOCKS = get("minecraft:wither_summon_base_blocks");
|
||||
public static final BlockCategory WOLVES_SPAWNABLE_ON = get("minecraft:wolves_spawnable_on");
|
||||
public static final BlockCategory WOODEN_BUTTONS = get("minecraft:wooden_buttons");
|
||||
public static final BlockCategory WOODEN_DOORS = get("minecraft:wooden_doors");
|
||||
public static final BlockCategory WOODEN_FENCES = get("minecraft:wooden_fences");
|
||||
@ -147,6 +182,7 @@ public final class BlockCategories {
|
||||
public static final BlockCategory WOODEN_STAIRS = get("minecraft:wooden_stairs");
|
||||
public static final BlockCategory WOODEN_TRAPDOORS = get("minecraft:wooden_trapdoors");
|
||||
public static final BlockCategory WOOL = get("minecraft:wool");
|
||||
public static final BlockCategory WOOL_CARPETS = get("minecraft:wool_carpets");
|
||||
|
||||
private BlockCategories() {
|
||||
}
|
||||
|
||||
@ -687,6 +687,8 @@ public final class BlockTypes {
|
||||
@Nullable
|
||||
public static final BlockType FLOWERING_AZALEA_LEAVES = init();
|
||||
@Nullable
|
||||
public static final BlockType FROGSPAWN = init();
|
||||
@Nullable
|
||||
public static final BlockType FLOWER_POT = init();
|
||||
@Nullable
|
||||
public static final BlockType FROSTED_ICE = init();
|
||||
@ -1015,6 +1017,38 @@ public final class BlockTypes {
|
||||
@Nullable
|
||||
public static final BlockType MAGMA_BLOCK = init();
|
||||
@Nullable
|
||||
public static final BlockType MANGROVE_BUTTON = init();
|
||||
@Nullable
|
||||
public static final BlockType MANGROVE_DOOR = init();
|
||||
@Nullable
|
||||
public static final BlockType MANGROVE_FENCE = init();
|
||||
@Nullable
|
||||
public static final BlockType MANGROVE_FENCE_GATE = init();
|
||||
@Nullable
|
||||
public static final BlockType MANGROVE_LEAVES = init();
|
||||
@Nullable
|
||||
public static final BlockType MANGROVE_LOG = init();
|
||||
@Nullable
|
||||
public static final BlockType MANGROVE_PLANKS = init();
|
||||
@Nullable
|
||||
public static final BlockType MANGROVE_PRESSURE_PLATE = init();
|
||||
@Nullable
|
||||
public static final BlockType MANGROVE_PROPAGULE = init();
|
||||
@Nullable
|
||||
public static final BlockType MANGROVE_ROOTS = init();
|
||||
@Nullable
|
||||
public static final BlockType MANGROVE_SIGN = init();
|
||||
@Nullable
|
||||
public static final BlockType MANGROVE_SLAB = init();
|
||||
@Nullable
|
||||
public static final BlockType MANGROVE_STAIRS = init();
|
||||
@Nullable
|
||||
public static final BlockType MANGROVE_TRAPDOOR = init();
|
||||
@Nullable
|
||||
public static final BlockType MANGROVE_WALL_SIGN = init();
|
||||
@Nullable
|
||||
public static final BlockType MANGROVE_WOOD = init();
|
||||
@Nullable
|
||||
public static final BlockType MEDIUM_AMETHYST_BUD = init();
|
||||
@Nullable
|
||||
public static final BlockType MELON = init();
|
||||
@ -1043,6 +1077,18 @@ public final class BlockTypes {
|
||||
@Nullable
|
||||
public static final BlockType MOVING_PISTON = init();
|
||||
@Nullable
|
||||
public static final BlockType MUD = init();
|
||||
@Nullable
|
||||
public static final BlockType MUD_BRICK_SLAB = init();
|
||||
@Nullable
|
||||
public static final BlockType MUD_BRICK_STAIRS = init();
|
||||
@Nullable
|
||||
public static final BlockType MUD_BRICK_WALL = init();
|
||||
@Nullable
|
||||
public static final BlockType MUD_BRICKS = init();
|
||||
@Nullable
|
||||
public static final BlockType MUDDY_MANGROVE_ROOTS = init();
|
||||
@Nullable
|
||||
public static final BlockType MUSHROOM_STEM = init();
|
||||
@Nullable
|
||||
public static final BlockType MYCELIUM = init();
|
||||
@ -1109,6 +1155,8 @@ public final class BlockTypes {
|
||||
@Nullable
|
||||
public static final BlockType OBSIDIAN = init();
|
||||
@Nullable
|
||||
public static final BlockType OCHRE_FROGLIGHT = init();
|
||||
@Nullable
|
||||
public static final BlockType ORANGE_BANNER = init();
|
||||
@Nullable
|
||||
public static final BlockType ORANGE_BED = init();
|
||||
@ -1151,6 +1199,10 @@ public final class BlockTypes {
|
||||
@Nullable
|
||||
public static final BlockType PACKED_ICE = init();
|
||||
@Nullable
|
||||
public static final BlockType PACKED_MUD = init();
|
||||
@Nullable
|
||||
public static final BlockType PEARLESCENT_FROGLIGHT = init();
|
||||
@Nullable
|
||||
public static final BlockType PEONY = init();
|
||||
@Nullable
|
||||
public static final BlockType PETRIFIED_OAK_SLAB = init();
|
||||
@ -1293,6 +1345,8 @@ public final class BlockTypes {
|
||||
@Nullable
|
||||
public static final BlockType POTTED_LILY_OF_THE_VALLEY = init();
|
||||
@Nullable
|
||||
public static final BlockType POTTED_MANGROVE_PROPAGULE = init();
|
||||
@Nullable
|
||||
public static final BlockType POTTED_OAK_SAPLING = init();
|
||||
@Nullable
|
||||
public static final BlockType POTTED_ORANGE_TULIP = init();
|
||||
@ -1407,6 +1461,8 @@ public final class BlockTypes {
|
||||
@Nullable
|
||||
public static final BlockType REDSTONE_WIRE = init();
|
||||
@Nullable
|
||||
public static final BlockType REINFORCED_DEEPSLATE = init();
|
||||
@Nullable
|
||||
public static final BlockType RED_BANNER = init();
|
||||
@Nullable
|
||||
public static final BlockType RED_BED = init();
|
||||
@ -1481,8 +1537,16 @@ public final class BlockTypes {
|
||||
@Nullable
|
||||
public static final BlockType SCAFFOLDING = init();
|
||||
@Nullable
|
||||
public static final BlockType SCULK = init();
|
||||
@Nullable
|
||||
public static final BlockType SCULK_CATALYST = init();
|
||||
@Nullable
|
||||
public static final BlockType SCULK_SENSOR = init();
|
||||
@Nullable
|
||||
public static final BlockType SCULK_SHRIEKER = init();
|
||||
@Nullable
|
||||
public static final BlockType SCULK_VEIN = init();
|
||||
@Nullable
|
||||
public static final BlockType SEAGRASS = init();
|
||||
@Nullable
|
||||
public static final BlockType SEA_LANTERN = init();
|
||||
@ -1630,6 +1694,10 @@ public final class BlockTypes {
|
||||
@Nullable
|
||||
public static final BlockType STRIPPED_JUNGLE_WOOD = init();
|
||||
@Nullable
|
||||
public static final BlockType STRIPPED_MANGROVE_LOG = init();
|
||||
@Nullable
|
||||
public static final BlockType STRIPPED_MANGROVE_WOOD = init();
|
||||
@Nullable
|
||||
public static final BlockType STRIPPED_OAK_LOG = init();
|
||||
@Nullable
|
||||
public static final BlockType STRIPPED_OAK_WOOD = init();
|
||||
@ -1686,6 +1754,8 @@ public final class BlockTypes {
|
||||
@Nullable
|
||||
public static final BlockType TWISTING_VINES = init();
|
||||
@Nullable
|
||||
public static final BlockType VERDANT_FROGLIGHT = init();
|
||||
@Nullable
|
||||
public static final BlockType TWISTING_VINES_PLANT = init();
|
||||
@Nullable
|
||||
public static final BlockType VINE = init();
|
||||
|
||||
@ -30,6 +30,8 @@ import java.util.Locale;
|
||||
@SuppressWarnings("unused")
|
||||
public final class EntityTypes {
|
||||
|
||||
@Nullable
|
||||
public static final EntityType ALLAY = get("minecraft:allay");
|
||||
@Nullable
|
||||
public static final EntityType AREA_EFFECT_CLOUD = get("minecraft:area_effect_cloud");
|
||||
@Nullable
|
||||
@ -51,6 +53,8 @@ public final class EntityTypes {
|
||||
@Nullable
|
||||
public static final EntityType CAVE_SPIDER = get("minecraft:cave_spider");
|
||||
@Nullable
|
||||
public static final EntityType CHEST_BOAT = get("minecraft:chest_boat");
|
||||
@Nullable
|
||||
public static final EntityType CHEST_MINECART = get("minecraft:chest_minecart");
|
||||
@Nullable
|
||||
public static final EntityType CHICKEN = get("minecraft:chicken");
|
||||
@ -105,6 +109,8 @@ public final class EntityTypes {
|
||||
@Nullable
|
||||
public static final EntityType FOX = get("minecraft:fox");
|
||||
@Nullable
|
||||
public static final EntityType FROG = get("minecraft:frog");
|
||||
@Nullable
|
||||
public static final EntityType FURNACE_MINECART = get("minecraft:furnace_minecart");
|
||||
@Nullable
|
||||
public static final EntityType GHAST = get("minecraft:ghast");
|
||||
@ -217,6 +223,8 @@ public final class EntityTypes {
|
||||
@Nullable
|
||||
public static final EntityType STRIDER = get("minecraft:strider");
|
||||
@Nullable
|
||||
public static final EntityType TADPOLE = get("minecraft:tadpole");
|
||||
@Nullable
|
||||
public static final EntityType TNT = get("minecraft:tnt");
|
||||
@Nullable
|
||||
public static final EntityType TNT_MINECART = get("minecraft:tnt_minecart");
|
||||
@ -237,6 +245,8 @@ public final class EntityTypes {
|
||||
@Nullable
|
||||
public static final EntityType WANDERING_TRADER = get("minecraft:wandering_trader");
|
||||
@Nullable
|
||||
public static final EntityType WARDEN = get("minecraft:warden");
|
||||
@Nullable
|
||||
public static final EntityType WITCH = get("minecraft:witch");
|
||||
@Nullable
|
||||
public static final EntityType WITHER = get("minecraft:wither");
|
||||
|
||||
@ -38,15 +38,20 @@ public final class ItemCategories {
|
||||
public static final ItemCategory BOATS = get("minecraft:boats");
|
||||
public static final ItemCategory BUTTONS = get("minecraft:buttons");
|
||||
public static final ItemCategory CANDLES = get("minecraft:candles");
|
||||
public static final ItemCategory CARPETS = get("minecraft:carpets");
|
||||
@Deprecated public static final ItemCategory CARPETS = get("minecraft:carpets");
|
||||
public static final ItemCategory CHEST_BOATS = get("minecraft:chest_boats");
|
||||
public static final ItemCategory CLUSTER_MAX_HARVESTABLES = get("minecraft:cluster_max_harvestables");
|
||||
public static final ItemCategory COAL_ORES = get("minecraft:coal_ores");
|
||||
public static final ItemCategory COALS = get("minecraft:coals");
|
||||
public static final ItemCategory COMPASSES = get("minecraft:compasses");
|
||||
public static final ItemCategory COMPLETES_FIND_TREE_TUTORIAL = get("minecraft:completes_find_tree_tutorial");
|
||||
public static final ItemCategory COPPER_ORES = get("minecraft:copper_ores");
|
||||
public static final ItemCategory CREEPER_DROP_MUSIC_DISCS = get("minecraft:creeper_drop_music_discs");
|
||||
public static final ItemCategory CRIMSON_STEMS = get("minecraft:crimson_stems");
|
||||
public static final ItemCategory DAMPENS_VIBRATIONS = get("minecraft:dampens_vibrations");
|
||||
public static final ItemCategory DARK_OAK_LOGS = get("minecraft:dark_oak_logs");
|
||||
public static final ItemCategory DIAMOND_ORES = get("minecraft:diamond_ores");
|
||||
public static final ItemCategory DIRT = get("minecraft:dirt");
|
||||
public static final ItemCategory DOORS = get("minecraft:doors");
|
||||
public static final ItemCategory EMERALD_ORES = get("minecraft:emerald_ores");
|
||||
public static final ItemCategory FENCES = get("minecraft:fences");
|
||||
@ -65,10 +70,12 @@ public final class ItemCategories {
|
||||
public static final ItemCategory LECTERN_BOOKS = get("minecraft:lectern_books");
|
||||
public static final ItemCategory LOGS = get("minecraft:logs");
|
||||
public static final ItemCategory LOGS_THAT_BURN = get("minecraft:logs_that_burn");
|
||||
public static final ItemCategory MANGROVE_LOGS = get("minecraft:mangrove_logs");
|
||||
public static final ItemCategory MUSIC_DISCS = get("minecraft:music_discs");
|
||||
public static final ItemCategory NON_FLAMMABLE_WOOD = get("minecraft:non_flammable_wood");
|
||||
public static final ItemCategory OAK_LOGS = get("minecraft:oak_logs");
|
||||
public static final ItemCategory OCCLUDES_VIBRATION_SIGNALS = get("minecraft:occludes_vibration_signals");
|
||||
@Deprecated public static final ItemCategory OCCLUDES_VIBRATION_SIGNALS = get("minecraft:occludes_vibration_signals");
|
||||
public static final ItemCategory OVERWORLD_NATURAL_LOGS = get("minecraft:overworld_natural_logs");
|
||||
public static final ItemCategory PIGLIN_FOOD = get("minecraft:piglin_food");
|
||||
public static final ItemCategory PIGLIN_LOVED = get("minecraft:piglin_loved");
|
||||
public static final ItemCategory PIGLIN_REPELLENTS = get("minecraft:piglin_repellents");
|
||||
@ -87,9 +94,11 @@ public final class ItemCategories {
|
||||
public static final ItemCategory STONE_CRAFTING_MATERIALS = get("minecraft:stone_crafting_materials");
|
||||
public static final ItemCategory STONE_TOOL_MATERIALS = get("minecraft:stone_tool_materials");
|
||||
public static final ItemCategory TALL_FLOWERS = get("minecraft:tall_flowers");
|
||||
public static final ItemCategory TERRACOTTA = get("minecraft:terracotta");
|
||||
public static final ItemCategory TRAPDOORS = get("minecraft:trapdoors");
|
||||
public static final ItemCategory WALLS = get("minecraft:walls");
|
||||
public static final ItemCategory WARPED_STEMS = get("minecraft:warped_stems");
|
||||
public static final ItemCategory WART_BLOCKS = get("minecraft:wart_blocks");
|
||||
public static final ItemCategory WOODEN_BUTTONS = get("minecraft:wooden_buttons");
|
||||
public static final ItemCategory WOODEN_DOORS = get("minecraft:wooden_doors");
|
||||
public static final ItemCategory WOODEN_FENCES = get("minecraft:wooden_fences");
|
||||
@ -98,6 +107,7 @@ public final class ItemCategories {
|
||||
public static final ItemCategory WOODEN_STAIRS = get("minecraft:wooden_stairs");
|
||||
public static final ItemCategory WOODEN_TRAPDOORS = get("minecraft:wooden_trapdoors");
|
||||
public static final ItemCategory WOOL = get("minecraft:wool");
|
||||
public static final ItemCategory WOOL_CARPETS = get("minecraft:wool_carpets");
|
||||
|
||||
private ItemCategories() {
|
||||
}
|
||||
|
||||
@ -42,6 +42,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType ACACIA_BUTTON = init();
|
||||
@Nullable
|
||||
public static final ItemType ACACIA_CHEST_BOAT = init();
|
||||
@Nullable
|
||||
public static final ItemType ACACIA_DOOR = init();
|
||||
@Nullable
|
||||
public static final ItemType ACACIA_FENCE = init();
|
||||
@ -72,6 +74,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType AIR = init();
|
||||
@Nullable
|
||||
public static final ItemType ALLAY_SPAWN_EGG = init();
|
||||
@Nullable
|
||||
public static final ItemType ALLIUM = init();
|
||||
@Nullable
|
||||
public static final ItemType AMETHYST_BLOCK = init();
|
||||
@ -146,6 +150,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType BIRCH_BUTTON = init();
|
||||
@Nullable
|
||||
public static final ItemType BIRCH_CHEST_BOAT = init();
|
||||
@Nullable
|
||||
public static final ItemType BIRCH_DOOR = init();
|
||||
@Nullable
|
||||
public static final ItemType BIRCH_FENCE = init();
|
||||
@ -572,6 +578,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType DARK_OAK_BUTTON = init();
|
||||
@Nullable
|
||||
public static final ItemType DARK_OAK_CHEST_BOAT = init();
|
||||
@Nullable
|
||||
public static final ItemType DARK_OAK_DOOR = init();
|
||||
@Nullable
|
||||
public static final ItemType DARK_OAK_FENCE = init();
|
||||
@ -714,6 +722,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType DIRT_PATH = init();
|
||||
@Nullable
|
||||
public static final ItemType DISC_FRAGMENT_5 = init();
|
||||
@Nullable
|
||||
public static final ItemType DISPENSER = init();
|
||||
@Nullable
|
||||
public static final ItemType DOLPHIN_SPAWN_EGG = init();
|
||||
@ -736,6 +746,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType DROWNED_SPAWN_EGG = init();
|
||||
@Nullable
|
||||
public static final ItemType ECHO_SHARD = init();
|
||||
@Nullable
|
||||
public static final ItemType EGG = init();
|
||||
@Nullable
|
||||
public static final ItemType ELDER_GUARDIAN_SPAWN_EGG = init();
|
||||
@ -832,6 +844,10 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType FOX_SPAWN_EGG = init();
|
||||
@Nullable
|
||||
public static final ItemType FROG_SPAWN_EGG = init();
|
||||
@Nullable
|
||||
public static final ItemType FROGSPAWN = init();
|
||||
@Nullable
|
||||
public static final ItemType FURNACE = init();
|
||||
@Nullable
|
||||
public static final ItemType FURNACE_MINECART = init();
|
||||
@ -866,6 +882,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType GLOWSTONE_DUST = init();
|
||||
@Nullable
|
||||
public static final ItemType GOAT_HORN = init();
|
||||
@Nullable
|
||||
public static final ItemType GOAT_SPAWN_EGG = init();
|
||||
@Nullable
|
||||
public static final ItemType GOLD_BLOCK = init();
|
||||
@ -1071,6 +1089,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType JUNGLE_BUTTON = init();
|
||||
@Nullable
|
||||
public static final ItemType JUNGLE_CHEST_BOAT = init();
|
||||
@Nullable
|
||||
public static final ItemType JUNGLE_DOOR = init();
|
||||
@Nullable
|
||||
public static final ItemType JUNGLE_FENCE = init();
|
||||
@ -1265,6 +1285,40 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType MAGMA_CUBE_SPAWN_EGG = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_BOAT = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_BUTTON = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_CHEST_BOAT = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_DOOR = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_FENCE = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_FENCE_GATE = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_LEAVES = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_LOG = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_PLANKS = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_PRESSURE_PLATE = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_PROPAGULE = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_ROOTS = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_SIGN = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_SLAB = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_STAIRS = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_TRAPDOOR = init();
|
||||
@Nullable
|
||||
public static final ItemType MANGROVE_WOOD = init();
|
||||
@Nullable
|
||||
public static final ItemType MAP = init();
|
||||
@Nullable
|
||||
public static final ItemType MEDIUM_AMETHYST_BUD = init();
|
||||
@ -1303,6 +1357,18 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType MOSSY_STONE_BRICKS = init();
|
||||
@Nullable
|
||||
public static final ItemType MUD = init();
|
||||
@Nullable
|
||||
public static final ItemType MUD_BRICK_SLAB = init();
|
||||
@Nullable
|
||||
public static final ItemType MUD_BRICK_STAIRS = init();
|
||||
@Nullable
|
||||
public static final ItemType MUD_BRICK_WALL = init();
|
||||
@Nullable
|
||||
public static final ItemType MUD_BRICKS = init();
|
||||
@Nullable
|
||||
public static final ItemType MUDDY_MANGROVE_ROOTS = init();
|
||||
@Nullable
|
||||
public static final ItemType MULE_SPAWN_EGG = init();
|
||||
@Nullable
|
||||
public static final ItemType MUSHROOM_STEM = init();
|
||||
@ -1313,6 +1379,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType MUSIC_DISC_13 = init();
|
||||
@Nullable
|
||||
public static final ItemType MUSIC_DISC_5 = init();
|
||||
@Nullable
|
||||
public static final ItemType MUSIC_DISC_BLOCKS = init();
|
||||
@Nullable
|
||||
public static final ItemType MUSIC_DISC_CAT = init();
|
||||
@ -1325,6 +1393,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType MUSIC_DISC_MELLOHI = init();
|
||||
@Nullable
|
||||
public static final ItemType MUSIC_DISC_OTHERSIDE = init();
|
||||
@Nullable
|
||||
public static final ItemType MUSIC_DISC_PIGSTEP = init();
|
||||
@Nullable
|
||||
public static final ItemType MUSIC_DISC_STAL = init();
|
||||
@ -1399,6 +1469,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType OAK_BUTTON = init();
|
||||
@Nullable
|
||||
public static final ItemType OAK_CHEST_BOAT = init();
|
||||
@Nullable
|
||||
public static final ItemType OAK_DOOR = init();
|
||||
@Nullable
|
||||
public static final ItemType OAK_FENCE = init();
|
||||
@ -1431,6 +1503,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType OCELOT_SPAWN_EGG = init();
|
||||
@Nullable
|
||||
public static final ItemType OCHRE_FROGLIGHT = init();
|
||||
@Nullable
|
||||
public static final ItemType ORANGE_BANNER = init();
|
||||
@Nullable
|
||||
public static final ItemType ORANGE_BED = init();
|
||||
@ -1471,6 +1545,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType PACKED_ICE = init();
|
||||
@Nullable
|
||||
public static final ItemType PACKED_MUD = init();
|
||||
@Nullable
|
||||
public static final ItemType PAINTING = init();
|
||||
@Nullable
|
||||
public static final ItemType PANDA_SPAWN_EGG = init();
|
||||
@ -1479,6 +1555,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType PARROT_SPAWN_EGG = init();
|
||||
@Nullable
|
||||
public static final ItemType PEARLESCENT_FROGLIGHT = init();
|
||||
@Nullable
|
||||
public static final ItemType PEONY = init();
|
||||
@Nullable
|
||||
public static final ItemType PETRIFIED_OAK_SLAB = init();
|
||||
@ -1699,6 +1777,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType RAW_IRON_BLOCK = init();
|
||||
@Nullable
|
||||
public static final ItemType RECOVERY_COMPASS = init();
|
||||
@Nullable
|
||||
public static final ItemType RED_BANNER = init();
|
||||
@Nullable
|
||||
public static final ItemType RED_BED = init();
|
||||
@ -1759,6 +1839,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType REDSTONE_TORCH = init();
|
||||
@Nullable
|
||||
public static final ItemType REINFORCED_DEEPSLATE = init();
|
||||
@Nullable
|
||||
public static final ItemType REPEATER = init();
|
||||
@Nullable
|
||||
public static final ItemType REPEATING_COMMAND_BLOCK = init();
|
||||
@ -1794,8 +1876,16 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType SCAFFOLDING = init();
|
||||
@Nullable
|
||||
public static final ItemType SCULK = init();
|
||||
@Nullable
|
||||
public static final ItemType SCULK_CATALYST = init();
|
||||
@Nullable
|
||||
public static final ItemType SCULK_SENSOR = init();
|
||||
@Nullable
|
||||
public static final ItemType SCULK_SHRIEKER = init();
|
||||
@Nullable
|
||||
public static final ItemType SCULK_VEIN = init();
|
||||
@Nullable
|
||||
public static final ItemType SCUTE = init();
|
||||
@Nullable
|
||||
public static final ItemType SEA_LANTERN = init();
|
||||
@ -1901,6 +1991,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType SPRUCE_BOAT = init();
|
||||
@Nullable
|
||||
public static final ItemType SPRUCE_CHEST_BOAT = init();
|
||||
@Nullable
|
||||
public static final ItemType SPRUCE_BUTTON = init();
|
||||
@Nullable
|
||||
public static final ItemType SPRUCE_DOOR = init();
|
||||
@ -1993,6 +2085,10 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType STRIPPED_JUNGLE_WOOD = init();
|
||||
@Nullable
|
||||
public static final ItemType STRIPPED_MANGROVE_LOG = init();
|
||||
@Nullable
|
||||
public static final ItemType STRIPPED_MANGROVE_WOOD = init();
|
||||
@Nullable
|
||||
public static final ItemType STRIPPED_OAK_LOG = init();
|
||||
@Nullable
|
||||
public static final ItemType STRIPPED_OAK_WOOD = init();
|
||||
@ -2019,6 +2115,10 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType SWEET_BERRIES = init();
|
||||
@Nullable
|
||||
public static final ItemType TADPOLE_BUCKET = init();
|
||||
@Nullable
|
||||
public static final ItemType TADPOLE_SPAWN_EGG = init();
|
||||
@Nullable
|
||||
public static final ItemType TALL_GRASS = init();
|
||||
@Nullable
|
||||
public static final ItemType TARGET = init();
|
||||
@ -2067,6 +2167,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType TWISTING_VINES = init();
|
||||
@Nullable
|
||||
public static final ItemType VERDANT_FROGLIGHT = init();
|
||||
@Nullable
|
||||
public static final ItemType VEX_SPAWN_EGG = init();
|
||||
@Nullable
|
||||
public static final ItemType VILLAGER_SPAWN_EGG = init();
|
||||
@ -2077,6 +2179,8 @@ public final class ItemTypes {
|
||||
@Nullable
|
||||
public static final ItemType WANDERING_TRADER_SPAWN_EGG = init();
|
||||
@Nullable
|
||||
public static final ItemType WARDEN_SPAWN_EGG = init();
|
||||
@Nullable
|
||||
public static final ItemType WARPED_BUTTON = init();
|
||||
@Nullable
|
||||
public static final ItemType WARPED_DOOR = init();
|
||||
|
||||
@ -57,7 +57,6 @@ public final class BundledBlockData {
|
||||
|
||||
private static final Logger LOGGER = LogManagerCompat.getLogger();
|
||||
private static BundledBlockData INSTANCE;
|
||||
private final ResourceLoader resourceLoader;
|
||||
|
||||
private final Map<String, BlockEntry> idMap = new HashMap<>();
|
||||
|
||||
@ -65,12 +64,6 @@ public final class BundledBlockData {
|
||||
* Create a new instance.
|
||||
*/
|
||||
private BundledBlockData() {
|
||||
this.resourceLoader = WorldEdit
|
||||
.getInstance()
|
||||
.getPlatformManager()
|
||||
.queryCapability(Capability.CONFIGURATION)
|
||||
.getResourceLoader();
|
||||
|
||||
try {
|
||||
loadFromResource();
|
||||
} catch (Throwable e) {
|
||||
@ -100,25 +93,7 @@ public final class BundledBlockData {
|
||||
});
|
||||
//FAWE end
|
||||
Gson gson = gsonBuilder.create();
|
||||
URL url = null;
|
||||
final int dataVersion = WorldEdit
|
||||
.getInstance()
|
||||
.getPlatformManager()
|
||||
.queryCapability(Capability.WORLD_EDITING)
|
||||
.getDataVersion();
|
||||
if (dataVersion >= Constants.DATA_VERSION_MC_1_17) {
|
||||
url = resourceLoader.getResource(BundledBlockData.class, "blocks.117.json");
|
||||
} else if (dataVersion >= Constants.DATA_VERSION_MC_1_16) {
|
||||
url = resourceLoader.getResource(BundledBlockData.class, "blocks.116.json");
|
||||
} else if (dataVersion >= Constants.DATA_VERSION_MC_1_15) {
|
||||
url = resourceLoader.getResource(BundledBlockData.class, "blocks.115.json");
|
||||
}
|
||||
if (url == null) {
|
||||
url = resourceLoader.getResource(BundledBlockData.class, "blocks.json");
|
||||
}
|
||||
if (url == null) {
|
||||
throw new IOException("Could not find blocks.json");
|
||||
}
|
||||
URL url = BundledRegistries.loadRegistry("blocks");
|
||||
String data = Resources.toString(url, Charset.defaultCharset());
|
||||
List<BlockEntry> entries = gson.fromJson(data, new TypeToken<List<BlockEntry>>() {
|
||||
}.getType());
|
||||
|
||||
@ -19,6 +19,18 @@
|
||||
|
||||
package com.sk89q.worldedit.world.registry;
|
||||
|
||||
import com.google.common.collect.ImmutableRangeMap;
|
||||
import com.google.common.collect.Range;
|
||||
import com.google.common.collect.RangeMap;
|
||||
import com.google.common.collect.TreeRangeMap;
|
||||
import com.sk89q.worldedit.WorldEdit;
|
||||
import com.sk89q.worldedit.extension.platform.Capability;
|
||||
import com.sk89q.worldedit.internal.Constants;
|
||||
import com.sk89q.worldedit.util.io.ResourceLoader;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.URL;
|
||||
|
||||
/**
|
||||
* An implementation of {@link Registries} that converts legacy numeric IDs and
|
||||
* a contains a built-in block and item database.
|
||||
@ -26,6 +38,34 @@ package com.sk89q.worldedit.world.registry;
|
||||
public class BundledRegistries implements Registries {
|
||||
|
||||
private static final BundledRegistries INSTANCE = new BundledRegistries();
|
||||
|
||||
private static final RangeMap<Integer, String> VERSION_MAP;
|
||||
|
||||
static {
|
||||
TreeRangeMap<Integer, String> versionMap = TreeRangeMap.create();
|
||||
versionMap.put(Range.atLeast(Constants.DATA_VERSION_MC_1_16), "116");
|
||||
versionMap.put(Range.atLeast(Constants.DATA_VERSION_MC_1_17), "117");
|
||||
// 1.18 did have one item change, but we didn't get it. It's fine.
|
||||
versionMap.put(Range.atLeast(Constants.DATA_VERSION_MC_1_19), "119");
|
||||
VERSION_MAP = ImmutableRangeMap.copyOf(versionMap);
|
||||
}
|
||||
|
||||
static URL loadRegistry(String name) throws IOException {
|
||||
ResourceLoader resourceLoader = WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.CONFIGURATION)
|
||||
.getResourceLoader();
|
||||
int dataVersion = WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.WORLD_EDITING)
|
||||
.getDataVersion();
|
||||
String version = VERSION_MAP.get(dataVersion);
|
||||
URL url = resourceLoader.getResource(BundledRegistries.class, name + "." + version + ".json");
|
||||
if (url == null) {
|
||||
url = resourceLoader.getResource(BundledRegistries.class, name + ".json");
|
||||
}
|
||||
if (url == null) {
|
||||
throw new IOException("Could not find " + name + ".json");
|
||||
}
|
||||
return url;
|
||||
}
|
||||
|
||||
private final BundledBlockRegistry blockRegistry = new BundledBlockRegistry();
|
||||
private final BundledItemRegistry itemRegistry = new BundledItemRegistry();
|
||||
private final NullEntityRegistry entityRegistry = new NullEntityRegistry();
|
||||
|
||||
Reference in New Issue
Block a user