Refreshing v2 with changes from v1 using rebase

build.gradle

@@ -6,7 +6,7 @@ plugins {
 
 ext {
     // Overall version number for NUI's various elements
-    nuiVersion = "1.2.1-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()
+
     // Terasology 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/device/InputDevice.java

@@ -15,7 +15,7 @@
  */
 package org.terasology.input.device;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;
 
 import java.util.Queue;
 

nui-input/src/main/java/org/terasology/input/device/KeyboardDevice.java

@@ -17,7 +17,7 @@
 
 import java.util.Queue;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;
 
 /**
  */

nui-input/src/main/java/org/terasology/input/device/MouseDevice.java

@@ -17,8 +17,8 @@
 
 import java.util.Queue;
 
-import org.terasology.module.sandbox.API;
 import org.joml.Vector2i;
+import org.terasology.gestalt.module.sandbox.API;
 
 /**
  */

nui-input/src/main/java/org/terasology/input/package-info.java

@@ -17,4 +17,4 @@
 
 @API package org.terasology.input;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;

nui-libgdx/src/main/java/org/terasology/nui/backends/libgdx/LibGDXFont.java

@@ -17,8 +17,8 @@
 
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.GlyphLayout;
-import org.terasology.assets.AssetData;
 import org.joml.Vector2i;
+import org.terasology.gestalt.assets.AssetData;
 import org.terasology.nui.asset.font.Font;
 
 import java.util.List;

nui-libgdx/src/main/java/org/terasology/nui/backends/libgdx/LibGDXTexture.java

@@ -16,10 +16,10 @@
 package org.terasology.nui.backends.libgdx;
 
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import org.terasology.assets.AssetData;
 import org.joml.Rectanglef;
 import org.joml.Rectanglei;
 import org.joml.Vector2i;
+import org.terasology.gestalt.assets.AssetData;
 import org.terasology.nui.UITextureRegion;
 import org.terasology.nui.util.RectUtility;
 

nui-reflect/build.gradle

@@ -10,8 +10,8 @@ dependencies {
     implementation group: 'org.reflections', name: 'reflections', version: '0.9.10'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.6.2'
 
-    implementation group: 'org.terasology', name: 'gestalt-module', version: '5.1.5'
-    implementation group: 'org.terasology', name: 'gestalt-asset-core', version: '5.1.5'
+    implementation group: 'org.terasology.gestalt', name: 'gestalt-module', version: '7.0.3'
+    implementation group: 'org.terasology.gestalt', name: 'gestalt-asset-core', version: '7.0.3'
 
     implementation group: 'com.google.guava', name: 'guava', version: '23.0'
     api ('org.joml:joml') {

nui-reflect/src/main/java/org/terasology/reflection/MappedContainer.java

@@ -16,7 +16,7 @@
 
 package org.terasology.reflection;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

nui-reflect/src/main/java/org/terasology/reflection/TypeInfo.java

@@ -15,7 +15,7 @@
  */
 package org.terasology.reflection;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;
 import org.terasology.reflection.ReflectionUtil;
 
 import java.lang.reflect.Type;

nui-reflect/src/main/java/org/terasology/reflection/TypeRegistry.java

@@ -22,9 +22,9 @@
 import org.reflections.scanners.TypeAnnotationsScanner;
 import org.reflections.util.ClasspathHelper;
 import org.reflections.util.ConfigurationBuilder;
-import org.terasology.module.Module;
-import org.terasology.module.ModuleEnvironment;
-import org.terasology.module.sandbox.ModuleClassLoader;
+import org.terasology.gestalt.module.Module;
+import org.terasology.gestalt.module.ModuleEnvironment;
+import org.terasology.gestalt.module.sandbox.ModuleClassLoader;
 import org.terasology.reflection.ReflectionUtil;
 
 import java.lang.annotation.Annotation;
@@ -118,11 +118,11 @@ private void initializeReflections(ClassLoader classLoader, ModuleEnvironment en
         initializeReflections(classLoader);
 
         for (Module module : environment.getModulesOrderedByDependencies()) {
-            if (!module.isCodeModule()) {
+            if (module.getClasspaths().size() == 0) {
                 continue;
             }
 
-            reflections.merge(module.getReflectionsFragment());
+            reflections.merge(module.getModuleManifest());
         }
     }
 

nui-reflect/src/main/java/org/terasology/reflection/copy/CopyStrategyLibrary.java

@@ -18,7 +18,7 @@
 import com.google.common.collect.Maps;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.assets.ResourceUrn;
+import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.reflection.metadata.ClassMetadata;
 import org.terasology.reflection.metadata.DefaultClassMetadata;
 import org.terasology.reflection.MappedContainer;

nui-reflect/src/main/java/org/terasology/reflection/metadata/AbstractClassLibrary.java

@@ -23,10 +23,10 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.assets.ResourceUrn;
-import org.terasology.module.Module;
-import org.terasology.module.ModuleEnvironment;
-import org.terasology.naming.Name;
+import org.terasology.gestalt.assets.ResourceUrn;
+import org.terasology.gestalt.module.Module;
+import org.terasology.gestalt.module.ModuleEnvironment;
+import org.terasology.gestalt.naming.Name;
 import org.terasology.reflection.copy.CopyStrategyLibrary;
 import org.terasology.reflection.reflect.ReflectFactory;
 

nui-reflect/src/main/java/org/terasology/reflection/metadata/ClassLibrary.java

@@ -16,9 +16,9 @@
 
 package org.terasology.reflection.metadata;
 
-import org.terasology.assets.ResourceUrn;
-import org.terasology.module.Module;
-import org.terasology.naming.Name;
+import org.terasology.gestalt.assets.ResourceUrn;
+import org.terasology.gestalt.module.Module;
+import org.terasology.gestalt.naming.Name;
 
 import java.util.List;
 

nui-reflect/src/main/java/org/terasology/reflection/metadata/ClassMetadata.java

@@ -23,7 +23,8 @@
 import org.reflections.ReflectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.assets.ResourceUrn;
+import org.terasology.gestalt.assets.ResourceUrn;
+import org.terasology.reflection.copy.CopyStrategy;
 import org.terasology.reflection.copy.CopyStrategyLibrary;
 import org.terasology.reflection.reflect.InaccessibleFieldException;
 import org.terasology.reflection.reflect.ObjectConstructor;

nui-reflect/src/main/java/org/terasology/reflection/metadata/DefaultClassLibrary.java

@@ -17,8 +17,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.assets.ResourceUrn;
-import org.terasology.module.ModuleEnvironment;
+import org.terasology.gestalt.assets.ResourceUrn;
+import org.terasology.gestalt.module.ModuleEnvironment;
 import org.terasology.reflection.copy.CopyStrategyLibrary;
 import org.terasology.reflection.reflect.ReflectFactory;
 

nui-reflect/src/main/java/org/terasology/reflection/metadata/DefaultClassMetadata.java

@@ -16,7 +16,8 @@
 package org.terasology.reflection.metadata;
 
 import com.google.common.base.Predicates;
-import org.terasology.assets.ResourceUrn;
+import org.terasology.gestalt.assets.ResourceUrn;
+import org.terasology.reflection.copy.CopyStrategy;
 import org.terasology.reflection.copy.CopyStrategyLibrary;
 import org.terasology.reflection.reflect.InaccessibleFieldException;
 import org.terasology.reflection.reflect.ReflectFactory;

nui-reflect/src/main/java/org/terasology/reflection/metadata/package-info.java

@@ -30,4 +30,4 @@
 @API
 package org.terasology.reflection.metadata;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;

nui/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 group: 'org.abego.treelayout', name: 'org.abego.treelayout.core', version: '1.0.3'
     api group: 'com.miglayout', name: 'miglayout-core', version: '5.0'

nui/src/main/java/org/terasology/nui/Color.java

@@ -21,7 +21,7 @@
 import org.joml.Vector3ic;
 import org.joml.Vector4fc;
 import org.joml.Vector4ic;
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;
 
 import java.nio.ByteBuffer;
 import java.util.Locale;

nui/src/main/java/org/terasology/nui/FontColor.java

@@ -16,7 +16,7 @@
 
 package org.terasology.nui;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;
 import org.terasology.nui.Color;
 
 /**

nui/src/main/java/org/terasology/nui/FontUnderline.java

@@ -16,7 +16,7 @@
 
 package org.terasology.nui;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;
 
 /**
  * Defines a set of special characters that mark contents of a string to be underlined

nui/src/main/java/org/terasology/nui/asset/Sound.java

@@ -18,7 +18,7 @@
 
 package org.terasology.nui.asset;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;
 
 @API
 public interface Sound {

nui/src/main/java/org/terasology/nui/asset/UIData.java

@@ -15,9 +15,9 @@
  */
 package org.terasology.nui.asset;
 
-import org.terasology.assets.AssetData;
-import org.terasology.assets.format.AssetDataFile;
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.assets.AssetData;
+import org.terasology.gestalt.assets.format.AssetDataFile;
+import org.terasology.gestalt.module.sandbox.API;
 import org.terasology.nui.UIWidget;
 
 /**

nui/src/main/java/org/terasology/nui/asset/UIElement.java

@@ -15,11 +15,11 @@
  */
 package org.terasology.nui.asset;
 
-import org.terasology.assets.Asset;
-import org.terasology.assets.AssetType;
-import org.terasology.assets.ResourceUrn;
-import org.terasology.assets.format.AssetDataFile;
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.assets.Asset;
+import org.terasology.gestalt.assets.AssetType;
+import org.terasology.gestalt.assets.ResourceUrn;
+import org.terasology.gestalt.assets.format.AssetDataFile;
+import org.terasology.gestalt.module.sandbox.API;
 import org.terasology.nui.UIWidget;
 
 import java.util.List;

nui/src/main/java/org/terasology/nui/asset/font/Font.java

@@ -16,8 +16,8 @@
 
 package org.terasology.nui.asset.font;
 
-import org.terasology.module.sandbox.API;
 import org.joml.Vector2i;
+import org.terasology.gestalt.module.sandbox.API;
 
 import java.util.List;
 

nui/src/main/java/org/terasology/nui/asset/font/FontCharacter.java

@@ -16,7 +16,7 @@
 
 package org.terasology.nui.asset.font;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;
 import org.terasology.nui.UITextureRegion;
 
 /**

nui/src/main/java/org/terasology/nui/databinding/package-info.java

@@ -19,4 +19,4 @@
  */
 @API package org.terasology.nui.databinding;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;

nui/src/main/java/org/terasology/nui/events/NUIBindButtonEvent.java

@@ -16,7 +16,7 @@
 
 package org.terasology.nui.events;
 
-import org.terasology.assets.ResourceUrn;
+import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.input.ButtonState;
 import org.terasology.input.device.KeyboardDevice;
 import org.terasology.input.device.MouseDevice;

nui/src/main/java/org/terasology/nui/events/package-info.java

@@ -19,4 +19,4 @@
  */
 @API package org.terasology.nui.events;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;

nui/src/main/java/org/terasology/nui/itemRendering/package-info.java

@@ -19,4 +19,4 @@
  */
 @API package org.terasology.nui.itemRendering;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;

nui/src/main/java/org/terasology/nui/layouts/miglayout/package-info.java

@@ -16,4 +16,4 @@
 
 @API package org.terasology.nui.layouts.miglayout;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;

nui/src/main/java/org/terasology/nui/layouts/package-info.java

@@ -19,4 +19,4 @@
  */
 @API package org.terasology.nui.layouts;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;

nui/src/main/java/org/terasology/nui/layouts/relative/package-info.java

@@ -19,4 +19,4 @@
  */
 @API package org.terasology.nui.layouts.relative;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;

nui/src/main/java/org/terasology/nui/package-info.java

@@ -29,4 +29,4 @@
  */
 @API package org.terasology.nui;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;

nui/src/main/java/org/terasology/nui/properties/Checkbox.java

@@ -15,7 +15,7 @@
  */
 package org.terasology.nui.properties;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

nui/src/main/java/org/terasology/nui/properties/OneOf.java

@@ -15,7 +15,7 @@
  */
 package org.terasology.nui.properties;
 
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

nui/src/main/java/org/terasology/nui/properties/OneOfProviderFactory.java

@@ -16,7 +16,7 @@
 package org.terasology.nui.properties;
 
 import com.google.common.collect.Maps;
-import org.terasology.module.sandbox.API;
+import org.terasology.gestalt.module.sandbox.API;
 import org.terasology.nui.databinding.Binding;
 import org.terasology.nui.itemRendering.ItemRenderer;