Skip to content

Commit

Permalink
reorder dMat to allow meta parser clarity
Browse files Browse the repository at this point in the history
  • Loading branch information
mcmonkey4eva committed Jun 8, 2018
1 parent 0946337 commit 257f344
Showing 1 changed file with 8 additions and 8 deletions.
Expand Up @@ -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");
Expand Down Expand Up @@ -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;
}
}

0 comments on commit 257f344

Please sign in to comment.