Skip to content

Commit 6eb056d

Browse files
me4502me4502
committed
MCUtils updates
1 parent 19d6c14 commit 6eb056d

File tree

4 files changed

+118
-1
lines changed

4 files changed

+118
-1
lines changed

‎worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockCategories.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public final class BlockCategories {
4747
public static final BlockCategory BIG_DRIPLEAF_PLACEABLE = get("minecraft:big_dripleaf_placeable");
4848
public static final BlockCategory BIRCH_LOGS = get("minecraft:birch_logs");
4949
public static final BlockCategory BUTTONS = get("minecraft:buttons");
50+
public static final BlockCategory CAMEL_SAND_STEP_SOUND_BLOCKS = get("minecraft:camel_sand_step_sound_blocks");
5051
public static final BlockCategory CAMPFIRES = get("minecraft:campfires");
5152
public static final BlockCategory CANDLE_CAKES = get("minecraft:candle_cakes");
5253
public static final BlockCategory CANDLES = get("minecraft:candles");
@@ -59,6 +60,7 @@ public final class BlockCategories {
5960
public static final BlockCategory COAL_ORES = get("minecraft:coal_ores");
6061
public static final BlockCategory COMBINATION_STEP_SOUND_BLOCKS = get("minecraft:combination_step_sound_blocks");
6162
public static final BlockCategory COMPLETES_FIND_TREE_TUTORIAL = get("minecraft:completes_find_tree_tutorial");
63+
public static final BlockCategory CONCRETE_POWDER = get("minecraft:concrete_powder");
6264
public static final BlockCategory CONVERTABLE_TO_MUD = get("minecraft:convertable_to_mud");
6365
public static final BlockCategory COPPER_ORES = get("minecraft:copper_ores");
6466
public static final BlockCategory CORAL_BLOCKS = get("minecraft:coral_blocks");

‎worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,16 @@ public final class BlockTypes {
212212
@Nullable public static final BlockType CHEST = get("minecraft:chest");
213213
@Nullable public static final BlockType CHIPPED_ANVIL = get("minecraft:chipped_anvil");
214214
@Nullable public static final BlockType CHISELED_BOOKSHELF = get("minecraft:chiseled_bookshelf");
215+
@Nullable public static final BlockType CHISELED_COPPER = get("minecraft:chiseled_copper");
215216
@Nullable public static final BlockType CHISELED_DEEPSLATE = get("minecraft:chiseled_deepslate");
216217
@Nullable public static final BlockType CHISELED_NETHER_BRICKS = get("minecraft:chiseled_nether_bricks");
217218
@Nullable public static final BlockType CHISELED_POLISHED_BLACKSTONE = get("minecraft:chiseled_polished_blackstone");
218219
@Nullable public static final BlockType CHISELED_QUARTZ_BLOCK = get("minecraft:chiseled_quartz_block");
219220
@Nullable public static final BlockType CHISELED_RED_SANDSTONE = get("minecraft:chiseled_red_sandstone");
220221
@Nullable public static final BlockType CHISELED_SANDSTONE = get("minecraft:chiseled_sandstone");
221222
@Nullable public static final BlockType CHISELED_STONE_BRICKS = get("minecraft:chiseled_stone_bricks");
223+
@Nullable public static final BlockType CHISELED_TUFF = get("minecraft:chiseled_tuff");
224+
@Nullable public static final BlockType CHISELED_TUFF_BRICKS = get("minecraft:chiseled_tuff_bricks");
222225
@Nullable public static final BlockType CHORUS_FLOWER = get("minecraft:chorus_flower");
223226
@Nullable public static final BlockType CHORUS_PLANT = get("minecraft:chorus_plant");
224227
@Nullable public static final BlockType CLAY = get("minecraft:clay");
@@ -240,13 +243,18 @@ public final class BlockTypes {
240243
@Nullable public static final BlockType COMPOSTER = get("minecraft:composter");
241244
@Nullable public static final BlockType CONDUIT = get("minecraft:conduit");
242245
@Nullable public static final BlockType COPPER_BLOCK = get("minecraft:copper_block");
246+
@Nullable public static final BlockType COPPER_BULB = get("minecraft:copper_bulb");
247+
@Nullable public static final BlockType COPPER_DOOR = get("minecraft:copper_door");
248+
@Nullable public static final BlockType COPPER_GRATE = get("minecraft:copper_grate");
243249
@Nullable public static final BlockType COPPER_ORE = get("minecraft:copper_ore");
250+
@Nullable public static final BlockType COPPER_TRAPDOOR = get("minecraft:copper_trapdoor");
244251
@Nullable public static final BlockType CORNFLOWER = get("minecraft:cornflower");
245252
@Nullable public static final BlockType CRACKED_DEEPSLATE_BRICKS = get("minecraft:cracked_deepslate_bricks");
246253
@Nullable public static final BlockType CRACKED_DEEPSLATE_TILES = get("minecraft:cracked_deepslate_tiles");
247254
@Nullable public static final BlockType CRACKED_NETHER_BRICKS = get("minecraft:cracked_nether_bricks");
248255
@Nullable public static final BlockType CRACKED_POLISHED_BLACKSTONE_BRICKS = get("minecraft:cracked_polished_blackstone_bricks");
249256
@Nullable public static final BlockType CRACKED_STONE_BRICKS = get("minecraft:cracked_stone_bricks");
257+
@Nullable public static final BlockType CRAFTER = get("minecraft:crafter");
250258
@Nullable public static final BlockType CRAFTING_TABLE = get("minecraft:crafting_table");
251259
@Nullable public static final BlockType CREEPER_HEAD = get("minecraft:creeper_head");
252260
@Nullable public static final BlockType CREEPER_WALL_HEAD = get("minecraft:creeper_wall_head");
@@ -381,7 +389,12 @@ public final class BlockTypes {
381389
@Nullable public static final BlockType END_STONE_BRICK_WALL = get("minecraft:end_stone_brick_wall");
382390
@Nullable public static final BlockType END_STONE_BRICKS = get("minecraft:end_stone_bricks");
383391
@Nullable public static final BlockType ENDER_CHEST = get("minecraft:ender_chest");
392+
@Nullable public static final BlockType EXPOSED_CHISELED_COPPER = get("minecraft:exposed_chiseled_copper");
384393
@Nullable public static final BlockType EXPOSED_COPPER = get("minecraft:exposed_copper");
394+
@Nullable public static final BlockType EXPOSED_COPPER_BULB = get("minecraft:exposed_copper_bulb");
395+
@Nullable public static final BlockType EXPOSED_COPPER_DOOR = get("minecraft:exposed_copper_door");
396+
@Nullable public static final BlockType EXPOSED_COPPER_GRATE = get("minecraft:exposed_copper_grate");
397+
@Nullable public static final BlockType EXPOSED_COPPER_TRAPDOOR = get("minecraft:exposed_copper_trapdoor");
385398
@Nullable public static final BlockType EXPOSED_CUT_COPPER = get("minecraft:exposed_cut_copper");
386399
@Nullable public static final BlockType EXPOSED_CUT_COPPER_SLAB = get("minecraft:exposed_cut_copper_slab");
387400
@Nullable public static final BlockType EXPOSED_CUT_COPPER_STAIRS = get("minecraft:exposed_cut_copper_stairs");
@@ -653,7 +666,12 @@ public final class BlockTypes {
653666
@Nullable public static final BlockType ORANGE_WALL_BANNER = get("minecraft:orange_wall_banner");
654667
@Nullable public static final BlockType ORANGE_WOOL = get("minecraft:orange_wool");
655668
@Nullable public static final BlockType OXEYE_DAISY = get("minecraft:oxeye_daisy");
669+
@Nullable public static final BlockType OXIDIZED_CHISELED_COPPER = get("minecraft:oxidized_chiseled_copper");
656670
@Nullable public static final BlockType OXIDIZED_COPPER = get("minecraft:oxidized_copper");
671+
@Nullable public static final BlockType OXIDIZED_COPPER_BULB = get("minecraft:oxidized_copper_bulb");
672+
@Nullable public static final BlockType OXIDIZED_COPPER_DOOR = get("minecraft:oxidized_copper_door");
673+
@Nullable public static final BlockType OXIDIZED_COPPER_GRATE = get("minecraft:oxidized_copper_grate");
674+
@Nullable public static final BlockType OXIDIZED_COPPER_TRAPDOOR = get("minecraft:oxidized_copper_trapdoor");
657675
@Nullable public static final BlockType OXIDIZED_CUT_COPPER = get("minecraft:oxidized_cut_copper");
658676
@Nullable public static final BlockType OXIDIZED_CUT_COPPER_SLAB = get("minecraft:oxidized_cut_copper_slab");
659677
@Nullable public static final BlockType OXIDIZED_CUT_COPPER_STAIRS = get("minecraft:oxidized_cut_copper_stairs");
@@ -712,6 +730,10 @@ public final class BlockTypes {
712730
@Nullable public static final BlockType POLISHED_GRANITE = get("minecraft:polished_granite");
713731
@Nullable public static final BlockType POLISHED_GRANITE_SLAB = get("minecraft:polished_granite_slab");
714732
@Nullable public static final BlockType POLISHED_GRANITE_STAIRS = get("minecraft:polished_granite_stairs");
733+
@Nullable public static final BlockType POLISHED_TUFF = get("minecraft:polished_tuff");
734+
@Nullable public static final BlockType POLISHED_TUFF_SLAB = get("minecraft:polished_tuff_slab");
735+
@Nullable public static final BlockType POLISHED_TUFF_STAIRS = get("minecraft:polished_tuff_stairs");
736+
@Nullable public static final BlockType POLISHED_TUFF_WALL = get("minecraft:polished_tuff_wall");
715737
@Nullable public static final BlockType POPPY = get("minecraft:poppy");
716738
@Nullable public static final BlockType POTATOES = get("minecraft:potatoes");
717739
@Nullable public static final BlockType POTTED_ACACIA_SAPLING = get("minecraft:potted_acacia_sapling");
@@ -941,13 +963,21 @@ public final class BlockTypes {
941963
@Nullable public static final BlockType TORCHFLOWER = get("minecraft:torchflower");
942964
@Nullable public static final BlockType TORCHFLOWER_CROP = get("minecraft:torchflower_crop");
943965
@Nullable public static final BlockType TRAPPED_CHEST = get("minecraft:trapped_chest");
966+
@Nullable public static final BlockType TRIAL_SPAWNER = get("minecraft:trial_spawner");
944967
@Nullable public static final BlockType TRIPWIRE = get("minecraft:tripwire");
945968
@Nullable public static final BlockType TRIPWIRE_HOOK = get("minecraft:tripwire_hook");
946969
@Nullable public static final BlockType TUBE_CORAL = get("minecraft:tube_coral");
947970
@Nullable public static final BlockType TUBE_CORAL_BLOCK = get("minecraft:tube_coral_block");
948971
@Nullable public static final BlockType TUBE_CORAL_FAN = get("minecraft:tube_coral_fan");
949972
@Nullable public static final BlockType TUBE_CORAL_WALL_FAN = get("minecraft:tube_coral_wall_fan");
950973
@Nullable public static final BlockType TUFF = get("minecraft:tuff");
974+
@Nullable public static final BlockType TUFF_BRICK_SLAB = get("minecraft:tuff_brick_slab");
975+
@Nullable public static final BlockType TUFF_BRICK_STAIRS = get("minecraft:tuff_brick_stairs");
976+
@Nullable public static final BlockType TUFF_BRICK_WALL = get("minecraft:tuff_brick_wall");
977+
@Nullable public static final BlockType TUFF_BRICKS = get("minecraft:tuff_bricks");
978+
@Nullable public static final BlockType TUFF_SLAB = get("minecraft:tuff_slab");
979+
@Nullable public static final BlockType TUFF_STAIRS = get("minecraft:tuff_stairs");
980+
@Nullable public static final BlockType TUFF_WALL = get("minecraft:tuff_wall");
951981
@Nullable public static final BlockType TURTLE_EGG = get("minecraft:turtle_egg");
952982
@Nullable public static final BlockType TWISTING_VINES = get("minecraft:twisting_vines");
953983
@Nullable public static final BlockType TWISTING_VINES_PLANT = get("minecraft:twisting_vines_plant");
@@ -977,23 +1007,48 @@ public final class BlockTypes {
9771007
@Nullable public static final BlockType WARPED_WART_BLOCK = get("minecraft:warped_wart_block");
9781008
@Nullable public static final BlockType WATER = get("minecraft:water");
9791009
@Nullable public static final BlockType WATER_CAULDRON = get("minecraft:water_cauldron");
1010+
@Nullable public static final BlockType WAXED_CHISELED_COPPER = get("minecraft:waxed_chiseled_copper");
9801011
@Nullable public static final BlockType WAXED_COPPER_BLOCK = get("minecraft:waxed_copper_block");
1012+
@Nullable public static final BlockType WAXED_COPPER_BULB = get("minecraft:waxed_copper_bulb");
1013+
@Nullable public static final BlockType WAXED_COPPER_DOOR = get("minecraft:waxed_copper_door");
1014+
@Nullable public static final BlockType WAXED_COPPER_GRATE = get("minecraft:waxed_copper_grate");
1015+
@Nullable public static final BlockType WAXED_COPPER_TRAPDOOR = get("minecraft:waxed_copper_trapdoor");
9811016
@Nullable public static final BlockType WAXED_CUT_COPPER = get("minecraft:waxed_cut_copper");
9821017
@Nullable public static final BlockType WAXED_CUT_COPPER_SLAB = get("minecraft:waxed_cut_copper_slab");
9831018
@Nullable public static final BlockType WAXED_CUT_COPPER_STAIRS = get("minecraft:waxed_cut_copper_stairs");
1019+
@Nullable public static final BlockType WAXED_EXPOSED_CHISELED_COPPER = get("minecraft:waxed_exposed_chiseled_copper");
9841020
@Nullable public static final BlockType WAXED_EXPOSED_COPPER = get("minecraft:waxed_exposed_copper");
1021+
@Nullable public static final BlockType WAXED_EXPOSED_COPPER_BULB = get("minecraft:waxed_exposed_copper_bulb");
1022+
@Nullable public static final BlockType WAXED_EXPOSED_COPPER_DOOR = get("minecraft:waxed_exposed_copper_door");
1023+
@Nullable public static final BlockType WAXED_EXPOSED_COPPER_GRATE = get("minecraft:waxed_exposed_copper_grate");
1024+
@Nullable public static final BlockType WAXED_EXPOSED_COPPER_TRAPDOOR = get("minecraft:waxed_exposed_copper_trapdoor");
9851025
@Nullable public static final BlockType WAXED_EXPOSED_CUT_COPPER = get("minecraft:waxed_exposed_cut_copper");
9861026
@Nullable public static final BlockType WAXED_EXPOSED_CUT_COPPER_SLAB = get("minecraft:waxed_exposed_cut_copper_slab");
9871027
@Nullable public static final BlockType WAXED_EXPOSED_CUT_COPPER_STAIRS = get("minecraft:waxed_exposed_cut_copper_stairs");
1028+
@Nullable public static final BlockType WAXED_OXIDIZED_CHISELED_COPPER = get("minecraft:waxed_oxidized_chiseled_copper");
9881029
@Nullable public static final BlockType WAXED_OXIDIZED_COPPER = get("minecraft:waxed_oxidized_copper");
1030+
@Nullable public static final BlockType WAXED_OXIDIZED_COPPER_BULB = get("minecraft:waxed_oxidized_copper_bulb");
1031+
@Nullable public static final BlockType WAXED_OXIDIZED_COPPER_DOOR = get("minecraft:waxed_oxidized_copper_door");
1032+
@Nullable public static final BlockType WAXED_OXIDIZED_COPPER_GRATE = get("minecraft:waxed_oxidized_copper_grate");
1033+
@Nullable public static final BlockType WAXED_OXIDIZED_COPPER_TRAPDOOR = get("minecraft:waxed_oxidized_copper_trapdoor");
9891034
@Nullable public static final BlockType WAXED_OXIDIZED_CUT_COPPER = get("minecraft:waxed_oxidized_cut_copper");
9901035
@Nullable public static final BlockType WAXED_OXIDIZED_CUT_COPPER_SLAB = get("minecraft:waxed_oxidized_cut_copper_slab");
9911036
@Nullable public static final BlockType WAXED_OXIDIZED_CUT_COPPER_STAIRS = get("minecraft:waxed_oxidized_cut_copper_stairs");
1037+
@Nullable public static final BlockType WAXED_WEATHERED_CHISELED_COPPER = get("minecraft:waxed_weathered_chiseled_copper");
9921038
@Nullable public static final BlockType WAXED_WEATHERED_COPPER = get("minecraft:waxed_weathered_copper");
1039+
@Nullable public static final BlockType WAXED_WEATHERED_COPPER_BULB = get("minecraft:waxed_weathered_copper_bulb");
1040+
@Nullable public static final BlockType WAXED_WEATHERED_COPPER_DOOR = get("minecraft:waxed_weathered_copper_door");
1041+
@Nullable public static final BlockType WAXED_WEATHERED_COPPER_GRATE = get("minecraft:waxed_weathered_copper_grate");
1042+
@Nullable public static final BlockType WAXED_WEATHERED_COPPER_TRAPDOOR = get("minecraft:waxed_weathered_copper_trapdoor");
9931043
@Nullable public static final BlockType WAXED_WEATHERED_CUT_COPPER = get("minecraft:waxed_weathered_cut_copper");
9941044
@Nullable public static final BlockType WAXED_WEATHERED_CUT_COPPER_SLAB = get("minecraft:waxed_weathered_cut_copper_slab");
9951045
@Nullable public static final BlockType WAXED_WEATHERED_CUT_COPPER_STAIRS = get("minecraft:waxed_weathered_cut_copper_stairs");
1046+
@Nullable public static final BlockType WEATHERED_CHISELED_COPPER = get("minecraft:weathered_chiseled_copper");
9961047
@Nullable public static final BlockType WEATHERED_COPPER = get("minecraft:weathered_copper");
1048+
@Nullable public static final BlockType WEATHERED_COPPER_BULB = get("minecraft:weathered_copper_bulb");
1049+
@Nullable public static final BlockType WEATHERED_COPPER_DOOR = get("minecraft:weathered_copper_door");
1050+
@Nullable public static final BlockType WEATHERED_COPPER_GRATE = get("minecraft:weathered_copper_grate");
1051+
@Nullable public static final BlockType WEATHERED_COPPER_TRAPDOOR = get("minecraft:weathered_copper_trapdoor");
9971052
@Nullable public static final BlockType WEATHERED_CUT_COPPER = get("minecraft:weathered_cut_copper");
9981053
@Nullable public static final BlockType WEATHERED_CUT_COPPER_SLAB = get("minecraft:weathered_cut_copper_slab");
9991054
@Nullable public static final BlockType WEATHERED_CUT_COPPER_STAIRS = get("minecraft:weathered_cut_copper_stairs");

‎worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityTypes.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public final class EntityTypes {
3838
@Nullable public static final EntityType BLAZE = get("minecraft:blaze");
3939
@Nullable public static final EntityType BLOCK_DISPLAY = get("minecraft:block_display");
4040
@Nullable public static final EntityType BOAT = get("minecraft:boat");
41+
@Nullable public static final EntityType BREEZE = get("minecraft:breeze");
4142
@Nullable public static final EntityType CAMEL = get("minecraft:camel");
4243
@Nullable public static final EntityType CAT = get("minecraft:cat");
4344
@Nullable public static final EntityType CAVE_SPIDER = get("minecraft:cave_spider");
@@ -142,6 +143,7 @@ public final class EntityTypes {
142143
@Nullable public static final EntityType VINDICATOR = get("minecraft:vindicator");
143144
@Nullable public static final EntityType WANDERING_TRADER = get("minecraft:wandering_trader");
144145
@Nullable public static final EntityType WARDEN = get("minecraft:warden");
146+
@Nullable public static final EntityType WIND_CHARGE = get("minecraft:wind_charge");
145147
@Nullable public static final EntityType WITCH = get("minecraft:witch");
146148
@Nullable public static final EntityType WITHER = get("minecraft:wither");
147149
@Nullable public static final EntityType WITHER_SKELETON = get("minecraft:wither_skeleton");

0 commit comments

Comments
 (0)