From 20f7e126e5c0fed5da3f98f93bd5e79af884a48b Mon Sep 17 00:00:00 2001
From: mfnalex <1122571+mfnalex@users.noreply.github.com>
Date: Fri, 24 Aug 2018 00:03:34 +0200
Subject: [PATCH] .

---
 .../JeffChestSort/JeffChestSortOrganizer.java | 14 +++++-
 .../JeffChestSort/JeffChestSortPlugin.java    |  2 +-
 .../utils/categories/960-wood.default.txt     | 47 +++++++++++++++++++
 .../utils/categories/970-stone.default.txt    |  6 +++
 .../utils/categories/980-plants.default.txt   | 28 +++++++++++
 .../utils/categories/981-corals.default.txt   |  1 +
 6 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 src/de/jeffclan/utils/categories/960-wood.default.txt
 create mode 100644 src/de/jeffclan/utils/categories/970-stone.default.txt
 create mode 100644 src/de/jeffclan/utils/categories/980-plants.default.txt
 create mode 100644 src/de/jeffclan/utils/categories/981-corals.default.txt

diff --git a/src/de/jeffclan/JeffChestSort/JeffChestSortOrganizer.java b/src/de/jeffclan/JeffChestSort/JeffChestSortOrganizer.java
index 349e6dc..982559c 100644
--- a/src/de/jeffclan/JeffChestSort/JeffChestSortOrganizer.java
+++ b/src/de/jeffclan/JeffChestSort/JeffChestSortOrganizer.java
@@ -83,10 +83,22 @@ public class JeffChestSortOrganizer {
 		}
 		
 		for(String woodName : woodNames) {
-			if(typeName.startsWith(woodName)) {
+			if(typeName.equals(woodName+"_wood")) {
+				typeName = "log_wood";
+				myColor = woodName;
+			}
+			else if(typeName.startsWith(woodName)) {
 				typeName = typeName.replaceFirst(woodName+"_", "");
 				myColor = woodName;
 			}
+			else if(typeName.equals("stripped_"+woodName+"_log")) {
+				//typeName = typeName.replaceFirst("stripped_"+woodName+"_", "stripped_");
+				typeName = "log_stripped";
+				myColor = woodName;
+			} else if(typeName.equals("stripped_"+woodName+"_wood")) {
+				typeName = "log_wood_stripped";
+				myColor = woodName;
+			}
 		}
 		
 		// Egg has to be put in front to group spawn eggs
diff --git a/src/de/jeffclan/JeffChestSort/JeffChestSortPlugin.java b/src/de/jeffclan/JeffChestSort/JeffChestSortPlugin.java
index 18e1d50..353d3fc 100644
--- a/src/de/jeffclan/JeffChestSort/JeffChestSortPlugin.java
+++ b/src/de/jeffclan/JeffChestSort/JeffChestSortPlugin.java
@@ -102,7 +102,7 @@ public class JeffChestSortPlugin extends JavaPlugin {
 	}
 
 	private void saveDefaultCategories() {
-		String[] defaultCategories = { "900-valuables","910-tools","920-combat","930-brewing","940-food","950-redstone" };
+		String[] defaultCategories = { "900-valuables","910-tools","920-combat","930-brewing","940-food","950-redstone","960-wood","970-stone","980-plants","981-corals" };
 
 		for (String category : defaultCategories) {
 
diff --git a/src/de/jeffclan/utils/categories/960-wood.default.txt b/src/de/jeffclan/utils/categories/960-wood.default.txt
new file mode 100644
index 0000000..bb078da
--- /dev/null
+++ b/src/de/jeffclan/utils/categories/960-wood.default.txt
@@ -0,0 +1,47 @@
+*_planks
+*_sapling
+*_log
+*_wood
+*_leaves
+acacia_slab
+birch_slab
+jungle_slab
+oak_slab
+dark_oak_slab
+spruce_slab
+acacia_fence
+birch_fence
+jungle_fence
+oak_fence
+dark_oak_fence
+spruce_fence
+acacia_fence_gate
+birch_fence_gate
+jungle_fence_gate
+oak_fence_gate
+dark_oak_fence_gate
+spruce_fence_gate
+acacia_trapdoor
+birch_trapdoor
+jungle_trapdoor
+oak_trapdoor
+dark_oak_trapdoor
+spruce_trapdoor
+acacia_stairs
+birch_stairs
+jungle_stairs
+oak_stairs
+dark_oak_stairs
+spruce_stairs
+acacia_door
+birch_door
+jungle_door
+oak_door
+dark_oak_door
+spruce_door
+acacia_boat
+birch_boat
+jungle_boat
+oak_boat
+dark_oak_boat
+spruce_boat
\ No newline at end of file
diff --git a/src/de/jeffclan/utils/categories/970-stone.default.txt b/src/de/jeffclan/utils/categories/970-stone.default.txt
new file mode 100644
index 0000000..b099260
--- /dev/null
+++ b/src/de/jeffclan/utils/categories/970-stone.default.txt
@@ -0,0 +1,6 @@
+stone
+cobblestone
+granite
+diorite
+andesite
+*stone_bricks
\ No newline at end of file
diff --git a/src/de/jeffclan/utils/categories/980-plants.default.txt b/src/de/jeffclan/utils/categories/980-plants.default.txt
new file mode 100644
index 0000000..aec52b3
--- /dev/null
+++ b/src/de/jeffclan/utils/categories/980-plants.default.txt
@@ -0,0 +1,28 @@
+grass
+fern
+dead_bush
+seagrass
+sea_pickle
+dandelion
+poppy
+blue_orchid
+allium
+azure_bluet
+red_tulip
+orange_tulip
+white_tulip
+pink_tulip
+oxeye_daisy
+brown_mushroom
+red_mushroom
+chorus_plant
+chorus_flower
+cactus
+vine
+lily_pad
+sunflower
+lilac
+rose_bush
+peony
+tall_grass
+large_fern
\ No newline at end of file
diff --git a/src/de/jeffclan/utils/categories/981-corals.default.txt b/src/de/jeffclan/utils/categories/981-corals.default.txt
new file mode 100644
index 0000000..ad31817
--- /dev/null
+++ b/src/de/jeffclan/utils/categories/981-corals.default.txt
@@ -0,0 +1 @@
+*_coral*
\ No newline at end of file