Changed resource paths and optimized textures.

Cleaned and updated pom.xml and readme.md.
Cleaned up gitignore some layout some.
Cleaned up formatting in some files a tiny bit.
Updated license headers to reflect changes.
Added .wav and .dat as binary in gitatttributes.
Removed jalopy.xml for now, as it's old and not used (yet).

.gitattributes

@@ -1,6 +1,10 @@
-# Set default behaviour, in case users don't have core.autocrlf set.
-* text=auto
+# Normalize as LF in the repository, OS native locally
+* text
+*.java text
 
-# Denote all files that are truly binary and should not be modified.
+# Binary files that should not be modified
+*.dat binary
+*.jpg binary
 *.png binary
-*.jpg binary
+*.ttf binary
+*.wav binary

.gitignore

@@ -39,25 +39,28 @@ ehthumbs.db
 Icon?
 Thumbs.db
 
-# Project files #
+# Build files #
 #################
+MANIFEST.MF
+dependency-reduced-pom.xml
+
+# Project files #
+#####################
 .classpath
 .externalToolBuilders
+.idea
 .project
 .settings
-MANIFEST.MF
-
-# Netbeans files #
-##################
 build
 dist
 nbproject
+atlassian-ide-plugin.xml
 build.xml
 nb-configuration.xml
-
-# IntelliJ IDEA files #
-#######################
-.idea
 *.iml
 *.ipr
-*.iws
+*.iws
+
+# Misc files #
+##############
+*.bak

HEADER.txt

@@ -1,24 +1,24 @@
 This file is part of ${name}.
 
 ${copyright} <${url}/>
-${name} is licensed under the ${license}.
+${name} is licensed under the Spout License Version 1.
 
-${name} is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+${name} is free software: you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free
+Software Foundation, either version 3 of the License, or (at your option)
+any later version.
 
 In addition, 180 days after any changes are published, you can use the
 software, incorporating those changes, under the terms of the MIT license,
-as described in the ${license}.
+as described in the Spout License Version 1.
 
-${name} is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
+${name} is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+more details.
 
 You should have received a copy of the GNU Lesser General Public License,
-the MIT license and the ${license} along with this program.
+the MIT license and the Spout License Version 1 along with this program.
 If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
-License and see <${licenseUrl}> for the full license,
-including the MIT license.
+License and see <http://spout.in/licensev1> for the full license, including
+the MIT license.

LICENSE.txt

@@ -1,24 +1,23 @@
-The dual license described in this file is called the SpoutDev License
-Version 1.
+The dual license described in this file is called the Spout License Version 1.
 
 -----------------------------------------------------------------------
 
-The software is licensed under the LGPL version 3.0.  
+The software is licensed under the GNU Lesser General Public License Version 3.
 
-In addition, the software as it existed no less than 180 days previously, 
-is licensed under the MIT license.  For clarity, files in a state that
-includes changes published less than 180 days previously, are NOT licensed 
+In addition, the software as it existed no less than 180 days previously,
+is licensed under the MIT License.  For clarity, files in a state that
+includes changes published less than 180 days previously are NOT licensed
 under the MIT license.  However, files in a state that only includes changes
-published more than 180 days previously, are licensed under the MIT license.
+published more than 180 days previously are licensed under the MIT license.
 
-The files, originating from the Glowstone and Lightstone projects, were 
-licensed by their respective authors under the MIT license.  However,
-any subsequent changes made as part of this project are licensed in 
-accordance with this license.
+The files originating from the Glowstone and Lightstone projects were
+licensed by their respective authors under the MIT License.  However, any
+subsequent changes made as part of this project are licensed in accordance
+with the dual license as described in this text.
 
-The LGPL version 3.0 license and the MIT license, including copyright 
-notice relating to the GlowStone and LightStone projects, are provided 
-below.
+The GNU Lesser General Public License Version 3 and the MIT License, including
+copyright notice relating to the Glowstone and Lightstone projects, are
+provided below.
 
 -----------------------------------------------------------------------
 
@@ -190,13 +189,13 @@ Library.
 
 -----------------------------------------------------------------------
 
-For information purposes, the license file from the Glowstone project 
-follows.  This is the license referred to as the MIT license in the 
+For information purposes, the license file from the Glowstone project
+follows.  This is the license referred to as the MIT license in the
 first paragraph.
 
 Glowstone Copyright (C) 2011 Tad Hardesty.
 Lightstone Copyright (C) 2010-2011 Graham Edgecombe.
-Spout Copyright (C) 2011 SpoutDev.
+Spout Copyright (C) 2011-2012 Spout LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -214,4 +213,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

pom.xml

@@ -23,15 +23,15 @@
 
 	<!-- Company information -->
 	<organization>
-		<name>VanillaDev</name>
+		<name>Spout LLC</name>
 		<url>http://www.spout.org</url>
 	</organization>
 
 	<!-- License information -->
 	<licenses>
 		<license>
 			<name>Spout License Version 1</name>
-			<url>http://cdn.spout.org/license/spoutv1.txt</url>
+			<url>http://spout.in/licensev1</url>
 			<distribution>repo</distribution>
 			<comments>GNU Lesser General Public License Version 3, but with a provision that files are released under the MIT license 180 days after they are published.</comments>
 		</license>
@@ -76,6 +76,20 @@
 		</pluginRepository>
 	</pluginRepositories>
 
+	<!-- Distribution management -->
+	<distributionManagement>
+		<!-- Publish releases here -->
+		<repository>
+			<id>spout-releases</id>
+			<url>http://nexus.spout.org/content/repositories/releases</url>
+		</repository>
+		<!-- Publish snapshots here -->
+		<snapshotRepository>
+			<id>spout-snapshots</id>
+			<url>http://nexus.spout.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
+
 	<!-- Project dependencies -->
 	<dependencies>
 		<!-- Provided by third-party -->

src/main/java/org/spout/vanilla/VanillaListener.java

@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla;
 

src/main/java/org/spout/vanilla/VanillaPlugin.java

@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla;
 
@@ -140,7 +140,7 @@ public void onEnable() {
 		if(Spout.getPlatform() == Platform.CLIENT) {
 			System.out.println("Loading Skydome");
 
-			Model m = (Model)Spout.getFilesystem().getResource("model://Spout/resources/resources/models/defaultskydome.spm");
+			Model m = (Model)Spout.getFilesystem().getResource("model://Spout/models/defaultskydome.spm");
 			System.out.println("Loaded Skydome");
 			Spout.getEngine().getWorld("world").getDataMap().put("Skydome", m);
 		}
@@ -163,8 +163,8 @@ public void onLoad() {
 		Protocol.registerProtocol(new VanillaProtocol());
 
 		VanillaMaterials.initialize();
-		MapPalette.DEFAULT = (MapPalette) Spout.getFilesystem().getResource("mappalette://Vanilla/resources/map/mapColorPalette.dat");
-		RecipeYaml.DEFAULT = (RecipeYaml) Spout.getFilesystem().getResource("recipe://Vanilla/resources/recipes.yml");
+		MapPalette.DEFAULT = (MapPalette) Spout.getFilesystem().getResource("mappalette://Vanilla/map/mapColorPalette.dat");
+		RecipeYaml.DEFAULT = (RecipeYaml) Spout.getFilesystem().getResource("recipe://Vanilla/recipes.yml");
 		VanillaRecipes.initialize();
 
 		getLogger().info("loaded");

src/main/java/org/spout/vanilla/chat/VanillaStyleFormatter.java

@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.chat;
 

src/main/java/org/spout/vanilla/chat/VanillaStyleHandler.java

@@ -1,28 +1,28 @@
 /*
  * This file is part of Vanilla.
  *
- * Copyright (c) 2011-2012, VanillaDev <http://www.spout.org/>
- * Vanilla is licensed under the SpoutDev License Version 1.
+ * Copyright (c) 2011-2012, Spout LLC <http://www.spout.org/>
+ * Vanilla is licensed under the Spout License Version 1.
  *
- * Vanilla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Vanilla is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
  *
  * In addition, 180 days after any changes are published, you can use the
  * software, incorporating those changes, under the terms of the MIT license,
- * as described in the SpoutDev License Version 1.
+ * as described in the Spout License Version 1.
  *
- * Vanilla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Vanilla is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU Lesser General Public License,
- * the MIT license and the SpoutDev License Version 1 along with this program.
+ * the MIT license and the Spout License Version 1 along with this program.
  * If not, see <http://www.gnu.org/licenses/> for the GNU Lesser General Public
- * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
- * including the MIT license.
+ * License and see <http://spout.in/licensev1> for the full license, including
+ * the MIT license.
  */
 package org.spout.vanilla.chat;