From 85e38b652539db2b96021d2c23ccc06f1661d357 Mon Sep 17 00:00:00 2001 From: Markil3 <> Date: Sun, 13 Dec 2020 22:45:54 -0700 Subject: [PATCH] Adds proper licensing for future material. --- JME3-LICENSE | 29 +++++++++++++++++++ .../controller/JoystickPreviewScreen.java | 6 ++++ src/main/java/markil3/controller/Main.java | 4 +-- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 JME3-LICENSE diff --git a/JME3-LICENSE b/JME3-LICENSE new file mode 100644 index 0000000..1fb17b9 --- /dev/null +++ b/JME3-LICENSE @@ -0,0 +1,29 @@ +Copyright (c) 2009-2020 jMonkeyEngine +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +* Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +* 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. + +* Neither the name of 'jMonkeyEngine' nor the names of its contributors +may be used to endorse or promote products derived from this software +without specific prior written permission. + +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 OWNER 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. \ No newline at end of file diff --git a/src/main/java/markil3/controller/JoystickPreviewScreen.java b/src/main/java/markil3/controller/JoystickPreviewScreen.java index ffd3c9e..9792e7e 100644 --- a/src/main/java/markil3/controller/JoystickPreviewScreen.java +++ b/src/main/java/markil3/controller/JoystickPreviewScreen.java @@ -1,5 +1,6 @@ /* * Copyright 2020 Markil 3. All rights reserved. + * Copyright (c) 2009-2020 jMonkeyEngine. All rights reserved. * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -21,6 +22,11 @@ import com.jme3.input.event.TouchEvent; /** * @author Markil 3 + * @author Normen Hansen + * @author Kirill Vainer + * @author Paul Speed + * @author dokthar + * @author Stephen Gold */ public class JoystickPreviewScreen extends BaseAppState implements RawInputListener diff --git a/src/main/java/markil3/controller/Main.java b/src/main/java/markil3/controller/Main.java index 3c0b738..34242bb 100644 --- a/src/main/java/markil3/controller/Main.java +++ b/src/main/java/markil3/controller/Main.java @@ -141,7 +141,7 @@ public class Main extends SimpleApplication { if (Arrays.binarySearch(args, "--defaultSettings") < 0) { - settings.load("Minigames"); + settings.load("JMEControllerConfig"); } } catch (BackingStoreException e1) @@ -150,7 +150,7 @@ public class Main extends SimpleApplication } finally { - settings.setTitle("Hide & Crate"); + settings.setTitle("JMEControllerConfig"); settings.setUseJoysticks(true); settings.setEmulateMouse(false); settings.setVSync(true);