mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2024-12-23 17:57:38 +00:00
Update for 1.3 blocks
This commit is contained in:
parent
6c94469550
commit
d40ef103ba
@ -151,4 +151,16 @@ public final class BlockID {
|
|||||||
public static final int DRAGON_EGG = 122;
|
public static final int DRAGON_EGG = 122;
|
||||||
public static final int REDSTONE_LAMP_OFF = 123;
|
public static final int REDSTONE_LAMP_OFF = 123;
|
||||||
public static final int REDSTONE_LAMP_ON = 124;
|
public static final int REDSTONE_LAMP_ON = 124;
|
||||||
|
public static final int DOUBLE_WOODEN_STEP = 125;
|
||||||
|
public static final int WOODEN_STEP = 126;
|
||||||
|
public static final int COCOA_PLANT = 127;
|
||||||
|
public static final int SANDSTONE_STAIRS = 128;
|
||||||
|
public static final int EMERALD_ORE = 129;
|
||||||
|
public static final int ENDER_CHEST = 130;
|
||||||
|
public static final int TRIPWIRE_HOOK = 131;
|
||||||
|
public static final int TRIPWIRE = 132;
|
||||||
|
public static final int EMERALD_BLOCK = 133;
|
||||||
|
public static final int SPRUCE_WOOD_STAIRS = 134;
|
||||||
|
public static final int BIRCH_WOOD_STAIRS = 135;
|
||||||
|
public static final int JUNGLE_WOOD_STAIRS = 136;
|
||||||
}
|
}
|
||||||
|
@ -159,7 +159,19 @@ public enum BlockType {
|
|||||||
END_STONE(BlockID.END_STONE, "End Stone", "endstone", "enderstone", "endersand"),
|
END_STONE(BlockID.END_STONE, "End Stone", "endstone", "enderstone", "endersand"),
|
||||||
DRAGON_EGG(BlockID.DRAGON_EGG, "Dragon Egg", "dragonegg", "dragons"),
|
DRAGON_EGG(BlockID.DRAGON_EGG, "Dragon Egg", "dragonegg", "dragons"),
|
||||||
REDSTONE_LAMP_OFF(BlockID.REDSTONE_LAMP_OFF, "Redstone lamp (off)", "redstonelamp", "redstonelampoff", "rslamp", "rslampoff", "rsglow", "rsglowoff"),
|
REDSTONE_LAMP_OFF(BlockID.REDSTONE_LAMP_OFF, "Redstone lamp (off)", "redstonelamp", "redstonelampoff", "rslamp", "rslampoff", "rsglow", "rsglowoff"),
|
||||||
REDSTONE_LAMP_ON(BlockID.REDSTONE_LAMP_ON, "Redstone lamp (on)", "redstonelampon", "rslampon", "rsglowon");
|
REDSTONE_LAMP_ON(BlockID.REDSTONE_LAMP_ON, "Redstone lamp (on)", "redstonelampon", "rslampon", "rsglowon"),
|
||||||
|
DOUBLE_WOODEN_STEP(BlockID.DOUBLE_WOODEN_STEP, "Double wood step", "doublewoodslab", "doublewoodstep"),
|
||||||
|
WOODEN_STEP(BlockID.WOODEN_STEP, "Wood step", "woodenslab", "woodslab", "woodstep", "woodhalfstep"),
|
||||||
|
COCOA_PLANT(BlockID.COCOA_PLANT, "Cocoa plant", "cocoplant", "cocoaplant"),
|
||||||
|
SANDSTONE_STAIRS(BlockID.SANDSTONE_STAIRS, "Sandstone stairs", "sandstairs", "sandstonestairs"),
|
||||||
|
EMERALD_ORE(BlockID.EMERALD_ORE, "Emerald ore", "emeraldore"),
|
||||||
|
ENDER_CHEST(BlockID.ENDER_CHEST, "Ender chest", "enderchest"),
|
||||||
|
TRIPWIRE_HOOK(BlockID.TRIPWIRE_HOOK, "Tripwire hook", "tripwirehook"),
|
||||||
|
TRIPWIRE(BlockID.TRIPWIRE, "Tripwire", "tripwire"),
|
||||||
|
EMERALD_BLOCK(BlockID.EMERALD_BLOCK, "Emerald block", "emeraldblock"),
|
||||||
|
SPRUCE_WOOD_STAIRS(BlockID.SPRUCE_WOOD_STAIRS, "Spruce wood stairs", "sprucestairs", "sprucewoodstairs"),
|
||||||
|
BIRCH_WOOD_STAIRS(BlockID.BIRCH_WOOD_STAIRS, "Birch wood stairs", "birchstairs", "birchwoodstairs"),
|
||||||
|
JUNGLE_WOOD_STAIRS(BlockID.JUNGLE_WOOD_STAIRS, "Jungle wood stairs", "junglestairs", "junglewoodstairs");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Stores a map of the IDs for fast access.
|
* Stores a map of the IDs for fast access.
|
||||||
|
@ -155,6 +155,9 @@ public final class ItemID {
|
|||||||
public static final int SPAWN_EGG = 383;
|
public static final int SPAWN_EGG = 383;
|
||||||
public static final int BOTTLE_O_ENCHANTING = 384;
|
public static final int BOTTLE_O_ENCHANTING = 384;
|
||||||
public static final int FIRE_CHARGE = 385;
|
public static final int FIRE_CHARGE = 385;
|
||||||
|
public static final int BOOK_AND_QUILL = 386;
|
||||||
|
public static final int WRITTEN_BOOK = 387;
|
||||||
|
public static final int EMERALD = 388;
|
||||||
@Deprecated public static final int GOLD_RECORD = 2256; // deprecated, but leave it there
|
@Deprecated public static final int GOLD_RECORD = 2256; // deprecated, but leave it there
|
||||||
@Deprecated public static final int GREEN_RECORD = 2257; // deprecated, but leave it there
|
@Deprecated public static final int GREEN_RECORD = 2257; // deprecated, but leave it there
|
||||||
public static final int DISC_13 = 2256;
|
public static final int DISC_13 = 2256;
|
||||||
|
@ -160,6 +160,18 @@ public enum ItemType {
|
|||||||
DRAGON_EGG(BlockID.DRAGON_EGG, "Dragon Egg", "dragonegg", "dragons"),
|
DRAGON_EGG(BlockID.DRAGON_EGG, "Dragon Egg", "dragonegg", "dragons"),
|
||||||
REDSTONE_LAMP_OFF(BlockID.REDSTONE_LAMP_OFF, "Redstone lamp (off)", "redstonelamp", "redstonelampoff", "rslamp", "rslampoff", "rsglow", "rsglowoff"),
|
REDSTONE_LAMP_OFF(BlockID.REDSTONE_LAMP_OFF, "Redstone lamp (off)", "redstonelamp", "redstonelampoff", "rslamp", "rslampoff", "rsglow", "rsglowoff"),
|
||||||
REDSTONE_LAMP_ON(BlockID.REDSTONE_LAMP_ON, "Redstone lamp (on)", "redstonelampon", "rslampon", "rsglowon"),
|
REDSTONE_LAMP_ON(BlockID.REDSTONE_LAMP_ON, "Redstone lamp (on)", "redstonelampon", "rslampon", "rsglowon"),
|
||||||
|
DOUBLE_WOODEN_STEP(BlockID.DOUBLE_WOODEN_STEP, "Double wood step", "doublewoodslab", "doublewoodstep"),
|
||||||
|
WOODEN_STEP(BlockID.WOODEN_STEP, "Wood step", "woodenslab", "woodslab", "woodstep", "woodhalfstep"),
|
||||||
|
COCOA_PLANT(BlockID.COCOA_PLANT, "Cocoa plant", "cocoplant", "cocoaplant"),
|
||||||
|
SANDSTONE_STAIRS(BlockID.SANDSTONE_STAIRS, "Sandstone stairs", "sandstairs", "sandstonestairs"),
|
||||||
|
EMERALD_ORE(BlockID.EMERALD_ORE, "Emerald ore", "emeraldore"),
|
||||||
|
ENDER_CHEST(BlockID.ENDER_CHEST, "Ender chest", "enderchest"),
|
||||||
|
TRIPWIRE_HOOK(BlockID.TRIPWIRE_HOOK, "Tripwire hook", "tripwirehook"),
|
||||||
|
TRIPWIRE(BlockID.TRIPWIRE, "Tripwire", "tripwire"),
|
||||||
|
EMERALD_BLOCK(BlockID.EMERALD_BLOCK, "Emerald block", "emeraldblock"),
|
||||||
|
SPRUCE_WOOD_STAIRS(BlockID.SPRUCE_WOOD_STAIRS, "Spruce wood stairs", "sprucestairs", "sprucewoodstairs"),
|
||||||
|
BIRCH_WOOD_STAIRS(BlockID.BIRCH_WOOD_STAIRS, "Birch wood stairs", "birchstairs", "birchwoodstairs"),
|
||||||
|
JUNGLE_WOOD_STAIRS(BlockID.JUNGLE_WOOD_STAIRS, "Jungle wood stairs", "junglestairs", "junglewoodstairs"),
|
||||||
|
|
||||||
// Items
|
// Items
|
||||||
IRON_SHOVEL(ItemID.IRON_SHOVEL, "Iron shovel", "ironshovel"),
|
IRON_SHOVEL(ItemID.IRON_SHOVEL, "Iron shovel", "ironshovel"),
|
||||||
@ -291,6 +303,9 @@ public enum ItemType {
|
|||||||
GLISTERING_MELON(ItemID.GLISTERING_MELON, "Glistering Melon", "glisteringmelon", "goldmelon"),
|
GLISTERING_MELON(ItemID.GLISTERING_MELON, "Glistering Melon", "glisteringmelon", "goldmelon"),
|
||||||
BOTTLE_O_ENCHANTING(ItemID.BOTTLE_O_ENCHANTING, "Bottle o' Enchanting", "expbottle", "bottleoenchanting", "experiencebottle", "exppotion", "experiencepotion"),
|
BOTTLE_O_ENCHANTING(ItemID.BOTTLE_O_ENCHANTING, "Bottle o' Enchanting", "expbottle", "bottleoenchanting", "experiencebottle", "exppotion", "experiencepotion"),
|
||||||
FIRE_CHARGE(ItemID.FIRE_CHARGE, "Fire Charge", "firecharge", "firestarter", "firerock"),
|
FIRE_CHARGE(ItemID.FIRE_CHARGE, "Fire Charge", "firecharge", "firestarter", "firerock"),
|
||||||
|
BOOK_AND_QUILL(ItemID.BOOK_AND_QUILL, "Book and Quill", "bookandquill", "quill", "writingbook"),
|
||||||
|
WRITTEN_BOOK(ItemID.WRITTEN_BOOK, "Written Book", "writtenbook"),
|
||||||
|
EMERALD(ItemID.EMERALD, "Emerald", "emerald"),
|
||||||
SPAWN_EGG(ItemID.SPAWN_EGG, "Spawn Egg", "spawnegg", "spawn", "mobspawnegg"),
|
SPAWN_EGG(ItemID.SPAWN_EGG, "Spawn Egg", "spawnegg", "spawn", "mobspawnegg"),
|
||||||
DISC_13(ItemID.DISC_13, "Music Disc - 13", "disc_13"),
|
DISC_13(ItemID.DISC_13, "Music Disc - 13", "disc_13"),
|
||||||
DISC_CAT(ItemID.DISC_CAT, "Music Disc - Cat", "disc_cat"),
|
DISC_CAT(ItemID.DISC_CAT, "Music Disc - Cat", "disc_cat"),
|
||||||
@ -500,9 +515,7 @@ public enum ItemType {
|
|||||||
shouldNotStack.add(ItemID.GOLD_CHEST);
|
shouldNotStack.add(ItemID.GOLD_CHEST);
|
||||||
shouldNotStack.add(ItemID.GOLD_PANTS);
|
shouldNotStack.add(ItemID.GOLD_PANTS);
|
||||||
shouldNotStack.add(ItemID.GOLD_BOOTS);
|
shouldNotStack.add(ItemID.GOLD_BOOTS);
|
||||||
shouldNotStack.add(ItemID.SIGN);
|
|
||||||
shouldNotStack.add(ItemID.WOODEN_DOOR_ITEM);
|
shouldNotStack.add(ItemID.WOODEN_DOOR_ITEM);
|
||||||
shouldNotStack.add(ItemID.BUCKET);
|
|
||||||
shouldNotStack.add(ItemID.WATER_BUCKET);
|
shouldNotStack.add(ItemID.WATER_BUCKET);
|
||||||
shouldNotStack.add(ItemID.LAVA_BUCKET);
|
shouldNotStack.add(ItemID.LAVA_BUCKET);
|
||||||
shouldNotStack.add(ItemID.MINECART);
|
shouldNotStack.add(ItemID.MINECART);
|
||||||
|
Loading…
Reference in New Issue
Block a user