From 5dcc6b9f4fcef2919a68de3a536d755bdd7ddb38 Mon Sep 17 00:00:00 2001 From: mcmonkey Date: Thu, 28 Jun 2018 13:22:18 -0700 Subject: [PATCH] add bed dmaterials, fixes #1781 --- .../aufdemrand/denizen/objects/dMaterial.java | 22 ++++++++++++++++++- .../objects/properties/item/ItemColor.java | 1 - 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java index 29c8b70c65..8d189f4179 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java @@ -87,7 +87,9 @@ public static enum dMaterials { ORANGE_CONCRETE_POWDER, MAGENTA_CONCRETE_POWDER, LIGHT_BLUE_CONCRETE_POWDER, YELLOW_CONCRETE_POWDER, LIME_CONCRETE_POWDER, PINK_CONCRETE_POWDER, GRAY_CONCRETE_POWDER, LIGHT_GRAY_CONCRETE_POWDER, CYAN_CONCRETE_POWDER, PURPLE_CONCRETE_POWDER, BLUE_CONCRETE_POWDER, BROWN_CONCRETE_POWDER, - GREEN_CONCRETE_POWDER, RED_CONCRETE_POWDER, BLACK_CONCRETE_POWDER + GREEN_CONCRETE_POWDER, RED_CONCRETE_POWDER, BLACK_CONCRETE_POWDER, WHITE_BED, ORANGE_BED, + MAGENTA_BED, LIGHT_BLUE_BED, YELLOW_BED, LIME_BED, PINK_BED, GRAY_BED, LIGHT_GRAY_BED, + CYAN_BED, PURPLE_BED, BLUE_BED, BROWN_BED, GREEN_BED, RED_BED, BLACK_BED } // dMaterials are just made and disposed of for standard 'Materials', but these we will keep around since @@ -403,6 +405,24 @@ public static enum dMaterials { public final static dMaterial ANDESITE = new dMaterial(Material.STONE, 5).forceIdentifyAs("ANDESITE"); public final static dMaterial POLISHED_ANDESITE = new dMaterial(Material.STONE, 6).forceIdentifyAs("POLISHED_ANDESITE"); + // Bed + public final static dMaterial WHITE_BED = new dMaterial(Material.BED, 0).forceIdentifyAs("WHITE_BED"); + public final static dMaterial ORANGE_BED = new dMaterial(Material.BED, 1).forceIdentifyAs("ORANGE_BED"); + public final static dMaterial MAGENTA_BED = new dMaterial(Material.BED, 2).forceIdentifyAs("MAGENTA_BED"); + public final static dMaterial LIGHT_BLUE_BED = new dMaterial(Material.BED, 3).forceIdentifyAs("LIGHT_BLUE_BED"); + public final static dMaterial YELLOW_BED = new dMaterial(Material.BED, 4).forceIdentifyAs("YELLOW_BED"); + public final static dMaterial LIME_BED = new dMaterial(Material.BED, 5).forceIdentifyAs("LIME_BED"); + public final static dMaterial PINK_BED = new dMaterial(Material.BED, 6).forceIdentifyAs("PINK_BED"); + public final static dMaterial GRAY_BED = new dMaterial(Material.BED, 7).forceIdentifyAs("GRAY_BED"); + public final static dMaterial LIGHT_GRAY_BED = new dMaterial(Material.BED, 8).forceIdentifyAs("LIGHT_GRAY_BED"); + public final static dMaterial CYAN_BED = new dMaterial(Material.BED, 9).forceIdentifyAs("CYAN_BED"); + public final static dMaterial PURPLE_BED = new dMaterial(Material.BED, 10).forceIdentifyAs("PURPLE_BED"); + public final static dMaterial BLUE_BED = new dMaterial(Material.BED, 11).forceIdentifyAs("BLUE_BED"); + public final static dMaterial BROWN_BED = new dMaterial(Material.BED, 12).forceIdentifyAs("BROWN_BED"); + public final static dMaterial GREEN_BED = new dMaterial(Material.BED, 13).forceIdentifyAs("GREEN_BED"); + public final static dMaterial RED_BED = new dMaterial(Material.BED, 14).forceIdentifyAs("RED_BED"); + public final static dMaterial BLACK_BED = new dMaterial(Material.BED, 15).forceIdentifyAs("BLACK_BED"); + // Version checks for version-specific materials public static dMaterial getMaterial1_12(String material, int data, String name) { if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_12_R1)) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemColor.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemColor.java index 31c6de33c8..34be86dfac 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemColor.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemColor.java @@ -4,7 +4,6 @@ import net.aufdemrand.denizen.nms.NMSVersion; import net.aufdemrand.denizen.objects.dColor; import net.aufdemrand.denizen.objects.dItem; -import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizencore.objects.Mechanism; import net.aufdemrand.denizencore.objects.dObject; import net.aufdemrand.denizencore.objects.properties.Property;