Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 17:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added better support for cake, added some more block/item aliases.

Browse Source
This commit is contained in:
sk89q 2011-01-29 12:08:16 -08:00
parent 3d98c7667d
commit df0b274014
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/sk89q/worldedit/blocks/BlockType.java
View File

@ -37,10 +37,10 @@ public enum BlockType {
WOOD(5, "Wood", "wood"), WOOD(5, "Wood", "wood"),
SAPLING(6, "Sapling", "sapling"), SAPLING(6, "Sapling", "sapling"),
BEDROCK(7, "Bedrock", new String[]{"adminium", "bedrock"}), BEDROCK(7, "Bedrock", new String[]{"adminium", "bedrock"}),
WATER(8, "Water", "watermoving"), WATER(8, "Water", new String[]{"watermoving", "movingwater"}),
STATIONARY_WATER(9, "Water (stationary)", "water"), STATIONARY_WATER(9, "Water (stationary)", new String[]{"water", "waterstationary", "stationarywater"}),
LAVA(10, "Lava", "lavamoving"), LAVA(10, "Lava", new String[]{"lavamoving", "movinglava"}),
STATIONARY_LAVA(11, "Lava (stationary)", "lava"), STATIONARY_LAVA(11, "Lava (stationary)", new String[]{"lava", "lavastationary", "stationarylava"}),
SAND(12, "Sand", "sand"), SAND(12, "Sand", "sand"),
GRAVEL(13, "Gravel", "gravel"), GRAVEL(13, "Gravel", "gravel"),
GOLD_ORE(14, "Gold ore", "goldore"), GOLD_ORE(14, "Gold ore", "goldore"),
@ -56,8 +56,8 @@ public enum BlockType {
SANDSTONE(24, "Sandstone", "sandstone"), SANDSTONE(24, "Sandstone", "sandstone"),
NOTE_BLOCK(25, "Note block", new String[]{"musicblock", "noteblock", "note", "music", "instrument"}), NOTE_BLOCK(25, "Note block", new String[]{"musicblock", "noteblock", "note", "music", "instrument"}),
CLOTH(35, "Cloth", new String[]{"cloth", "wool"}), CLOTH(35, "Cloth", new String[]{"cloth", "wool"}),
YELLOW_FLOWER(37, "Yellow flower", "yellowflower"), YELLOW_FLOWER(37, "Yellow flower", new String[]{"yellowflower", "flower"}),
RED_FLOWER(38, "Red rose", new String[]{"redflower", "redrose"}), RED_FLOWER(38, "Red rose", new String[]{"redflower", "redrose", "rose"}),
BROWN_MUSHROOM(39, "Brown mushroom", new String[]{"brownmushroom", "mushroom"}), BROWN_MUSHROOM(39, "Brown mushroom", new String[]{"brownmushroom", "mushroom"}),
RED_MUSHROOM(40, "Red mushroom", "redmushroom"), RED_MUSHROOM(40, "Red mushroom", "redmushroom"),
GOLD_BLOCK(41, "Gold block", new String[]{"gold", "goldblock"}), GOLD_BLOCK(41, "Gold block", new String[]{"gold", "goldblock"}),
@ -108,11 +108,11 @@ public enum BlockType {
FENCE(85, "Fence", "fence"), FENCE(85, "Fence", "fence"),
PUMPKIN(86, "Pumpkin", "pumpkin"), PUMPKIN(86, "Pumpkin", "pumpkin"),
NETHERRACK(87, "Netherrack", new String[]{"redmossycobblestone", "redcobblestone", "redmosstone", "redcobble", "netherstone", "netherrack", "nether"}), NETHERRACK(87, "Netherrack", new String[]{"redmossycobblestone", "redcobblestone", "redmosstone", "redcobble", "netherstone", "netherrack", "nether"}),
SOUL_SAND(88, "Soul sand", new String[]{"slowmud", "mud", "soulsand"}), SOUL_SAND(88, "Soul sand", new String[]{"slowmud", "slowsand", "mud", "soulsand"}),
GLOWSTONE(89, "Glowstone", new String[]{"brittlegold", "glowstone", "lightstone"}), GLOWSTONE(89, "Glowstone", new String[]{"brittlegold", "glowstone", "lightstone"}),
PORTAL(90, "Portal", "portal"), PORTAL(90, "Portal", "portal"),
JACK_O_LANTERN(91, "Pumpkin (on)", new String[]{"pumpkinlighted", "pumpkinon", "litpumpkin"}), JACK_O_LANTERN(91, "Pumpkin (on)", new String[]{"pumpkinlighted", "pumpkinon", "litpumpkin"}),
CAKE(92, "Cake", "Cake"); CAKE(92, "Cake", "cake");
/** /**
* Stores a list of dropped blocks for blocks. * Stores a list of dropped blocks for blocks.
@ -397,7 +397,8 @@ public enum BlockType {
|| id == 77 // Stone button || id == 77 // Stone button
|| id == 81 // Cactus || id == 81 // Cactus
|| id == 86 // Pumpkin || id == 86 // Pumpkin
|| id == 91; // Jack-o-lantern || id == 91 // Jack-o-lantern
|| id == 92; // Cake
} }
/** /**

14
src/com/sk89q/worldedit/blocks/ItemType.java
View File

@ -37,10 +37,10 @@ public enum ItemType {
WOOD(5, "Wood", "wood"), WOOD(5, "Wood", "wood"),
SAPLING(6, "Sapling", "sapling"), SAPLING(6, "Sapling", "sapling"),
BEDROCK(7, "Bedrock", new String[]{"adminium", "bedrock"}), BEDROCK(7, "Bedrock", new String[]{"adminium", "bedrock"}),
WATER(8, "Water", "watermoving"), WATER(8, "Water", new String[]{"watermoving", "movingwater"}),
STATIONARY_WATER(9, "Water (stationary)", "water"), STATIONARY_WATER(9, "Water (stationary)", new String[]{"water", "waterstationary", "stationarywater"}),
LAVA(10, "Lava", "lavamoving"), LAVA(10, "Lava", new String[]{"lavamoving", "movinglava"}),
STATIONARY_LAVA(11, "Lava (stationary)", "lava"), STATIONARY_LAVA(11, "Lava (stationary)", new String[]{"lava", "lavastationary", "stationarylava"}),
SAND(12, "Sand", "sand"), SAND(12, "Sand", "sand"),
GRAVEL(13, "Gravel", "gravel"), GRAVEL(13, "Gravel", "gravel"),
GOLD_ORE(14, "Gold ore", "goldore"), GOLD_ORE(14, "Gold ore", "goldore"),
@ -56,8 +56,8 @@ public enum ItemType {
SANDSTONE(24, "Sandstone", "sandstone"), SANDSTONE(24, "Sandstone", "sandstone"),
NOTE_BLOCK(25, "Note block", new String[]{"musicblock", "noteblock", "note", "music", "instrument"}), NOTE_BLOCK(25, "Note block", new String[]{"musicblock", "noteblock", "note", "music", "instrument"}),
CLOTH(35, "Cloth", "cloth"), CLOTH(35, "Cloth", "cloth"),
YELLOW_FLOWER(37, "Yellow flower", "yellowflower"), YELLOW_FLOWER(37, "Yellow flower", new String[]{"yellowflower", "flower"}),
RED_FLOWER(38, "Red rose", new String[]{"redflower", "redrose"}), RED_FLOWER(38, "Red rose", new String[]{"redflower", "redrose", "rose"}),
BROWN_MUSHROOM(39, "Brown mushroom", new String[]{"brownmushroom", "mushroom"}), BROWN_MUSHROOM(39, "Brown mushroom", new String[]{"brownmushroom", "mushroom"}),
RED_MUSHROOM(40, "Red mushroom", "redmushroom"), RED_MUSHROOM(40, "Red mushroom", "redmushroom"),
GOLD_BLOCK(41, "Gold block", new String[]{"gold", "goldblock"}), GOLD_BLOCK(41, "Gold block", new String[]{"gold", "goldblock"}),
@ -112,7 +112,7 @@ public enum ItemType {
GLOWSTONE(89, "Glowstone", new String[]{"brittlegold", "glowstone", "lightstone"}), GLOWSTONE(89, "Glowstone", new String[]{"brittlegold", "glowstone", "lightstone"}),
PORTAL(90, "Portal", "portal"), PORTAL(90, "Portal", "portal"),
JACK_O_LANTERN(91, "Pumpkin (on)", new String[]{"pumpkinlighted", "pumpkinon", "litpumpkin"}), JACK_O_LANTERN(91, "Pumpkin (on)", new String[]{"pumpkinlighted", "pumpkinon", "litpumpkin"}),
CAKE(92, "Cake", "Cake"), CAKE(92, "Cake", "cake"),
IRON_SHOVEL(256, "Iron shovel", "ironshovel"), IRON_SHOVEL(256, "Iron shovel", "ironshovel"),
IRON_PICK(257, "Iron pick", "ironpick"), IRON_PICK(257, "Iron pick", "ironpick"),
IRON_AXE(258, "Iron axe", "ironaxe"), IRON_AXE(258, "Iron axe", "ironaxe"),