From 257f344ddc87e1d16abf8473f85d8b2bcc00feac Mon Sep 17 00:00:00 2001 From: mcmonkey Date: Fri, 8 Jun 2018 12:20:36 -0700 Subject: [PATCH] reorder dMat to allow meta parser clarity --- .../aufdemrand/denizen/objects/dMaterial.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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 ab02ea396c..abde2e2185 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java @@ -405,6 +405,14 @@ 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"); + // 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)) { + return new dMaterial(Material.valueOf(material), data).forceIdentifyAs(name); + } + return null; + } + // Concrete public final static dMaterial WHITE_CONCRETE = getMaterial1_12("CONCRETE", 0, "WHITE_CONCRETE"); public final static dMaterial ORANGE_CONCRETE = getMaterial1_12("CONCRETE", 1, "ORANGE_CONCRETE"); @@ -1183,12 +1191,4 @@ public String getAttribute(Attribute attribute) { return new Element(identify()).getAttribute(attribute.fulfill(0)); } - - // 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)) { - return new dMaterial(Material.valueOf(material), data).forceIdentifyAs(name); - } - return null; - } }