Merge pull request #41 from SoSeDiK/master

Fix for #40
TheBusyBiscuit · Jan 9, 2019 · 8e3785e · 8e3785e
2 parents 393fe10 + f8d846b
commit 8e3785e
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 23 deletions.
diff --git a/pom.xml b/pom.xml
@@ -47,6 +47,14 @@
                     <include>plugin.yml</include>
                 </includes>
             </resource>
+            <resource>
+                <directory>${basedir}/src</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>config.yml</include>
+                    <include>**/schematics/*.schematic</include>
+                </includes>
+            </resource>
         </resources>
     </build>
     <dependencies>

diff --git a/src/me/mrCookieSlime/ExoticGarden/ExoticGarden.java b/src/me/mrCookieSlime/ExoticGarden/ExoticGarden.java
@@ -1,10 +1,6 @@
 package me.mrCookieSlime.ExoticGarden;
 
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -688,25 +684,8 @@ public void registerTree(String name, MaterialData material, String texture, Str
 			}
 		}
 
-		InputStream stream = Tree.class.getResourceAsStream("schematics/" + id + "_TREE.schematic");
-	    OutputStream out = null;
-	    int read;
-	    byte[] buffer = new byte[4096];
-	    try {
-	        out = new FileOutputStream(new File("plugins/ExoticGarden/schematics/" + id + "_TREE.schematic"));
-	        while ((read = stream.read(buffer)) > 0) {
-	            out.write(buffer, 0, read);
-	        }
-	    } catch (IOException e) {
-	        e.printStackTrace();
-	    } finally {
-	        try {
-				stream.close();
-				out.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-	    }
+		if (!new File("plugins/ExoticGarden/schematics", id + "_TREE.schematic").exists())
+			saveResource("schematics/" + id + "_TREE.schematic", false);
 	}
 
 	public void registerBerry(String name, String color, Color pcolor, PlantType type, PlantData data) {

diff --git a/...icGarden/schematics/CHERRY_TREE.schematic → src/schematics/CHERRY_TREE.schematic b/...icGarden/schematics/CHERRY_TREE.schematic → src/schematics/CHERRY_TREE.schematic
diff --git a/...cGarden/schematics/COCONUT_TREE.schematic → src/schematics/COCONUT_TREE.schematic b/...cGarden/schematics/COCONUT_TREE.schematic → src/schematics/COCONUT_TREE.schematic
diff --git a/...en/schematics/DRAGON_FRUIT_TREE.schematic → src/schematics/DRAGON_FRUIT_TREE.schematic b/...en/schematics/DRAGON_FRUIT_TREE.schematic → src/schematics/DRAGON_FRUIT_TREE.schematic
diff --git a/...ticGarden/schematics/LEMON_TREE.schematic → src/schematics/LEMON_TREE.schematic b/...ticGarden/schematics/LEMON_TREE.schematic → src/schematics/LEMON_TREE.schematic
diff --git a/...oticGarden/schematics/LIME_TREE.schematic → src/schematics/LIME_TREE.schematic b/...oticGarden/schematics/LIME_TREE.schematic → src/schematics/LIME_TREE.schematic
diff --git a/...arden/schematics/OAK_APPLE_TREE.schematic → src/schematics/OAK_APPLE_TREE.schematic b/...arden/schematics/OAK_APPLE_TREE.schematic → src/schematics/OAK_APPLE_TREE.schematic
diff --git a/...icGarden/schematics/ORANGE_TREE.schematic → src/schematics/ORANGE_TREE.schematic b/...icGarden/schematics/ORANGE_TREE.schematic → src/schematics/ORANGE_TREE.schematic
diff --git a/...ticGarden/schematics/PEACH_TREE.schematic → src/schematics/PEACH_TREE.schematic b/...ticGarden/schematics/PEACH_TREE.schematic → src/schematics/PEACH_TREE.schematic
diff --git a/...oticGarden/schematics/PEAR_TREE.schematic → src/schematics/PEAR_TREE.schematic b/...oticGarden/schematics/PEAR_TREE.schematic → src/schematics/PEAR_TREE.schematic
diff --git a/...oticGarden/schematics/PLUM_TREE.schematic → src/schematics/PLUM_TREE.schematic b/...oticGarden/schematics/PLUM_TREE.schematic → src/schematics/PLUM_TREE.schematic
diff --git a/...den/schematics/POMEGRANATE_TREE.schematic → src/schematics/POMEGRANATE_TREE.schematic b/...den/schematics/POMEGRANATE_TREE.schematic → src/schematics/POMEGRANATE_TREE.schematic