diff --git a/models.txt b/renderdata/models.txt
similarity index 100%
rename from models.txt
rename to renderdata/models.txt
diff --git a/texture.txt b/renderdata/texture.txt
similarity index 100%
rename from texture.txt
rename to renderdata/texture.txt
diff --git a/src/main/assembly/package.xml b/src/main/assembly/package.xml
index f1accf0b..a043c10a 100644
--- a/src/main/assembly/package.xml
+++ b/src/main/assembly/package.xml
@@ -31,8 +31,6 @@
shaders.txt
perspectives.txt
lightings.txt
- models.txt
- texture.txt
worlds.txt.sample
${project.basedir}/texturepacks
@@ -40,6 +38,9 @@
${project.basedir}/templates
/dynmap/templates
+
+ ${project.basedir}/renderdata
+ /dynmap/renderdata
diff --git a/src/main/java/org/dynmap/hdmap/HDBlockModels.java b/src/main/java/org/dynmap/hdmap/HDBlockModels.java
index 60b13789..48778034 100644
--- a/src/main/java/org/dynmap/hdmap/HDBlockModels.java
+++ b/src/main/java/org/dynmap/hdmap/HDBlockModels.java
@@ -250,18 +250,6 @@ public class HDBlockModels {
if((m.databits & (1 << i)) != 0) {
if(smod == null) smod = m.getScaledMap(scale);
row[i] = smod;
-/* if((m.blockid == 50) && (i == 5)) {
- String v0 = "";
- String v = "";
- for(int x = 0; x < m.blockflags.length; x++)
- v0 = v0 + " " + m.blockflags[x];
- for(int x = 0; x < smod.length; x++) {
- v = v + " " + smod[x];
- if((x%scale) == (scale-1)) v += "|";
- }
- Log.info("src=" + v0);
- Log.info("scaled=" + v);
- } */
}
}
}
@@ -275,8 +263,8 @@ public class HDBlockModels {
*/
public static void loadModels(File datadir) {
/* Load block models */
- loadModelFile(new File(datadir, "models.txt"));
- File custom = new File(datadir, "custom-models.txt");
+ loadModelFile(new File(datadir, "renderdata/models.txt"));
+ File custom = new File(datadir, "renderdata/custom-models.txt");
if(custom.canRead()) {
loadModelFile(custom);
}
diff --git a/src/main/java/org/dynmap/hdmap/TexturePack.java b/src/main/java/org/dynmap/hdmap/TexturePack.java
index d803f0c4..ecd8bf24 100644
--- a/src/main/java/org/dynmap/hdmap/TexturePack.java
+++ b/src/main/java/org/dynmap/hdmap/TexturePack.java
@@ -557,8 +557,8 @@ public class TexturePack {
/* Initialize map with blank map for all entries */
HDTextureMap.initializeTable();
/* Load block models */
- loadTextureFile(new File(datadir, "texture.txt"));
- File custom = new File(datadir, "custom-texture.txt");
+ loadTextureFile(new File(datadir, "renderdata/texture.txt"));
+ File custom = new File(datadir, "renderdata/custom-texture.txt");
if(custom.canRead()) {
loadTextureFile(custom);
}