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

Updated item ids and names for 1.7

Browse Source
This commit is contained in:
Wizjany 2011-07-01 00:26:40 -04:00
parent b4f646a11a
commit 5231352f6c
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sk89q/worldedit/LocalWorld.java
View File

@ -312,7 +312,7 @@ public abstract class LocalWorld {
* @return * @return
*/ */
public boolean isValidBlockType(int type) { public boolean isValidBlockType(int type) {
return !((type > 32 && type < 35) || type == 36 || type == 29 || type > 96); return type >= 0 && type < 96;
} }
/** /**

4
src/main/java/com/sk89q/worldedit/blocks/BlockID.java
View File

@ -54,10 +54,14 @@ public final class BlockID {
public static final int BED = 26; public static final int BED = 26;
public static final int POWERED_RAIL = 27; public static final int POWERED_RAIL = 27;
public static final int DETECTOR_RAIL = 28; public static final int DETECTOR_RAIL = 28;
public static final int PISTON_STICKY_BASE = 29;
public static final int WEB = 30; public static final int WEB = 30;
public static final int LONG_GRASS = 31; public static final int LONG_GRASS = 31;
public static final int DEAD_BUSH = 32; public static final int DEAD_BUSH = 32;
public static final int PISTON_BASE = 33;
public static final int PISTON_EXTENSION = 34;
public static final int CLOTH = 35; public static final int CLOTH = 35;
public static final int PISTON_MOVING_PIECE = 36;
public static final int YELLOW_FLOWER = 37; public static final int YELLOW_FLOWER = 37;
public static final int RED_FLOWER = 38; public static final int RED_FLOWER = 38;
public static final int BROWN_MUSHROOM = 39; public static final int BROWN_MUSHROOM = 39;

6
src/main/java/com/sk89q/worldedit/blocks/BlockType.java
View File

@ -60,10 +60,14 @@ public enum BlockType {
BED(26, "Bed", "bed"), BED(26, "Bed", "bed"),
POWERED_RAIL(27, "Powered Rail", "poweredrail", "boosterrail", "poweredtrack", "boostertrack", "booster"), POWERED_RAIL(27, "Powered Rail", "poweredrail", "boosterrail", "poweredtrack", "boostertrack", "booster"),
DETECTOR_RAIL(28, "Detector Rail", "detectorrail", "detector"), DETECTOR_RAIL(28, "Detector Rail", "detectorrail", "detector"),
PISTON_STICKY_BASE(29, "Sticky Piston", "stickypiston"),
WEB(30, "Web", "web", "spiderweb"), WEB(30, "Web", "web", "spiderweb"),
LONG_GRASS(31, "Long grass", "longgrass", "tallgrass"), LONG_GRASS(31, "Long grass", "longgrass", "tallgrass"),
DEAD_BUSH(32, "Shrub", "deadbush", "shrub", "deadshrub", "tumbleweed"), DEAD_BUSH(32, "Shrub", "deadbush", "shrub", "deadshrub", "tumbleweed"),
PISTON_BASE(33, "Piston", "piston"),
PISTON_EXTENSION(34, "Piston extension", "pistonextendsion", "pistonhead"),
CLOTH(35, "Wool", "cloth", "wool"), CLOTH(35, "Wool", "cloth", "wool"),
PISTON_MOVING_PIECE(36, "Piston moving piece", "movingpiston"),
YELLOW_FLOWER(37, "Yellow flower", "yellowflower", "flower"), YELLOW_FLOWER(37, "Yellow flower", "yellowflower", "flower"),
RED_FLOWER(38, "Red rose", "redflower", "redrose", "rose"), RED_FLOWER(38, "Red rose", "redflower", "redrose", "rose"),
BROWN_MUSHROOM(39, "Brown mushroom", "brownmushroom", "mushroom"), BROWN_MUSHROOM(39, "Brown mushroom", "brownmushroom", "mushroom"),
@ -159,7 +163,9 @@ public enum BlockType {
blockDrops.put(27, 27); blockDrops.put(27, 27);
blockDrops.put(28, 28); blockDrops.put(28, 28);
blockDrops.put(30, 30); blockDrops.put(30, 30);
blockDrops.put(34, -1);
blockDrops.put(35, 35); blockDrops.put(35, 35);
blockDrops.put(36, -1);
blockDrops.put(37, 37); blockDrops.put(37, 37);
blockDrops.put(38, 38); blockDrops.put(38, 38);
blockDrops.put(39, 39); blockDrops.put(39, 39);

5
src/main/java/com/sk89q/worldedit/blocks/ItemType.java
View File

@ -62,10 +62,14 @@ public enum ItemType {
BED(26, "Bed", "bed"), BED(26, "Bed", "bed"),
POWERED_RAIL(27, "Powered Rail", "poweredrail", "boosterrail", "poweredtrack", "boostertrack", "booster"), POWERED_RAIL(27, "Powered Rail", "poweredrail", "boosterrail", "poweredtrack", "boostertrack", "booster"),
DETECTOR_RAIL(28, "Detector Rail", "detectorrail", "detector"), DETECTOR_RAIL(28, "Detector Rail", "detectorrail", "detector"),
PISTON_STICKY_BASE(29, "Sticky Piston", "stickypiston"),
WEB(30, "Web", "web", "spiderweb"), WEB(30, "Web", "web", "spiderweb"),
LONG_GRASS(31, "Long grass", "longgrass", "tallgrass"), LONG_GRASS(31, "Long grass", "longgrass", "tallgrass"),
DEAD_BUSH(32, "Shrub", "deadbush", "shrub", "deadshrub", "tumbleweed"), DEAD_BUSH(32, "Shrub", "deadbush", "shrub", "deadshrub", "tumbleweed"),
PISTON_BASE(33, "Piston", "piston"),
PISTON_EXTENSION(34, "Piston extension", "pistonhead"),
CLOTH(35, "Wool", "cloth", "wool"), CLOTH(35, "Wool", "cloth", "wool"),
PISTON_MOVING_PIECE(36, "Piston moving piece", "movingpiston"),
YELLOW_FLOWER(37, "Yellow flower", "yellowflower", "flower"), YELLOW_FLOWER(37, "Yellow flower", "yellowflower", "flower"),
RED_FLOWER(38, "Red rose", "redflower", "redrose", "rose"), RED_FLOWER(38, "Red rose", "redflower", "redrose", "rose"),
BROWN_MUSHROOM(39, "Brown mushroom", "brownmushroom", "mushroom"), BROWN_MUSHROOM(39, "Brown mushroom", "brownmushroom", "mushroom"),
@ -231,6 +235,7 @@ public enum ItemType {
REDSTONE_REPEATER(356, "Redstone repeater", "redstonerepeater", "diode", "delayer", "repeater"), REDSTONE_REPEATER(356, "Redstone repeater", "redstonerepeater", "diode", "delayer", "repeater"),
COOKIE(357, "Cookie", "cookie"), COOKIE(357, "Cookie", "cookie"),
MAP(358, "Map", "map"), MAP(358, "Map", "map"),
SHEARS(359, "Shears", "shears", "scissors"),
GOLD_RECORD(2256, "Gold Record", "goldrecord", "golddisc"), GOLD_RECORD(2256, "Gold Record", "goldrecord", "golddisc"),
GREEN_RECORD(2257, "Green Record", "greenrecord", "greenddisc"); GREEN_RECORD(2257, "Green Record", "greenrecord", "greenddisc");