merged dev

LICENSE.txt

@@ -1,28 +1,34 @@
-Copyright (c) 2014, Ondřej Hruška (MightyPork), <ondra@ondrovo.com>
+RPW LICENSE
+===========
 
-Contributors:
-* Jacopo Santoni <jack@pixbits.com>, https://github.com/Jakz
+* You're NOT ALLOWED to make money on RPW in any way (eg. adf.ly links), unless
+  you have contributed to the code in a significant way.
+
+* In any case, you are NOT ALLOWED to sell RPW or it's parts.
 
+* You're NOT ALLOWED to redistribute the binary or source files without permission.
 
-All rights reserved.
+* You CAN use parts of RPW's source code in your projects, for example the utility
+  classes. For larger portions of code, please give us proper credit.
 
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
+* If - for whatever reason - the authors stopped updating the project and it was 
+  left orphaned, you ARE ALLOWED to fork it and continue the development under
+  the same project name and license.
 
-1. Redistributions of source code must retain the above copyright notice, this 
-   list of conditions and the following disclaimer.
+* Any and all contributors should be given proper credit. 
 
-2. Redistributions in binary form must reproduce the above copyright notice, 
-   this list of conditions and the following disclaimer in the documentation 
-   and/or other materials provided with the distribution.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE 
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright (c) 2014-2015
+- Ondřej Hruška    github.com/MightyPork
+
+Contributors
+- Jacopo Santoni   github.com/Jakz
+- Joaquin Lainson  github.com/Jiggy-12321
+
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.

src/README.txt

@@ -5,36 +5,23 @@
           /_/|_/_/   |__/|__/  
 
 ----------------------------------------------------------------------------
- 
+
     To run the program, mark it as executable and use:
-   
+
         java -jar ThisJarFile.jar
-       
+
     ...or right-click it and select "Open using JRE".
 
 ---------------------------------------------------------------------------- 
-   
+
     Java 7 is recommended, Java 6 minimal.
 
 ----------------------------------------------------------------------------
-
-      Links:
 
-       * Download latest version  -> http://goo.gl/oZ4vTD
+      Official website:   rpw.ondrovo.com
 
-       * RPW on Planet Minecraft  -> http://goo.gl/BwlCs
-
-       * RPW on Minecraft Forum   -> http://goo.gl/ipbcH
-
-       * RPW on GitHub            -> https://github.com/MightyPork/rpw
-
-
-      Contact MightyPork (author):
-
-       * Twitter  -> @MightyPork
-
-       * Google+  -> +OndrejHruska
-
-       * e-mail   -> ondra@ondrovo.com
+      GitHub repo:        github.com/MightyPork/rpw
+
+      RPW news:           @RPWapp (twitter)
 
 ----------------------------------------------------------------------------

src/data/changelog/420.md

@@ -0,0 +1,9 @@
+- Fixed bug #45 "Sound Wizard not working"
+- Added links to official website
+- New icons in the "View" menu
+- Updated website links (help menu etc.)
+- Better icon
+- Bugfixes
+
+
+

src/data/export/pack-readme.txt

@@ -13,23 +13,20 @@
       | |/ |/ / /_/ / /  / ,< / /_/ /  __/ / / / /__/ / / /
       |__/|__/\____/_/  /_/|_/_.___/\___/_/ /_/\___/_/ /_/
 
- RPW is open and free software, available under the MIT License.
-
 --------------------------------------------------------------------
 
  [Get RPW] 
 
-   * PlanetMinecraft  -> http://goo.gl/BwlCs
-   * Minecraft Forum  -> http://goo.gl/ipbcH
+   * Official website  -> rpw.ondrovo.com
 
  [Contribute] 
 
-   * RPW on GitHub     -> https://github.com/MightyPork/rpw
+   * RPW on GitHub     -> github.com/MightyPork/rpw
 
  [Twitter] 
 
-   * MightyPork    -> @MightyPork, <ondra@ondrovo.com>
    * RPW news      -> @RPWapp
+   * MightyPork    -> @MightyPork
 
 --------------------------------------------------------------------
 

src/net/mightypork/rpw/Config.java

@@ -71,7 +71,7 @@ public void savePath(String path)
 	public static final boolean def_SHOW_SOUNDS = true;
 	public static final boolean def_SHOW_TEXTS = true;
 	public static final boolean def_SHOW_TEXTURES = true;
-	public static final boolean def_SHOW_TECHNICAL = false;
+	public static final boolean def_SHOW_TECHNICAL = true;
 	public static final boolean def_PREVIEW_HOVER = false;
 	public static final boolean def_AUTO_SAVE = false;
 	public static final boolean def_SHOW_HIDDEN_IN_FILEPICKER = true;

src/net/mightypork/rpw/Const.java

@@ -14,7 +14,7 @@
 
 public class Const
 {
-	public static final int VERSION_SERIAL = 410;
+	public static final int VERSION_SERIAL = 420;
 
 	public static final String VERSION = VersionUtils.getVersionString(VERSION_SERIAL);
 	public static final int VERSION_MAJOR = VersionUtils.getVersionMajor(VERSION_SERIAL);

src/net/mightypork/rpw/Paths.java

@@ -54,9 +54,9 @@ public class Paths
 
 	public static final String URL_DONATE = "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=B9X6Q5QU7FKPC";
 	public static final String URL_UPDATE_FILE = "https://dl.dropboxusercontent.com/u/64454818/RPW/version.txt";
+	public static final String URL_RPW_WEB = "http://rpw.ondrovo.com";
 	public static final String URL_PLANETMINECRAFT_WEB = "http://www.planetminecraft.com/mod/tool-resourcepack-workbench---the-ultimate-pack-creator/";
-	public static final String URL_MINECRAFTFORUM_WEB = "http://www.minecraftforum.net/topic/1897669-tool-resourcepack-workbench-v1-the-ultimate-composition-tool/";
-	public static final String URL_UPDATE_WEB = URL_PLANETMINECRAFT_WEB;
+//	public static final String URL_MINECRAFTFORUM_WEB = "http://www.minecraftforum.net/topic/1897669-tool-resourcepack-workbench-v1-the-ultimate-composition-tool/";
 	public static final String URL_GITHUB_WEB = "https://github.com/MightyPork/rpw/";
 	public static final String URL_GITHUB_BUGS = "https://github.com/MightyPork/rpw/issues/new";
 

src/net/mightypork/rpw/gui/Icons.java

@@ -33,7 +33,6 @@
 
 public class Icons
 {
-
 	public static ImageIcon MENU_NEW;
 	public static ImageIcon MENU_REVERT;
 	public static ImageIcon MENU_SAVE;
@@ -77,6 +76,7 @@ public class Icons
 	public static ImageIcon MENU_MCF;
 	public static ImageIcon MENU_PMC;
 	public static ImageIcon MENU_DOWNLOAD;
+	public static ImageIcon MENU_WEBSITE;
 
 	public static ImageIcon TREE_CLOSE;
 	public static ImageIcon TREE_OPEN;
@@ -87,6 +87,8 @@ public class Icons
 	public static ImageIcon TREE_FILE_SHADER;
 	public static ImageIcon TREE_FILE_JSON;
 	public static ImageIcon TREE_FILE_GENERIC;
+	public static ImageIcon TREE_FILE_TECH;
+	public static ImageIcon TREE_FILE_FONT;
 
 	public static ImageIcon LOADING;
 	public static ImageIcon MENU_YES;
@@ -173,8 +175,10 @@ public static void init()
 		MENU_PMC			= loadImage(imgPath + "menu/pmc.png");
 		MENU_MCF			= loadImage(imgPath + "menu/mcf.png");
 		MENU_DOWNLOAD		= loadImage(imgPath + "menu/download.png");
+
+		MENU_WEBSITE		= loadImage(imgPath + "menu/website.png");
 
-		WINDOW				= loadImage(imgPath + "window-icon.png");
+		WINDOW				= loadImage(imgPath + "window-icon-2.png");
 
 		TREE_CLOSE			= loadImage(imgPath + "tree/close.png");
 		TREE_OPEN 			= loadImage(imgPath + "tree/open.png");
@@ -185,6 +189,8 @@ public static void init()
 		TREE_FILE_SHADER 	= loadImage(imgPath + "tree/file-shader.png");
 		TREE_FILE_JSON 		= loadImage(imgPath + "tree/file-json.png");
 		TREE_FILE_GENERIC	= loadImage(imgPath + "tree/file-unknown.png");
+		TREE_FILE_FONT		= loadImage(imgPath + "tree/file-font.png");
+		TREE_FILE_TECH		= loadImage(imgPath + "tree/file-tech.png");
 
 
 		IMAGE_NOT_FOUND		= IMAGE_ERROR_64;

src/net/mightypork/rpw/gui/widgets/MenuMain.java

@@ -279,37 +279,44 @@ public MenuMain() {
 
 		menu = menuView = new JMenu("View");
 		menu.setMnemonic(KeyEvent.VK_V);
+
+			ckitem = itemOptionTextureFiles = new JCheckBoxMenuItem("Show textures");
+			ckitem.setIcon(Icons.TREE_FILE_IMAGE);
+			ckitem.setMnemonic(KeyEvent.VK_U);		
+			menu.add(ckitem);
+
+			ckitem = itemOptionSoundFiles = new JCheckBoxMenuItem("Show sounds");
+			ckitem.setIcon(Icons.TREE_FILE_AUDIO);
+			ckitem.setMnemonic(KeyEvent.VK_A);		
+			menu.add(ckitem);
 
-			ckitem = itemOptionTextFiles = new JCheckBoxMenuItem("Show text files (splashes...)");
+			ckitem = itemOptionTextFiles = new JCheckBoxMenuItem("Show text files");
+			ckitem.setIcon(Icons.TREE_FILE_TEXT);
 			ckitem.setMnemonic(KeyEvent.VK_T);		
 			menu.add(ckitem);
 
-			ckitem = itemOptionLangFiles = new JCheckBoxMenuItem("Show translation files (*.lang)");
+			ckitem = itemOptionLangFiles = new JCheckBoxMenuItem("Show language files");
+			ckitem.setIcon(Icons.TREE_FILE_TEXT);
 			ckitem.setMnemonic(KeyEvent.VK_L);	
 			menu.add(ckitem);
 
-			ckitem = itemOptionTextureFiles = new JCheckBoxMenuItem("Show textures (images)");
-			ckitem.setMnemonic(KeyEvent.VK_U);		
-			menu.add(ckitem);
-
-			ckitem = itemOptionFontFiles = new JCheckBoxMenuItem("Show unicode font textures");
+			ckitem = itemOptionFontFiles = new JCheckBoxMenuItem("Show unicode font");
+			ckitem.setIcon(Icons.TREE_FILE_FONT);
 			ckitem.setMnemonic(KeyEvent.VK_F);		
 			menu.add(ckitem);
 
-			ckitem = itemOptionSoundFiles = new JCheckBoxMenuItem("Show audio files");
-			ckitem.setMnemonic(KeyEvent.VK_A);		
+			ckitem = itemOptionTechFiles = new JCheckBoxMenuItem("Show shaders, models etc.");
+			ckitem.setIcon(Icons.TREE_FILE_TECH);
+			ckitem.setMnemonic(KeyEvent.VK_X);		
 			menu.add(ckitem);
 
 			menu.addSeparator();
 
-			ckitem = itemOptionObsoleteDirs = new JCheckBoxMenuItem("Show obsolete files");
+			ckitem = itemOptionObsoleteDirs = new JCheckBoxMenuItem("Show obsolete (useless) files");
+			ckitem.setIcon(Icons.TREE_FILE_GENERIC);
 			ckitem.setMnemonic(KeyEvent.VK_W);
 			ckitem.setToolTipText("Show assets that are no longer used by the game.");
 			menu.add(ckitem);		
-
-			ckitem = itemOptionTechFiles = new JCheckBoxMenuItem("Show tech files (shaders etc)");
-			ckitem.setMnemonic(KeyEvent.VK_X);		
-			menu.add(ckitem);
 
 			menu.addSeparator();
 
@@ -398,19 +405,25 @@ public MenuMain() {
 
 			menu.addSeparator();
 
-			item = new JMenuItem("RPW on Planet Minecraft");
+			item = new JMenuItem("Official website");
+			item.setIcon(Icons.MENU_WEBSITE);// FIXME
+			item.addActionListener(Gui.openUrlListener);
+			item.setActionCommand(Paths.URL_RPW_WEB);
+			menu.add(item);	
+
+			item = new JMenuItem("PMC post");
 			item.setIcon(Icons.MENU_PMC);
 			item.addActionListener(Gui.openUrlListener);
 			item.setActionCommand(Paths.URL_PLANETMINECRAFT_WEB);
 			menu.add(item);	
 
-			item = new JMenuItem("RPW on Minecraft Forum");
-			item.setIcon(Icons.MENU_MCF);
-			item.addActionListener(Gui.openUrlListener);
-			item.setActionCommand(Paths.URL_MINECRAFTFORUM_WEB);
-			menu.add(item);
+//			item = new JMenuItem("RPW on Minecraft Forum");
+//			item.setIcon(Icons.MENU_MCF);
+//			item.addActionListener(Gui.openUrlListener);
+//			item.setActionCommand(Paths.URL_MINECRAFTFORUM_WEB);
+//			menu.add(item);
 
-			item = new JMenuItem("RPW on GitHub");
+			item = new JMenuItem("GitHub");
 			item.setIcon(Icons.MENU_GITHUB);
 			item.addActionListener(Gui.openUrlListener);
 			item.setActionCommand(Paths.URL_GITHUB_WEB);

src/net/mightypork/rpw/gui/windows/dialogs/DialogSoundWizard.java

@@ -185,8 +185,7 @@ private Component createMiddlePanel()
 		fieldKey = Gui.textField();
 		fieldKey.setDragEnabled(false);
 		fieldKey.addKeyListener(TextInputValidator.identifiers());
-		fieldKey.setTransferHandler(new TransferHandler() {
-		});
+		fieldKey.setTransferHandler(new TransferHandler() {});
 		middlePanelComponents.add(fieldKey);
 
 		fieldCategory = new JComboBox(Const.SOUND_CATEGORIES);
@@ -251,7 +250,7 @@ private Component createRightPanel()
 	@Override
 	protected void addActions()
 	{
-		setEnterButton(buttonOK);
+		setEnterButton(buttonSave);
 
 		// DEL key handler
 		fileList.list.addKeyListener(new KeyListener() {
@@ -672,7 +671,7 @@ public boolean importData(TransferSupport support)
 					String path = Utils.toLastDot(node.getPathRelativeToRoot().getPath());
 
 					// Fix Windoze backslashes
-					path = path.replaceAll("\\", "/");
+					path = path.replace('\\', '/');
 
 					if (!fileList.contains(path)) {
 						fileList.addItemNoSort(path);

src/net/mightypork/rpw/gui/windows/messages/DialogCrash.java

@@ -86,7 +86,10 @@ private String createReport(Throwable error)
 		txt += "-------------------|-------------------------------\n";
 		txt += " Runtime name      | " + System.getProperty("java.runtime.name") + "\n";
 		txt += " Java version      | " + System.getProperty("java.version") + "\n";
+		txt += " Java vendor       | " + System.getProperty("java.vendor") + "\n";
+		txt += " Java path         | " + System.getProperty("java.home") + "\n";
 		txt += " OS name           | " + System.getProperty("os.name") + "\n";
+		txt += " OS arch           | " + System.getProperty("os.arch") + "\n";
 		txt += " File encoding     | " + System.getProperty("file.encoding") + "\n";
 		txt += " Launch dir        | " + System.getProperty("user.dir") + "\n";
 		txt += " RPW version       | " + Const.VERSION + "\n";
@@ -193,8 +196,8 @@ protected boolean hasButtons()
 	@Override
 	protected JButton[] makeButtons()
 	{
-		buttonGH = new JButton("Report issue", Icons.MENU_GITHUB);
-		buttonCopy = new JButton("Copy text", Icons.MENU_COPY);
+		buttonGH = new JButton("Report Issue", Icons.MENU_GITHUB);
+		buttonCopy = new JButton("Copy Text", Icons.MENU_COPY);
 		buttonContinue = new JButton("Carry On", Icons.MENU_CANCEL);
 		buttonQuit = new JButton("Close RPW", Icons.MENU_EXIT);
 

src/net/mightypork/rpw/gui/windows/messages/DialogUpdateNotify.java

@@ -65,20 +65,22 @@ protected JComponent buildGui()
 
 		JButton btn;
 
-		hb.add(btn = new JButton("PMC", Icons.MENU_PMC));
-		btn.setActionCommand(Paths.URL_PLANETMINECRAFT_WEB);
+		hb.add(btn = new JButton("Official website", Icons.MENU_WEBSITE));
+		btn.setActionCommand(Paths.URL_RPW_WEB);
 		btn.addActionListener(Gui.openUrlListener);
 		btn.addActionListener(closeListener);
-
+		
 		hb.gap();
 
-		hb.add(btn = new JButton("MC Forum", Icons.MENU_MCF));
-		btn.setActionCommand(Paths.URL_MINECRAFTFORUM_WEB);
+		hb.add(btn = new JButton("PMC", Icons.MENU_PMC));
+		btn.setActionCommand(Paths.URL_PLANETMINECRAFT_WEB);
 		btn.addActionListener(Gui.openUrlListener);
 		btn.addActionListener(closeListener);
 
 		hb.gap();
 
+		hb.gap();
+
 		hb.add(btn = new JButton("Direct", Icons.MENU_DOWNLOAD));
 		btn.setActionCommand(Paths.URL_LATEST_DOWNLOAD);
 		btn.addActionListener(closeListener);