gestaltv7 compability for NUI 2.0

README.md

@@ -22,6 +22,12 @@ PR with your changes. You can start right away by using the Gitpod online worksp
 
 [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/MovingBlocks/TeraNUI)
 
+In Terasology, you can test easily locally until you're ready for a snapshot or release. To do so, you'll need to re-embed TeraNUI into Terasology as source which has priority over any binary version. You can get the TeraNUI library as source into your local Terasology workspace as follows:
+```sh
+groovyw lib get TeraNUI
+```
+This will place the TeraNUI source code into `/libs/TeraNUI`. Please note, that you may need to reload/refresh your gradle workspace in Intellij IDEA.
+
 ## 🤖 Maintenance
 
 The main development of TeraNUI happens on the `master` branch, a strong main branch that always has the latest version
@@ -51,7 +57,8 @@ The exact build steps for this library are defined in the [Jenkinsfile](./Jenkin
 
 🗄 [**Snapshots**][artifactory-nui-snapshot] ▪ [**Releases**][artifactory-nui-release]
 
-> 🚧 TODO: how to consume TeraNUI from the Terasolgoy Artifactory (e.g., gradle dependency snippet)
+
+> 🚧 TODO: how to consume TeraNUI from the Terasology Artifactory (e.g., gradle dependency snippet)
 
 ### Release Process
 

build.gradle

@@ -6,7 +6,7 @@ plugins {
 
 ext {
     // Overall version number for NUI's various elements
-    nuiVersion = "1.0.0-SNAPSHOT"
+    nuiVersion = "2.1.0-SNAPSHOT"
 
     // JOML version we're tracking
     jomlVersion = "1.9.25"

gradle/common.gradle

@@ -15,6 +15,9 @@ repositories {
     jcenter()
     mavenCentral()
 
+    // Google's Maven repository - Needed for com.android.support:support-annotations, which gestalt 7 uses
+    google()
+
     // MovingBlocks Artifactory instance for libs not readily available elsewhere plus our own libs
     maven {
         def repoViaEnv = System.getenv()["RESOLUTION_REPO"]

nui-input/build.gradle

@@ -6,8 +6,8 @@ plugins {
 apply from: "$rootDir/gradle/common.gradle"
 
 dependencies {
-    api group: 'org.terasology', name: 'gestalt-module', version: '5.1.5'
-    api group: 'org.terasology', name: 'gestalt-asset-core', version: '5.1.5'
+    api group: 'org.terasology.gestalt', name: 'gestalt-module', version: '7.0.3'
+    api group: 'org.terasology.gestalt', name: 'gestalt-asset-core', version: '7.0.3'
 
     api ('org.joml:joml') {
         version {

nui-input/src/main/java/org/terasology/input/ActivateMode.java → nui-input/src/main/java/org/terasology/nui/input/ActivateMode.java

@@ -1,24 +1,10 @@
-/*
- * Copyright 2013 MovingBlocks
- *
- * 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
- *
- *      http://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.
- */
+// Copyright 2020 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
 
-package org.terasology.input;
+package org.terasology.nui.input;
 
 /**
  * This enum determines which events a button will send
- *
  */
 public enum ActivateMode {
     /**
@@ -34,8 +20,8 @@ public enum ActivateMode {
      */
     BOTH(true, true);
 
-    private boolean activatedOnPress;
-    private boolean activatedOnRelease;
+    private final boolean activatedOnPress;
+    private final boolean activatedOnRelease;
 
     ActivateMode(boolean activatedOnPress, boolean activatedOnRelease) {
         this.activatedOnPress = activatedOnPress;