From 3d5303ef55a528d41e962c72575ddaf1d6f21d84 Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Sat, 15 Jan 2011 20:38:41 +0000 Subject: [PATCH] Correctly added all MaterialData to their appropriate Material enum By: Dinnerbone --- paper-api/src/main/java/org/bukkit/Material.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/Material.java b/paper-api/src/main/java/org/bukkit/Material.java index c5f363f744..6bc9509012 100644 --- a/paper-api/src/main/java/org/bukkit/Material.java +++ b/paper-api/src/main/java/org/bukkit/Material.java @@ -6,9 +6,7 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.bukkit.material.Dye; -import org.bukkit.material.MaterialData; -import org.bukkit.material.Wool; +import org.bukkit.material.*; /** * An enum of all material ids accepted by the official server + client @@ -54,12 +52,12 @@ public enum Material { BOOKSHELF(47), MOSSY_COBBLESTONE(48), OBSIDIAN(49), - TORCH(50), + TORCH(50, Torch.class), FIRE(51), MOB_SPAWNER(52), WOOD_STAIRS(53), CHEST(54), - REDSTONE_WIRE(55), + REDSTONE_WIRE(55, RedstoneWire.class), DIAMOND_ORE(56), DIAMOND_BLOCK(57), WORKBENCH(58), @@ -79,8 +77,8 @@ public enum Material { WOOD_PLATE(72), REDSTONE_ORE(73), GLOWING_REDSTONE_ORE(74), - REDSTONE_TORCH_OFF(75), - REDSTONE_TORCH_ON(76), + REDSTONE_TORCH_OFF(75, RedstoneTorch.class), + REDSTONE_TORCH_ON(76, RedstoneTorch.class), STONE_BUTTON(77), SNOW(78), ICE(79), @@ -172,7 +170,7 @@ public enum Material { MINECART(328), SADDLE(329), IRON_DOOR(330), - REDSTONE(331), + REDSTONE(331, RedstoneWire.class), SNOW_BALL(332), BOAT(333), LEATHER(334),