From 4e677006968b23adad81560f8e83863b5b181969 Mon Sep 17 00:00:00 2001
From: bensku <bmi@mbnet.fi>
Date: Sat, 15 Apr 2017 12:12:19 +0300
Subject: [PATCH] Add some tree types (#494)

---
 gradle.properties                              |  2 +-
 .../ch/njol/skript/util/StructureType.java     | 12 +++++++-----
 src/main/resources/lang/english.lang           | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index e5cbb211377..ac7f34da6ee 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 groupid=ch.njol
 name=skript
-version=2.2-dev26d
\ No newline at end of file
+version=2.2-dev26e
\ No newline at end of file
diff --git a/src/main/java/ch/njol/skript/util/StructureType.java b/src/main/java/ch/njol/skript/util/StructureType.java
index 2c0540fdc14..22c1d91b518 100644
--- a/src/main/java/ch/njol/skript/util/StructureType.java
+++ b/src/main/java/ch/njol/skript/util/StructureType.java
@@ -34,16 +34,18 @@
 import ch.njol.skript.localization.Noun;
 import ch.njol.util.coll.CollectionUtils;
 
-/**
- * @author Peter Güttinger
- */
 public enum StructureType {
-	TREE(TreeType.TREE, TreeType.BIG_TREE, TreeType.REDWOOD, TreeType.TALL_REDWOOD, TreeType.SMALL_JUNGLE, TreeType.JUNGLE, TreeType.SWAMP),
+	TREE(TreeType.TREE, TreeType.BIG_TREE, TreeType.REDWOOD, TreeType.TALL_REDWOOD, TreeType.MEGA_REDWOOD,
+			TreeType.BIRCH, TreeType.TALL_BIRCH, TreeType.SMALL_JUNGLE, TreeType.JUNGLE, TreeType.COCOA_TREE,
+			TreeType.ACACIA, TreeType.DARK_OAK, TreeType.SWAMP),
 	
 	REGULAR(TreeType.TREE, TreeType.BIG_TREE), SMALL_REGULAR(TreeType.TREE), BIG_REGULAR(TreeType.BIG_TREE),
 	REDWOOD(TreeType.REDWOOD, TreeType.TALL_REDWOOD), SMALL_REDWOOD(TreeType.REDWOOD), BIG_REDWOOD(TreeType.TALL_REDWOOD),
+	MEGA_REDWOOD(TreeType.MEGA_REDWOOD),
+	BIRCH(TreeType.BIRCH), TALL_BIRCH(TreeType.TALL_BIRCH),
 	JUNGLE(TreeType.SMALL_JUNGLE, TreeType.JUNGLE), SMALL_JUNGLE(TreeType.SMALL_JUNGLE), BIG_JUNGLE(TreeType.JUNGLE),
-	JUNGLE_BUSH(TreeType.JUNGLE_BUSH),
+	JUNGLE_BUSH(TreeType.JUNGLE_BUSH), COCOA_TREE(TreeType.COCOA_TREE),
+	ACACIA(TreeType.ACACIA), DARK_OAK(TreeType.DARK_OAK),
 	SWAMP(TreeType.SWAMP),
 	
 	MUSHROOM(TreeType.RED_MUSHROOM, TreeType.BROWN_MUSHROOM),
diff --git a/src/main/resources/lang/english.lang b/src/main/resources/lang/english.lang
index 0617e827226..cc6f79a8cb5 100644
--- a/src/main/resources/lang/english.lang
+++ b/src/main/resources/lang/english.lang
@@ -367,6 +367,15 @@ tree types:
 	big_redwood:
 		name: tall redwood¦s
 		pattern: (big|tall) (fir|pine|spruce|redwood)s?
+	mega_redwood:
+		name: mega redwood¦s
+		pattern: (mega|giant) (fir|pine|spruce|redwood)s?
+	birch:
+		name: birch¦es
+		pattern: birch(es)?
+	tall_birch:
+		name: tall birch¦es
+		pattern: (tall|big) birch(es)?
 	jungle:
 		name: jungle tree¦s
 		pattern: (any )?jungle trees?
@@ -376,6 +385,15 @@ tree types:
 	big_jungle:
 		name: big jungle tree¦s
 		pattern: (big|tall|huge|giant|large) jungle trees?
+	cocoa_tree:
+		name: cocoa tree¦s
+		pattern: cocoa trees?
+	acacia:
+		name: acacia¦s
+		pattern: acacias?
+	dark_oak:
+		name: dark oak¦s
+		pattern: dark oaks?
 	jungle_bush:
 		name: bush¦es
 		pattern: (jungle )?bush(es)?