Skip to content

feat: migrate in change from v1 to master #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pollend wants to merge 9 commits into from
Closed

feat: migrate in change from v1 to master #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
926d327
Updated NUI to use gestalt 7 (#4)
BenjaminAmos Aug 9, 2020
4f78131
release: version 2.0.0
skaldarnar Aug 9, 2020
456edae
chore: prepare next snapshot for 2.1.0-SNAPSHOT
skaldarnar Aug 9, 2020
40b4a18
chore: add info how to get TeraNUI for local testting
jdrueckert Aug 9, 2020
b228db2
chore: Add math utility `addClampAtMax` for float
skaldarnar Aug 10, 2020
a4a74e3
fix: `createFromMinAndSize` clamps and validates result
skaldarnar Aug 10, 2020
e1f7918
docs: Add JavaDoc for `createFromMinAndMax`
skaldarnar Aug 10, 2020
7e9c5d5
fiy(miglayout): `setRowConstraints` uses col constraints (#26)
jdrueckert Sep 12, 2020
50aba64
Merge branch 'release/v1.x' into feature/master-update-from-v1
pollend Mar 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {

ext {
// Overall version number for NUI's various elements
nuiVersion = "1.5.0-SNAPSHOT"
nuiVersion = "2.1.0-SNAPSHOT"

// JOML version we're tracking
jomlVersion = "1.10.0"
Expand Down
6 changes: 4 additions & 2 deletions gradle/common.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ repositories {
mavenLocal()

// External libs - jcenter is Bintray and is supposed to be a superset of Maven Central, but do both just in case
jcenter()
mavenCentral()

// Terasology Artifactory instance for libs not readily available elsewhere plus our own libs
// 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"]
if (rootProject.hasProperty("alternativeResolutionRepo")) {
Expand Down
4 changes: 2 additions & 2 deletions nui-input/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion nui-input/src/main/java/org/terasology/input/device/InputDevice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
5 changes: 3 additions & 2 deletions nui-input/src/main/java/org/terasology/input/device/KeyboardDevice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
// SPDX-License-Identifier: Apache-2.0
package org.terasology.input.device;

import java.util.Queue;

import org.terasology.module.sandbox.API;
import org.terasology.gestalt.module.sandbox.API;

import java.util.Queue;

/**
*/
Expand Down
6 changes: 3 additions & 3 deletions nui-input/src/main/java/org/terasology/input/device/MouseDevice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
*/
package org.terasology.input.device;

import java.util.Queue;

import org.joml.Vector2d;
import org.terasology.module.sandbox.API;
import org.joml.Vector2i;
import org.terasology.gestalt.module.sandbox.API;

import java.util.Queue;

/**
*/
Expand Down
2 changes: 1 addition & 1 deletion nui-input/src/main/java/org/terasology/input/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@

@API package org.terasology.input;

import org.terasology.module.sandbox.API;
import org.terasology.gestalt.module.sandbox.API;
2 changes: 1 addition & 1 deletion nui-libgdx/src/main/java/org/terasology/nui/backends/libgdx/LibGDXFont.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions nui-libgdx/src/main/java/org/terasology/nui/backends/libgdx/LibGDXTexture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.Vector2i;
import org.terasology.gestalt.assets.AssetData;
import org.terasology.joml.geom.Rectanglef;
import org.terasology.joml.geom.Rectanglei;
import org.joml.Vector2i;
import org.terasology.nui.UITextureRegion;
import org.terasology.nui.util.RectUtility;

Expand Down
4 changes: 2 additions & 2 deletions nui-reflect/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down
2 changes: 1 addition & 1 deletion nui-reflect/src/main/java/org/terasology/reflection/MappedContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion nui-reflect/src/main/java/org/terasology/reflection/TypeInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions nui-reflect/src/main/java/org/terasology/reflection/TypeRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}
}

Expand Down
2 changes: 1 addition & 1 deletion nui-reflect/src/main/java/org/terasology/reflection/copy/CopyStrategyLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions nui-reflect/src/main/java/org/terasology/reflection/metadata/AbstractClassLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions nui-reflect/src/main/java/org/terasology/reflection/metadata/ClassLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion nui-reflect/src/main/java/org/terasology/reflection/metadata/ClassMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
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.CopyStrategyLibrary;
import org.terasology.reflection.reflect.InaccessibleFieldException;
import org.terasology.reflection.reflect.ObjectConstructor;
Expand Down
4 changes: 2 additions & 2 deletions nui-reflect/src/main/java/org/terasology/reflection/metadata/DefaultClassLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion nui-reflect/src/main/java/org/terasology/reflection/metadata/DefaultClassMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
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.CopyStrategyLibrary;
import org.terasology.reflection.reflect.InaccessibleFieldException;
import org.terasology.reflection.reflect.ReflectFactory;
Expand Down
2 changes: 1 addition & 1 deletion nui-reflect/src/main/java/org/terasology/reflection/metadata/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
@API
package org.terasology.reflection.metadata;

import org.terasology.module.sandbox.API;
import org.terasology.gestalt.module.sandbox.API;
4 changes: 2 additions & 2 deletions nui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion nui/src/main/java/org/terasology/nui/Color.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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;
Expand Down
2 changes: 1 addition & 1 deletion nui/src/main/java/org/terasology/nui/FontColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion nui/src/main/java/org/terasology/nui/FontUnderline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion nui/src/main/java/org/terasology/nui/asset/Sound.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions nui/src/main/java/org/terasology/nui/asset/UIData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
10 changes: 5 additions & 5 deletions nui/src/main/java/org/terasology/nui/asset/UIElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion nui/src/main/java/org/terasology/nui/asset/font/Font.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion nui/src/main/java/org/terasology/nui/asset/font/FontCharacter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion nui/src/main/java/org/terasology/nui/databinding/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
*/
@API package org.terasology.nui.databinding;

import org.terasology.module.sandbox.API;
import org.terasology.gestalt.module.sandbox.API;
2 changes: 1 addition & 1 deletion nui/src/main/java/org/terasology/nui/events/NUIBindButtonEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion nui/src/main/java/org/terasology/nui/events/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
*/
@API package org.terasology.nui.events;

import org.terasology.module.sandbox.API;
import org.terasology.gestalt.module.sandbox.API;
2 changes: 1 addition & 1 deletion nui/src/main/java/org/terasology/nui/itemRendering/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
*/
@API package org.terasology.nui.itemRendering;

import org.terasology.module.sandbox.API;
import org.terasology.gestalt.module.sandbox.API;
2 changes: 1 addition & 1 deletion nui/src/main/java/org/terasology/nui/layouts/miglayout/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@

@API package org.terasology.nui.layouts.miglayout;

import org.terasology.module.sandbox.API;
import org.terasology.gestalt.module.sandbox.API;
2 changes: 1 addition & 1 deletion nui/src/main/java/org/terasology/nui/layouts/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
*/
@API package org.terasology.nui.layouts;

import org.terasology.module.sandbox.API;
import org.terasology.gestalt.module.sandbox.API;
2 changes: 1 addition & 1 deletion nui/src/main/java/org/terasology/nui/layouts/relative/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
*/
@API package org.terasology.nui.layouts.relative;

import org.terasology.module.sandbox.API;
import org.terasology.gestalt.module.sandbox.API;
2 changes: 1 addition & 1 deletion nui/src/main/java/org/terasology/nui/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
*/
@API package org.terasology.nui;

import org.terasology.module.sandbox.API;
import org.terasology.gestalt.module.sandbox.API;
2 changes: 1 addition & 1 deletion nui/src/main/java/org/terasology/nui/properties/Checkbox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion nui/src/main/java/org/terasology/nui/properties/OneOf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading