Merge branch 'develop'

Author: redomar

.travis.yml

@@ -5,4 +5,4 @@ jdk:
 # blocklist
 branches:
   except:
-  - develop
+  - experimental

README.md

@@ -1,4 +1,4 @@
-JavaGame [![GitHub release](https://img.shields.io/github/release/redomar/JavaGame.svg?style=flat-square&label=Alpha)](https://github.com/redomar/JavaGame/releases/latest) [![Travis-CI Build Status](https://img.shields.io/travis/redomar/JavaGame.svg?style=flat-square)](https://travis-ci.org/redomar/JavaGame) [![GitHub license](https://img.shields.io/badge/license-AGPLv3-red.svg?style=flat-square)](https://raw.githubusercontent.com/Redomar/JavaGame/master/LICENSE)
+JavaGame [![GitHub release](https://img.shields.io/github/release/redomar/JavaGame.svg?style=flat-square&label=Alpha)](https://github.com/redomar/JavaGame/releases/latest) [![JDK version](https://img.shields.io/badge/JDK-OpenJDK%208-007396?style=flat-square&logo=Java)](https://openjdk.java.net/install/) [![Travis-CI Build Status](https://img.shields.io/travis/redomar/JavaGame.svg?style=flat-square)](https://travis-ci.org/redomar/JavaGame) [![GitHub license](https://img.shields.io/badge/license-AGPLv3-red.svg?style=flat-square)](https://raw.githubusercontent.com/Redomar/JavaGame/master/LICENSE):
 ==
 
 #### What is JavaGame?

build.gradle

@@ -1,3 +1,8 @@
+plugins {
+    id 'com.adarshr.test-logger' version '2.0.0'
+    id "nebula.lint" version "16.0.2"
+}
+
 repositories{
     mavenCentral()
 }
@@ -16,16 +21,14 @@ sourceSets{
 }
 
 dependencies{
-    compile 'org.apache.commons:commons-lang3:3.4'
-    compile('com.googlecode.soundlibs:mp3spi:1.9.5-1'){
-        exclude module: 'junit'
-    }
-    testCompile 'junit:junit:4.12'
-    compile files('res/jars/JSplashScreen.jar')
+    implementation 'org.apache.commons:commons-text:+'
+    implementation 'org.apache.commons:commons-lang3:3.+'
+    testImplementation 'junit:junit:4.13'
+    implementation files('res/jars/JSplashScreen.jar')
 }
 
 jar {
-    from configurations.compile.collect { zipTree it }
+    from configurations.compileClasspath.collect { zipTree it }
 	manifest.attributes 'Main-Class' : 'com.redomar.game.Launcher'
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Thu Feb 14 18:53:49 GMT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,20 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
 ##
@@ -28,16 +44,16 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -138,32 +154,30 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=`save "$@"`
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
-  cd "$(dirname "$0")"
-fi
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

gradlew.bat

@@ -4,14 +4,15 @@
 import com.redomar.game.entities.Dummy;
 import com.redomar.game.entities.Player;
 import com.redomar.game.entities.Vendor;
+import com.redomar.game.entities.trees.Spruce;
 import com.redomar.game.gfx.Screen;
 import com.redomar.game.gfx.SpriteSheet;
 import com.redomar.game.level.LevelHandler;
 import com.redomar.game.lib.Font;
 import com.redomar.game.lib.Time;
 import com.redomar.game.script.PrintTypes;
 import com.redomar.game.script.Printing;
-import org.apache.commons.lang3.text.WordUtils;
+import org.apache.commons.text.WordUtils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -79,6 +80,7 @@ public class Game extends Canvas implements Runnable {
 	private Player player;
 	private Dummy dummy;                            // Dummy NPC follows the player around
 	private Vendor vendor;                          // Vendor NPC exhibits random movement and is only found on cutom_level
+	private Spruce spruce;							// Tree -- Spruce
 	private Font font = new Font();                 // Font object capable of displaying 2 fonts: Arial and Segoe UI
 	private String nowPlaying;
 	private boolean notActive = true;
@@ -215,6 +217,8 @@ public void setMap(String Map_str) {
 		setPlayer(new Player(level, 100, 100, input,
 			getJdata_UserName(), shirtCol, faceCol));
 		level.addEntity(player);
+		spruce = new Spruce(level, 70,170, 2 );
+		level.addEntity(spruce);
 	}
 
 	public static void setMap(int map) {
@@ -361,7 +365,11 @@ public void init() {
 		input = new InputHandler(this);                                         // Input begins to record key presses
 		setMouse(new MouseHandler(this));                                       // Mouse tracking and clicking is now recorded
 		setWindow(new WindowHandler(this));
-		setMap("/levels/custom_level.png");
+		try{
+			setMap("/levels/custom_level.png");
+		} catch (Exception e){
+			System.err.println(e);
+		}
 		setMap(1);                                                                     // 1 corresponds to custom_level
 
 		game.setVendor(new Vendor(level, "Vendor", 215, 215, 304, 543));
@@ -545,7 +553,7 @@ public void render() {
 	* whether it is running in developer mode, or if the application is closing.
 	*/
 	private void status(Graphics g, boolean TerminalMode, boolean TerminalQuit) {
-		if (TerminalMode == true) {                                                             // If running in developer mode
+		if (TerminalMode) {                                                             // If running in developer mode
 			g.setColor(Color.CYAN);
 			g.drawString("JavaGame Stats", 0, 10);                               // Display "JavaGame Stats" in cyan at the bottom left of the screen
 			g.drawString("FPS/TPS: " + fps + "/" + tps, 0, 25);                  // Display the FPS and TPS in cyan directly above "JavaGame Stats"
@@ -563,14 +571,16 @@ private void status(Graphics g, boolean TerminalMode, boolean TerminalQuit) {
 			g.setColor(Color.CYAN);
 			g.fillRect(getMouse().getX() - 12, getMouse().getY() - 12, 24, 24);
 		}
-		if (TerminalQuit == true) {                                                             // If the game is shutting off
-			g.setColor(Color.BLACK);
-			g.fillRect(0, 0, getWidth(), getHeight());                               // Make the screen fully black
-			g.setColor(Color.RED);
-			g.drawString("Shutting down the Game", (getWidth() / 2) - 70,           // Display "Shutting down the Game" in red in the middle of the screen
-				(getHeight() / 2) - 8);
-			g.dispose();                                                                    // Free up memory for graphics
+		// If the game is shutting off
+		if (!TerminalQuit) {
+			return;
 		}
+		g.setColor(Color.BLACK);
+		g.fillRect(0, 0, getWidth(), getHeight());                               // Make the screen fully black
+		g.setColor(Color.RED);
+		g.drawString("Shutting down the Game", (getWidth() / 2) - 70,           // Display "Shutting down the Game" in red in the middle of the screen
+			(getHeight() / 2) - 8);
+		g.dispose();                                                                    // Free up memory for graphics
 	}
 
 	public WindowHandler getWindow() {

res/sprite_sheet.png

@@ -0,0 +1,57 @@
+package com.redomar.game;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import javax.imageio.ImageIO;
+import javax.swing.*;
+
+/**
+ * Credit to Gagandeep Bali @ stackoverflow
+ */
+public class HelpMenu {
+
+	private MyPanel contentPane;
+
+	private void displayGUI() {
+		JFrame frame = new JFrame("Help Menu");
+		frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+		contentPane = new MyPanel();
+
+		frame.setContentPane(contentPane);
+		frame.setLocationRelativeTo(null);
+		frame.pack();
+		frame.setLocationByPlatform(true);
+		frame.setVisible(true);
+	}
+
+	private class MyPanel extends JPanel {
+
+		private BufferedImage image;
+
+		private MyPanel() {
+			try {
+				image = ImageIO.read(MyPanel.class.getResource("/controls/controls.png"));
+			} catch (IOException ioe) {
+				ioe.printStackTrace();
+			}
+		}
+
+		@Override
+		public Dimension getPreferredSize() {
+			return image == null ? new Dimension(400, 300): new Dimension(image.getWidth(), image.getHeight());
+		}
+
+		@Override
+		protected void paintComponent(Graphics g) {
+			super.paintComponent(g);
+			g.drawImage(image, 0, 0, this);
+		}
+	}
+
+	public static void run() {
+		Runnable runnable = () -> new HelpMenu().displayGUI();
+		EventQueue.invokeLater(runnable);
+	}
+}